]> git.openstreetmap.org Git - rails.git/commitdiff
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"
                 },
-                "name": "Dam"
-            },
-            "waterway/ditch": {
-                "icon": "waterway-ditch",
+                "name": "The Swan",
+                "icon": "beer",
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Rose and Crown": {
                 "tags": {
-                    "waterway": "ditch"
+                    "name": "Rose and Crown",
+                    "amenity": "pub"
                 },
-                "name": "Ditch"
-            },
-            "waterway/drain": {
-                "icon": "waterway-stream",
+                "name": "Rose and Crown",
+                "icon": "beer",
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Victoria": {
                 "tags": {
-                    "waterway": "drain"
+                    "name": "The Victoria",
+                    "amenity": "pub"
                 },
-                "name": "Drain"
-            },
-            "waterway/river": {
-                "icon": "waterway-river",
+                "name": "The Victoria",
+                "icon": "beer",
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "terms": [
-                    "beck",
-                    "branch",
-                    "brook",
-                    "course",
-                    "creek",
-                    "estuary",
-                    "rill",
-                    "rivulet",
-                    "run",
-                    "runnel",
-                    "stream",
-                    "tributary",
-                    "watercourse"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/New Inn": {
                 "tags": {
-                    "waterway": "river"
+                    "name": "New Inn",
+                    "amenity": "pub"
                 },
-                "name": "River"
-            },
-            "waterway/riverbank": {
-                "icon": "water",
+                "name": "New Inn",
+                "icon": "beer",
                 "geometry": [
+                    "point",
+                    "vertex",
                     "area"
                 ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/pub/Royal Hotel": {
                 "tags": {
-                    "waterway": "riverbank"
+                    "name": "Royal Hotel",
+                    "amenity": "pub"
                 },
-                "name": "Riverbank"
-            },
-            "waterway/stream": {
-                "icon": "waterway-stream",
+                "name": "Royal Hotel",
+                "icon": "beer",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
                 "fields": [
-                    "layer"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Cross Keys": {
+                "tags": {
+                    "name": "Cross Keys",
+                    "amenity": "pub"
+                },
+                "name": "Cross Keys",
+                "icon": "beer",
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "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"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Greyhound": {
                 "tags": {
-                    "waterway": "stream"
+                    "name": "The Greyhound",
+                    "amenity": "pub"
                 },
-                "name": "Stream"
-            },
-            "waterway/weir": {
-                "icon": "dam",
+                "name": "The Greyhound",
+                "icon": "beer",
                 "geometry": [
+                    "point",
                     "vertex",
-                    "line"
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Black Horse": {
                 "tags": {
-                    "waterway": "weir"
+                    "name": "The Black Horse",
+                    "amenity": "pub"
                 },
-                "name": "Weir"
+                "name": "The Black Horse",
+                "icon": "beer",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
             },
-            "amenity/bank/ABN AMRO": {
+            "amenity/pub/The New Inn": {
                 "tags": {
-                    "name": "ABN AMRO",
-                    "amenity": "bank"
+                    "name": "The New Inn",
+                    "amenity": "pub"
                 },
-                "name": "ABN AMRO",
-                "icon": "bank",
+                "name": "The New Inn",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ABSA": {
+            "amenity/pub/Kings Head": {
                 "tags": {
-                    "name": "ABSA",
-                    "amenity": "bank"
+                    "name": "Kings Head",
+                    "amenity": "pub"
                 },
-                "name": "ABSA",
-                "icon": "bank",
+                "name": "Kings Head",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/AIB": {
+            "amenity/pub/The Angel": {
                 "tags": {
-                    "name": "AIB",
-                    "amenity": "bank"
+                    "name": "The Angel",
+                    "amenity": "pub"
                 },
-                "name": "AIB",
-                "icon": "bank",
+                "name": "The Angel",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ANZ": {
+            "amenity/pub/The Queens Head": {
                 "tags": {
-                    "name": "ANZ",
-                    "amenity": "bank"
+                    "name": "The Queens Head",
+                    "amenity": "pub"
                 },
-                "name": "ANZ",
-                "icon": "bank",
+                "name": "The Queens Head",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/AXA": {
+            "amenity/pub/The Ship Inn": {
                 "tags": {
-                    "name": "AXA",
-                    "amenity": "bank"
+                    "name": "The Ship Inn",
+                    "amenity": "pub"
                 },
-                "name": "AXA",
-                "icon": "bank",
+                "name": "The Ship Inn",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Alior Bank": {
+            "amenity/pub/Rose & Crown": {
                 "tags": {
-                    "name": "Alior Bank",
-                    "amenity": "bank"
+                    "name": "Rose & Crown",
+                    "amenity": "pub"
                 },
-                "name": "Alior Bank",
-                "icon": "bank",
+                "name": "Rose & Crown",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Allied Bank": {
+            "amenity/pub/Queens Head": {
                 "tags": {
-                    "name": "Allied Bank",
-                    "amenity": "bank"
+                    "name": "Queens Head",
+                    "amenity": "pub"
                 },
-                "name": "Allied Bank",
-                "icon": "bank",
+                "name": "Queens Head",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Alpha Bank": {
+            "amenity/pub/Irish Pub": {
                 "tags": {
-                    "name": "Alpha Bank",
-                    "amenity": "bank"
+                    "name": "Irish Pub",
+                    "amenity": "pub"
                 },
-                "name": "Alpha Bank",
-                "icon": "bank",
+                "name": "Irish Pub",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Argenta": {
+            "amenity/fuel/76": {
                 "tags": {
-                    "name": "Argenta",
-                    "amenity": "bank"
+                    "name": "76",
+                    "amenity": "fuel"
                 },
-                "name": "Argenta",
-                "icon": "bank",
+                "name": "76",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Axis Bank": {
+            "amenity/fuel/Neste": {
                 "tags": {
-                    "name": "Axis Bank",
-                    "amenity": "bank"
+                    "name": "Neste",
+                    "amenity": "fuel"
                 },
-                "name": "Axis Bank",
-                "icon": "bank",
+                "name": "Neste",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BAWAG PSK": {
+            "amenity/fuel/BP": {
                 "tags": {
-                    "name": "BAWAG PSK",
-                    "amenity": "bank"
+                    "name": "BP",
+                    "amenity": "fuel"
                 },
-                "name": "BAWAG PSK",
-                "icon": "bank",
+                "name": "BP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BB&T": {
+            "amenity/fuel/Shell": {
                 "tags": {
-                    "name": "BB&T",
-                    "amenity": "bank"
+                    "name": "Shell",
+                    "amenity": "fuel"
                 },
-                "name": "BB&T",
-                "icon": "bank",
+                "name": "Shell",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BBK": {
+            "amenity/fuel/Agip": {
                 "tags": {
-                    "name": "BBK",
-                    "amenity": "bank"
+                    "name": "Agip",
+                    "amenity": "fuel"
                 },
-                "name": "BBK",
-                "icon": "bank",
+                "name": "Agip",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BBVA": {
+            "amenity/fuel/Migrol": {
                 "tags": {
-                    "name": "BBVA",
-                    "amenity": "bank"
+                    "name": "Migrol",
+                    "amenity": "fuel"
                 },
-                "name": "BBVA",
-                "icon": "bank",
+                "name": "Migrol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BCI": {
+            "amenity/fuel/Avia": {
                 "tags": {
-                    "name": "BCI",
-                    "amenity": "bank"
+                    "name": "Avia",
+                    "amenity": "fuel"
                 },
-                "name": "BCI",
-                "icon": "bank",
+                "name": "Avia",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BCR": {
+            "amenity/fuel/Texaco": {
                 "tags": {
-                    "name": "BCR",
-                    "amenity": "bank"
+                    "name": "Texaco",
+                    "amenity": "fuel"
                 },
-                "name": "BCR",
-                "icon": "bank",
+                "name": "Texaco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BDO": {
+            "amenity/fuel/Total": {
                 "tags": {
-                    "name": "BDO",
-                    "amenity": "bank"
+                    "name": "Total",
+                    "amenity": "fuel"
                 },
-                "name": "BDO",
-                "icon": "bank",
+                "name": "Total",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BES": {
+            "amenity/fuel/Statoil": {
                 "tags": {
-                    "name": "BES",
-                    "amenity": "bank"
+                    "name": "Statoil",
+                    "amenity": "fuel"
                 },
-                "name": "BES",
-                "icon": "bank",
+                "name": "Statoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BMO": {
+            "amenity/fuel/Esso": {
                 "tags": {
-                    "name": "BMO",
-                    "amenity": "bank"
+                    "name": "Esso",
+                    "amenity": "fuel"
                 },
-                "name": "BMO",
-                "icon": "bank",
+                "name": "Esso",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNL": {
+            "amenity/fuel/Jet": {
                 "tags": {
-                    "name": "BNL",
-                    "amenity": "bank"
+                    "name": "Jet",
+                    "amenity": "fuel"
                 },
-                "name": "BNL",
-                "icon": "bank",
+                "name": "Jet",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNP": {
+            "amenity/fuel/Avanti": {
                 "tags": {
-                    "name": "BNP",
-                    "amenity": "bank"
+                    "name": "Avanti",
+                    "amenity": "fuel"
                 },
-                "name": "BNP",
-                "icon": "bank",
+                "name": "Avanti",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNP Paribas": {
+            "amenity/fuel/Sainsbury's": {
                 "tags": {
-                    "name": "BNP Paribas",
-                    "amenity": "bank"
+                    "name": "Sainsbury's",
+                    "amenity": "fuel"
                 },
-                "name": "BNP Paribas",
-                "icon": "bank",
+                "name": "Sainsbury's",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNP Paribas Fortis": {
+            "amenity/fuel/OMV": {
                 "tags": {
-                    "name": "BNP Paribas Fortis",
-                    "amenity": "bank"
+                    "name": "OMV",
+                    "amenity": "fuel"
                 },
-                "name": "BNP Paribas Fortis",
-                "icon": "bank",
+                "name": "OMV",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BPI": {
+            "amenity/fuel/Aral": {
                 "tags": {
-                    "name": "BPI",
-                    "amenity": "bank"
+                    "name": "Aral",
+                    "amenity": "fuel"
                 },
-                "name": "BPI",
-                "icon": "bank",
+                "name": "Aral",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BRD": {
+            "amenity/fuel/Tesco": {
                 "tags": {
-                    "name": "BRD",
-                    "amenity": "bank"
+                    "name": "Tesco",
+                    "amenity": "fuel"
                 },
-                "name": "BRD",
-                "icon": "bank",
+                "name": "Tesco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BW-Bank": {
+            "amenity/fuel/JET": {
                 "tags": {
-                    "name": "BW-Bank",
-                    "amenity": "bank"
+                    "name": "JET",
+                    "amenity": "fuel"
                 },
-                "name": "BW-Bank",
-                "icon": "bank",
+                "name": "JET",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BZ WBK": {
+            "amenity/fuel/Morrisons": {
                 "tags": {
-                    "name": "BZ WBK",
-                    "amenity": "bank"
+                    "name": "Morrisons",
+                    "amenity": "fuel"
                 },
-                "name": "BZ WBK",
-                "icon": "bank",
+                "name": "Morrisons",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banamex": {
+            "amenity/fuel/United": {
                 "tags": {
-                    "name": "Banamex",
-                    "amenity": "bank"
+                    "name": "United",
+                    "amenity": "fuel"
                 },
-                "name": "Banamex",
-                "icon": "bank",
+                "name": "United",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Intesa": {
+            "amenity/fuel/Canadian Tire": {
                 "tags": {
-                    "name": "Banca Intesa",
-                    "amenity": "bank"
+                    "name": "Canadian Tire",
+                    "amenity": "fuel"
                 },
-                "name": "Banca Intesa",
-                "icon": "bank",
+                "name": "Canadian Tire",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Popolare di Novara": {
+            "amenity/fuel/Mobil": {
                 "tags": {
-                    "name": "Banca Popolare di Novara",
-                    "amenity": "bank"
+                    "name": "Mobil",
+                    "amenity": "fuel"
                 },
-                "name": "Banca Popolare di Novara",
-                "icon": "bank",
+                "name": "Mobil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Popolare di Vicenza": {
+            "amenity/fuel/Caltex": {
                 "tags": {
-                    "name": "Banca Popolare di Vicenza",
-                    "amenity": "bank"
+                    "name": "Caltex",
+                    "amenity": "fuel"
                 },
-                "name": "Banca Popolare di Vicenza",
-                "icon": "bank",
+                "name": "Caltex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Transilvania": {
+            "amenity/fuel/Sunoco": {
                 "tags": {
-                    "name": "Banca Transilvania",
-                    "amenity": "bank"
+                    "name": "Sunoco",
+                    "amenity": "fuel"
                 },
-                "name": "Banca Transilvania",
-                "icon": "bank",
+                "name": "Sunoco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancaja": {
+            "amenity/fuel/Q8": {
                 "tags": {
-                    "name": "Bancaja",
-                    "amenity": "bank"
+                    "name": "Q8",
+                    "amenity": "fuel"
                 },
-                "name": "Bancaja",
-                "icon": "bank",
+                "name": "Q8",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco BCI": {
+            "amenity/fuel/ABC": {
                 "tags": {
-                    "name": "Banco BCI",
-                    "amenity": "bank"
+                    "name": "ABC",
+                    "amenity": "fuel"
                 },
-                "name": "Banco BCI",
-                "icon": "bank",
+                "name": "ABC",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Estado": {
+            "amenity/fuel/Tankstelle": {
                 "tags": {
-                    "name": "Banco Estado",
-                    "amenity": "bank"
+                    "name": "Tankstelle",
+                    "amenity": "fuel"
                 },
-                "name": "Banco Estado",
-                "icon": "bank",
+                "name": "Tankstelle",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco G&T Continental": {
+            "amenity/fuel/ARAL": {
                 "tags": {
-                    "name": "Banco G&T Continental",
-                    "amenity": "bank"
+                    "name": "ARAL",
+                    "amenity": "fuel"
                 },
-                "name": "Banco G&T Continental",
-                "icon": "bank",
+                "name": "ARAL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Itaú": {
+            "amenity/fuel/CEPSA": {
                 "tags": {
-                    "name": "Banco Itaú",
-                    "amenity": "bank"
+                    "name": "CEPSA",
+                    "amenity": "fuel"
                 },
-                "name": "Banco Itaú",
-                "icon": "bank",
+                "name": "CEPSA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Nación": {
+            "amenity/fuel/BFT": {
                 "tags": {
-                    "name": "Banco Nación",
-                    "amenity": "bank"
+                    "name": "BFT",
+                    "amenity": "fuel"
                 },
-                "name": "Banco Nación",
-                "icon": "bank",
+                "name": "BFT",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Pastor": {
+            "amenity/fuel/Petron": {
                 "tags": {
-                    "name": "Banco Pastor",
-                    "amenity": "bank"
+                    "name": "Petron",
+                    "amenity": "fuel"
                 },
-                "name": "Banco Pastor",
-                "icon": "bank",
+                "name": "Petron",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Popular": {
+            "amenity/fuel/Intermarché": {
                 "tags": {
-                    "name": "Banco Popular",
-                    "amenity": "bank"
+                    "name": "Intermarché",
+                    "amenity": "fuel"
                 },
-                "name": "Banco Popular",
-                "icon": "bank",
+                "name": "Intermarché",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Provincia": {
+            "amenity/fuel/Super U": {
                 "tags": {
-                    "name": "Banco Provincia",
-                    "amenity": "bank"
+                    "name": "Super U",
+                    "amenity": "fuel"
                 },
-                "name": "Banco Provincia",
-                "icon": "bank",
+                "name": "Super U",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Santander": {
+            "amenity/fuel/Auchan": {
                 "tags": {
-                    "name": "Banco Santander",
-                    "amenity": "bank"
+                    "name": "Auchan",
+                    "amenity": "fuel"
                 },
-                "name": "Banco Santander",
-                "icon": "bank",
+                "name": "Auchan",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de Chile": {
+            "amenity/fuel/Elf": {
                 "tags": {
-                    "name": "Banco de Chile",
-                    "amenity": "bank"
+                    "name": "Elf",
+                    "amenity": "fuel"
                 },
-                "name": "Banco de Chile",
-                "icon": "bank",
+                "name": "Elf",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de Costa Rica": {
+            "amenity/fuel/Carrefour": {
                 "tags": {
-                    "name": "Banco de Costa Rica",
-                    "amenity": "bank"
+                    "name": "Carrefour",
+                    "amenity": "fuel"
                 },
-                "name": "Banco de Costa Rica",
-                "icon": "bank",
+                "name": "Carrefour",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de Desarrollo Banrural": {
+            "amenity/fuel/Station Service E. Leclerc": {
                 "tags": {
-                    "name": "Banco de Desarrollo Banrural",
-                    "amenity": "bank"
+                    "name": "Station Service E. Leclerc",
+                    "amenity": "fuel"
                 },
-                "name": "Banco de Desarrollo Banrural",
-                "icon": "bank",
+                "name": "Station Service E. Leclerc",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de la Nación": {
+            "amenity/fuel/Shell Express": {
                 "tags": {
-                    "name": "Banco de la Nación",
-                    "amenity": "bank"
+                    "name": "Shell Express",
+                    "amenity": "fuel"
                 },
-                "name": "Banco de la Nación",
-                "icon": "bank",
+                "name": "Shell Express",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco do Brasil": {
+            "amenity/fuel/Hess": {
                 "tags": {
-                    "name": "Banco do Brasil",
-                    "amenity": "bank"
+                    "name": "Hess",
+                    "amenity": "fuel"
                 },
-                "name": "Banco do Brasil",
-                "icon": "bank",
+                "name": "Hess",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BancoEstado": {
+            "amenity/fuel/Flying V": {
                 "tags": {
-                    "name": "BancoEstado",
-                    "amenity": "bank"
+                    "name": "Flying V",
+                    "amenity": "fuel"
                 },
-                "name": "BancoEstado",
-                "icon": "bank",
+                "name": "Flying V",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancolombia": {
+            "amenity/fuel/bft": {
                 "tags": {
-                    "name": "Bancolombia",
-                    "amenity": "bank"
+                    "name": "bft",
+                    "amenity": "fuel"
                 },
-                "name": "Bancolombia",
-                "icon": "bank",
+                "name": "bft",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancomer": {
+            "amenity/fuel/Gulf": {
                 "tags": {
-                    "name": "Bancomer",
-                    "amenity": "bank"
+                    "name": "Gulf",
+                    "amenity": "fuel"
                 },
-                "name": "Bancomer",
-                "icon": "bank",
+                "name": "Gulf",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancpost": {
+            "amenity/fuel/PTT": {
                 "tags": {
-                    "name": "Bancpost",
-                    "amenity": "bank"
+                    "name": "PTT",
+                    "amenity": "fuel"
                 },
-                "name": "Bancpost",
-                "icon": "bank",
+                "name": "PTT",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banesco": {
+            "amenity/fuel/St1": {
                 "tags": {
-                    "name": "Banesco",
-                    "amenity": "bank"
+                    "name": "St1",
+                    "amenity": "fuel"
                 },
-                "name": "Banesco",
-                "icon": "bank",
+                "name": "St1",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banesto": {
+            "amenity/fuel/Teboil": {
                 "tags": {
-                    "name": "Banesto",
-                    "amenity": "bank"
+                    "name": "Teboil",
+                    "amenity": "fuel"
                 },
-                "name": "Banesto",
-                "icon": "bank",
+                "name": "Teboil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank Austria": {
+            "amenity/fuel/HEM": {
                 "tags": {
-                    "name": "Bank Austria",
-                    "amenity": "bank"
+                    "name": "HEM",
+                    "amenity": "fuel"
                 },
-                "name": "Bank Austria",
-                "icon": "bank",
+                "name": "HEM",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank Mandiri": {
+            "amenity/fuel/GALP": {
                 "tags": {
-                    "name": "Bank Mandiri",
-                    "amenity": "bank"
+                    "name": "GALP",
+                    "amenity": "fuel"
                 },
-                "name": "Bank Mandiri",
-                "icon": "bank",
+                "name": "GALP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank Spółdzielczy": {
+            "amenity/fuel/OK": {
                 "tags": {
-                    "name": "Bank Spółdzielczy",
-                    "amenity": "bank"
+                    "name": "OK",
+                    "amenity": "fuel"
                 },
-                "name": "Bank Spółdzielczy",
-                "icon": "bank",
+                "name": "OK",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of America": {
+            "amenity/fuel/ÖMV": {
                 "tags": {
-                    "name": "Bank of America",
-                    "amenity": "bank"
+                    "name": "ÖMV",
+                    "amenity": "fuel"
                 },
-                "name": "Bank of America",
-                "icon": "bank",
+                "name": "ÖMV",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of Ireland": {
+            "amenity/fuel/Tinq": {
                 "tags": {
-                    "name": "Bank of Ireland",
-                    "amenity": "bank"
+                    "name": "Tinq",
+                    "amenity": "fuel"
                 },
-                "name": "Bank of Ireland",
-                "icon": "bank",
+                "name": "Tinq",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of Montreal": {
+            "amenity/fuel/OKQ8": {
                 "tags": {
-                    "name": "Bank of Montreal",
-                    "amenity": "bank"
+                    "name": "OKQ8",
+                    "amenity": "fuel"
                 },
-                "name": "Bank of Montreal",
-                "icon": "bank",
+                "name": "OKQ8",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of Scotland": {
+            "amenity/fuel/Freie Tankstelle": {
                 "tags": {
-                    "name": "Bank of Scotland",
-                    "amenity": "bank"
+                    "name": "Freie Tankstelle",
+                    "amenity": "fuel"
                 },
-                "name": "Bank of Scotland",
-                "icon": "bank",
+                "name": "Freie Tankstelle",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of the West": {
+            "amenity/fuel/Repsol": {
                 "tags": {
-                    "name": "Bank of the West",
-                    "amenity": "bank"
+                    "name": "Repsol",
+                    "amenity": "fuel"
                 },
-                "name": "Bank of the West",
-                "icon": "bank",
+                "name": "Repsol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bankia": {
+            "amenity/fuel/Westfalen": {
                 "tags": {
-                    "name": "Bankia",
-                    "amenity": "bank"
+                    "name": "Westfalen",
+                    "amenity": "fuel"
                 },
-                "name": "Bankia",
-                "icon": "bank",
+                "name": "Westfalen",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bankinter": {
+            "amenity/fuel/Esso Express": {
                 "tags": {
-                    "name": "Bankinter",
-                    "amenity": "bank"
+                    "name": "Esso Express",
+                    "amenity": "fuel"
                 },
-                "name": "Bankinter",
-                "icon": "bank",
+                "name": "Esso Express",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banorte": {
+            "amenity/fuel/Raiffeisenbank": {
                 "tags": {
-                    "name": "Banorte",
-                    "amenity": "bank"
+                    "name": "Raiffeisenbank",
+                    "amenity": "fuel"
                 },
-                "name": "Banorte",
-                "icon": "bank",
+                "name": "Raiffeisenbank",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banque Nationale": {
+            "amenity/fuel/Tamoil": {
                 "tags": {
-                    "name": "Banque Nationale",
-                    "amenity": "bank"
+                    "name": "Tamoil",
+                    "amenity": "fuel"
                 },
-                "name": "Banque Nationale",
-                "icon": "bank",
+                "name": "Tamoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banque Populaire": {
+            "amenity/fuel/Engen": {
                 "tags": {
-                    "name": "Banque Populaire",
-                    "amenity": "bank"
+                    "name": "Engen",
+                    "amenity": "fuel"
                 },
-                "name": "Banque Populaire",
-                "icon": "bank",
+                "name": "Engen",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Barclays": {
+            "amenity/fuel/Sasol": {
                 "tags": {
-                    "name": "Barclays",
-                    "amenity": "bank"
+                    "name": "Sasol",
+                    "amenity": "fuel"
                 },
-                "name": "Barclays",
-                "icon": "bank",
+                "name": "Sasol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Belfius": {
+            "amenity/fuel/Topaz": {
                 "tags": {
-                    "name": "Belfius",
-                    "amenity": "bank"
+                    "name": "Topaz",
+                    "amenity": "fuel"
                 },
-                "name": "Belfius",
-                "icon": "bank",
+                "name": "Topaz",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bendigo Bank": {
+            "amenity/fuel/LPG": {
                 "tags": {
-                    "name": "Bendigo Bank",
-                    "amenity": "bank"
+                    "name": "LPG",
+                    "amenity": "fuel"
                 },
-                "name": "Bendigo Bank",
-                "icon": "bank",
+                "name": "LPG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Berliner Sparkasse": {
+            "amenity/fuel/Coop": {
                 "tags": {
-                    "name": "Berliner Sparkasse",
-                    "amenity": "bank"
+                    "name": "Coop",
+                    "amenity": "fuel"
                 },
-                "name": "Berliner Sparkasse",
-                "icon": "bank",
+                "name": "Coop",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Berliner Volksbank": {
+            "amenity/fuel/Orlen": {
                 "tags": {
-                    "name": "Berliner Volksbank",
-                    "amenity": "bank"
+                    "name": "Orlen",
+                    "amenity": "fuel"
                 },
-                "name": "Berliner Volksbank",
-                "icon": "bank",
+                "name": "Orlen",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bicentenario": {
+            "amenity/fuel/Oilibya": {
                 "tags": {
-                    "name": "Bicentenario",
-                    "amenity": "bank"
+                    "name": "Oilibya",
+                    "amenity": "fuel"
                 },
-                "name": "Bicentenario",
-                "icon": "bank",
+                "name": "Oilibya",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bradesco": {
+            "amenity/fuel/Tango": {
                 "tags": {
-                    "name": "Bradesco",
-                    "amenity": "bank"
+                    "name": "Tango",
+                    "amenity": "fuel"
                 },
-                "name": "Bradesco",
-                "icon": "bank",
+                "name": "Tango",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/CIBC": {
+            "amenity/fuel/Star": {
                 "tags": {
-                    "name": "CIBC",
-                    "amenity": "bank"
+                    "name": "Star",
+                    "amenity": "fuel"
                 },
-                "name": "CIBC",
-                "icon": "bank",
+                "name": "Star",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/CIC": {
+            "amenity/fuel/Петрол": {
                 "tags": {
-                    "name": "CIC",
-                    "amenity": "bank"
+                    "name": "Петрол",
+                    "amenity": "fuel"
                 },
-                "name": "CIC",
-                "icon": "bank",
+                "name": "Петрол",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caisse d'Épargne": {
+            "amenity/fuel/Cepsa": {
                 "tags": {
-                    "name": "Caisse d'Épargne",
-                    "amenity": "bank"
+                    "name": "Cepsa",
+                    "amenity": "fuel"
                 },
-                "name": "Caisse d'Épargne",
-                "icon": "bank",
+                "name": "Cepsa",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caixa": {
+            "amenity/fuel/OIL!": {
                 "tags": {
-                    "name": "Caixa",
-                    "amenity": "bank"
+                    "name": "OIL!",
+                    "amenity": "fuel"
                 },
-                "name": "Caixa",
-                "icon": "bank",
+                "name": "OIL!",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caixa Econômica Federal": {
+            "amenity/fuel/Ultramar": {
                 "tags": {
-                    "name": "Caixa Econômica Federal",
-                    "amenity": "bank"
+                    "name": "Ultramar",
+                    "amenity": "fuel"
                 },
-                "name": "Caixa Econômica Federal",
-                "icon": "bank",
+                "name": "Ultramar",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caixa Geral de Depósitos": {
+            "amenity/fuel/Irving": {
                 "tags": {
-                    "name": "Caixa Geral de Depósitos",
-                    "amenity": "bank"
+                    "name": "Irving",
+                    "amenity": "fuel"
                 },
-                "name": "Caixa Geral de Depósitos",
-                "icon": "bank",
+                "name": "Irving",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Círculo": {
+            "amenity/fuel/Lukoil": {
                 "tags": {
-                    "name": "Caja Círculo",
-                    "amenity": "bank"
+                    "name": "Lukoil",
+                    "amenity": "fuel"
                 },
-                "name": "Caja Círculo",
-                "icon": "bank",
+                "name": "Lukoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Duero": {
+            "amenity/fuel/Petro-Canada": {
                 "tags": {
-                    "name": "Caja Duero",
-                    "amenity": "bank"
+                    "name": "Petro-Canada",
+                    "amenity": "fuel"
                 },
-                "name": "Caja Duero",
-                "icon": "bank",
+                "name": "Petro-Canada",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Madrid": {
+            "amenity/fuel/7-Eleven": {
                 "tags": {
-                    "name": "Caja Madrid",
-                    "amenity": "bank"
+                    "name": "7-Eleven",
+                    "amenity": "fuel"
                 },
-                "name": "Caja Madrid",
-                "icon": "bank",
+                "name": "7-Eleven",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Rural": {
+            "amenity/fuel/Agrola": {
                 "tags": {
-                    "name": "Caja Rural",
-                    "amenity": "bank"
+                    "name": "Agrola",
+                    "amenity": "fuel"
                 },
-                "name": "Caja Rural",
-                "icon": "bank",
+                "name": "Agrola",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja de Burgos": {
+            "amenity/fuel/Husky": {
                 "tags": {
-                    "name": "Caja de Burgos",
-                    "amenity": "bank"
+                    "name": "Husky",
+                    "amenity": "fuel"
                 },
-                "name": "Caja de Burgos",
-                "icon": "bank",
+                "name": "Husky",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Cajamar": {
+            "amenity/fuel/Slovnaft": {
                 "tags": {
-                    "name": "Cajamar",
-                    "amenity": "bank"
+                    "name": "Slovnaft",
+                    "amenity": "fuel"
                 },
-                "name": "Cajamar",
-                "icon": "bank",
+                "name": "Slovnaft",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Cajero Automatico Bancared": {
+            "amenity/fuel/Sheetz": {
                 "tags": {
-                    "name": "Cajero Automatico Bancared",
-                    "amenity": "bank"
+                    "name": "Sheetz",
+                    "amenity": "fuel"
                 },
-                "name": "Cajero Automatico Bancared",
-                "icon": "bank",
+                "name": "Sheetz",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Canara Bank": {
+            "amenity/fuel/Mol": {
                 "tags": {
-                    "name": "Canara Bank",
-                    "amenity": "bank"
+                    "name": "Mol",
+                    "amenity": "fuel"
                 },
-                "name": "Canara Bank",
-                "icon": "bank",
+                "name": "Mol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Cassa di Risparmio del Veneto": {
+            "amenity/fuel/Petronas": {
                 "tags": {
-                    "name": "Cassa di Risparmio del Veneto",
-                    "amenity": "bank"
+                    "name": "Petronas",
+                    "amenity": "fuel"
                 },
-                "name": "Cassa di Risparmio del Veneto",
-                "icon": "bank",
+                "name": "Petronas",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Chase": {
+            "amenity/fuel/Газпромнефть": {
                 "tags": {
-                    "name": "Chase",
-                    "amenity": "bank"
+                    "name": "Газпромнефть",
+                    "amenity": "fuel"
                 },
-                "name": "Chase",
-                "icon": "bank",
+                "name": "Газпромнефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/China Bank": {
+            "amenity/fuel/Лукойл": {
                 "tags": {
-                    "name": "China Bank",
-                    "amenity": "bank"
+                    "name": "Лукойл",
+                    "amenity": "fuel"
                 },
-                "name": "China Bank",
-                "icon": "bank",
+                "name": "Лукойл",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Chinabank": {
+            "amenity/fuel/Elan": {
                 "tags": {
-                    "name": "Chinabank",
-                    "amenity": "bank"
+                    "name": "Elan",
+                    "amenity": "fuel"
                 },
-                "name": "Chinabank",
-                "icon": "bank",
+                "name": "Elan",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Citibank": {
+            "amenity/fuel/Роснефть": {
                 "tags": {
-                    "name": "Citibank",
-                    "amenity": "bank"
+                    "name": "Роснефть",
+                    "amenity": "fuel"
                 },
-                "name": "Citibank",
-                "icon": "bank",
+                "name": "Роснефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Citizens Bank": {
+            "amenity/fuel/Turmöl": {
                 "tags": {
-                    "name": "Citizens Bank",
-                    "amenity": "bank"
+                    "name": "Turmöl",
+                    "amenity": "fuel"
                 },
-                "name": "Citizens Bank",
-                "icon": "bank",
+                "name": "Turmöl",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/CityCommerce Bank": {
+            "amenity/fuel/Neste A24": {
                 "tags": {
-                    "name": "CityCommerce Bank",
-                    "amenity": "bank"
+                    "name": "Neste A24",
+                    "amenity": "fuel"
                 },
-                "name": "CityCommerce Bank",
-                "icon": "bank",
+                "name": "Neste A24",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Commercial Bank of Ceylon PLC": {
+            "amenity/fuel/Marathon": {
                 "tags": {
-                    "name": "Commercial Bank of Ceylon PLC",
-                    "amenity": "bank"
+                    "name": "Marathon",
+                    "amenity": "fuel"
                 },
-                "name": "Commercial Bank of Ceylon PLC",
-                "icon": "bank",
+                "name": "Marathon",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Commerzbank": {
+            "amenity/fuel/Valero": {
                 "tags": {
-                    "name": "Commerzbank",
-                    "amenity": "bank"
+                    "name": "Valero",
+                    "amenity": "fuel"
                 },
-                "name": "Commerzbank",
-                "icon": "bank",
+                "name": "Valero",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Commonwealth Bank": {
+            "amenity/fuel/Eni": {
                 "tags": {
-                    "name": "Commonwealth Bank",
-                    "amenity": "bank"
+                    "name": "Eni",
+                    "amenity": "fuel"
                 },
-                "name": "Commonwealth Bank",
-                "icon": "bank",
+                "name": "Eni",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Credit Agricole": {
+            "amenity/fuel/Chevron": {
                 "tags": {
-                    "name": "Credit Agricole",
-                    "amenity": "bank"
+                    "name": "Chevron",
+                    "amenity": "fuel"
                 },
-                "name": "Credit Agricole",
-                "icon": "bank",
+                "name": "Chevron",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Credit Suisse": {
+            "amenity/fuel/ТНК": {
                 "tags": {
-                    "name": "Credit Suisse",
-                    "amenity": "bank"
+                    "name": "ТНК",
+                    "amenity": "fuel"
                 },
-                "name": "Credit Suisse",
-                "icon": "bank",
+                "name": "ТНК",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit Agricole": {
+            "amenity/fuel/REPSOL": {
                 "tags": {
-                    "name": "Crédit Agricole",
-                    "amenity": "bank"
+                    "name": "REPSOL",
+                    "amenity": "fuel"
                 },
-                "name": "Crédit Agricole",
-                "icon": "bank",
+                "name": "REPSOL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit Mutuel": {
+            "amenity/fuel/MOL": {
                 "tags": {
-                    "name": "Crédit Mutuel",
-                    "amenity": "bank"
+                    "name": "MOL",
+                    "amenity": "fuel"
                 },
-                "name": "Crédit Mutuel",
-                "icon": "bank",
+                "name": "MOL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit Mutuel de Bretagne": {
+            "amenity/fuel/Bliska": {
                 "tags": {
-                    "name": "Crédit Mutuel de Bretagne",
-                    "amenity": "bank"
+                    "name": "Bliska",
+                    "amenity": "fuel"
                 },
-                "name": "Crédit Mutuel de Bretagne",
-                "icon": "bank",
+                "name": "Bliska",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit du Nord": {
+            "amenity/fuel/Api": {
                 "tags": {
-                    "name": "Crédit du Nord",
-                    "amenity": "bank"
+                    "name": "Api",
+                    "amenity": "fuel"
                 },
-                "name": "Crédit du Nord",
-                "icon": "bank",
+                "name": "Api",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Danske Bank": {
+            "amenity/fuel/Arco": {
                 "tags": {
-                    "name": "Danske Bank",
-                    "amenity": "bank"
+                    "name": "Arco",
+                    "amenity": "fuel"
                 },
-                "name": "Danske Bank",
-                "icon": "bank",
+                "name": "Arco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Davivienda": {
+            "amenity/fuel/Pemex": {
                 "tags": {
-                    "name": "Davivienda",
-                    "amenity": "bank"
+                    "name": "Pemex",
+                    "amenity": "fuel"
                 },
-                "name": "Davivienda",
-                "icon": "bank",
+                "name": "Pemex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/De Venezuela": {
+            "amenity/fuel/Exxon": {
                 "tags": {
-                    "name": "De Venezuela",
-                    "amenity": "bank"
+                    "name": "Exxon",
+                    "amenity": "fuel"
                 },
-                "name": "De Venezuela",
-                "icon": "bank",
+                "name": "Exxon",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Del Tesoro": {
+            "amenity/fuel/Coles Express": {
                 "tags": {
-                    "name": "Del Tesoro",
-                    "amenity": "bank"
+                    "name": "Coles Express",
+                    "amenity": "fuel"
                 },
-                "name": "Del Tesoro",
-                "icon": "bank",
+                "name": "Coles Express",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Deutsche Bank": {
+            "amenity/fuel/Petrom": {
                 "tags": {
-                    "name": "Deutsche Bank",
-                    "amenity": "bank"
+                    "name": "Petrom",
+                    "amenity": "fuel"
                 },
-                "name": "Deutsche Bank",
-                "icon": "bank",
+                "name": "Petrom",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Dresdner Bank": {
+            "amenity/fuel/PETRONOR": {
                 "tags": {
-                    "name": "Dresdner Bank",
-                    "amenity": "bank"
+                    "name": "PETRONOR",
+                    "amenity": "fuel"
                 },
-                "name": "Dresdner Bank",
-                "icon": "bank",
+                "name": "PETRONOR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ecobank": {
+            "amenity/fuel/Rompetrol": {
                 "tags": {
-                    "name": "Ecobank",
-                    "amenity": "bank"
+                    "name": "Rompetrol",
+                    "amenity": "fuel"
                 },
-                "name": "Ecobank",
-                "icon": "bank",
+                "name": "Rompetrol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Erste Bank": {
+            "amenity/fuel/Lotos": {
                 "tags": {
-                    "name": "Erste Bank",
-                    "amenity": "bank"
+                    "name": "Lotos",
+                    "amenity": "fuel"
                 },
-                "name": "Erste Bank",
-                "icon": "bank",
+                "name": "Lotos",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Eurobank": {
+            "amenity/fuel/ОМВ": {
                 "tags": {
-                    "name": "Eurobank",
-                    "amenity": "bank"
+                    "name": "ОМВ",
+                    "amenity": "fuel"
                 },
-                "name": "Eurobank",
-                "icon": "bank",
+                "name": "ОМВ",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/FNB": {
+            "amenity/fuel/BR": {
                 "tags": {
-                    "name": "FNB",
-                    "amenity": "bank"
+                    "name": "BR",
+                    "amenity": "fuel"
                 },
-                "name": "FNB",
-                "icon": "bank",
+                "name": "BR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Fifth Third Bank": {
+            "amenity/fuel/Copec": {
                 "tags": {
-                    "name": "Fifth Third Bank",
-                    "amenity": "bank"
+                    "name": "Copec",
+                    "amenity": "fuel"
                 },
-                "name": "Fifth Third Bank",
-                "icon": "bank",
+                "name": "Copec",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/First National Bank": {
+            "amenity/fuel/Petrobras": {
                 "tags": {
-                    "name": "First National Bank",
-                    "amenity": "bank"
+                    "name": "Petrobras",
+                    "amenity": "fuel"
                 },
-                "name": "First National Bank",
-                "icon": "bank",
+                "name": "Petrobras",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/GE Money Bank": {
+            "amenity/fuel/Liberty": {
                 "tags": {
-                    "name": "GE Money Bank",
-                    "amenity": "bank"
+                    "name": "Liberty",
+                    "amenity": "fuel"
                 },
-                "name": "GE Money Bank",
-                "icon": "bank",
+                "name": "Liberty",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/HDFC Bank": {
+            "amenity/fuel/IP": {
                 "tags": {
-                    "name": "HDFC Bank",
-                    "amenity": "bank"
+                    "name": "IP",
+                    "amenity": "fuel"
                 },
-                "name": "HDFC Bank",
-                "icon": "bank",
+                "name": "IP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/HSBC": {
+            "amenity/fuel/YPF": {
                 "tags": {
-                    "name": "HSBC",
-                    "amenity": "bank"
+                    "name": "YPF",
+                    "amenity": "fuel"
                 },
-                "name": "HSBC",
-                "icon": "bank",
+                "name": "YPF",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Halifax": {
+            "amenity/fuel/Erg": {
                 "tags": {
-                    "name": "Halifax",
-                    "amenity": "bank"
+                    "name": "Erg",
+                    "amenity": "fuel"
                 },
-                "name": "Halifax",
-                "icon": "bank",
+                "name": "Erg",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Hamburger Sparkasse": {
+            "amenity/fuel/Eneos": {
                 "tags": {
-                    "name": "Hamburger Sparkasse",
-                    "amenity": "bank"
+                    "name": "Eneos",
+                    "amenity": "fuel"
                 },
-                "name": "Hamburger Sparkasse",
-                "icon": "bank",
+                "name": "Eneos",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Handelsbanken": {
+            "amenity/fuel/Citgo": {
                 "tags": {
-                    "name": "Handelsbanken",
-                    "amenity": "bank"
+                    "name": "Citgo",
+                    "amenity": "fuel"
                 },
-                "name": "Handelsbanken",
-                "icon": "bank",
+                "name": "Citgo",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/HypoVereinsbank": {
+            "amenity/fuel/Metano": {
                 "tags": {
-                    "name": "HypoVereinsbank",
-                    "amenity": "bank"
+                    "name": "Metano",
+                    "amenity": "fuel"
                 },
-                "name": "HypoVereinsbank",
-                "icon": "bank",
+                "name": "Metano",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ICICI Bank": {
+            "amenity/fuel/Сургутнефтегаз": {
                 "tags": {
-                    "name": "ICICI Bank",
-                    "amenity": "bank"
+                    "name": "Сургутнефтегаз",
+                    "amenity": "fuel"
                 },
-                "name": "ICICI Bank",
-                "icon": "bank",
+                "name": "Сургутнефтегаз",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ING": {
+            "amenity/fuel/EKO": {
                 "tags": {
-                    "name": "ING",
-                    "amenity": "bank"
+                    "name": "EKO",
+                    "amenity": "fuel"
                 },
-                "name": "ING",
-                "icon": "bank",
+                "name": "EKO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ING Bank Śląski": {
+            "amenity/fuel/Eko": {
                 "tags": {
-                    "name": "ING Bank Śląski",
-                    "amenity": "bank"
+                    "name": "Eko",
+                    "amenity": "fuel"
                 },
-                "name": "ING Bank Śląski",
-                "icon": "bank",
+                "name": "Eko",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ibercaja": {
+            "amenity/fuel/Indipend.": {
                 "tags": {
-                    "name": "Ibercaja",
-                    "amenity": "bank"
+                    "name": "Indipend.",
+                    "amenity": "fuel"
                 },
-                "name": "Ibercaja",
-                "icon": "bank",
+                "name": "Indipend.",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Intesa San Paolo": {
+            "amenity/fuel/IES": {
                 "tags": {
-                    "name": "Intesa San Paolo",
-                    "amenity": "bank"
+                    "name": "IES",
+                    "amenity": "fuel"
                 },
-                "name": "Intesa San Paolo",
-                "icon": "bank",
+                "name": "IES",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Itaú": {
+            "amenity/fuel/TotalErg": {
                 "tags": {
-                    "name": "Itaú",
-                    "amenity": "bank"
+                    "name": "TotalErg",
+                    "amenity": "fuel"
                 },
-                "name": "Itaú",
-                "icon": "bank",
+                "name": "TotalErg",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/KBC": {
+            "amenity/fuel/Cenex": {
                 "tags": {
-                    "name": "KBC",
-                    "amenity": "bank"
+                    "name": "Cenex",
+                    "amenity": "fuel"
                 },
-                "name": "KBC",
-                "icon": "bank",
+                "name": "Cenex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Key Bank": {
+            "amenity/fuel/ПТК": {
                 "tags": {
-                    "name": "Key Bank",
-                    "amenity": "bank"
+                    "name": "ПТК",
+                    "amenity": "fuel"
                 },
-                "name": "Key Bank",
-                "icon": "bank",
+                "name": "ПТК",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Komerční banka": {
+            "amenity/fuel/HP": {
                 "tags": {
-                    "name": "Komerční banka",
-                    "amenity": "bank"
+                    "name": "HP",
+                    "amenity": "fuel"
                 },
-                "name": "Komerční banka",
-                "icon": "bank",
+                "name": "HP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Kreissparkasse": {
+            "amenity/fuel/Phillips 66": {
                 "tags": {
-                    "name": "Kreissparkasse",
-                    "amenity": "bank"
+                    "name": "Phillips 66",
+                    "amenity": "fuel"
                 },
-                "name": "Kreissparkasse",
-                "icon": "bank",
+                "name": "Phillips 66",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Kreissparkasse Köln": {
+            "amenity/fuel/CARREFOUR": {
                 "tags": {
-                    "name": "Kreissparkasse Köln",
-                    "amenity": "bank"
+                    "name": "CARREFOUR",
+                    "amenity": "fuel"
                 },
-                "name": "Kreissparkasse Köln",
-                "icon": "bank",
+                "name": "CARREFOUR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/LCL": {
+            "amenity/fuel/ERG": {
                 "tags": {
-                    "name": "LCL",
-                    "amenity": "bank"
+                    "name": "ERG",
+                    "amenity": "fuel"
                 },
-                "name": "LCL",
-                "icon": "bank",
+                "name": "ERG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/La Banque Postale": {
+            "amenity/fuel/Speedway": {
                 "tags": {
-                    "name": "La Banque Postale",
-                    "amenity": "bank"
+                    "name": "Speedway",
+                    "amenity": "fuel"
                 },
-                "name": "La Banque Postale",
-                "icon": "bank",
+                "name": "Speedway",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/La Caixa": {
+            "amenity/fuel/Benzina": {
                 "tags": {
-                    "name": "La Caixa",
-                    "amenity": "bank"
+                    "name": "Benzina",
+                    "amenity": "fuel"
                 },
-                "name": "La Caixa",
-                "icon": "bank",
+                "name": "Benzina",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Landbank": {
-                "tags": {
-                    "name": "Landbank",
-                    "amenity": "bank"
+            "amenity/fuel/Татнефть": {
+                "tags": {
+                    "name": "Татнефть",
+                    "amenity": "fuel"
                 },
-                "name": "Landbank",
-                "icon": "bank",
+                "name": "Татнефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Lloyds Bank": {
+            "amenity/fuel/Terpel": {
                 "tags": {
-                    "name": "Lloyds Bank",
-                    "amenity": "bank"
+                    "name": "Terpel",
+                    "amenity": "fuel"
                 },
-                "name": "Lloyds Bank",
-                "icon": "bank",
+                "name": "Terpel",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/M&T Bank": {
+            "amenity/fuel/WOG": {
                 "tags": {
-                    "name": "M&T Bank",
-                    "amenity": "bank"
+                    "name": "WOG",
+                    "amenity": "fuel"
                 },
-                "name": "M&T Bank",
-                "icon": "bank",
+                "name": "WOG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Maybank": {
+            "amenity/fuel/Seaoil": {
                 "tags": {
-                    "name": "Maybank",
-                    "amenity": "bank"
+                    "name": "Seaoil",
+                    "amenity": "fuel"
                 },
-                "name": "Maybank",
-                "icon": "bank",
+                "name": "Seaoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Mercantil": {
+            "amenity/fuel/АЗС": {
                 "tags": {
-                    "name": "Mercantil",
-                    "amenity": "bank"
+                    "name": "АЗС",
+                    "amenity": "fuel"
                 },
-                "name": "Mercantil",
-                "icon": "bank",
+                "name": "АЗС",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Metrobank": {
+            "amenity/fuel/Kwik Trip": {
                 "tags": {
-                    "name": "Metrobank",
-                    "amenity": "bank"
+                    "name": "Kwik Trip",
+                    "amenity": "fuel"
                 },
-                "name": "Metrobank",
-                "icon": "bank",
+                "name": "Kwik Trip",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Millenium Bank": {
+            "amenity/fuel/Wawa": {
                 "tags": {
-                    "name": "Millenium Bank",
-                    "amenity": "bank"
+                    "name": "Wawa",
+                    "amenity": "fuel"
                 },
-                "name": "Millenium Bank",
-                "icon": "bank",
+                "name": "Wawa",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Millennium Bank": {
+            "amenity/fuel/Pertamina": {
                 "tags": {
-                    "name": "Millennium Bank",
-                    "amenity": "bank"
+                    "name": "Pertamina",
+                    "amenity": "fuel"
                 },
-                "name": "Millennium Bank",
-                "icon": "bank",
+                "name": "Pertamina",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Monte dei Paschi di Siena": {
+            "amenity/fuel/COSMO": {
                 "tags": {
-                    "name": "Monte dei Paschi di Siena",
-                    "amenity": "bank"
+                    "name": "COSMO",
+                    "amenity": "fuel"
                 },
-                "name": "Monte dei Paschi di Siena",
-                "icon": "bank",
+                "name": "COSMO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/NAB": {
+            "amenity/fuel/Z": {
                 "tags": {
-                    "name": "NAB",
-                    "amenity": "bank"
+                    "name": "Z",
+                    "amenity": "fuel"
                 },
-                "name": "NAB",
-                "icon": "bank",
+                "name": "Z",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/NatWest": {
+            "amenity/fuel/Indian Oil": {
                 "tags": {
-                    "name": "NatWest",
-                    "amenity": "bank"
+                    "name": "Indian Oil",
+                    "amenity": "fuel"
                 },
-                "name": "NatWest",
-                "icon": "bank",
+                "name": "Indian Oil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/National Bank": {
+            "amenity/fuel/АГЗС": {
                 "tags": {
-                    "name": "National Bank",
-                    "amenity": "bank"
+                    "name": "АГЗС",
+                    "amenity": "fuel"
                 },
-                "name": "National Bank",
-                "icon": "bank",
+                "name": "АГЗС",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Nationwide": {
+            "amenity/fuel/INA": {
                 "tags": {
-                    "name": "Nationwide",
-                    "amenity": "bank"
+                    "name": "INA",
+                    "amenity": "fuel"
                 },
-                "name": "Nationwide",
-                "icon": "bank",
+                "name": "INA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Nedbank": {
+            "amenity/fuel/JOMO": {
                 "tags": {
-                    "name": "Nedbank",
-                    "amenity": "bank"
+                    "name": "JOMO",
+                    "amenity": "fuel"
                 },
-                "name": "Nedbank",
-                "icon": "bank",
+                "name": "JOMO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Nordea": {
+            "amenity/fuel/Holiday": {
                 "tags": {
-                    "name": "Nordea",
-                    "amenity": "bank"
+                    "name": "Holiday",
+                    "amenity": "fuel"
                 },
-                "name": "Nordea",
-                "icon": "bank",
+                "name": "Holiday",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/OLB": {
+            "amenity/fuel/IDEMITSU": {
                 "tags": {
-                    "name": "OLB",
-                    "amenity": "bank"
+                    "name": "IDEMITSU",
+                    "amenity": "fuel"
                 },
-                "name": "OLB",
-                "icon": "bank",
+                "name": "IDEMITSU",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/OTP": {
+            "amenity/fuel/ENEOS": {
                 "tags": {
-                    "name": "OTP",
-                    "amenity": "bank"
+                    "name": "ENEOS",
+                    "amenity": "fuel"
                 },
-                "name": "OTP",
-                "icon": "bank",
+                "name": "ENEOS",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Oberbank": {
+            "amenity/fuel/Stacja paliw": {
                 "tags": {
-                    "name": "Oberbank",
-                    "amenity": "bank"
+                    "name": "Stacja paliw",
+                    "amenity": "fuel"
                 },
-                "name": "Oberbank",
-                "icon": "bank",
+                "name": "Stacja paliw",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Oldenburgische Landesbank": {
+            "amenity/fuel/Bharat Petroleum": {
                 "tags": {
-                    "name": "Oldenburgische Landesbank",
-                    "amenity": "bank"
+                    "name": "Bharat Petroleum",
+                    "amenity": "fuel"
                 },
-                "name": "Oldenburgische Landesbank",
-                "icon": "bank",
+                "name": "Bharat Petroleum",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Osuuspankki": {
+            "amenity/fuel/CAMPSA": {
                 "tags": {
-                    "name": "Osuuspankki",
-                    "amenity": "bank"
+                    "name": "CAMPSA",
+                    "amenity": "fuel"
                 },
-                "name": "Osuuspankki",
-                "icon": "bank",
+                "name": "CAMPSA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PKO BP": {
+            "amenity/fuel/Casey's General Store": {
                 "tags": {
-                    "name": "PKO BP",
-                    "amenity": "bank"
+                    "name": "Casey's General Store",
+                    "amenity": "fuel"
                 },
-                "name": "PKO BP",
-                "icon": "bank",
+                "name": "Casey's General Store",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PNB": {
+            "amenity/fuel/Kangaroo": {
                 "tags": {
-                    "name": "PNB",
-                    "amenity": "bank"
+                    "name": "Kangaroo",
+                    "amenity": "fuel"
                 },
-                "name": "PNB",
-                "icon": "bank",
+                "name": "Kangaroo",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PNC Bank": {
+            "amenity/fuel/Белоруснефть": {
                 "tags": {
-                    "name": "PNC Bank",
-                    "amenity": "bank"
+                    "name": "Белоруснефть",
+                    "amenity": "fuel"
                 },
-                "name": "PNC Bank",
-                "icon": "bank",
+                "name": "Белоруснефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PSBank": {
+            "amenity/fuel/コスモ石油 (COSMO)": {
                 "tags": {
-                    "name": "PSBank",
-                    "amenity": "bank"
+                    "name": "コスモ石油 (COSMO)",
+                    "amenity": "fuel"
                 },
-                "name": "PSBank",
-                "icon": "bank",
+                "name": "コスモ石油 (COSMO)",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Pekao SA": {
+            "amenity/fuel/MEROIL": {
                 "tags": {
-                    "name": "Pekao SA",
-                    "amenity": "bank"
+                    "name": "MEROIL",
+                    "amenity": "fuel"
                 },
-                "name": "Pekao SA",
-                "icon": "bank",
+                "name": "MEROIL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Peoples Bank": {
+            "amenity/fuel/1-2-3": {
                 "tags": {
-                    "name": "Peoples Bank",
-                    "amenity": "bank"
+                    "name": "1-2-3",
+                    "amenity": "fuel"
                 },
-                "name": "Peoples Bank",
-                "icon": "bank",
+                "name": "1-2-3",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Postbank": {
+            "amenity/fuel/Conoco": {
                 "tags": {
-                    "name": "Postbank",
-                    "amenity": "bank"
+                    "name": "Conoco",
+                    "amenity": "fuel"
                 },
-                "name": "Postbank",
-                "icon": "bank",
+                "name": "Conoco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/RBC": {
+            "amenity/fuel/出光": {
                 "tags": {
-                    "name": "RBC",
-                    "amenity": "bank"
+                    "name": "出光",
+                    "name:en": "IDEMITSU",
+                    "amenity": "fuel"
                 },
-                "name": "RBC",
-                "icon": "bank",
+                "name": "出光",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/RBS": {
+            "amenity/fuel/НК Альянс": {
                 "tags": {
-                    "name": "RBS",
-                    "amenity": "bank"
+                    "name": "НК Альянс",
+                    "amenity": "fuel"
                 },
-                "name": "RBS",
-                "icon": "bank",
+                "name": "НК Альянс",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/RCBC": {
+            "amenity/fuel/Sinclair": {
                 "tags": {
-                    "name": "RCBC",
-                    "amenity": "bank"
+                    "name": "Sinclair",
+                    "amenity": "fuel"
                 },
-                "name": "RCBC",
-                "icon": "bank",
+                "name": "Sinclair",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Rabobank": {
+            "amenity/fuel/SPBU": {
                 "tags": {
-                    "name": "Rabobank",
-                    "amenity": "bank"
+                    "name": "SPBU",
+                    "amenity": "fuel"
                 },
-                "name": "Rabobank",
-                "icon": "bank",
+                "name": "SPBU",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Raiffeisenbank": {
+            "amenity/fuel/Макпетрол": {
                 "tags": {
-                    "name": "Raiffeisenbank",
-                    "amenity": "bank"
+                    "name": "Макпетрол",
+                    "amenity": "fuel"
                 },
-                "name": "Raiffeisenbank",
-                "icon": "bank",
+                "name": "Макпетрол",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Regions Bank": {
+            "amenity/fuel/Circle K": {
                 "tags": {
-                    "name": "Regions Bank",
-                    "amenity": "bank"
+                    "name": "Circle K",
+                    "amenity": "fuel"
                 },
-                "name": "Regions Bank",
-                "icon": "bank",
+                "name": "Circle K",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Royal Bank": {
+            "amenity/fuel/Posto Ipiranga": {
                 "tags": {
-                    "name": "Royal Bank",
-                    "amenity": "bank"
+                    "name": "Posto Ipiranga",
+                    "amenity": "fuel"
                 },
-                "name": "Royal Bank",
-                "icon": "bank",
+                "name": "Posto Ipiranga",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Royal Bank of Scotland": {
+            "amenity/fuel/Phoenix": {
                 "tags": {
-                    "name": "Royal Bank of Scotland",
-                    "amenity": "bank"
+                    "name": "Phoenix",
+                    "amenity": "fuel"
                 },
-                "name": "Royal Bank of Scotland",
-                "icon": "bank",
+                "name": "Phoenix",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/SEB": {
+            "amenity/fuel/Ipiranga": {
                 "tags": {
-                    "name": "SEB",
-                    "amenity": "bank"
+                    "name": "Ipiranga",
+                    "amenity": "fuel"
                 },
-                "name": "SEB",
-                "icon": "bank",
+                "name": "Ipiranga",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Santander": {
+            "amenity/fuel/OKKO": {
                 "tags": {
-                    "name": "Santander",
-                    "amenity": "bank"
+                    "name": "OKKO",
+                    "amenity": "fuel"
                 },
-                "name": "Santander",
-                "icon": "bank",
+                "name": "OKKO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Santander Consumer Bank": {
+            "amenity/fuel/ОККО": {
                 "tags": {
-                    "name": "Santander Consumer Bank",
-                    "amenity": "bank"
+                    "name": "ОККО",
+                    "amenity": "fuel"
                 },
-                "name": "Santander Consumer Bank",
-                "icon": "bank",
+                "name": "ОККО",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Santander Totta": {
+            "amenity/fuel/บางจาก": {
                 "tags": {
-                    "name": "Santander Totta",
-                    "amenity": "bank"
+                    "name": "บางจาก",
+                    "amenity": "fuel"
                 },
-                "name": "Santander Totta",
-                "icon": "bank",
+                "name": "บางจาก",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sberbank": {
+            "amenity/fuel/QuikTrip": {
                 "tags": {
-                    "name": "Sberbank",
-                    "amenity": "bank"
+                    "name": "QuikTrip",
+                    "amenity": "fuel"
                 },
-                "name": "Sberbank",
-                "icon": "bank",
+                "name": "QuikTrip",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Scotiabank": {
+            "amenity/fuel/Stewart's": {
                 "tags": {
-                    "name": "Scotiabank",
-                    "amenity": "bank"
+                    "name": "Stewart's",
+                    "amenity": "fuel"
                 },
-                "name": "Scotiabank",
-                "icon": "bank",
+                "name": "Stewart's",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Security Bank": {
+            "amenity/fuel/Posto BR": {
                 "tags": {
-                    "name": "Security Bank",
-                    "amenity": "bank"
+                    "name": "Posto BR",
+                    "amenity": "fuel"
                 },
-                "name": "Security Bank",
-                "icon": "bank",
+                "name": "Posto BR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Slovenská sporiteľňa": {
+            "amenity/fuel/ป ต ท": {
                 "tags": {
-                    "name": "Slovenská sporiteľňa",
-                    "amenity": "bank"
+                    "name": "ป ต ท",
+                    "amenity": "fuel"
                 },
-                "name": "Slovenská sporiteľňa",
-                "icon": "bank",
+                "name": "ป ต ท",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Société Générale": {
+            "amenity/fuel/ปตท": {
                 "tags": {
-                    "name": "Société Générale",
-                    "amenity": "bank"
+                    "name": "ปตท",
+                    "amenity": "fuel"
                 },
-                "name": "Société Générale",
-                "icon": "bank",
+                "name": "ปตท",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparda-Bank": {
+            "amenity/fuel/ANP": {
                 "tags": {
-                    "name": "Sparda-Bank",
-                    "amenity": "bank"
+                    "name": "ANP",
+                    "amenity": "fuel"
                 },
-                "name": "Sparda-Bank",
-                "icon": "bank",
+                "name": "ANP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparkasse": {
+            "amenity/fuel/Kum & Go": {
                 "tags": {
-                    "name": "Sparkasse",
-                    "amenity": "bank"
+                    "name": "Kum & Go",
+                    "amenity": "fuel"
                 },
-                "name": "Sparkasse",
-                "icon": "bank",
+                "name": "Kum & Go",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparkasse Aachen": {
+            "amenity/fuel/Sokimex": {
                 "tags": {
-                    "name": "Sparkasse Aachen",
-                    "amenity": "bank"
+                    "name": "Sokimex",
+                    "amenity": "fuel"
                 },
-                "name": "Sparkasse Aachen",
-                "icon": "bank",
+                "name": "Sokimex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparkasse KölnBonn": {
+            "amenity/fuel/Tela": {
                 "tags": {
-                    "name": "Sparkasse KölnBonn",
-                    "amenity": "bank"
+                    "name": "Tela",
+                    "amenity": "fuel"
                 },
-                "name": "Sparkasse KölnBonn",
-                "icon": "bank",
+                "name": "Tela",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Stadtsparkasse": {
+            "amenity/fuel/Укрнафта": {
                 "tags": {
-                    "name": "Stadtsparkasse",
-                    "amenity": "bank"
+                    "name": "Укрнафта",
+                    "amenity": "fuel"
                 },
-                "name": "Stadtsparkasse",
-                "icon": "bank",
+                "name": "Укрнафта",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Standard Bank": {
+            "amenity/fuel/Татнефтепродукт": {
                 "tags": {
-                    "name": "Standard Bank",
-                    "amenity": "bank"
+                    "name": "Татнефтепродукт",
+                    "amenity": "fuel"
                 },
-                "name": "Standard Bank",
-                "icon": "bank",
+                "name": "Татнефтепродукт",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/State Bank of India": {
+            "amenity/fuel/Afriquia": {
                 "tags": {
-                    "name": "State Bank of India",
-                    "amenity": "bank"
+                    "name": "Afriquia",
+                    "amenity": "fuel"
                 },
-                "name": "State Bank of India",
-                "icon": "bank",
+                "name": "Afriquia",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/SunTrust": {
+            "amenity/fuel/Murphy USA": {
                 "tags": {
-                    "name": "SunTrust",
-                    "amenity": "bank"
+                    "name": "Murphy USA",
+                    "amenity": "fuel"
                 },
-                "name": "SunTrust",
-                "icon": "bank",
+                "name": "Murphy USA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/SunTrust Bank": {
+            "amenity/fuel/昭和シェル (Showa-shell)": {
                 "tags": {
-                    "name": "SunTrust Bank",
-                    "amenity": "bank"
+                    "name": "昭和シェル (Showa-shell)",
+                    "amenity": "fuel"
                 },
-                "name": "SunTrust Bank",
-                "icon": "bank",
+                "name": "昭和シェル (Showa-shell)",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Swedbank": {
+            "amenity/fuel/CNG": {
                 "tags": {
-                    "name": "Swedbank",
-                    "amenity": "bank"
+                    "name": "CNG",
+                    "amenity": "fuel"
                 },
-                "name": "Swedbank",
-                "icon": "bank",
+                "name": "CNG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/TD Bank": {
+            "amenity/fast_food/Quick": {
                 "tags": {
-                    "name": "TD Bank",
-                    "amenity": "bank"
+                    "name": "Quick",
+                    "amenity": "fast_food"
                 },
-                "name": "TD Bank",
-                "icon": "bank",
+                "name": "Quick",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/TD Canada Trust": {
+            "amenity/fast_food/McDonald's": {
                 "tags": {
-                    "name": "TD Canada Trust",
-                    "amenity": "bank"
+                    "name": "McDonald's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "TD Canada Trust",
-                "icon": "bank",
+                "name": "McDonald's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/TSB": {
+            "amenity/fast_food/Burger King": {
                 "tags": {
-                    "name": "TSB",
-                    "amenity": "bank"
+                    "name": "Burger King",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "TSB",
-                "icon": "bank",
+                "name": "Burger King",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Targobank": {
+            "amenity/fast_food/Ali Baba": {
                 "tags": {
-                    "name": "Targobank",
-                    "amenity": "bank"
+                    "name": "Ali Baba",
+                    "amenity": "fast_food"
                 },
-                "name": "Targobank",
-                "icon": "bank",
+                "name": "Ali Baba",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Tatra banka": {
+            "amenity/fast_food/Hungry Jacks": {
                 "tags": {
-                    "name": "Tatra banka",
-                    "amenity": "bank"
+                    "name": "Hungry Jacks",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "Tatra banka",
-                "icon": "bank",
+                "name": "Hungry Jacks",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/UBS": {
+            "amenity/fast_food/Red Rooster": {
                 "tags": {
-                    "name": "UBS",
-                    "amenity": "bank"
+                    "name": "Red Rooster",
+                    "amenity": "fast_food"
                 },
-                "name": "UBS",
-                "icon": "bank",
+                "name": "Red Rooster",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/UCPB": {
+            "amenity/fast_food/KFC": {
                 "tags": {
-                    "name": "UCPB",
-                    "amenity": "bank"
+                    "name": "KFC",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
-                "name": "UCPB",
-                "icon": "bank",
+                "name": "KFC",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/US Bank": {
+            "amenity/fast_food/Domino's Pizza": {
                 "tags": {
-                    "name": "US Bank",
-                    "amenity": "bank"
+                    "name": "Domino's Pizza",
+                    "cuisine": "pizza",
+                    "amenity": "fast_food"
                 },
-                "name": "US Bank",
-                "icon": "bank",
+                "name": "Domino's Pizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ulster Bank": {
+            "amenity/fast_food/Chowking": {
                 "tags": {
-                    "name": "Ulster Bank",
-                    "amenity": "bank"
+                    "name": "Chowking",
+                    "amenity": "fast_food"
                 },
-                "name": "Ulster Bank",
-                "icon": "bank",
+                "name": "Chowking",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/UniCredit Bank": {
+            "amenity/fast_food/Jollibee": {
                 "tags": {
-                    "name": "UniCredit Bank",
-                    "amenity": "bank"
+                    "name": "Jollibee",
+                    "amenity": "fast_food"
                 },
-                "name": "UniCredit Bank",
-                "icon": "bank",
+                "name": "Jollibee",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Unicredit Banca": {
+            "amenity/fast_food/Hesburger": {
                 "tags": {
-                    "name": "Unicredit Banca",
-                    "amenity": "bank"
+                    "name": "Hesburger",
+                    "amenity": "fast_food"
                 },
-                "name": "Unicredit Banca",
-                "icon": "bank",
+                "name": "Hesburger",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Unicaja": {
+            "amenity/fast_food/肯德基": {
                 "tags": {
-                    "name": "Unicaja",
-                    "amenity": "bank"
+                    "name": "肯德基",
+                    "amenity": "fast_food"
                 },
-                "name": "Unicaja",
-                "icon": "bank",
+                "name": "肯德基",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Union Bank": {
+            "amenity/fast_food/Wendy's": {
                 "tags": {
-                    "name": "Union Bank",
-                    "amenity": "bank"
+                    "name": "Wendy's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "Union Bank",
-                "icon": "bank",
+                "name": "Wendy's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/VR-Bank": {
+            "amenity/fast_food/Tim Hortons": {
                 "tags": {
-                    "name": "VR-Bank",
-                    "amenity": "bank"
+                    "name": "Tim Hortons",
+                    "amenity": "fast_food"
                 },
-                "name": "VR-Bank",
-                "icon": "bank",
+                "name": "Tim Hortons",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Volksbank": {
+            "amenity/fast_food/Steers": {
                 "tags": {
-                    "name": "Volksbank",
-                    "amenity": "bank"
+                    "name": "Steers",
+                    "amenity": "fast_food"
                 },
-                "name": "Volksbank",
-                "icon": "bank",
+                "name": "Steers",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/VÚB": {
+            "amenity/fast_food/Hardee's": {
                 "tags": {
-                    "name": "VÚB",
-                    "amenity": "bank"
+                    "name": "Hardee's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "VÚB",
-                "icon": "bank",
+                "name": "Hardee's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Wachovia": {
+            "amenity/fast_food/Arby's": {
                 "tags": {
-                    "name": "Wachovia",
-                    "amenity": "bank"
+                    "name": "Arby's",
+                    "amenity": "fast_food"
                 },
-                "name": "Wachovia",
-                "icon": "bank",
+                "name": "Arby's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Wells Fargo": {
+            "amenity/fast_food/A&W": {
                 "tags": {
-                    "name": "Wells Fargo",
-                    "amenity": "bank"
+                    "name": "A&W",
+                    "amenity": "fast_food"
                 },
-                "name": "Wells Fargo",
-                "icon": "bank",
+                "name": "A&W",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Western Union": {
+            "amenity/fast_food/Dairy Queen": {
                 "tags": {
-                    "name": "Western Union",
-                    "amenity": "bank"
+                    "name": "Dairy Queen",
+                    "amenity": "fast_food"
                 },
-                "name": "Western Union",
-                "icon": "bank",
+                "name": "Dairy Queen",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Westpac": {
+            "amenity/fast_food/Hallo Pizza": {
                 "tags": {
-                    "name": "Westpac",
-                    "amenity": "bank"
+                    "name": "Hallo Pizza",
+                    "amenity": "fast_food"
                 },
-                "name": "Westpac",
-                "icon": "bank",
+                "name": "Hallo Pizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Yorkshire Bank": {
+            "amenity/fast_food/Fish & Chips": {
                 "tags": {
-                    "name": "Yorkshire Bank",
-                    "amenity": "bank"
+                    "name": "Fish & Chips",
+                    "amenity": "fast_food"
                 },
-                "name": "Yorkshire Bank",
-                "icon": "bank",
+                "name": "Fish & Chips",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ČSOB": {
+            "amenity/fast_food/Harvey's": {
                 "tags": {
-                    "name": "ČSOB",
-                    "amenity": "bank"
+                    "name": "Harvey's",
+                    "amenity": "fast_food"
                 },
-                "name": "ČSOB",
-                "icon": "bank",
+                "name": "Harvey's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Česká spořitelna": {
+            "amenity/fast_food/麥當勞": {
                 "tags": {
-                    "name": "Česká spořitelna",
-                    "amenity": "bank"
+                    "name": "麥當勞",
+                    "amenity": "fast_food"
                 },
-                "name": "Česká spořitelna",
-                "icon": "bank",
+                "name": "麥當勞",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Альфа-Банк": {
+            "amenity/fast_food/Pizza Pizza": {
                 "tags": {
-                    "name": "Альфа-Банк",
-                    "amenity": "bank"
+                    "name": "Pizza Pizza",
+                    "amenity": "fast_food"
                 },
-                "name": "Альфа-Банк",
-                "icon": "bank",
+                "name": "Pizza Pizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Банк Москвы": {
+            "amenity/fast_food/Kotipizza": {
                 "tags": {
-                    "name": "Банк Москвы",
-                    "amenity": "bank"
+                    "name": "Kotipizza",
+                    "amenity": "fast_food"
                 },
-                "name": "Банк Москвы",
-                "icon": "bank",
+                "name": "Kotipizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Белагропромбанк": {
+            "amenity/fast_food/Jack in the Box": {
                 "tags": {
-                    "name": "Белагропромбанк",
-                    "amenity": "bank"
+                    "name": "Jack in the Box",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "Белагропромбанк",
-                "icon": "bank",
+                "name": "Jack in the Box",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Беларусбанк": {
+            "amenity/fast_food/Istanbul": {
                 "tags": {
-                    "name": "Беларусбанк",
-                    "amenity": "bank"
+                    "name": "Istanbul",
+                    "amenity": "fast_food"
                 },
-                "name": "Беларусбанк",
-                "icon": "bank",
+                "name": "Istanbul",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ВТБ": {
+            "amenity/fast_food/Kochlöffel": {
                 "tags": {
-                    "name": "ВТБ",
-                    "amenity": "bank"
+                    "name": "Kochlöffel",
+                    "amenity": "fast_food"
                 },
-                "name": "ВТБ",
-                "icon": "bank",
+                "name": "Kochlöffel",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ВТБ24": {
+            "amenity/fast_food/Döner": {
                 "tags": {
-                    "name": "ВТБ24",
-                    "amenity": "bank"
+                    "name": "Döner",
+                    "amenity": "fast_food"
                 },
-                "name": "ВТБ24",
-                "icon": "bank",
+                "name": "Döner",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Возрождение": {
+            "amenity/fast_food/Telepizza": {
                 "tags": {
-                    "name": "Возрождение",
-                    "amenity": "bank"
+                    "name": "Telepizza",
+                    "amenity": "fast_food"
                 },
-                "name": "Возрождение",
-                "icon": "bank",
+                "name": "Telepizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Газпромбанк": {
+            "amenity/fast_food/Sibylla": {
                 "tags": {
-                    "name": "Газпромбанк",
-                    "amenity": "bank"
+                    "name": "Sibylla",
+                    "amenity": "fast_food"
                 },
-                "name": "Газпромбанк",
-                "icon": "bank",
+                "name": "Sibylla",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ощадбанк": {
+            "amenity/fast_food/Carl's Jr.": {
                 "tags": {
-                    "name": "Ощадбанк",
-                    "amenity": "bank"
+                    "name": "Carl's Jr.",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "Ощадбанк",
-                "icon": "bank",
+                "name": "Carl's Jr.",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ПриватБанк": {
+            "amenity/fast_food/Quiznos": {
                 "tags": {
-                    "name": "ПриватБанк",
-                    "amenity": "bank"
+                    "name": "Quiznos",
+                    "cuisine": "sandwich",
+                    "amenity": "fast_food"
                 },
-                "name": "ПриватБанк",
-                "icon": "bank",
+                "name": "Quiznos",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Промсвязьбанк": {
+            "amenity/fast_food/Wimpy": {
                 "tags": {
-                    "name": "Промсвязьбанк",
-                    "amenity": "bank"
+                    "name": "Wimpy",
+                    "amenity": "fast_food"
                 },
-                "name": "Промсвязьбанк",
-                "icon": "bank",
+                "name": "Wimpy",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Райффайзен Банк Аваль": {
+            "amenity/fast_food/Sonic": {
                 "tags": {
-                    "name": "Райффайзен Банк Аваль",
-                    "amenity": "bank"
+                    "name": "Sonic",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
-                "name": "Райффайзен Банк Аваль",
-                "icon": "bank",
+                "name": "Sonic",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Росбанк": {
+            "amenity/fast_food/Taco Bell": {
                 "tags": {
-                    "name": "Росбанк",
-                    "amenity": "bank"
+                    "name": "Taco Bell",
+                    "amenity": "fast_food"
                 },
-                "name": "Росбанк",
-                "icon": "bank",
+                "name": "Taco Bell",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Россельхозбанк": {
+            "amenity/fast_food/Pizza Nova": {
                 "tags": {
-                    "name": "Россельхозбанк",
-                    "amenity": "bank"
+                    "name": "Pizza Nova",
+                    "amenity": "fast_food"
                 },
-                "name": "Россельхозбанк",
-                "icon": "bank",
+                "name": "Pizza Nova",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Сбербанк": {
+            "amenity/fast_food/Papa John's": {
                 "tags": {
-                    "name": "Сбербанк",
-                    "amenity": "bank"
+                    "name": "Papa John's",
+                    "cuisine": "pizza",
+                    "amenity": "fast_food"
                 },
-                "name": "Сбербанк",
-                "icon": "bank",
+                "name": "Papa John's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Совкомбанк": {
+            "amenity/fast_food/Nordsee": {
                 "tags": {
-                    "name": "Совкомбанк",
-                    "amenity": "bank"
+                    "name": "Nordsee",
+                    "amenity": "fast_food"
                 },
-                "name": "Совкомбанк",
-                "icon": "bank",
+                "name": "Nordsee",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/УкрСиббанк": {
+            "amenity/fast_food/Mr. Sub": {
                 "tags": {
-                    "name": "УкрСиббанк",
-                    "amenity": "bank"
+                    "name": "Mr. Sub",
+                    "amenity": "fast_food"
                 },
-                "name": "УкрСиббанк",
-                "icon": "bank",
+                "name": "Mr. Sub",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Уралсиб": {
+            "amenity/fast_food/Kebab": {
                 "tags": {
-                    "name": "Уралсиб",
-                    "amenity": "bank"
+                    "name": "Kebab",
+                    "amenity": "fast_food"
                 },
-                "name": "Уралсиб",
-                "icon": "bank",
+                "name": "Kebab",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ლიბერთი ბანკი": {
+            "amenity/fast_food/Макдоналдс": {
                 "tags": {
-                    "name": "ლიბერთი ბანკი",
-                    "name:en": "Liberty Bank",
-                    "amenity": "bank"
+                    "name": "Макдоналдс",
+                    "name:en": "McDonald's",
+                    "amenity": "fast_food"
                 },
-                "name": "ლიბერთი ბანკი",
-                "icon": "bank",
+                "name": "Макдоналдс",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/みずほ銀行": {
+            "amenity/fast_food/Asia Imbiss": {
                 "tags": {
-                    "name": "みずほ銀行",
-                    "amenity": "bank"
+                    "name": "Asia Imbiss",
+                    "amenity": "fast_food"
                 },
-                "name": "みずほ銀行",
-                "icon": "bank",
+                "name": "Asia Imbiss",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/りそな銀行": {
+            "amenity/fast_food/Imbiss": {
                 "tags": {
-                    "name": "りそな銀行",
-                    "name:en": "Mizuho Bank",
-                    "amenity": "bank"
+                    "name": "Imbiss",
+                    "amenity": "fast_food"
                 },
-                "name": "りそな銀行",
-                "icon": "bank",
+                "name": "Imbiss",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/三井住友銀行": {
+            "amenity/fast_food/Chipotle": {
                 "tags": {
-                    "name": "三井住友銀行",
-                    "amenity": "bank"
+                    "name": "Chipotle",
+                    "cuisine": "mexican",
+                    "amenity": "fast_food"
                 },
-                "name": "三井住友銀行",
-                "icon": "bank",
+                "name": "Chipotle",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/三菱東京UFJ銀行": {
+            "amenity/fast_food/マクドナルド": {
                 "tags": {
-                    "name": "三菱東京UFJ銀行",
-                    "amenity": "bank"
-                },
-                "name": "三菱東京UFJ銀行",
-                "icon": "bank",
+                    "name": "マクドナルド",
+                    "name:en": "McDonald's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
+                },
+                "name": "マクドナルド",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/中国银行": {
+            "amenity/fast_food/In-N-Out Burger": {
                 "tags": {
-                    "name": "中国银行",
-                    "amenity": "bank"
+                    "name": "In-N-Out Burger",
+                    "amenity": "fast_food"
                 },
-                "name": "中国银行",
-                "icon": "bank",
+                "name": "In-N-Out Burger",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/광주은행": {
+            "amenity/fast_food/Jimmy John's": {
                 "tags": {
-                    "name": "광주은행",
-                    "name:en": "Gwangju Bank",
-                    "amenity": "bank"
+                    "name": "Jimmy John's",
+                    "amenity": "fast_food"
                 },
-                "name": "광주은행",
-                "icon": "bank",
+                "name": "Jimmy John's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/국민은행": {
+            "amenity/fast_food/Jamba Juice": {
                 "tags": {
-                    "name": "국민은행",
-                    "name:en": "Gungmin Bank",
-                    "amenity": "bank"
+                    "name": "Jamba Juice",
+                    "amenity": "fast_food"
                 },
-                "name": "국민은행",
-                "icon": "bank",
+                "name": "Jamba Juice",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/농협": {
+            "amenity/fast_food/Робин Сдобин": {
                 "tags": {
-                    "name": "농협",
-                    "amenity": "bank"
+                    "name": "Робин Сдобин",
+                    "amenity": "fast_food"
                 },
-                "name": "농협",
-                "icon": "bank",
+                "name": "Робин Сдобин",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/신한은행": {
+            "amenity/fast_food/Baskin Robbins": {
                 "tags": {
-                    "name": "신한은행",
-                    "name:en": "Sinhan Bank",
-                    "amenity": "bank"
+                    "name": "Baskin Robbins",
+                    "amenity": "fast_food"
                 },
-                "name": "신한은행",
-                "icon": "bank",
+                "name": "Baskin Robbins",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/우리은행": {
+            "amenity/fast_food/ケンタッキーフライドチキン": {
                 "tags": {
-                    "name": "우리은행",
-                    "name:en": "Uri Bank",
-                    "amenity": "bank"
+                    "name": "ケンタッキーフライドチキン",
+                    "name:en": "KFC",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
-                "name": "우리은행",
-                "icon": "bank",
+                "name": "ケンタッキーフライドチキン",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/중소기업은행": {
+            "amenity/fast_food/吉野家": {
                 "tags": {
-                    "name": "중소기업은행",
-                    "name:en": "Industrial Bank of Korea",
-                    "amenity": "bank"
+                    "name": "吉野家",
+                    "amenity": "fast_food"
                 },
-                "name": "중소기업은행",
-                "icon": "bank",
+                "name": "吉野家",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/bank/하나은행": {
+            "amenity/fast_food/Taco Time": {
                 "tags": {
-                    "name": "하나은행",
-                    "amenity": "bank"
+                    "name": "Taco Time",
+                    "amenity": "fast_food"
                 },
-                "name": "하나은행",
-                "icon": "bank",
+                "name": "Taco Time",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Cafe Amazon": {
+            "amenity/fast_food/松屋": {
                 "tags": {
-                    "name": "Cafe Amazon",
-                    "amenity": "cafe"
+                    "name": "松屋",
+                    "name:en": "Matsuya",
+                    "amenity": "fast_food"
                 },
-                "name": "Cafe Amazon",
-                "icon": "cafe",
+                "name": "松屋",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -71955,19 +74857,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Cafe Coffee Day": {
+            "amenity/fast_food/Little Caesars": {
                 "tags": {
-                    "name": "Cafe Coffee Day",
-                    "amenity": "cafe"
+                    "name": "Little Caesars",
+                    "amenity": "fast_food"
                 },
-                "name": "Cafe Coffee Day",
-                "icon": "cafe",
+                "name": "Little Caesars",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -71975,19 +74877,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Cafeteria": {
+            "amenity/fast_food/El Pollo Loco": {
                 "tags": {
-                    "name": "Cafeteria",
-                    "amenity": "cafe"
+                    "name": "El Pollo Loco",
+                    "amenity": "fast_food"
                 },
-                "name": "Cafeteria",
-                "icon": "cafe",
+                "name": "El Pollo Loco",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -71995,19 +74897,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Caffè Nero": {
+            "amenity/fast_food/Del Taco": {
                 "tags": {
-                    "name": "Caffè Nero",
-                    "amenity": "cafe"
+                    "name": "Del Taco",
+                    "amenity": "fast_food"
                 },
-                "name": "Caffè Nero",
-                "icon": "cafe",
+                "name": "Del Taco",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72015,19 +74917,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Café Central": {
+            "amenity/fast_food/White Castle": {
                 "tags": {
-                    "name": "Café Central",
-                    "amenity": "cafe"
+                    "name": "White Castle",
+                    "amenity": "fast_food"
                 },
-                "name": "Café Central",
-                "icon": "cafe",
+                "name": "White Castle",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72035,19 +74937,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Caribou Coffee": {
+            "amenity/fast_food/Boston Market": {
                 "tags": {
-                    "name": "Caribou Coffee",
-                    "amenity": "cafe"
+                    "name": "Boston Market",
+                    "amenity": "fast_food"
                 },
-                "name": "Caribou Coffee",
-                "icon": "cafe",
+                "name": "Boston Market",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72055,19 +74957,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Coffee Time": {
+            "amenity/fast_food/Chick-fil-A": {
                 "tags": {
-                    "name": "Coffee Time",
-                    "amenity": "cafe"
+                    "name": "Chick-fil-A",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
-                "name": "Coffee Time",
-                "icon": "cafe",
+                "name": "Chick-fil-A",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72075,19 +74978,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Costa": {
+            "amenity/fast_food/Panda Express": {
                 "tags": {
-                    "name": "Costa",
-                    "amenity": "cafe"
+                    "name": "Panda Express",
+                    "amenity": "fast_food"
                 },
-                "name": "Costa",
-                "icon": "cafe",
+                "name": "Panda Express",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72095,20 +74998,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Dunkin Donuts": {
+            "amenity/fast_food/Whataburger": {
                 "tags": {
-                    "name": "Dunkin Donuts",
-                    "cuisine": "donut",
-                    "amenity": "cafe"
+                    "name": "Whataburger",
+                    "amenity": "fast_food"
                 },
-                "name": "Dunkin Donuts",
-                "icon": "cafe",
+                "name": "Whataburger",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72116,19 +75018,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Eiscafe": {
+            "amenity/fast_food/Taco John's": {
                 "tags": {
-                    "name": "Eiscafe",
-                    "amenity": "cafe"
+                    "name": "Taco John's",
+                    "amenity": "fast_food"
                 },
-                "name": "Eiscafe",
-                "icon": "cafe",
+                "name": "Taco John's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72136,19 +75038,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Eiscafe Venezia": {
+            "amenity/fast_food/Теремок": {
                 "tags": {
-                    "name": "Eiscafe Venezia",
-                    "amenity": "cafe"
+                    "name": "Теремок",
+                    "amenity": "fast_food"
                 },
-                "name": "Eiscafe Venezia",
-                "icon": "cafe",
+                "name": "Теремок",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72156,19 +75058,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Eisdiele": {
+            "amenity/fast_food/Culver's": {
                 "tags": {
-                    "name": "Eisdiele",
-                    "amenity": "cafe"
+                    "name": "Culver's",
+                    "amenity": "fast_food"
                 },
-                "name": "Eisdiele",
-                "icon": "cafe",
+                "name": "Culver's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72176,19 +75078,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Pret A Manger": {
+            "amenity/fast_food/Five Guys": {
                 "tags": {
-                    "name": "Pret A Manger",
-                    "amenity": "cafe"
+                    "name": "Five Guys",
+                    "amenity": "fast_food"
                 },
-                "name": "Pret A Manger",
-                "icon": "cafe",
+                "name": "Five Guys",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72196,19 +75098,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Second Cup": {
+            "amenity/fast_food/Church's Chicken": {
                 "tags": {
-                    "name": "Second Cup",
-                    "amenity": "cafe"
+                    "name": "Church's Chicken",
+                    "amenity": "fast_food"
                 },
-                "name": "Second Cup",
-                "icon": "cafe",
+                "name": "Church's Chicken",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72216,19 +75118,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Segafredo": {
+            "amenity/fast_food/Popeye's": {
                 "tags": {
-                    "name": "Segafredo",
-                    "amenity": "cafe"
+                    "name": "Popeye's",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
-                "name": "Segafredo",
-                "icon": "cafe",
+                "name": "Popeye's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72236,20 +75139,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Starbucks": {
+            "amenity/fast_food/Long John Silver's": {
                 "tags": {
-                    "name": "Starbucks",
-                    "cuisine": "coffee_shop",
-                    "amenity": "cafe"
+                    "name": "Long John Silver's",
+                    "amenity": "fast_food"
                 },
-                "name": "Starbucks",
-                "icon": "cafe",
+                "name": "Long John Silver's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72257,19 +75159,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Tchibo": {
+            "amenity/fast_food/Pollo Campero": {
                 "tags": {
-                    "name": "Tchibo",
-                    "amenity": "cafe"
+                    "name": "Pollo Campero",
+                    "amenity": "fast_food"
                 },
-                "name": "Tchibo",
-                "icon": "cafe",
+                "name": "Pollo Campero",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72277,19 +75179,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Traveler's Coffee": {
+            "amenity/fast_food/すき家": {
                 "tags": {
-                    "name": "Traveler's Coffee",
-                    "amenity": "cafe"
+                    "name": "すき家",
+                    "name:en": "SUKIYA",
+                    "amenity": "fast_food"
                 },
-                "name": "Traveler's Coffee",
-                "icon": "cafe",
+                "name": "すき家",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72297,19 +75200,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Кафе": {
+            "amenity/fast_food/モスバーガー": {
                 "tags": {
-                    "name": "Кафе",
-                    "amenity": "cafe"
+                    "name": "モスバーガー",
+                    "name:en": "MOS BURGER",
+                    "amenity": "fast_food"
                 },
-                "name": "Кафе",
-                "icon": "cafe",
+                "name": "モスバーガー",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72317,19 +75221,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Кофе Хауз": {
+            "amenity/fast_food/Русский Аппетит": {
                 "tags": {
-                    "name": "Ð\9aоÑ\84е Ð¥Ð°Ñ\83з",
-                    "amenity": "cafe"
+                    "name": "РÑ\83Ñ\81Ñ\81кий Ð\90ппеÑ\82иÑ\82",
+                    "amenity": "fast_food"
                 },
-                "name": "Ð\9aоÑ\84е Ð¥Ð°Ñ\83з",
-                "icon": "cafe",
+                "name": "РÑ\83Ñ\81Ñ\81кий Ð\90ппеÑ\82иÑ\82",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72337,19 +75241,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Столовая": {
+            "amenity/fast_food/なか卯": {
                 "tags": {
-                    "name": "Столовая",
-                    "amenity": "cafe"
+                    "name": "なか卯",
+                    "amenity": "fast_food"
                 },
-                "name": "Столовая",
-                "icon": "cafe",
+                "name": "なか卯",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72357,19 +75261,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Шашлычная": {
+            "amenity/restaurant/Pizza Hut": {
                 "tags": {
-                    "name": "Шашлычная",
-                    "amenity": "cafe"
+                    "name": "Pizza Hut",
+                    "amenity": "restaurant"
                 },
-                "name": "Шашлычная",
-                "icon": "cafe",
+                "name": "Pizza Hut",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72377,19 +75281,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Шоколадница": {
+            "amenity/restaurant/Little Chef": {
                 "tags": {
-                    "name": "Шоколадница",
-                    "amenity": "cafe"
+                    "name": "Little Chef",
+                    "amenity": "restaurant"
                 },
-                "name": "Шоколадница",
-                "icon": "cafe",
+                "name": "Little Chef",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72397,19 +75302,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/คาเฟ่ อเมซอน": {
+            "amenity/restaurant/Adler": {
                 "tags": {
-                    "name": "คาเฟ่ อเมซอน",
-                    "amenity": "cafe"
+                    "name": "Adler",
+                    "amenity": "restaurant"
                 },
-                "name": "คาเฟ่ อเมซอน",
-                "icon": "cafe",
+                "name": "Adler",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72417,20 +75323,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/カフェ・ド・クリエ": {
+            "amenity/restaurant/Zur Krone": {
                 "tags": {
-                    "name": "カフェ・ド・クリエ",
-                    "name:en": "Cafe de CRIE",
-                    "amenity": "cafe"
+                    "name": "Zur Krone",
+                    "amenity": "restaurant"
                 },
-                "name": "カフェ・ド・クリエ",
-                "icon": "cafe",
+                "name": "Zur Krone",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72438,20 +75344,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/スターバックス": {
+            "amenity/restaurant/Deutsches Haus": {
                 "tags": {
-                    "name": "スターバックス",
-                    "name:en": "Starbucks",
-                    "amenity": "cafe"
+                    "name": "Deutsches Haus",
+                    "amenity": "restaurant"
                 },
-                "name": "スターバックス",
-                "icon": "cafe",
+                "name": "Deutsches Haus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72459,20 +75365,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/ドトール": {
-                "tags": {
-                    "name": "ドトール",
-                    "name:en": "DOUTOR",
-                    "amenity": "cafe"
+            "amenity/restaurant/Krone": {
+                "tags": {
+                    "name": "Krone",
+                    "amenity": "restaurant"
                 },
-                "name": "ドトール",
-                "icon": "cafe",
+                "name": "Krone",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72480,131 +75386,167 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Avis": {
+            "amenity/restaurant/Akropolis": {
                 "tags": {
-                    "name": "Avis",
-                    "amenity": "car_rental"
+                    "name": "Akropolis",
+                    "amenity": "restaurant"
                 },
-                "name": "Avis",
-                "icon": "car",
+                "name": "Akropolis",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Budget": {
+            "amenity/restaurant/Schützenhaus": {
                 "tags": {
-                    "name": "Budget",
-                    "amenity": "car_rental"
+                    "name": "Schützenhaus",
+                    "amenity": "restaurant"
                 },
-                "name": "Budget",
-                "icon": "car",
+                "name": "Schützenhaus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Enterprise": {
+            "amenity/restaurant/TGI Friday's": {
                 "tags": {
-                    "name": "Enterprise",
-                    "amenity": "car_rental"
+                    "name": "TGI Friday's",
+                    "amenity": "restaurant"
                 },
-                "name": "Enterprise",
-                "icon": "car",
+                "name": "TGI Friday's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Europcar": {
+            "amenity/restaurant/Kreuz": {
                 "tags": {
-                    "name": "Europcar",
-                    "amenity": "car_rental"
+                    "name": "Kreuz",
+                    "amenity": "restaurant"
                 },
-                "name": "Europcar",
-                "icon": "car",
+                "name": "Kreuz",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Hertz": {
+            "amenity/restaurant/Waldschänke": {
                 "tags": {
-                    "name": "Hertz",
-                    "amenity": "car_rental"
+                    "name": "Waldschänke",
+                    "amenity": "restaurant"
                 },
-                "name": "Hertz",
-                "icon": "car",
+                "name": "Waldschänke",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Sixt": {
+            "amenity/restaurant/La Piazza": {
                 "tags": {
-                    "name": "Sixt",
-                    "amenity": "car_rental"
+                    "name": "La Piazza",
+                    "amenity": "restaurant"
                 },
-                "name": "Sixt",
-                "icon": "car",
+                "name": "La Piazza",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/stadtmobil CarSharing-Station": {
+            "amenity/restaurant/Lamm": {
                 "tags": {
-                    "name": "stadtmobil CarSharing-Station",
-                    "amenity": "car_rental"
+                    "name": "Lamm",
+                    "amenity": "restaurant"
                 },
-                "name": "stadtmobil CarSharing-Station",
-                "icon": "car",
+                "name": "Lamm",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/A&W": {
+            "amenity/restaurant/Zur Sonne": {
                 "tags": {
-                    "name": "A&W",
-                    "amenity": "fast_food"
+                    "name": "Zur Sonne",
+                    "amenity": "restaurant"
                 },
-                "name": "A&W",
-                "icon": "fast-food",
+                "name": "Zur Sonne",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72613,17 +75555,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Ali Baba": {
+            "amenity/restaurant/Zur Linde": {
                 "tags": {
-                    "name": "Ali Baba",
-                    "amenity": "fast_food"
+                    "name": "Zur Linde",
+                    "amenity": "restaurant"
                 },
-                "name": "Ali Baba",
-                "icon": "fast-food",
+                "name": "Zur Linde",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72632,17 +75576,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Arby's": {
+            "amenity/restaurant/Poseidon": {
                 "tags": {
-                    "name": "Arby's",
-                    "amenity": "fast_food"
+                    "name": "Poseidon",
+                    "amenity": "restaurant"
                 },
-                "name": "Arby's",
-                "icon": "fast-food",
+                "name": "Poseidon",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72651,17 +75597,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Asia Imbiss": {
+            "amenity/restaurant/Shanghai": {
                 "tags": {
-                    "name": "Asia Imbiss",
-                    "amenity": "fast_food"
+                    "name": "Shanghai",
+                    "amenity": "restaurant"
                 },
-                "name": "Asia Imbiss",
-                "icon": "fast-food",
+                "name": "Shanghai",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72670,17 +75618,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Baskin Robbins": {
+            "amenity/restaurant/Red Lobster": {
                 "tags": {
-                    "name": "Baskin Robbins",
-                    "amenity": "fast_food"
+                    "name": "Red Lobster",
+                    "amenity": "restaurant"
                 },
-                "name": "Baskin Robbins",
-                "icon": "fast-food",
+                "name": "Red Lobster",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72689,17 +75639,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Boston Market": {
+            "amenity/restaurant/Zum Löwen": {
                 "tags": {
-                    "name": "Boston Market",
-                    "amenity": "fast_food"
+                    "name": "Zum Löwen",
+                    "amenity": "restaurant"
                 },
-                "name": "Boston Market",
-                "icon": "fast-food",
+                "name": "Zum Löwen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72708,18 +75660,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Burger King": {
+            "amenity/restaurant/Swiss Chalet": {
                 "tags": {
-                    "name": "Burger King",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Swiss Chalet",
+                    "amenity": "restaurant"
                 },
-                "name": "Burger King",
-                "icon": "fast-food",
+                "name": "Swiss Chalet",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72728,18 +75681,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Carl's Jr.": {
+            "amenity/restaurant/Olympia": {
                 "tags": {
-                    "name": "Carl's Jr.",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Olympia",
+                    "amenity": "restaurant"
                 },
-                "name": "Carl's Jr.",
-                "icon": "fast-food",
+                "name": "Olympia",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72748,18 +75702,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Chick-fil-A": {
+            "amenity/restaurant/Wagamama": {
                 "tags": {
-                    "name": "Chick-fil-A",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "Wagamama",
+                    "amenity": "restaurant"
                 },
-                "name": "Chick-fil-A",
-                "icon": "fast-food",
+                "name": "Wagamama",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72768,18 +75723,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Chipotle": {
+            "amenity/restaurant/Frankie & Benny's": {
                 "tags": {
-                    "name": "Chipotle",
-                    "cuisine": "mexican",
-                    "amenity": "fast_food"
+                    "name": "Frankie & Benny's",
+                    "amenity": "restaurant"
                 },
-                "name": "Chipotle",
-                "icon": "fast-food",
+                "name": "Frankie & Benny's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72788,17 +75744,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Chowking": {
+            "amenity/restaurant/Hooters": {
                 "tags": {
-                    "name": "Chowking",
-                    "amenity": "fast_food"
+                    "name": "Hooters",
+                    "amenity": "restaurant"
                 },
-                "name": "Chowking",
-                "icon": "fast-food",
+                "name": "Hooters",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72807,17 +75765,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Church's Chicken": {
+            "amenity/restaurant/Sternen": {
                 "tags": {
-                    "name": "Church's Chicken",
-                    "amenity": "fast_food"
+                    "name": "Sternen",
+                    "amenity": "restaurant"
                 },
-                "name": "Church's Chicken",
-                "icon": "fast-food",
+                "name": "Sternen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72826,17 +75786,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Culver's": {
+            "amenity/restaurant/Hirschen": {
                 "tags": {
-                    "name": "Culver's",
-                    "amenity": "fast_food"
+                    "name": "Hirschen",
+                    "amenity": "restaurant"
                 },
-                "name": "Culver's",
-                "icon": "fast-food",
+                "name": "Hirschen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72845,17 +75807,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Dairy Queen": {
+            "amenity/restaurant/Denny's": {
                 "tags": {
-                    "name": "Dairy Queen",
-                    "amenity": "fast_food"
+                    "name": "Denny's",
+                    "amenity": "restaurant"
                 },
-                "name": "Dairy Queen",
-                "icon": "fast-food",
+                "name": "Denny's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72864,17 +75828,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Del Taco": {
+            "amenity/restaurant/Athen": {
                 "tags": {
-                    "name": "Del Taco",
-                    "amenity": "fast_food"
+                    "name": "Athen",
+                    "amenity": "restaurant"
                 },
-                "name": "Del Taco",
-                "icon": "fast-food",
+                "name": "Athen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72883,18 +75849,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Domino's Pizza": {
+            "amenity/restaurant/Sonne": {
                 "tags": {
-                    "name": "Domino's Pizza",
-                    "cuisine": "pizza",
-                    "amenity": "fast_food"
+                    "name": "Sonne",
+                    "amenity": "restaurant"
                 },
-                "name": "Domino's Pizza",
-                "icon": "fast-food",
+                "name": "Sonne",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72903,17 +75870,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Döner": {
+            "amenity/restaurant/Hirsch": {
                 "tags": {
-                    "name": "Döner",
-                    "amenity": "fast_food"
+                    "name": "Hirsch",
+                    "amenity": "restaurant"
                 },
-                "name": "Döner",
-                "icon": "fast-food",
+                "name": "Hirsch",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72922,17 +75891,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/El Pollo Loco": {
+            "amenity/restaurant/Ratskeller": {
                 "tags": {
-                    "name": "El Pollo Loco",
-                    "amenity": "fast_food"
+                    "name": "Ratskeller",
+                    "amenity": "restaurant"
                 },
-                "name": "El Pollo Loco",
-                "icon": "fast-food",
+                "name": "Ratskeller",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72941,17 +75912,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Fish & Chips": {
+            "amenity/restaurant/La Cantina": {
                 "tags": {
-                    "name": "Fish & Chips",
-                    "amenity": "fast_food"
+                    "name": "La Cantina",
+                    "amenity": "restaurant"
                 },
-                "name": "Fish & Chips",
-                "icon": "fast-food",
+                "name": "La Cantina",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72960,17 +75933,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Five Guys": {
+            "amenity/restaurant/Gasthaus Krone": {
                 "tags": {
-                    "name": "Five Guys",
-                    "amenity": "fast_food"
+                    "name": "Gasthaus Krone",
+                    "amenity": "restaurant"
                 },
-                "name": "Five Guys",
-                "icon": "fast-food",
+                "name": "Gasthaus Krone",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72979,17 +75954,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hallo Pizza": {
+            "amenity/restaurant/El Greco": {
                 "tags": {
-                    "name": "Hallo Pizza",
-                    "amenity": "fast_food"
+                    "name": "El Greco",
+                    "amenity": "restaurant"
                 },
-                "name": "Hallo Pizza",
-                "icon": "fast-food",
+                "name": "El Greco",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72998,18 +75975,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hardee's": {
+            "amenity/restaurant/Gasthof zur Post": {
                 "tags": {
-                    "name": "Hardee's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Gasthof zur Post",
+                    "amenity": "restaurant"
                 },
-                "name": "Hardee's",
-                "icon": "fast-food",
+                "name": "Gasthof zur Post",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73018,17 +75996,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Harvey's": {
+            "amenity/restaurant/Nando's": {
                 "tags": {
-                    "name": "Harvey's",
-                    "amenity": "fast_food"
+                    "name": "Nando's",
+                    "amenity": "restaurant"
                 },
-                "name": "Harvey's",
-                "icon": "fast-food",
+                "name": "Nando's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73037,17 +76017,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hesburger": {
+            "amenity/restaurant/Löwen": {
                 "tags": {
-                    "name": "Hesburger",
-                    "amenity": "fast_food"
+                    "name": "Löwen",
+                    "amenity": "restaurant"
                 },
-                "name": "Hesburger",
-                "icon": "fast-food",
+                "name": "Löwen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73056,18 +76038,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hungry Jacks": {
+            "amenity/restaurant/Pizza Express": {
                 "tags": {
-                    "name": "Hungry Jacks",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Pizza Express",
+                    "amenity": "restaurant"
                 },
-                "name": "Hungry Jacks",
-                "icon": "fast-food",
+                "name": "Pizza Express",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73076,17 +76059,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Imbiss": {
+            "amenity/restaurant/Mandarin": {
                 "tags": {
-                    "name": "Imbiss",
-                    "amenity": "fast_food"
+                    "name": "Mandarin",
+                    "amenity": "restaurant"
                 },
-                "name": "Imbiss",
-                "icon": "fast-food",
+                "name": "Mandarin",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73095,17 +76080,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/In-N-Out Burger": {
+            "amenity/restaurant/Hong Kong": {
                 "tags": {
-                    "name": "In-N-Out Burger",
-                    "amenity": "fast_food"
-                },
-                "name": "In-N-Out Burger",
-                "icon": "fast-food",
+                    "name": "Hong Kong",
+                    "amenity": "restaurant"
+                },
+                "name": "Hong Kong",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73114,17 +76101,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Istanbul": {
+            "amenity/restaurant/Zizzi": {
                 "tags": {
-                    "name": "Istanbul",
-                    "amenity": "fast_food"
+                    "name": "Zizzi",
+                    "amenity": "restaurant"
                 },
-                "name": "Istanbul",
-                "icon": "fast-food",
+                "name": "Zizzi",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73133,18 +76122,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jack in the Box": {
+            "amenity/restaurant/Cracker Barrel": {
                 "tags": {
-                    "name": "Jack in the Box",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Cracker Barrel",
+                    "amenity": "restaurant"
                 },
-                "name": "Jack in the Box",
-                "icon": "fast-food",
+                "name": "Cracker Barrel",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73153,17 +76143,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jamba Juice": {
+            "amenity/restaurant/Rhodos": {
                 "tags": {
-                    "name": "Jamba Juice",
-                    "amenity": "fast_food"
+                    "name": "Rhodos",
+                    "amenity": "restaurant"
                 },
-                "name": "Jamba Juice",
-                "icon": "fast-food",
+                "name": "Rhodos",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73172,17 +76164,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jimmy John's": {
+            "amenity/restaurant/Lindenhof": {
                 "tags": {
-                    "name": "Jimmy John's",
-                    "amenity": "fast_food"
+                    "name": "Lindenhof",
+                    "amenity": "restaurant"
                 },
-                "name": "Jimmy John's",
-                "icon": "fast-food",
+                "name": "Lindenhof",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73191,17 +76185,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jollibee": {
+            "amenity/restaurant/Milano": {
                 "tags": {
-                    "name": "Jollibee",
-                    "amenity": "fast_food"
+                    "name": "Milano",
+                    "amenity": "restaurant"
                 },
-                "name": "Jollibee",
-                "icon": "fast-food",
+                "name": "Milano",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73210,18 +76206,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/KFC": {
+            "amenity/restaurant/Dolce Vita": {
                 "tags": {
-                    "name": "KFC",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "Dolce Vita",
+                    "amenity": "restaurant"
                 },
-                "name": "KFC",
-                "icon": "fast-food",
+                "name": "Dolce Vita",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73230,17 +76227,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Kebab": {
+            "amenity/restaurant/Kirchenwirt": {
                 "tags": {
-                    "name": "Kebab",
-                    "amenity": "fast_food"
+                    "name": "Kirchenwirt",
+                    "amenity": "restaurant"
                 },
-                "name": "Kebab",
-                "icon": "fast-food",
+                "name": "Kirchenwirt",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73249,17 +76248,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Kochlöffel": {
+            "amenity/restaurant/Kantine": {
                 "tags": {
-                    "name": "Kochlöffel",
-                    "amenity": "fast_food"
+                    "name": "Kantine",
+                    "amenity": "restaurant"
                 },
-                "name": "Kochlöffel",
-                "icon": "fast-food",
+                "name": "Kantine",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73268,17 +76269,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Kotipizza": {
+            "amenity/restaurant/Ochsen": {
                 "tags": {
-                    "name": "Kotipizza",
-                    "amenity": "fast_food"
+                    "name": "Ochsen",
+                    "amenity": "restaurant"
                 },
-                "name": "Kotipizza",
-                "icon": "fast-food",
+                "name": "Ochsen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73287,17 +76290,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Little Caesars": {
+            "amenity/restaurant/Spur": {
                 "tags": {
-                    "name": "Little Caesars",
-                    "amenity": "fast_food"
+                    "name": "Spur",
+                    "amenity": "restaurant"
                 },
-                "name": "Little Caesars",
-                "icon": "fast-food",
+                "name": "Spur",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73306,17 +76311,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Long John Silver's": {
+            "amenity/restaurant/Mykonos": {
                 "tags": {
-                    "name": "Long John Silver's",
-                    "amenity": "fast_food"
+                    "name": "Mykonos",
+                    "amenity": "restaurant"
                 },
-                "name": "Long John Silver's",
-                "icon": "fast-food",
+                "name": "Mykonos",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73325,18 +76332,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/McDonald's": {
+            "amenity/restaurant/Lotus": {
                 "tags": {
-                    "name": "McDonald's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Lotus",
+                    "amenity": "restaurant"
                 },
-                "name": "McDonald's",
-                "icon": "fast-food",
+                "name": "Lotus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73345,17 +76353,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Mr. Sub": {
+            "amenity/restaurant/Applebee's": {
                 "tags": {
-                    "name": "Mr. Sub",
-                    "amenity": "fast_food"
+                    "name": "Applebee's",
+                    "amenity": "restaurant"
                 },
-                "name": "Mr. Sub",
-                "icon": "fast-food",
+                "name": "Applebee's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73364,17 +76374,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Nordsee": {
+            "amenity/restaurant/Flunch": {
                 "tags": {
-                    "name": "Nordsee",
-                    "amenity": "fast_food"
+                    "name": "Flunch",
+                    "amenity": "restaurant"
                 },
-                "name": "Nordsee",
-                "icon": "fast-food",
+                "name": "Flunch",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73383,17 +76395,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Panda Express": {
+            "amenity/restaurant/Zur Post": {
                 "tags": {
-                    "name": "Panda Express",
-                    "amenity": "fast_food"
+                    "name": "Zur Post",
+                    "amenity": "restaurant"
                 },
-                "name": "Panda Express",
-                "icon": "fast-food",
+                "name": "Zur Post",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73402,18 +76416,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Papa John's": {
+            "amenity/restaurant/China Town": {
                 "tags": {
-                    "name": "Papa John's",
-                    "cuisine": "pizza",
-                    "amenity": "fast_food"
+                    "name": "China Town",
+                    "amenity": "restaurant"
                 },
-                "name": "Papa John's",
-                "icon": "fast-food",
+                "name": "China Town",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73422,17 +76437,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Pizza Nova": {
+            "amenity/restaurant/La Dolce Vita": {
                 "tags": {
-                    "name": "Pizza Nova",
-                    "amenity": "fast_food"
+                    "name": "La Dolce Vita",
+                    "amenity": "restaurant"
                 },
-                "name": "Pizza Nova",
-                "icon": "fast-food",
+                "name": "La Dolce Vita",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73441,17 +76458,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Pizza Pizza": {
+            "amenity/restaurant/Waffle House": {
                 "tags": {
-                    "name": "Pizza Pizza",
-                    "amenity": "fast_food"
+                    "name": "Waffle House",
+                    "amenity": "restaurant"
                 },
-                "name": "Pizza Pizza",
-                "icon": "fast-food",
+                "name": "Waffle House",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73460,17 +76479,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Pollo Campero": {
+            "amenity/restaurant/Delphi": {
                 "tags": {
-                    "name": "Pollo Campero",
-                    "amenity": "fast_food"
+                    "name": "Delphi",
+                    "amenity": "restaurant"
                 },
-                "name": "Pollo Campero",
-                "icon": "fast-food",
+                "name": "Delphi",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73479,18 +76500,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Popeye's": {
+            "amenity/restaurant/Linde": {
                 "tags": {
-                    "name": "Popeye's",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "Linde",
+                    "amenity": "restaurant"
                 },
-                "name": "Popeye's",
-                "icon": "fast-food",
+                "name": "Linde",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73499,17 +76521,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Quick": {
+            "amenity/restaurant/Dionysos": {
                 "tags": {
-                    "name": "Quick",
-                    "amenity": "fast_food"
+                    "name": "Dionysos",
+                    "amenity": "restaurant"
                 },
-                "name": "Quick",
-                "icon": "fast-food",
+                "name": "Dionysos",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73518,18 +76542,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Quiznos": {
+            "amenity/restaurant/Outback Steakhouse": {
                 "tags": {
-                    "name": "Quiznos",
-                    "cuisine": "sandwich",
-                    "amenity": "fast_food"
+                    "name": "Outback Steakhouse",
+                    "amenity": "restaurant"
                 },
-                "name": "Quiznos",
-                "icon": "fast-food",
+                "name": "Outback Steakhouse",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73538,17 +76563,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Red Rooster": {
+            "amenity/restaurant/Kelsey's": {
                 "tags": {
-                    "name": "Red Rooster",
-                    "amenity": "fast_food"
+                    "name": "Kelsey's",
+                    "amenity": "restaurant"
                 },
-                "name": "Red Rooster",
-                "icon": "fast-food",
+                "name": "Kelsey's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73557,17 +76584,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Sibylla": {
+            "amenity/restaurant/Boston Pizza": {
                 "tags": {
-                    "name": "Sibylla",
-                    "amenity": "fast_food"
+                    "name": "Boston Pizza",
+                    "amenity": "restaurant"
                 },
-                "name": "Sibylla",
-                "icon": "fast-food",
+                "name": "Boston Pizza",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73576,18 +76605,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Sonic": {
+            "amenity/restaurant/Bella Italia": {
                 "tags": {
-                    "name": "Sonic",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Bella Italia",
+                    "amenity": "restaurant"
                 },
-                "name": "Sonic",
-                "icon": "fast-food",
+                "name": "Bella Italia",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73596,17 +76626,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Steers": {
+            "amenity/restaurant/Sizzler": {
                 "tags": {
-                    "name": "Steers",
-                    "amenity": "fast_food"
+                    "name": "Sizzler",
+                    "amenity": "restaurant"
                 },
-                "name": "Steers",
-                "icon": "fast-food",
+                "name": "Sizzler",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73615,17 +76647,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Taco Bell": {
+            "amenity/restaurant/Grüner Baum": {
                 "tags": {
-                    "name": "Taco Bell",
-                    "amenity": "fast_food"
+                    "name": "Grüner Baum",
+                    "amenity": "restaurant"
                 },
-                "name": "Taco Bell",
-                "icon": "fast-food",
+                "name": "Grüner Baum",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73634,17 +76668,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Taco John's": {
+            "amenity/restaurant/Taj Mahal": {
                 "tags": {
-                    "name": "Taco John's",
-                    "amenity": "fast_food"
+                    "name": "Taj Mahal",
+                    "amenity": "restaurant"
                 },
-                "name": "Taco John's",
-                "icon": "fast-food",
+                "name": "Taj Mahal",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73653,17 +76689,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Taco Time": {
+            "amenity/restaurant/Rössli": {
                 "tags": {
-                    "name": "Taco Time",
-                    "amenity": "fast_food"
+                    "name": "Rössli",
+                    "amenity": "restaurant"
                 },
-                "name": "Taco Time",
-                "icon": "fast-food",
+                "name": "Rössli",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73672,17 +76710,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Telepizza": {
+            "amenity/restaurant/Traube": {
                 "tags": {
-                    "name": "Telepizza",
-                    "amenity": "fast_food"
+                    "name": "Traube",
+                    "amenity": "restaurant"
                 },
-                "name": "Telepizza",
-                "icon": "fast-food",
+                "name": "Traube",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73691,17 +76731,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Tim Hortons": {
+            "amenity/restaurant/Red Robin": {
                 "tags": {
-                    "name": "Tim Hortons",
-                    "amenity": "fast_food"
+                    "name": "Red Robin",
+                    "amenity": "restaurant"
                 },
-                "name": "Tim Hortons",
-                "icon": "fast-food",
+                "name": "Red Robin",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73710,18 +76752,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Wendy's": {
+            "amenity/restaurant/Roma": {
                 "tags": {
-                    "name": "Wendy's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Roma",
+                    "amenity": "restaurant"
                 },
-                "name": "Wendy's",
-                "icon": "fast-food",
+                "name": "Roma",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73730,17 +76773,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Whataburger": {
+            "amenity/restaurant/San Marco": {
                 "tags": {
-                    "name": "Whataburger",
-                    "amenity": "fast_food"
+                    "name": "San Marco",
+                    "amenity": "restaurant"
                 },
-                "name": "Whataburger",
-                "icon": "fast-food",
+                "name": "San Marco",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73749,17 +76794,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/White Castle": {
+            "amenity/restaurant/Hellas": {
                 "tags": {
-                    "name": "White Castle",
-                    "amenity": "fast_food"
+                    "name": "Hellas",
+                    "amenity": "restaurant"
                 },
-                "name": "White Castle",
-                "icon": "fast-food",
+                "name": "Hellas",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73768,17 +76815,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Wimpy": {
+            "amenity/restaurant/La Perla": {
                 "tags": {
-                    "name": "Wimpy",
-                    "amenity": "fast_food"
+                    "name": "La Perla",
+                    "amenity": "restaurant"
                 },
-                "name": "Wimpy",
-                "icon": "fast-food",
+                "name": "La Perla",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73787,18 +76836,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Макдоналдс": {
+            "amenity/restaurant/Vips": {
                 "tags": {
-                    "name": "Макдоналдс",
-                    "name:en": "McDonald's",
-                    "amenity": "fast_food"
-                },
-                "name": "Макдоналдс",
-                "icon": "fast-food",
+                    "name": "Vips",
+                    "amenity": "restaurant"
+                },
+                "name": "Vips",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73807,17 +76857,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Робин Сдобин": {
+            "amenity/restaurant/Panera Bread": {
                 "tags": {
-                    "name": "Робин Сдобин",
-                    "amenity": "fast_food"
+                    "name": "Panera Bread",
+                    "amenity": "restaurant"
                 },
-                "name": "Робин Сдобин",
-                "icon": "fast-food",
+                "name": "Panera Bread",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73826,17 +76878,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Русский Аппетит": {
+            "amenity/restaurant/Da Vinci": {
                 "tags": {
-                    "name": "Русский Аппетит",
-                    "amenity": "fast_food"
+                    "name": "Da Vinci",
+                    "amenity": "restaurant"
                 },
-                "name": "Русский Аппетит",
-                "icon": "fast-food",
+                "name": "Da Vinci",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73845,17 +76899,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Теремок": {
+            "amenity/restaurant/Hippopotamus": {
                 "tags": {
-                    "name": "Теремок",
-                    "amenity": "fast_food"
+                    "name": "Hippopotamus",
+                    "amenity": "restaurant"
                 },
-                "name": "Теремок",
-                "icon": "fast-food",
+                "name": "Hippopotamus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73864,18 +76920,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/すき家": {
+            "amenity/restaurant/Prezzo": {
                 "tags": {
-                    "name": "すき家",
-                    "name:en": "SUKIYA",
-                    "amenity": "fast_food"
+                    "name": "Prezzo",
+                    "amenity": "restaurant"
                 },
-                "name": "すき家",
-                "icon": "fast-food",
+                "name": "Prezzo",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73884,17 +76941,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/なか卯": {
+            "amenity/restaurant/Courtepaille": {
                 "tags": {
-                    "name": "なか卯",
-                    "amenity": "fast_food"
+                    "name": "Courtepaille",
+                    "amenity": "restaurant"
                 },
-                "name": "なか卯",
-                "icon": "fast-food",
+                "name": "Courtepaille",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73903,19 +76962,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/ケンタッキーフライドチキン": {
+            "amenity/restaurant/Hard Rock Cafe": {
                 "tags": {
-                    "name": "ケンタッキーフライドチキン",
-                    "name:en": "KFC",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "Hard Rock Cafe",
+                    "amenity": "restaurant"
                 },
-                "name": "ケンタッキーフライドチキン",
-                "icon": "fast-food",
+                "name": "Hard Rock Cafe",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73924,19 +76983,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/マクドナルド": {
+            "amenity/restaurant/Panorama": {
                 "tags": {
-                    "name": "マクドナルド",
-                    "name:en": "McDonald's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Panorama",
+                    "amenity": "restaurant"
                 },
-                "name": "マクドナルド",
-                "icon": "fast-food",
+                "name": "Panorama",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73945,18 +77004,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/モスバーガー": {
+            "amenity/restaurant/デニーズ": {
                 "tags": {
-                    "name": "モスバーガー",
-                    "name:en": "MOS BURGER",
-                    "amenity": "fast_food"
+                    "name": "デニーズ",
+                    "amenity": "restaurant"
                 },
-                "name": "ã\83¢ã\82¹ã\83\90ã\83¼ã\82¬ã\83¼",
-                "icon": "fast-food",
+                "name": "ã\83\87ã\83\8bã\83¼ã\82º",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73965,17 +77025,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/吉野家": {
+            "amenity/restaurant/Sportheim": {
                 "tags": {
-                    "name": "吉野家",
-                    "amenity": "fast_food"
+                    "name": "Sportheim",
+                    "amenity": "restaurant"
                 },
-                "name": "吉野家",
-                "icon": "fast-food",
+                "name": "Sportheim",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73984,18 +77046,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/松屋": {
+            "amenity/restaurant/餃子の王将": {
                 "tags": {
-                    "name": "松屋",
-                    "name:en": "Matsuya",
-                    "amenity": "fast_food"
+                    "name": "餃子の王将",
+                    "amenity": "restaurant"
                 },
-                "name": "松屋",
-                "icon": "fast-food",
+                "name": "餃子の王将",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -74004,17 +77067,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/肯德基": {
+            "amenity/restaurant/Bären": {
                 "tags": {
-                    "name": "肯德基",
-                    "amenity": "fast_food"
+                    "name": "Bären",
+                    "amenity": "restaurant"
                 },
-                "name": "肯德基",
-                "icon": "fast-food",
+                "name": "Bären",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -74023,17 +77088,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/麥當勞": {
+            "amenity/restaurant/Alte Post": {
                 "tags": {
-                    "name": "麥當勞",
-                    "amenity": "fast_food"
+                    "name": "Alte Post",
+                    "amenity": "restaurant"
                 },
-                "name": "麥當勞",
-                "icon": "fast-food",
+                "name": "Alte Post",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
@@ -74042,6804 +77109,7151 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/76": {
+            "amenity/restaurant/China Garden": {
                 "tags": {
-                    "name": "76",
-                    "amenity": "fuel"
+                    "name": "China Garden",
+                    "amenity": "restaurant"
                 },
-                "name": "76",
-                "icon": "fuel",
+                "name": "China Garden",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/1-2-3": {
+            "amenity/restaurant/Vapiano": {
                 "tags": {
-                    "name": "1-2-3",
-                    "amenity": "fuel"
+                    "name": "Vapiano",
+                    "amenity": "restaurant"
                 },
-                "name": "1-2-3",
-                "icon": "fuel",
+                "name": "Vapiano",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/7-Eleven": {
+            "amenity/restaurant/Mamma Mia": {
                 "tags": {
-                    "name": "7-Eleven",
-                    "amenity": "fuel"
+                    "name": "Mamma Mia",
+                    "amenity": "restaurant"
                 },
-                "name": "7-Eleven",
-                "icon": "fuel",
+                "name": "Mamma Mia",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ABC": {
+            "amenity/restaurant/Schwarzer Adler": {
                 "tags": {
-                    "name": "ABC",
-                    "amenity": "fuel"
+                    "name": "Schwarzer Adler",
+                    "amenity": "restaurant"
                 },
-                "name": "ABC",
-                "icon": "fuel",
+                "name": "Schwarzer Adler",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Agip": {
+            "amenity/restaurant/IHOP": {
                 "tags": {
-                    "name": "Agip",
-                    "amenity": "fuel"
+                    "name": "IHOP",
+                    "amenity": "restaurant"
                 },
-                "name": "Agip",
-                "icon": "fuel",
+                "name": "IHOP",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ANP": {
+            "amenity/restaurant/Chili's": {
                 "tags": {
-                    "name": "ANP",
-                    "amenity": "fuel"
+                    "name": "Chili's",
+                    "amenity": "restaurant"
                 },
-                "name": "ANP",
-                "icon": "fuel",
+                "name": "Chili's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ARAL": {
+            "amenity/restaurant/Olive Garden": {
                 "tags": {
-                    "name": "ARAL",
-                    "amenity": "fuel"
+                    "name": "Olive Garden",
+                    "amenity": "restaurant"
                 },
-                "name": "ARAL",
-                "icon": "fuel",
+                "name": "Olive Garden",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Avia": {
+            "amenity/restaurant/Friendly's": {
                 "tags": {
-                    "name": "Avia",
-                    "amenity": "fuel"
+                    "name": "Friendly's",
+                    "amenity": "restaurant"
                 },
-                "name": "Avia",
-                "icon": "fuel",
+                "name": "Friendly's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Afriquia": {
+            "amenity/restaurant/Buffalo Grill": {
                 "tags": {
-                    "name": "Afriquia",
-                    "amenity": "fuel"
+                    "name": "Buffalo Grill",
+                    "amenity": "restaurant"
                 },
-                "name": "Afriquia",
-                "icon": "fuel",
+                "name": "Buffalo Grill",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Agrola": {
+            "amenity/restaurant/Texas Roadhouse": {
                 "tags": {
-                    "name": "Agrola",
-                    "amenity": "fuel"
+                    "name": "Texas Roadhouse",
+                    "amenity": "restaurant"
                 },
-                "name": "Agrola",
-                "icon": "fuel",
+                "name": "Texas Roadhouse",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Api": {
+            "amenity/restaurant/ガスト": {
                 "tags": {
-                    "name": "Api",
-                    "amenity": "fuel"
+                    "name": "ガスト",
+                    "name:en": "Gusto",
+                    "amenity": "restaurant"
                 },
-                "name": "Api",
-                "icon": "fuel",
+                "name": "ガスト",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Aral": {
+            "amenity/restaurant/Sakura": {
                 "tags": {
-                    "name": "Aral",
-                    "amenity": "fuel"
+                    "name": "Sakura",
+                    "amenity": "restaurant"
                 },
-                "name": "Aral",
-                "icon": "fuel",
+                "name": "Sakura",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Arco": {
+            "amenity/restaurant/Mensa": {
                 "tags": {
-                    "name": "Arco",
-                    "amenity": "fuel"
+                    "name": "Mensa",
+                    "amenity": "restaurant"
                 },
-                "name": "Arco",
-                "icon": "fuel",
+                "name": "Mensa",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Auchan": {
+            "amenity/restaurant/The Keg": {
                 "tags": {
-                    "name": "Auchan",
-                    "amenity": "fuel"
+                    "name": "The Keg",
+                    "amenity": "restaurant"
                 },
-                "name": "Auchan",
-                "icon": "fuel",
+                "name": "The Keg",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Avanti": {
+            "amenity/restaurant/サイゼリヤ": {
                 "tags": {
-                    "name": "Avanti",
-                    "amenity": "fuel"
+                    "name": "サイゼリヤ",
+                    "amenity": "restaurant"
                 },
-                "name": "Avanti",
-                "icon": "fuel",
+                "name": "サイゼリヤ",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/BFT": {
+            "amenity/restaurant/La Strada": {
                 "tags": {
-                    "name": "BFT",
-                    "amenity": "fuel"
+                    "name": "La Strada",
+                    "amenity": "restaurant"
                 },
-                "name": "BFT",
-                "icon": "fuel",
+                "name": "La Strada",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/BP": {
+            "amenity/restaurant/Village Inn": {
                 "tags": {
-                    "name": "BP",
-                    "amenity": "fuel"
+                    "name": "Village Inn",
+                    "amenity": "restaurant"
                 },
-                "name": "BP",
-                "icon": "fuel",
+                "name": "Village Inn",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/BR": {
+            "amenity/restaurant/Buffalo Wild Wings": {
                 "tags": {
-                    "name": "BR",
-                    "amenity": "fuel"
+                    "name": "Buffalo Wild Wings",
+                    "amenity": "restaurant"
                 },
-                "name": "BR",
-                "icon": "fuel",
+                "name": "Buffalo Wild Wings",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Benzina": {
+            "amenity/restaurant/Peking": {
                 "tags": {
-                    "name": "Benzina",
-                    "amenity": "fuel"
+                    "name": "Peking",
+                    "amenity": "restaurant"
                 },
-                "name": "Benzina",
-                "icon": "fuel",
+                "name": "Peking",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Bliska": {
+            "amenity/restaurant/California Pizza Kitchen": {
                 "tags": {
-                    "name": "Bliska",
-                    "amenity": "fuel"
+                    "name": "California Pizza Kitchen",
+                    "amenity": "restaurant"
                 },
-                "name": "Bliska",
-                "icon": "fuel",
+                "name": "California Pizza Kitchen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/C. C. E. Leclerc": {
+            "amenity/restaurant/Якитория": {
                 "tags": {
-                    "name": "C. C. E. Leclerc",
-                    "amenity": "fuel"
+                    "name": "Якитория",
+                    "amenity": "restaurant"
                 },
-                "name": "C. C. E. Leclerc",
-                "icon": "fuel",
+                "name": "Якитория",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/CAMPSA": {
+            "amenity/restaurant/Golden Corral": {
                 "tags": {
-                    "name": "CAMPSA",
-                    "amenity": "fuel"
+                    "name": "Golden Corral",
+                    "amenity": "restaurant"
                 },
-                "name": "CAMPSA",
-                "icon": "fuel",
+                "name": "Golden Corral",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/CARREFOUR": {
+            "amenity/restaurant/Perkins": {
                 "tags": {
-                    "name": "CARREFOUR",
-                    "amenity": "fuel"
+                    "name": "Perkins",
+                    "amenity": "restaurant"
                 },
-                "name": "CARREFOUR",
-                "icon": "fuel",
+                "name": "Perkins",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/CEPSA": {
+            "amenity/restaurant/Ruby Tuesday": {
                 "tags": {
-                    "name": "CEPSA",
-                    "amenity": "fuel"
+                    "name": "Ruby Tuesday",
+                    "amenity": "restaurant"
                 },
-                "name": "CEPSA",
-                "icon": "fuel",
+                "name": "Ruby Tuesday",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/COSMO": {
+            "amenity/restaurant/Shari's": {
                 "tags": {
-                    "name": "COSMO",
-                    "amenity": "fuel"
+                    "name": "Shari's",
+                    "amenity": "restaurant"
                 },
-                "name": "COSMO",
-                "icon": "fuel",
+                "name": "Shari's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Caltex": {
+            "amenity/restaurant/Bob Evans": {
                 "tags": {
-                    "name": "Caltex",
-                    "amenity": "fuel"
+                    "name": "Bob Evans",
+                    "amenity": "restaurant"
                 },
-                "name": "Caltex",
-                "icon": "fuel",
+                "name": "Bob Evans",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Canadian Tire": {
+            "amenity/restaurant/바다횟집 (Bada Fish Restaurant)": {
                 "tags": {
-                    "name": "Canadian Tire",
-                    "amenity": "fuel"
+                    "name": "바다횟집 (Bada Fish Restaurant)",
+                    "amenity": "restaurant"
                 },
-                "name": "Canadian Tire",
-                "icon": "fuel",
+                "name": "바다횟집 (Bada Fish Restaurant)",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Carrefour": {
+            "amenity/restaurant/Mang Inasal": {
                 "tags": {
-                    "name": "Carrefour",
-                    "amenity": "fuel"
+                    "name": "Mang Inasal",
+                    "amenity": "restaurant"
                 },
-                "name": "Carrefour",
-                "icon": "fuel",
+                "name": "Mang Inasal",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Casey's General Store": {
+            "amenity/restaurant/Евразия": {
                 "tags": {
-                    "name": "Casey's General Store",
-                    "amenity": "fuel"
+                    "name": "Евразия",
+                    "amenity": "restaurant"
                 },
-                "name": "Casey's General Store",
-                "icon": "fuel",
+                "name": "Евразия",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Cenex": {
+            "amenity/restaurant/ジョナサン": {
                 "tags": {
-                    "name": "Cenex",
-                    "amenity": "fuel"
+                    "name": "ジョナサン",
+                    "amenity": "restaurant"
                 },
-                "name": "Cenex",
-                "icon": "fuel",
+                "name": "ジョナサン",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Cepsa": {
+            "amenity/restaurant/Longhorn Steakhouse": {
                 "tags": {
-                    "name": "Cepsa",
-                    "amenity": "fuel"
+                    "name": "Longhorn Steakhouse",
+                    "amenity": "restaurant"
                 },
-                "name": "Cepsa",
-                "icon": "fuel",
+                "name": "Longhorn Steakhouse",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Chevron": {
+            "amenity/bank/Chase": {
                 "tags": {
-                    "name": "Chevron",
-                    "amenity": "fuel"
+                    "name": "Chase",
+                    "amenity": "bank"
                 },
-                "name": "Chevron",
-                "icon": "fuel",
+                "name": "Chase",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Circle K": {
+            "amenity/bank/Commonwealth Bank": {
                 "tags": {
-                    "name": "Circle K",
-                    "amenity": "fuel"
+                    "name": "Commonwealth Bank",
+                    "amenity": "bank"
                 },
-                "name": "Circle K",
-                "icon": "fuel",
+                "name": "Commonwealth Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Citgo": {
+            "amenity/bank/Citibank": {
                 "tags": {
-                    "name": "Citgo",
-                    "amenity": "fuel"
+                    "name": "Citibank",
+                    "amenity": "bank"
                 },
-                "name": "Citgo",
-                "icon": "fuel",
+                "name": "Citibank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Coles Express": {
+            "amenity/bank/HSBC": {
                 "tags": {
-                    "name": "Coles Express",
-                    "amenity": "fuel"
+                    "name": "HSBC",
+                    "amenity": "bank"
                 },
-                "name": "Coles Express",
-                "icon": "fuel",
+                "name": "HSBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Conoco": {
+            "amenity/bank/Barclays": {
                 "tags": {
-                    "name": "Conoco",
-                    "amenity": "fuel"
+                    "name": "Barclays",
+                    "amenity": "bank"
                 },
-                "name": "Conoco",
-                "icon": "fuel",
+                "name": "Barclays",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Coop": {
+            "amenity/bank/Westpac": {
                 "tags": {
-                    "name": "Coop",
-                    "amenity": "fuel"
+                    "name": "Westpac",
+                    "amenity": "bank"
                 },
-                "name": "Coop",
-                "icon": "fuel",
+                "name": "Westpac",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Copec": {
+            "amenity/bank/NAB": {
                 "tags": {
-                    "name": "Copec",
-                    "amenity": "fuel"
+                    "name": "NAB",
+                    "amenity": "bank"
                 },
-                "name": "Copec",
-                "icon": "fuel",
+                "name": "NAB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/E.Leclerc": {
+            "amenity/bank/ANZ": {
                 "tags": {
-                    "name": "E.Leclerc",
-                    "amenity": "fuel"
+                    "name": "ANZ",
+                    "amenity": "bank"
                 },
-                "name": "E.Leclerc",
-                "icon": "fuel",
+                "name": "ANZ",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/EKO": {
+            "amenity/bank/Lloyds Bank": {
                 "tags": {
-                    "name": "EKO",
-                    "amenity": "fuel"
+                    "name": "Lloyds Bank",
+                    "amenity": "bank"
                 },
-                "name": "EKO",
-                "icon": "fuel",
+                "name": "Lloyds Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ENEOS": {
+            "amenity/bank/Landbank": {
                 "tags": {
-                    "name": "ENEOS",
-                    "amenity": "fuel"
+                    "name": "Landbank",
+                    "amenity": "bank"
                 },
-                "name": "ENEOS",
-                "icon": "fuel",
+                "name": "Landbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ERG": {
+            "amenity/bank/Sparkasse": {
                 "tags": {
-                    "name": "ERG",
-                    "amenity": "fuel"
+                    "name": "Sparkasse",
+                    "amenity": "bank"
                 },
-                "name": "ERG",
-                "icon": "fuel",
+                "name": "Sparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Esso": {
+            "amenity/bank/UCPB": {
                 "tags": {
-                    "name": "Esso",
-                    "amenity": "fuel"
+                    "name": "UCPB",
+                    "amenity": "bank"
                 },
-                "name": "Esso",
-                "icon": "fuel",
+                "name": "UCPB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Eko": {
+            "amenity/bank/PNB": {
                 "tags": {
-                    "name": "Eko",
-                    "amenity": "fuel"
+                    "name": "PNB",
+                    "amenity": "bank"
                 },
-                "name": "Eko",
-                "icon": "fuel",
+                "name": "PNB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Elan": {
+            "amenity/bank/Metrobank": {
                 "tags": {
-                    "name": "Elan",
-                    "amenity": "fuel"
+                    "name": "Metrobank",
+                    "amenity": "bank"
                 },
-                "name": "Elan",
-                "icon": "fuel",
+                "name": "Metrobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Elf": {
+            "amenity/bank/BDO": {
                 "tags": {
-                    "name": "Elf",
-                    "amenity": "fuel"
+                    "name": "BDO",
+                    "amenity": "bank"
                 },
-                "name": "Elf",
-                "icon": "fuel",
+                "name": "BDO",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Eneos": {
+            "amenity/bank/Volksbank": {
                 "tags": {
-                    "name": "Eneos",
-                    "amenity": "fuel"
+                    "name": "Volksbank",
+                    "amenity": "bank"
                 },
-                "name": "Eneos",
-                "icon": "fuel",
+                "name": "Volksbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Engen": {
+            "amenity/bank/BPI": {
                 "tags": {
-                    "name": "Engen",
-                    "amenity": "fuel"
+                    "name": "BPI",
+                    "amenity": "bank"
                 },
-                "name": "Engen",
-                "icon": "fuel",
+                "name": "BPI",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Eni": {
+            "amenity/bank/Postbank": {
                 "tags": {
-                    "name": "Eni",
-                    "amenity": "fuel"
+                    "name": "Postbank",
+                    "amenity": "bank"
                 },
-                "name": "Eni",
-                "icon": "fuel",
+                "name": "Postbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Erg": {
+            "amenity/bank/NatWest": {
                 "tags": {
-                    "name": "Erg",
-                    "amenity": "fuel"
+                    "name": "NatWest",
+                    "amenity": "bank"
                 },
-                "name": "Erg",
-                "icon": "fuel",
+                "name": "NatWest",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Esso Express": {
+            "amenity/bank/Yorkshire Bank": {
                 "tags": {
-                    "name": "Esso Express",
-                    "amenity": "fuel"
+                    "name": "Yorkshire Bank",
+                    "amenity": "bank"
                 },
-                "name": "Esso Express",
-                "icon": "fuel",
+                "name": "Yorkshire Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Exxon": {
+            "amenity/bank/ABSA": {
                 "tags": {
-                    "name": "Exxon",
-                    "amenity": "fuel"
+                    "name": "ABSA",
+                    "amenity": "bank"
                 },
-                "name": "Exxon",
-                "icon": "fuel",
+                "name": "ABSA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Flying V": {
+            "amenity/bank/Standard Bank": {
                 "tags": {
-                    "name": "Flying V",
-                    "amenity": "fuel"
+                    "name": "Standard Bank",
+                    "amenity": "bank"
                 },
-                "name": "Flying V",
-                "icon": "fuel",
+                "name": "Standard Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Freie Tankstelle": {
+            "amenity/bank/FNB": {
                 "tags": {
-                    "name": "Freie Tankstelle",
-                    "amenity": "fuel"
+                    "name": "FNB",
+                    "amenity": "bank"
                 },
-                "name": "Freie Tankstelle",
-                "icon": "fuel",
+                "name": "FNB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/GALP": {
+            "amenity/bank/Deutsche Bank": {
                 "tags": {
-                    "name": "GALP",
-                    "amenity": "fuel"
+                    "name": "Deutsche Bank",
+                    "amenity": "bank"
                 },
-                "name": "GALP",
-                "icon": "fuel",
+                "name": "Deutsche Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Gulf": {
+            "amenity/bank/SEB": {
                 "tags": {
-                    "name": "Gulf",
-                    "amenity": "fuel"
+                    "name": "SEB",
+                    "amenity": "bank"
                 },
-                "name": "Gulf",
-                "icon": "fuel",
+                "name": "SEB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/HEM": {
+            "amenity/bank/Commerzbank": {
                 "tags": {
-                    "name": "HEM",
-                    "amenity": "fuel"
+                    "name": "Commerzbank",
+                    "amenity": "bank"
                 },
-                "name": "HEM",
-                "icon": "fuel",
+                "name": "Commerzbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/HP": {
+            "amenity/bank/Targobank": {
                 "tags": {
-                    "name": "HP",
-                    "amenity": "fuel"
+                    "name": "Targobank",
+                    "amenity": "bank"
                 },
-                "name": "HP",
-                "icon": "fuel",
+                "name": "Targobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Hess": {
+            "amenity/bank/ABN AMRO": {
                 "tags": {
-                    "name": "Hess",
-                    "amenity": "fuel"
+                    "name": "ABN AMRO",
+                    "amenity": "bank"
                 },
-                "name": "Hess",
-                "icon": "fuel",
+                "name": "ABN AMRO",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Holiday": {
+            "amenity/bank/Handelsbanken": {
                 "tags": {
-                    "name": "Holiday",
-                    "amenity": "fuel"
+                    "name": "Handelsbanken",
+                    "amenity": "bank"
                 },
-                "name": "Holiday",
-                "icon": "fuel",
+                "name": "Handelsbanken",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Husky": {
+            "amenity/bank/Swedbank": {
                 "tags": {
-                    "name": "Husky",
-                    "amenity": "fuel"
+                    "name": "Swedbank",
+                    "amenity": "bank"
                 },
-                "name": "Husky",
-                "icon": "fuel",
+                "name": "Swedbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/IDEMITSU": {
+            "amenity/bank/Kreissparkasse": {
                 "tags": {
-                    "name": "IDEMITSU",
-                    "amenity": "fuel"
+                    "name": "Kreissparkasse",
+                    "amenity": "bank"
                 },
-                "name": "IDEMITSU",
-                "icon": "fuel",
+                "name": "Kreissparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/IES": {
+            "amenity/bank/UniCredit Bank": {
                 "tags": {
-                    "name": "IES",
-                    "amenity": "fuel"
+                    "name": "UniCredit Bank",
+                    "amenity": "bank"
                 },
-                "name": "IES",
-                "icon": "fuel",
+                "name": "UniCredit Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/INA": {
+            "amenity/bank/Monte dei Paschi di Siena": {
                 "tags": {
-                    "name": "INA",
-                    "amenity": "fuel"
+                    "name": "Monte dei Paschi di Siena",
+                    "amenity": "bank"
                 },
-                "name": "INA",
-                "icon": "fuel",
+                "name": "Monte dei Paschi di Siena",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/IP": {
+            "amenity/bank/Caja Rural": {
                 "tags": {
-                    "name": "IP",
-                    "amenity": "fuel"
+                    "name": "Caja Rural",
+                    "amenity": "bank"
                 },
-                "name": "IP",
-                "icon": "fuel",
+                "name": "Caja Rural",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Indian Oil": {
+            "amenity/bank/Dresdner Bank": {
                 "tags": {
-                    "name": "Indian Oil",
-                    "amenity": "fuel"
+                    "name": "Dresdner Bank",
+                    "amenity": "bank"
                 },
-                "name": "Indian Oil",
-                "icon": "fuel",
+                "name": "Dresdner Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Indipend.": {
+            "amenity/bank/Sparda-Bank": {
                 "tags": {
-                    "name": "Indipend.",
-                    "amenity": "fuel"
+                    "name": "Sparda-Bank",
+                    "amenity": "bank"
                 },
-                "name": "Indipend.",
-                "icon": "fuel",
+                "name": "Sparda-Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Intermarché": {
+            "amenity/bank/VÚB": {
                 "tags": {
-                    "name": "Intermarché",
-                    "amenity": "fuel"
+                    "name": "VÚB",
+                    "amenity": "bank"
                 },
-                "name": "Intermarché",
-                "icon": "fuel",
+                "name": "VÚB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Ipiranga": {
+            "amenity/bank/Slovenská sporiteľňa": {
                 "tags": {
-                    "name": "Ipiranga",
-                    "amenity": "fuel"
+                    "name": "Slovenská sporiteľňa",
+                    "amenity": "bank"
                 },
-                "name": "Ipiranga",
-                "icon": "fuel",
+                "name": "Slovenská sporiteľňa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Irving": {
+            "amenity/bank/Bank of Montreal": {
                 "tags": {
-                    "name": "Irving",
-                    "amenity": "fuel"
+                    "name": "Bank of Montreal",
+                    "amenity": "bank"
                 },
-                "name": "Irving",
-                "icon": "fuel",
+                "name": "Bank of Montreal",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/JET": {
+            "amenity/bank/KBC": {
                 "tags": {
-                    "name": "JET",
-                    "amenity": "fuel"
+                    "name": "KBC",
+                    "amenity": "bank"
                 },
-                "name": "JET",
-                "icon": "fuel",
+                "name": "KBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/JOMO": {
+            "amenity/bank/Royal Bank of Scotland": {
                 "tags": {
-                    "name": "JOMO",
-                    "amenity": "fuel"
+                    "name": "Royal Bank of Scotland",
+                    "amenity": "bank"
                 },
-                "name": "JOMO",
-                "icon": "fuel",
+                "name": "Royal Bank of Scotland",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Jet": {
+            "amenity/bank/TSB": {
                 "tags": {
-                    "name": "Jet",
-                    "amenity": "fuel"
+                    "name": "TSB",
+                    "amenity": "bank"
                 },
-                "name": "Jet",
-                "icon": "fuel",
+                "name": "TSB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Kum & Go": {
+            "amenity/bank/US Bank": {
                 "tags": {
-                    "name": "Kum & Go",
-                    "amenity": "fuel"
+                    "name": "US Bank",
+                    "amenity": "bank"
                 },
-                "name": "Kum & Go",
-                "icon": "fuel",
+                "name": "US Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Kwik Trip": {
+            "amenity/bank/HypoVereinsbank": {
                 "tags": {
-                    "name": "Kwik Trip",
-                    "amenity": "fuel"
+                    "name": "HypoVereinsbank",
+                    "amenity": "bank"
                 },
-                "name": "Kwik Trip",
-                "icon": "fuel",
+                "name": "HypoVereinsbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/LPG": {
+            "amenity/bank/Bank Austria": {
                 "tags": {
-                    "name": "LPG",
-                    "amenity": "fuel"
+                    "name": "Bank Austria",
+                    "amenity": "bank"
                 },
-                "name": "LPG",
-                "icon": "fuel",
+                "name": "Bank Austria",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Lotos": {
+            "amenity/bank/ING": {
                 "tags": {
-                    "name": "Lotos",
-                    "amenity": "fuel"
+                    "name": "ING",
+                    "amenity": "bank"
                 },
-                "name": "Lotos",
-                "icon": "fuel",
+                "name": "ING",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Lukoil": {
+            "amenity/bank/Erste Bank": {
                 "tags": {
-                    "name": "Lukoil",
-                    "amenity": "fuel"
+                    "name": "Erste Bank",
+                    "amenity": "bank"
                 },
-                "name": "Lukoil",
-                "icon": "fuel",
+                "name": "Erste Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/MEROIL": {
+            "amenity/bank/CIBC": {
                 "tags": {
-                    "name": "MEROIL",
-                    "amenity": "fuel"
+                    "name": "CIBC",
+                    "amenity": "bank"
                 },
-                "name": "MEROIL",
-                "icon": "fuel",
+                "name": "CIBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/MOL": {
+            "amenity/bank/Scotiabank": {
                 "tags": {
-                    "name": "MOL",
-                    "amenity": "fuel"
+                    "name": "Scotiabank",
+                    "amenity": "bank"
                 },
-                "name": "MOL",
-                "icon": "fuel",
+                "name": "Scotiabank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Marathon": {
+            "amenity/bank/Caisse d'Épargne": {
                 "tags": {
-                    "name": "Marathon",
-                    "amenity": "fuel"
+                    "name": "Caisse d'Épargne",
+                    "amenity": "bank"
                 },
-                "name": "Marathon",
-                "icon": "fuel",
+                "name": "Caisse d'Épargne",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Metano": {
+            "amenity/bank/Santander": {
                 "tags": {
-                    "name": "Metano",
-                    "amenity": "fuel"
+                    "name": "Santander",
+                    "amenity": "bank"
                 },
-                "name": "Metano",
-                "icon": "fuel",
+                "name": "Santander",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Migrol": {
+            "amenity/bank/Bank of Scotland": {
                 "tags": {
-                    "name": "Migrol",
-                    "amenity": "fuel"
+                    "name": "Bank of Scotland",
+                    "amenity": "bank"
                 },
-                "name": "Migrol",
-                "icon": "fuel",
+                "name": "Bank of Scotland",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Mobil": {
+            "amenity/bank/TD Canada Trust": {
                 "tags": {
-                    "name": "Mobil",
-                    "amenity": "fuel"
+                    "name": "TD Canada Trust",
+                    "amenity": "bank"
                 },
-                "name": "Mobil",
-                "icon": "fuel",
+                "name": "TD Canada Trust",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Mol": {
+            "amenity/bank/BMO": {
                 "tags": {
-                    "name": "Mol",
-                    "amenity": "fuel"
+                    "name": "BMO",
+                    "amenity": "bank"
                 },
-                "name": "Mol",
-                "icon": "fuel",
+                "name": "BMO",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Morrisons": {
+            "amenity/bank/Danske Bank": {
                 "tags": {
-                    "name": "Morrisons",
-                    "amenity": "fuel"
+                    "name": "Danske Bank",
+                    "amenity": "bank"
                 },
-                "name": "Morrisons",
-                "icon": "fuel",
+                "name": "Danske Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Neste": {
+            "amenity/bank/OTP": {
                 "tags": {
-                    "name": "Neste",
-                    "amenity": "fuel"
+                    "name": "OTP",
+                    "amenity": "bank"
                 },
-                "name": "Neste",
-                "icon": "fuel",
+                "name": "OTP",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Neste A24": {
+            "amenity/bank/Crédit Agricole": {
                 "tags": {
-                    "name": "Neste A24",
-                    "amenity": "fuel"
+                    "name": "Crédit Agricole",
+                    "amenity": "bank"
                 },
-                "name": "Neste A24",
-                "icon": "fuel",
+                "name": "Crédit Agricole",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OIL!": {
+            "amenity/bank/LCL": {
                 "tags": {
-                    "name": "OIL!",
-                    "amenity": "fuel"
+                    "name": "LCL",
+                    "amenity": "bank"
                 },
-                "name": "OIL!",
-                "icon": "fuel",
+                "name": "LCL",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OK": {
+            "amenity/bank/VR-Bank": {
                 "tags": {
-                    "name": "OK",
-                    "amenity": "fuel"
+                    "name": "VR-Bank",
+                    "amenity": "bank"
                 },
-                "name": "OK",
-                "icon": "fuel",
+                "name": "VR-Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OKKO": {
+            "amenity/bank/ČSOB": {
                 "tags": {
-                    "name": "OKKO",
-                    "amenity": "fuel"
+                    "name": "ČSOB",
+                    "amenity": "bank"
                 },
-                "name": "OKKO",
-                "icon": "fuel",
+                "name": "ČSOB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OKQ8": {
+            "amenity/bank/Česká spořitelna": {
                 "tags": {
-                    "name": "OKQ8",
-                    "amenity": "fuel"
+                    "name": "Česká spořitelna",
+                    "amenity": "bank"
                 },
-                "name": "OKQ8",
-                "icon": "fuel",
+                "name": "Česká spořitelna",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OMV": {
+            "amenity/bank/BNP": {
                 "tags": {
-                    "name": "OMV",
-                    "amenity": "fuel"
+                    "name": "BNP",
+                    "amenity": "bank"
                 },
-                "name": "OMV",
-                "icon": "fuel",
+                "name": "BNP",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Oilibya": {
+            "amenity/bank/Royal Bank": {
                 "tags": {
-                    "name": "Oilibya",
-                    "amenity": "fuel"
+                    "name": "Royal Bank",
+                    "amenity": "bank"
                 },
-                "name": "Oilibya",
-                "icon": "fuel",
+                "name": "Royal Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Orlen": {
+            "amenity/bank/Nationwide": {
                 "tags": {
-                    "name": "Orlen",
-                    "amenity": "fuel"
+                    "name": "Nationwide",
+                    "amenity": "bank"
                 },
-                "name": "Orlen",
-                "icon": "fuel",
+                "name": "Nationwide",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Pemex": {
+            "amenity/bank/Halifax": {
                 "tags": {
-                    "name": "Pemex",
-                    "amenity": "fuel"
+                    "name": "Halifax",
+                    "amenity": "bank"
                 },
-                "name": "Pemex",
-                "icon": "fuel",
+                "name": "Halifax",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/PETRONOR": {
+            "amenity/bank/BAWAG PSK": {
                 "tags": {
-                    "name": "PETRONOR",
-                    "amenity": "fuel"
+                    "name": "BAWAG PSK",
+                    "amenity": "bank"
                 },
-                "name": "PETRONOR",
-                "icon": "fuel",
+                "name": "BAWAG PSK",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/PTT": {
+            "amenity/bank/National Bank": {
                 "tags": {
-                    "name": "PTT",
-                    "amenity": "fuel"
+                    "name": "National Bank",
+                    "amenity": "bank"
                 },
-                "name": "PTT",
-                "icon": "fuel",
+                "name": "National Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Pertamina": {
+            "amenity/bank/Nedbank": {
                 "tags": {
-                    "name": "Pertamina",
-                    "amenity": "fuel"
+                    "name": "Nedbank",
+                    "amenity": "bank"
                 },
-                "name": "Pertamina",
-                "icon": "fuel",
+                "name": "Nedbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petro-Canada": {
+            "amenity/bank/First National Bank": {
                 "tags": {
-                    "name": "Petro-Canada",
-                    "amenity": "fuel"
+                    "name": "First National Bank",
+                    "amenity": "bank"
                 },
-                "name": "Petro-Canada",
-                "icon": "fuel",
+                "name": "First National Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petrobras": {
+            "amenity/bank/Nordea": {
                 "tags": {
-                    "name": "Petrobras",
-                    "amenity": "fuel"
+                    "name": "Nordea",
+                    "amenity": "bank"
                 },
-                "name": "Petrobras",
-                "icon": "fuel",
+                "name": "Nordea",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petrom": {
+            "amenity/bank/Rabobank": {
                 "tags": {
-                    "name": "Petrom",
-                    "amenity": "fuel"
+                    "name": "Rabobank",
+                    "amenity": "bank"
                 },
-                "name": "Petrom",
-                "icon": "fuel",
+                "name": "Rabobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petron": {
+            "amenity/bank/Sparkasse KölnBonn": {
                 "tags": {
-                    "name": "Petron",
-                    "amenity": "fuel"
+                    "name": "Sparkasse KölnBonn",
+                    "amenity": "bank"
                 },
-                "name": "Petron",
-                "icon": "fuel",
+                "name": "Sparkasse KölnBonn",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petronas": {
+            "amenity/bank/Tatra banka": {
                 "tags": {
-                    "name": "Petronas",
-                    "amenity": "fuel"
+                    "name": "Tatra banka",
+                    "amenity": "bank"
                 },
-                "name": "Petronas",
-                "icon": "fuel",
+                "name": "Tatra banka",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Phillips 66": {
+            "amenity/bank/Berliner Sparkasse": {
                 "tags": {
-                    "name": "Phillips 66",
-                    "amenity": "fuel"
+                    "name": "Berliner Sparkasse",
+                    "amenity": "bank"
                 },
-                "name": "Phillips 66",
-                "icon": "fuel",
+                "name": "Berliner Sparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Phoenix": {
+            "amenity/bank/Berliner Volksbank": {
                 "tags": {
-                    "name": "Phoenix",
-                    "amenity": "fuel"
+                    "name": "Berliner Volksbank",
+                    "amenity": "bank"
                 },
-                "name": "Phoenix",
-                "icon": "fuel",
+                "name": "Berliner Volksbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Q8": {
+            "amenity/bank/Wells Fargo": {
                 "tags": {
-                    "name": "Q8",
-                    "amenity": "fuel"
+                    "name": "Wells Fargo",
+                    "amenity": "bank"
                 },
-                "name": "Q8",
-                "icon": "fuel",
+                "name": "Wells Fargo",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/QuikTrip": {
+            "amenity/bank/Credit Suisse": {
                 "tags": {
-                    "name": "QuikTrip",
-                    "amenity": "fuel"
+                    "name": "Credit Suisse",
+                    "amenity": "bank"
                 },
-                "name": "QuikTrip",
-                "icon": "fuel",
+                "name": "Credit Suisse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/REPSOL": {
+            "amenity/bank/Société Générale": {
                 "tags": {
-                    "name": "REPSOL",
-                    "amenity": "fuel"
+                    "name": "Société Générale",
+                    "amenity": "bank"
                 },
-                "name": "REPSOL",
-                "icon": "fuel",
+                "name": "Société Générale",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Repsol": {
+            "amenity/bank/Osuuspankki": {
                 "tags": {
-                    "name": "Repsol",
-                    "amenity": "fuel"
+                    "name": "Osuuspankki",
+                    "amenity": "bank"
                 },
-                "name": "Repsol",
-                "icon": "fuel",
+                "name": "Osuuspankki",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Rompetrol": {
+            "amenity/bank/Sparkasse Aachen": {
                 "tags": {
-                    "name": "Rompetrol",
-                    "amenity": "fuel"
+                    "name": "Sparkasse Aachen",
+                    "amenity": "bank"
                 },
-                "name": "Rompetrol",
-                "icon": "fuel",
+                "name": "Sparkasse Aachen",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Shell": {
+            "amenity/bank/Hamburger Sparkasse": {
                 "tags": {
-                    "name": "Shell",
-                    "amenity": "fuel"
+                    "name": "Hamburger Sparkasse",
+                    "amenity": "bank"
                 },
-                "name": "Shell",
-                "icon": "fuel",
+                "name": "Hamburger Sparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sainsbury's": {
+            "amenity/bank/Cassa di Risparmio del Veneto": {
                 "tags": {
-                    "name": "Sainsbury's",
-                    "amenity": "fuel"
+                    "name": "Cassa di Risparmio del Veneto",
+                    "amenity": "bank"
                 },
-                "name": "Sainsbury's",
-                "icon": "fuel",
+                "name": "Cassa di Risparmio del Veneto",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sasol": {
+            "amenity/bank/BNP Paribas": {
                 "tags": {
-                    "name": "Sasol",
-                    "amenity": "fuel"
+                    "name": "BNP Paribas",
+                    "amenity": "bank"
                 },
-                "name": "Sasol",
-                "icon": "fuel",
+                "name": "BNP Paribas",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sheetz": {
+            "amenity/bank/Banque Populaire": {
                 "tags": {
-                    "name": "Sheetz",
-                    "amenity": "fuel"
+                    "name": "Banque Populaire",
+                    "amenity": "bank"
                 },
-                "name": "Sheetz",
-                "icon": "fuel",
+                "name": "Banque Populaire",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Shell Express": {
+            "amenity/bank/BNP Paribas Fortis": {
                 "tags": {
-                    "name": "Shell Express",
-                    "amenity": "fuel"
+                    "name": "BNP Paribas Fortis",
+                    "amenity": "bank"
                 },
-                "name": "Shell Express",
-                "icon": "fuel",
+                "name": "BNP Paribas Fortis",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sinclair": {
+            "amenity/bank/Banco Popular": {
                 "tags": {
-                    "name": "Sinclair",
-                    "amenity": "fuel"
+                    "name": "Banco Popular",
+                    "amenity": "bank"
                 },
-                "name": "Sinclair",
-                "icon": "fuel",
+                "name": "Banco Popular",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Slovnaft": {
+            "amenity/bank/Bancaja": {
                 "tags": {
-                    "name": "Slovnaft",
-                    "amenity": "fuel"
+                    "name": "Bancaja",
+                    "amenity": "bank"
                 },
-                "name": "Slovnaft",
-                "icon": "fuel",
+                "name": "Bancaja",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sokimex": {
+            "amenity/bank/Banesto": {
                 "tags": {
-                    "name": "Sokimex",
-                    "amenity": "fuel"
+                    "name": "Banesto",
+                    "amenity": "bank"
                 },
-                "name": "Sokimex",
-                "icon": "fuel",
+                "name": "Banesto",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Speedway": {
+            "amenity/bank/La Caixa": {
                 "tags": {
-                    "name": "Speedway",
-                    "amenity": "fuel"
+                    "name": "La Caixa",
+                    "amenity": "bank"
                 },
-                "name": "Speedway",
-                "icon": "fuel",
+                "name": "La Caixa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/St1": {
+            "amenity/bank/Santander Consumer Bank": {
                 "tags": {
-                    "name": "St1",
-                    "amenity": "fuel"
+                    "name": "Santander Consumer Bank",
+                    "amenity": "bank"
                 },
-                "name": "St1",
-                "icon": "fuel",
+                "name": "Santander Consumer Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Stacja paliw": {
+            "amenity/bank/BRD": {
                 "tags": {
-                    "name": "Stacja paliw",
-                    "amenity": "fuel"
+                    "name": "BRD",
+                    "amenity": "bank"
                 },
-                "name": "Stacja paliw",
-                "icon": "fuel",
+                "name": "BRD",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Star": {
+            "amenity/bank/BCR": {
                 "tags": {
-                    "name": "Star",
-                    "amenity": "fuel"
+                    "name": "BCR",
+                    "amenity": "bank"
                 },
-                "name": "Star",
-                "icon": "fuel",
+                "name": "BCR",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Total": {
+            "amenity/bank/Banca Transilvania": {
                 "tags": {
-                    "name": "Total",
-                    "amenity": "fuel"
+                    "name": "Banca Transilvania",
+                    "amenity": "bank"
                 },
-                "name": "Total",
-                "icon": "fuel",
+                "name": "Banca Transilvania",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Statoil": {
+            "amenity/bank/BW-Bank": {
                 "tags": {
-                    "name": "Statoil",
-                    "amenity": "fuel"
+                    "name": "BW-Bank",
+                    "amenity": "bank"
                 },
-                "name": "Statoil",
-                "icon": "fuel",
+                "name": "BW-Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Stewart's": {
+            "amenity/bank/Komerční banka": {
                 "tags": {
-                    "name": "Stewart's",
-                    "amenity": "fuel"
+                    "name": "Komerční banka",
+                    "amenity": "bank"
                 },
-                "name": "Stewart's",
-                "icon": "fuel",
+                "name": "Komerční banka",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sunoco": {
+            "amenity/bank/Banco Pastor": {
                 "tags": {
-                    "name": "Sunoco",
-                    "amenity": "fuel"
+                    "name": "Banco Pastor",
+                    "amenity": "bank"
                 },
-                "name": "Sunoco",
-                "icon": "fuel",
+                "name": "Banco Pastor",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Super U": {
+            "amenity/bank/Stadtsparkasse": {
                 "tags": {
-                    "name": "Super U",
-                    "amenity": "fuel"
+                    "name": "Stadtsparkasse",
+                    "amenity": "bank"
                 },
-                "name": "Super U",
-                "icon": "fuel",
+                "name": "Stadtsparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tamoil": {
+            "amenity/bank/Ulster Bank": {
                 "tags": {
-                    "name": "Tamoil",
-                    "amenity": "fuel"
+                    "name": "Ulster Bank",
+                    "amenity": "bank"
                 },
-                "name": "Tamoil",
-                "icon": "fuel",
+                "name": "Ulster Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tango": {
+            "amenity/bank/Sberbank": {
                 "tags": {
-                    "name": "Tango",
-                    "amenity": "fuel"
+                    "name": "Sberbank",
+                    "amenity": "bank"
                 },
-                "name": "Tango",
-                "icon": "fuel",
+                "name": "Sberbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tankstelle": {
+            "amenity/bank/CIC": {
                 "tags": {
-                    "name": "Tankstelle",
-                    "amenity": "fuel"
+                    "name": "CIC",
+                    "amenity": "bank"
                 },
-                "name": "Tankstelle",
-                "icon": "fuel",
+                "name": "CIC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Teboil": {
+            "amenity/bank/Bancpost": {
                 "tags": {
-                    "name": "Teboil",
-                    "amenity": "fuel"
+                    "name": "Bancpost",
+                    "amenity": "bank"
                 },
-                "name": "Teboil",
-                "icon": "fuel",
+                "name": "Bancpost",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tela": {
+            "amenity/bank/Caja Madrid": {
                 "tags": {
-                    "name": "Tela",
-                    "amenity": "fuel"
+                    "name": "Caja Madrid",
+                    "amenity": "bank"
                 },
-                "name": "Tela",
-                "icon": "fuel",
+                "name": "Caja Madrid",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Terpel": {
+            "amenity/bank/Maybank": {
                 "tags": {
-                    "name": "Terpel",
-                    "amenity": "fuel"
+                    "name": "Maybank",
+                    "amenity": "bank"
                 },
-                "name": "Terpel",
-                "icon": "fuel",
+                "name": "Maybank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tesco": {
+            "amenity/bank/中国银行": {
                 "tags": {
-                    "name": "Tesco",
-                    "amenity": "fuel"
+                    "name": "中国银行",
+                    "amenity": "bank"
                 },
-                "name": "Tesco",
-                "icon": "fuel",
+                "name": "中国银行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Texaco": {
+            "amenity/bank/Unicredit Banca": {
                 "tags": {
-                    "name": "Texaco",
-                    "amenity": "fuel"
+                    "name": "Unicredit Banca",
+                    "amenity": "bank"
                 },
-                "name": "Texaco",
-                "icon": "fuel",
+                "name": "Unicredit Banca",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tinq": {
+            "amenity/bank/Crédit Mutuel": {
                 "tags": {
-                    "name": "Tinq",
-                    "amenity": "fuel"
+                    "name": "Crédit Mutuel",
+                    "amenity": "bank"
                 },
-                "name": "Tinq",
-                "icon": "fuel",
+                "name": "Crédit Mutuel",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Topaz": {
+            "amenity/bank/BBVA": {
                 "tags": {
-                    "name": "Topaz",
-                    "amenity": "fuel"
+                    "name": "BBVA",
+                    "amenity": "bank"
                 },
-                "name": "Topaz",
-                "icon": "fuel",
+                "name": "BBVA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/TotalErg": {
+            "amenity/bank/Intesa San Paolo": {
                 "tags": {
-                    "name": "TotalErg",
-                    "amenity": "fuel"
+                    "name": "Intesa San Paolo",
+                    "amenity": "bank"
                 },
-                "name": "TotalErg",
-                "icon": "fuel",
+                "name": "Intesa San Paolo",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Turmöl": {
+            "amenity/bank/TD Bank": {
                 "tags": {
-                    "name": "Turmöl",
-                    "amenity": "fuel"
+                    "name": "TD Bank",
+                    "amenity": "bank"
                 },
-                "name": "Turmöl",
-                "icon": "fuel",
+                "name": "TD Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Ultramar": {
+            "amenity/bank/Belfius": {
                 "tags": {
-                    "name": "Ultramar",
-                    "amenity": "fuel"
+                    "name": "Belfius",
+                    "amenity": "bank"
                 },
-                "name": "Ultramar",
-                "icon": "fuel",
+                "name": "Belfius",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/United": {
+            "amenity/bank/Bank of America": {
                 "tags": {
-                    "name": "United",
-                    "amenity": "fuel"
+                    "name": "Bank of America",
+                    "amenity": "bank"
                 },
-                "name": "United",
-                "icon": "fuel",
+                "name": "Bank of America",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Valero": {
+            "amenity/bank/RBC": {
                 "tags": {
-                    "name": "Valero",
-                    "amenity": "fuel"
+                    "name": "RBC",
+                    "amenity": "bank"
                 },
-                "name": "Valero",
-                "icon": "fuel",
+                "name": "RBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/WOG": {
+            "amenity/bank/Alpha Bank": {
                 "tags": {
-                    "name": "WOG",
-                    "amenity": "fuel"
+                    "name": "Alpha Bank",
+                    "amenity": "bank"
                 },
-                "name": "WOG",
-                "icon": "fuel",
+                "name": "Alpha Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Wawa": {
+            "amenity/bank/Сбербанк": {
                 "tags": {
-                    "name": "Wawa",
-                    "amenity": "fuel"
+                    "name": "Сбербанк",
+                    "amenity": "bank"
                 },
-                "name": "Wawa",
-                "icon": "fuel",
+                "name": "Сбербанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Westfalen": {
+            "amenity/bank/Россельхозбанк": {
                 "tags": {
-                    "name": "Westfalen",
-                    "amenity": "fuel"
+                    "name": "Россельхозбанк",
+                    "amenity": "bank"
                 },
-                "name": "Westfalen",
-                "icon": "fuel",
+                "name": "Россельхозбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/YPF": {
+            "amenity/bank/Crédit du Nord": {
                 "tags": {
-                    "name": "YPF",
-                    "amenity": "fuel"
+                    "name": "Crédit du Nord",
+                    "amenity": "bank"
                 },
-                "name": "YPF",
-                "icon": "fuel",
+                "name": "Crédit du Nord",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Z": {
+            "amenity/bank/BancoEstado": {
                 "tags": {
-                    "name": "Z",
-                    "amenity": "fuel"
+                    "name": "BancoEstado",
+                    "amenity": "bank"
                 },
-                "name": "Z",
-                "icon": "fuel",
+                "name": "BancoEstado",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/bft": {
+            "amenity/bank/Millennium Bank": {
                 "tags": {
-                    "name": "bft",
-                    "amenity": "fuel"
+                    "name": "Millennium Bank",
+                    "amenity": "bank"
                 },
-                "name": "bft",
-                "icon": "fuel",
+                "name": "Millennium Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ÖMV": {
+            "amenity/bank/State Bank of India": {
                 "tags": {
-                    "name": "ÖMV",
-                    "amenity": "fuel"
+                    "name": "State Bank of India",
+                    "amenity": "bank"
                 },
-                "name": "ÖMV",
-                "icon": "fuel",
+                "name": "State Bank of India",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/АГЗС": {
+            "amenity/bank/Беларусбанк": {
                 "tags": {
-                    "name": "Ð\90Ð\93Ð\97С",
-                    "amenity": "fuel"
+                    "name": "Ð\91елаÑ\80Ñ\83Ñ\81банк",
+                    "amenity": "bank"
                 },
-                "name": "Ð\90Ð\93Ð\97С",
-                "icon": "fuel",
+                "name": "Ð\91елаÑ\80Ñ\83Ñ\81банк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/АЗС": {
+            "amenity/bank/ING Bank Śląski": {
                 "tags": {
-                    "name": "АЗС",
-                    "amenity": "fuel"
+                    "name": "ING Bank Śląski",
+                    "amenity": "bank"
                 },
-                "name": "АЗС",
-                "icon": "fuel",
+                "name": "ING Bank Śląski",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Башнефть": {
+            "amenity/bank/Caixa Geral de Depósitos": {
                 "tags": {
-                    "name": "Башнефть",
-                    "amenity": "fuel"
+                    "name": "Caixa Geral de Depósitos",
+                    "amenity": "bank"
                 },
-                "name": "Башнефть",
-                "icon": "fuel",
+                "name": "Caixa Geral de Depósitos",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Белоруснефть": {
+            "amenity/bank/Kreissparkasse Köln": {
                 "tags": {
-                    "name": "Белоруснефть",
-                    "amenity": "fuel"
+                    "name": "Kreissparkasse Köln",
+                    "amenity": "bank"
                 },
-                "name": "Белоруснефть",
-                "icon": "fuel",
+                "name": "Kreissparkasse Köln",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Газпромнефть": {
+            "amenity/bank/Banco BCI": {
                 "tags": {
-                    "name": "Газпромнефть",
-                    "amenity": "fuel"
+                    "name": "Banco BCI",
+                    "amenity": "bank"
                 },
-                "name": "Газпромнефть",
-                "icon": "fuel",
+                "name": "Banco BCI",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Лукойл": {
+            "amenity/bank/Banco de Chile": {
                 "tags": {
-                    "name": "Лукойл",
-                    "amenity": "fuel"
+                    "name": "Banco de Chile",
+                    "amenity": "bank"
                 },
-                "name": "Лукойл",
-                "icon": "fuel",
+                "name": "Banco de Chile",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Макпетрол": {
+            "amenity/bank/ВТБ24": {
                 "tags": {
-                    "name": "Ð\9cакпеÑ\82Ñ\80ол",
-                    "amenity": "fuel"
+                    "name": "Ð\92ТÐ\9124",
+                    "amenity": "bank"
                 },
-                "name": "Ð\9cакпеÑ\82Ñ\80ол",
-                "icon": "fuel",
+                "name": "Ð\92ТÐ\9124",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/НК Альянс": {
+            "amenity/bank/UBS": {
                 "tags": {
-                    "name": "НК Альянс",
-                    "amenity": "fuel"
+                    "name": "UBS",
+                    "amenity": "bank"
                 },
-                "name": "НК Альянс",
-                "icon": "fuel",
+                "name": "UBS",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ОККО": {
+            "amenity/bank/PKO BP": {
                 "tags": {
-                    "name": "ОККО",
-                    "amenity": "fuel"
+                    "name": "PKO BP",
+                    "amenity": "bank"
                 },
-                "name": "ОККО",
-                "icon": "fuel",
+                "name": "PKO BP",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ОМВ": {
+            "amenity/bank/Chinabank": {
                 "tags": {
-                    "name": "ОМВ",
-                    "amenity": "fuel"
+                    "name": "Chinabank",
+                    "amenity": "bank"
                 },
-                "name": "ОМВ",
-                "icon": "fuel",
+                "name": "Chinabank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ПТК": {
+            "amenity/bank/PSBank": {
                 "tags": {
-                    "name": "ПТК",
-                    "amenity": "fuel"
+                    "name": "PSBank",
+                    "amenity": "bank"
                 },
-                "name": "ПТК",
-                "icon": "fuel",
+                "name": "PSBank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Петрол": {
+            "amenity/bank/Union Bank": {
                 "tags": {
-                    "name": "Петрол",
-                    "amenity": "fuel"
+                    "name": "Union Bank",
+                    "amenity": "bank"
                 },
-                "name": "Петрол",
-                "icon": "fuel",
+                "name": "Union Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Роснефть": {
+            "amenity/bank/China Bank": {
                 "tags": {
-                    "name": "Роснефть",
-                    "amenity": "fuel"
+                    "name": "China Bank",
+                    "amenity": "bank"
                 },
-                "name": "Роснефть",
-                "icon": "fuel",
+                "name": "China Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Славнефть": {
+            "amenity/bank/RCBC": {
                 "tags": {
-                    "name": "Славнефть",
-                    "amenity": "fuel"
+                    "name": "RCBC",
+                    "amenity": "bank"
                 },
-                "name": "Славнефть",
-                "icon": "fuel",
+                "name": "RCBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Сургутнефтегаз": {
+            "amenity/bank/Unicaja": {
                 "tags": {
-                    "name": "Сургутнефтегаз",
-                    "amenity": "fuel"
+                    "name": "Unicaja",
+                    "amenity": "bank"
                 },
-                "name": "Сургутнефтегаз",
-                "icon": "fuel",
+                "name": "Unicaja",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ТНК": {
+            "amenity/bank/BBK": {
                 "tags": {
-                    "name": "ТНК",
-                    "amenity": "fuel"
+                    "name": "BBK",
+                    "amenity": "bank"
                 },
-                "name": "ТНК",
-                "icon": "fuel",
+                "name": "BBK",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Татнефтепродукт": {
+            "amenity/bank/Ibercaja": {
                 "tags": {
-                    "name": "Татнефтепродукт",
-                    "amenity": "fuel"
+                    "name": "Ibercaja",
+                    "amenity": "bank"
                 },
-                "name": "Татнефтепродукт",
-                "icon": "fuel",
+                "name": "Ibercaja",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Татнефть": {
+            "amenity/bank/RBS": {
                 "tags": {
-                    "name": "Татнефть",
-                    "amenity": "fuel"
+                    "name": "RBS",
+                    "amenity": "bank"
                 },
-                "name": "Татнефть",
-                "icon": "fuel",
+                "name": "RBS",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/บางจาก": {
+            "amenity/bank/Commercial Bank of Ceylon PLC": {
                 "tags": {
-                    "name": "บางจาก",
-                    "amenity": "fuel"
+                    "name": "Commercial Bank of Ceylon PLC",
+                    "amenity": "bank"
                 },
-                "name": "บางจาก",
-                "icon": "fuel",
+                "name": "Commercial Bank of Ceylon PLC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ป ต ท": {
+            "amenity/bank/Bank of Ireland": {
                 "tags": {
-                    "name": "ป ต ท",
-                    "amenity": "fuel"
+                    "name": "Bank of Ireland",
+                    "amenity": "bank"
                 },
-                "name": "ป ต ท",
-                "icon": "fuel",
+                "name": "Bank of Ireland",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ปตท": {
+            "amenity/bank/BNL": {
                 "tags": {
-                    "name": "ปตท",
-                    "amenity": "fuel"
+                    "name": "BNL",
+                    "amenity": "bank"
                 },
-                "name": "ปตท",
-                "icon": "fuel",
+                "name": "BNL",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/コスモ石油 (COSMO)": {
+            "amenity/bank/Banco Santander": {
                 "tags": {
-                    "name": "コスモ石油 (COSMO)",
-                    "amenity": "fuel"
+                    "name": "Banco Santander",
+                    "amenity": "bank"
                 },
-                "name": "コスモ石油 (COSMO)",
-                "icon": "fuel",
+                "name": "Banco Santander",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/出光": {
+            "amenity/bank/Banco Itaú": {
                 "tags": {
-                    "name": "出光",
-                    "name:en": "IDEMITSU",
-                    "amenity": "fuel"
+                    "name": "Banco Itaú",
+                    "amenity": "bank"
                 },
-                "name": "出光",
-                "icon": "fuel",
+                "name": "Banco Itaú",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/昭和シェル (Showa-shell)": {
+            "amenity/bank/AIB": {
                 "tags": {
-                    "name": "昭和シェル (Showa-shell)",
-                    "amenity": "fuel"
+                    "name": "AIB",
+                    "amenity": "bank"
                 },
-                "name": "昭和シェル (Showa-shell)",
-                "icon": "fuel",
+                "name": "AIB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Аптека 36,6": {
+            "amenity/bank/BZ WBK": {
                 "tags": {
-                    "name": "Аптека 36,6",
-                    "amenity": "pharmacy"
+                    "name": "BZ WBK",
+                    "amenity": "bank"
                 },
-                "name": "Аптека 36,6",
-                "icon": "pharmacy",
+                "name": "BZ WBK",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Adler Apotheke": {
+            "amenity/bank/Banco do Brasil": {
                 "tags": {
-                    "name": "Adler Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banco do Brasil",
+                    "amenity": "bank"
                 },
-                "name": "Adler Apotheke",
-                "icon": "pharmacy",
+                "name": "Banco do Brasil",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Alte Apotheke": {
+            "amenity/bank/Caixa Econômica Federal": {
                 "tags": {
-                    "name": "Alte Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Caixa Econômica Federal",
+                    "amenity": "bank"
                 },
-                "name": "Alte Apotheke",
-                "icon": "pharmacy",
+                "name": "Caixa Econômica Federal",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Apotheke": {
+            "amenity/bank/Fifth Third Bank": {
                 "tags": {
-                    "name": "Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Fifth Third Bank",
+                    "amenity": "bank"
                 },
-                "name": "Apotheke",
-                "icon": "pharmacy",
+                "name": "Fifth Third Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Apotheke am Markt": {
+            "amenity/bank/Banca Popolare di Vicenza": {
                 "tags": {
-                    "name": "Apotheke am Markt",
-                    "amenity": "pharmacy"
+                    "name": "Banca Popolare di Vicenza",
+                    "amenity": "bank"
                 },
-                "name": "Apotheke am Markt",
-                "icon": "pharmacy",
+                "name": "Banca Popolare di Vicenza",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Apteka": {
+            "amenity/bank/Wachovia": {
                 "tags": {
-                    "name": "Apteka",
-                    "amenity": "pharmacy"
+                    "name": "Wachovia",
+                    "amenity": "bank"
                 },
-                "name": "Apteka",
-                "icon": "pharmacy",
+                "name": "Wachovia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Bahnhof-Apotheke": {
+            "amenity/bank/OLB": {
                 "tags": {
-                    "name": "Bahnhof-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "OLB",
+                    "amenity": "bank"
                 },
-                "name": "Bahnhof-Apotheke",
-                "icon": "pharmacy",
+                "name": "OLB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Boots": {
+            "amenity/bank/みずほ銀行": {
                 "tags": {
-                    "name": "Boots",
-                    "amenity": "pharmacy"
+                    "name": "みずほ銀行",
+                    "amenity": "bank"
                 },
-                "name": "Boots",
-                "icon": "pharmacy",
+                "name": "みずほ銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Brunnen-Apotheke": {
+            "amenity/bank/BES": {
                 "tags": {
-                    "name": "Brunnen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "BES",
+                    "amenity": "bank"
                 },
-                "name": "Brunnen-Apotheke",
-                "icon": "pharmacy",
+                "name": "BES",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Burg-Apotheke": {
+            "amenity/bank/ICICI Bank": {
                 "tags": {
-                    "name": "Burg-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "ICICI Bank",
+                    "amenity": "bank"
                 },
-                "name": "Burg-Apotheke",
-                "icon": "pharmacy",
+                "name": "ICICI Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Bären-Apotheke": {
+            "amenity/bank/HDFC Bank": {
                 "tags": {
-                    "name": "Bären-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "HDFC Bank",
+                    "amenity": "bank"
                 },
-                "name": "Bären-Apotheke",
-                "icon": "pharmacy",
+                "name": "HDFC Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/CVS": {
+            "amenity/bank/La Banque Postale": {
                 "tags": {
-                    "name": "CVS",
-                    "amenity": "pharmacy"
+                    "name": "La Banque Postale",
+                    "amenity": "bank"
                 },
-                "name": "CVS",
-                "icon": "pharmacy",
+                "name": "La Banque Postale",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Clicks": {
+            "amenity/bank/Pekao SA": {
                 "tags": {
-                    "name": "Clicks",
-                    "amenity": "pharmacy"
+                    "name": "Pekao SA",
+                    "amenity": "bank"
                 },
-                "name": "Clicks",
-                "icon": "pharmacy",
+                "name": "Pekao SA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Cruz Verde": {
+            "amenity/bank/Oberbank": {
                 "tags": {
-                    "name": "Cruz Verde",
-                    "amenity": "pharmacy"
+                    "name": "Oberbank",
+                    "amenity": "bank"
                 },
-                "name": "Cruz Verde",
-                "icon": "pharmacy",
+                "name": "Oberbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Engel-Apotheke": {
+            "amenity/bank/Bradesco": {
                 "tags": {
-                    "name": "Engel-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Bradesco",
+                    "amenity": "bank"
                 },
-                "name": "Engel-Apotheke",
-                "icon": "pharmacy",
+                "name": "Bradesco",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Eurovaistinė": {
+            "amenity/bank/Oldenburgische Landesbank": {
                 "tags": {
-                    "name": "Eurovaistinė",
-                    "amenity": "pharmacy"
+                    "name": "Oldenburgische Landesbank",
+                    "amenity": "bank"
                 },
-                "name": "Eurovaistinė",
-                "icon": "pharmacy",
+                "name": "Oldenburgische Landesbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacia Comunale": {
+            "amenity/bank/Scotia Bank": {
                 "tags": {
-                    "name": "Farmacia Comunale",
-                    "amenity": "pharmacy"
+                    "name": "Scotia Bank",
+                    "amenity": "bank"
                 },
-                "name": "Farmacia Comunale",
-                "icon": "pharmacy",
+                "name": "Scotia Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacias Ahumada": {
+            "amenity/bank/Bendigo Bank": {
                 "tags": {
-                    "name": "Farmacias Ahumada",
-                    "amenity": "pharmacy"
+                    "name": "Bendigo Bank",
+                    "amenity": "bank"
                 },
-                "name": "Farmacias Ahumada",
-                "icon": "pharmacy",
+                "name": "Bendigo Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacias Cruz Verde": {
+            "amenity/bank/Argenta": {
                 "tags": {
-                    "name": "Farmacias Cruz Verde",
-                    "amenity": "pharmacy"
+                    "name": "Argenta",
+                    "amenity": "bank"
                 },
-                "name": "Farmacias Cruz Verde",
-                "icon": "pharmacy",
+                "name": "Argenta",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacias SalcoBrand": {
+            "amenity/bank/AXA": {
                 "tags": {
-                    "name": "Farmacias SalcoBrand",
-                    "amenity": "pharmacy"
+                    "name": "AXA",
+                    "amenity": "bank"
                 },
-                "name": "Farmacias SalcoBrand",
-                "icon": "pharmacy",
+                "name": "AXA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacity": {
+            "amenity/bank/Axis Bank": {
                 "tags": {
-                    "name": "Farmacity",
-                    "amenity": "pharmacy"
+                    "name": "Axis Bank",
+                    "amenity": "bank"
                 },
-                "name": "Farmacity",
-                "icon": "pharmacy",
+                "name": "Axis Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmahorro": {
+            "amenity/bank/Banco Nación": {
                 "tags": {
-                    "name": "Farmahorro",
-                    "amenity": "pharmacy"
+                    "name": "Banco Nación",
+                    "amenity": "bank"
                 },
-                "name": "Farmahorro",
-                "icon": "pharmacy",
+                "name": "Banco Nación",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmatodo": {
+            "amenity/bank/GE Money Bank": {
                 "tags": {
-                    "name": "Farmatodo",
-                    "amenity": "pharmacy"
+                    "name": "GE Money Bank",
+                    "amenity": "bank"
                 },
-                "name": "Farmatodo",
-                "icon": "pharmacy",
+                "name": "GE Money Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Gintarinė vaistinė": {
+            "amenity/bank/Альфа-Банк": {
                 "tags": {
-                    "name": "Gintarinė vaistinė",
-                    "amenity": "pharmacy"
+                    "name": "Альфа-Банк",
+                    "amenity": "bank"
                 },
-                "name": "Gintarinė vaistinė",
-                "icon": "pharmacy",
+                "name": "Альфа-Банк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Hirsch-Apotheke": {
+            "amenity/bank/Белагропромбанк": {
                 "tags": {
-                    "name": "Hirsch-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Белагропромбанк",
+                    "amenity": "bank"
                 },
-                "name": "Hirsch-Apotheke",
-                "icon": "pharmacy",
+                "name": "Белагропромбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Hubertus Apotheke": {
+            "amenity/bank/Caja Círculo": {
                 "tags": {
-                    "name": "Hubertus Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Caja Círculo",
+                    "amenity": "bank"
                 },
-                "name": "Hubertus Apotheke",
-                "icon": "pharmacy",
+                "name": "Caja Círculo",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Jean Coutu": {
+            "amenity/bank/Eurobank": {
                 "tags": {
-                    "name": "Jean Coutu",
-                    "amenity": "pharmacy"
+                    "name": "Eurobank",
+                    "amenity": "bank"
                 },
-                "name": "Jean Coutu",
-                "icon": "pharmacy",
+                "name": "Eurobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Kinney Drugs": {
+            "amenity/bank/Banca Intesa": {
                 "tags": {
-                    "name": "Kinney Drugs",
-                    "amenity": "pharmacy"
+                    "name": "Banca Intesa",
+                    "amenity": "bank"
                 },
-                "name": "Kinney Drugs",
-                "icon": "pharmacy",
+                "name": "Banca Intesa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Linden-Apotheke": {
+            "amenity/bank/Canara Bank": {
                 "tags": {
-                    "name": "Linden-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Canara Bank",
+                    "amenity": "bank"
                 },
-                "name": "Linden-Apotheke",
-                "icon": "pharmacy",
+                "name": "Canara Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Ljekarna": {
+            "amenity/bank/Cajamar": {
                 "tags": {
-                    "name": "Ljekarna",
-                    "amenity": "pharmacy"
+                    "name": "Cajamar",
+                    "amenity": "bank"
                 },
-                "name": "Ljekarna",
-                "icon": "pharmacy",
+                "name": "Cajamar",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Lloyds Pharmacy": {
+            "amenity/bank/Banamex": {
                 "tags": {
-                    "name": "Lloyds Pharmacy",
-                    "amenity": "pharmacy"
+                    "name": "Banamex",
+                    "amenity": "bank"
                 },
-                "name": "Lloyds Pharmacy",
-                "icon": "pharmacy",
+                "name": "Banamex",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Löwen-Apotheke": {
+            "amenity/bank/Crédit Mutuel de Bretagne": {
                 "tags": {
-                    "name": "Löwen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Crédit Mutuel de Bretagne",
+                    "amenity": "bank"
                 },
-                "name": "Löwen-Apotheke",
-                "icon": "pharmacy",
+                "name": "Crédit Mutuel de Bretagne",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Marien-Apotheke": {
+            "amenity/bank/Davivienda": {
                 "tags": {
-                    "name": "Marien-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Davivienda",
+                    "amenity": "bank"
                 },
-                "name": "Marien-Apotheke",
-                "icon": "pharmacy",
+                "name": "Davivienda",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Markt-Apotheke": {
+            "amenity/bank/Bank Spółdzielczy": {
                 "tags": {
-                    "name": "Markt-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Bank Spółdzielczy",
+                    "amenity": "bank"
                 },
-                "name": "Markt-Apotheke",
-                "icon": "pharmacy",
+                "name": "Bank Spółdzielczy",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Mercury Drug": {
+            "amenity/bank/Credit Agricole": {
                 "tags": {
-                    "name": "Mercury Drug",
-                    "amenity": "pharmacy"
+                    "name": "Credit Agricole",
+                    "amenity": "bank"
                 },
-                "name": "Mercury Drug",
-                "icon": "pharmacy",
+                "name": "Credit Agricole",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Neue Apotheke": {
+            "amenity/bank/Bankinter": {
                 "tags": {
-                    "name": "Neue Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Bankinter",
+                    "amenity": "bank"
                 },
-                "name": "Neue Apotheke",
-                "icon": "pharmacy",
+                "name": "Bankinter",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Pharmacie Centrale": {
+            "amenity/bank/Banque Nationale": {
                 "tags": {
-                    "name": "Pharmacie Centrale",
-                    "amenity": "pharmacy"
+                    "name": "Banque Nationale",
+                    "amenity": "bank"
                 },
-                "name": "Pharmacie Centrale",
-                "icon": "pharmacy",
+                "name": "Banque Nationale",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Pharmaprix": {
+            "amenity/bank/Bank of the West": {
                 "tags": {
-                    "name": "Pharmaprix",
-                    "amenity": "pharmacy"
+                    "name": "Bank of the West",
+                    "amenity": "bank"
                 },
-                "name": "Pharmaprix",
-                "icon": "pharmacy",
+                "name": "Bank of the West",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Pharmasave": {
+            "amenity/bank/Key Bank": {
                 "tags": {
-                    "name": "Pharmasave",
-                    "amenity": "pharmacy"
+                    "name": "Key Bank",
+                    "amenity": "bank"
                 },
-                "name": "Pharmasave",
-                "icon": "pharmacy",
+                "name": "Key Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rathaus-Apotheke": {
+            "amenity/bank/Western Union": {
                 "tags": {
-                    "name": "Rathaus-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Western Union",
+                    "amenity": "bank"
                 },
-                "name": "Rathaus-Apotheke",
-                "icon": "pharmacy",
+                "name": "Western Union",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rats-Apotheke": {
+            "amenity/bank/Citizens Bank": {
                 "tags": {
-                    "name": "Rats-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Citizens Bank",
+                    "amenity": "bank"
                 },
-                "name": "Rats-Apotheke",
-                "icon": "pharmacy",
+                "name": "Citizens Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rite Aid": {
+            "amenity/bank/ПриватБанк": {
                 "tags": {
-                    "name": "Rite Aid",
-                    "amenity": "pharmacy"
+                    "name": "ПриватБанк",
+                    "amenity": "bank"
                 },
-                "name": "Rite Aid",
-                "icon": "pharmacy",
+                "name": "ПриватБанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rosen-Apotheke": {
+            "amenity/bank/Security Bank": {
                 "tags": {
-                    "name": "Rosen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Security Bank",
+                    "amenity": "bank"
                 },
-                "name": "Rosen-Apotheke",
-                "icon": "pharmacy",
+                "name": "Security Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rowlands Pharmacy": {
+            "amenity/bank/Ecobank": {
                 "tags": {
-                    "name": "Rowlands Pharmacy",
-                    "amenity": "pharmacy"
+                    "name": "Ecobank",
+                    "amenity": "bank"
                 },
-                "name": "Rowlands Pharmacy",
-                "icon": "pharmacy",
+                "name": "Ecobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/SalcoBrand": {
+            "amenity/bank/Millenium Bank": {
                 "tags": {
-                    "name": "SalcoBrand",
-                    "amenity": "pharmacy"
+                    "name": "Millenium Bank",
+                    "amenity": "bank"
                 },
-                "name": "SalcoBrand",
-                "icon": "pharmacy",
+                "name": "Millenium Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Shoppers Drug Mart": {
+            "amenity/bank/Bankia": {
                 "tags": {
-                    "name": "Shoppers Drug Mart",
-                    "amenity": "pharmacy"
+                    "name": "Bankia",
+                    "amenity": "bank"
                 },
-                "name": "Shoppers Drug Mart",
-                "icon": "pharmacy",
+                "name": "Bankia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Sonnen-Apotheke": {
+            "amenity/bank/三菱東京UFJ銀行": {
                 "tags": {
-                    "name": "Sonnen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "三菱東京UFJ銀行",
+                    "amenity": "bank"
                 },
-                "name": "Sonnen-Apotheke",
-                "icon": "pharmacy",
+                "name": "三菱東京UFJ銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Stadt-Apotheke": {
+            "amenity/bank/Caixa": {
                 "tags": {
-                    "name": "Stadt-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Caixa",
+                    "amenity": "bank"
                 },
-                "name": "Stadt-Apotheke",
-                "icon": "pharmacy",
+                "name": "Caixa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Stern-Apotheke": {
+            "amenity/bank/Banco de Costa Rica": {
                 "tags": {
-                    "name": "Stern-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banco de Costa Rica",
+                    "amenity": "bank"
                 },
-                "name": "Stern-Apotheke",
-                "icon": "pharmacy",
+                "name": "Banco de Costa Rica",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Superdrug": {
+            "amenity/bank/SunTrust Bank": {
                 "tags": {
-                    "name": "Superdrug",
-                    "amenity": "pharmacy"
+                    "name": "SunTrust Bank",
+                    "amenity": "bank"
                 },
-                "name": "Superdrug",
-                "icon": "pharmacy",
+                "name": "SunTrust Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/The Generics Pharmacy": {
+            "amenity/bank/Itaú": {
                 "tags": {
-                    "name": "The Generics Pharmacy",
-                    "amenity": "pharmacy"
+                    "name": "Itaú",
+                    "amenity": "bank"
                 },
-                "name": "The Generics Pharmacy",
-                "icon": "pharmacy",
+                "name": "Itaú",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Walgreens": {
+            "amenity/bank/PBZ": {
                 "tags": {
-                    "name": "Walgreens",
-                    "amenity": "pharmacy"
+                    "name": "PBZ",
+                    "amenity": "bank"
                 },
-                "name": "Walgreens",
-                "icon": "pharmacy",
+                "name": "PBZ",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Айболит": {
+            "amenity/bank/Bancolombia": {
                 "tags": {
-                    "name": "Айболит",
-                    "amenity": "pharmacy"
+                    "name": "Bancolombia",
+                    "amenity": "bank"
                 },
-                "name": "Айболит",
-                "icon": "pharmacy",
+                "name": "Bancolombia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Аптека": {
+            "amenity/bank/Райффайзен Банк Аваль": {
                 "tags": {
-                    "name": "Ð\90пÑ\82ека",
-                    "amenity": "pharmacy"
+                    "name": "РайÑ\84Ñ\84айзен Ð\91анк Ð\90валÑ\8c",
+                    "amenity": "bank"
                 },
-                "name": "Ð\90пÑ\82ека",
-                "icon": "pharmacy",
+                "name": "РайÑ\84Ñ\84айзен Ð\91анк Ð\90валÑ\8c",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Аптечный пункт": {
+            "amenity/bank/Bancomer": {
                 "tags": {
-                    "name": "Аптечный пункт",
-                    "amenity": "pharmacy"
+                    "name": "Bancomer",
+                    "amenity": "bank"
                 },
-                "name": "Аптечный пункт",
-                "icon": "pharmacy",
+                "name": "Bancomer",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Вита": {
+            "amenity/bank/Banorte": {
                 "tags": {
-                    "name": "Вита",
-                    "amenity": "pharmacy"
+                    "name": "Banorte",
+                    "amenity": "bank"
                 },
-                "name": "Вита",
-                "icon": "pharmacy",
+                "name": "Banorte",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Имплозия": {
+            "amenity/bank/Alior Bank": {
                 "tags": {
-                    "name": "Имплозия",
-                    "amenity": "pharmacy"
+                    "name": "Alior Bank",
+                    "amenity": "bank"
                 },
-                "name": "Имплозия",
-                "icon": "pharmacy",
+                "name": "Alior Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Классика": {
+            "amenity/bank/BOC": {
                 "tags": {
-                    "name": "Классика",
-                    "amenity": "pharmacy"
+                    "name": "BOC",
+                    "amenity": "bank"
                 },
-                "name": "Классика",
-                "icon": "pharmacy",
+                "name": "BOC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Невис": {
+            "amenity/bank/Банк Москвы": {
                 "tags": {
-                    "name": "Ð\9dевиÑ\81",
-                    "amenity": "pharmacy"
+                    "name": "Ð\91анк Ð\9cоÑ\81квÑ\8b",
+                    "amenity": "bank"
                 },
-                "name": "Ð\9dевиÑ\81",
-                "icon": "pharmacy",
+                "name": "Ð\91анк Ð\9cоÑ\81квÑ\8b",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Первая помощь": {
+            "amenity/bank/ВТБ": {
                 "tags": {
-                    "name": "Ð\9fеÑ\80ваÑ\8f Ð¿Ð¾Ð¼Ð¾Ñ\89Ñ\8c",
-                    "amenity": "pharmacy"
+                    "name": "Ð\92ТÐ\91",
+                    "amenity": "bank"
                 },
-                "name": "Ð\9fеÑ\80ваÑ\8f Ð¿Ð¾Ð¼Ð¾Ñ\89Ñ\8c",
-                "icon": "pharmacy",
+                "name": "Ð\92ТÐ\91",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Радуга": {
+            "amenity/bank/Caja Duero": {
                 "tags": {
-                    "name": "Радуга",
-                    "amenity": "pharmacy"
+                    "name": "Caja Duero",
+                    "amenity": "bank"
                 },
-                "name": "Радуга",
-                "icon": "pharmacy",
+                "name": "Caja Duero",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Ригла": {
+            "amenity/bank/Regions Bank": {
                 "tags": {
-                    "name": "Ригла",
-                    "amenity": "pharmacy"
+                    "name": "Regions Bank",
+                    "amenity": "bank"
                 },
-                "name": "Ригла",
-                "icon": "pharmacy",
+                "name": "Regions Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Фармакор": {
+            "amenity/bank/Росбанк": {
                 "tags": {
-                    "name": "ФаÑ\80макоÑ\80",
-                    "amenity": "pharmacy"
+                    "name": "РоÑ\81банк",
+                    "amenity": "bank"
                 },
-                "name": "ФаÑ\80макоÑ\80",
-                "icon": "pharmacy",
+                "name": "РоÑ\81банк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Фармация": {
+            "amenity/bank/Banco Estado": {
                 "tags": {
-                    "name": "Фармация",
-                    "amenity": "pharmacy"
+                    "name": "Banco Estado",
+                    "amenity": "bank"
                 },
-                "name": "Фармация",
-                "icon": "pharmacy",
+                "name": "Banco Estado",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Фармленд": {
+            "amenity/bank/BCI": {
                 "tags": {
-                    "name": "Фармленд",
-                    "amenity": "pharmacy"
+                    "name": "BCI",
+                    "amenity": "bank"
                 },
-                "name": "Фармленд",
-                "icon": "pharmacy",
+                "name": "BCI",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/аптека": {
+            "amenity/bank/SunTrust": {
                 "tags": {
-                    "name": "аптека",
-                    "amenity": "pharmacy"
+                    "name": "SunTrust",
+                    "amenity": "bank"
                 },
-                "name": "аптека",
-                "icon": "pharmacy",
+                "name": "SunTrust",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/ავერსი (Aversi)": {
+            "amenity/bank/PNC Bank": {
                 "tags": {
-                    "name": "ავერსი (Aversi)",
-                    "amenity": "pharmacy"
+                    "name": "PNC Bank",
+                    "amenity": "bank"
                 },
-                "name": "ავერსი (Aversi)",
-                "icon": "pharmacy",
+                "name": "PNC Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/サンドラッグ": {
+            "amenity/bank/신한은행": {
                 "tags": {
-                    "name": "サンドラッグ",
-                    "amenity": "pharmacy"
+                    "name": "신한은행",
+                    "name:en": "Sinhan Bank",
+                    "amenity": "bank"
                 },
-                "name": "サンドラッグ",
-                "icon": "pharmacy",
+                "name": "신한은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/スギ薬局": {
+            "amenity/bank/우리은행": {
                 "tags": {
-                    "name": "スギ薬局",
-                    "amenity": "pharmacy"
+                    "name": "우리은행",
+                    "name:en": "Uri Bank",
+                    "amenity": "bank"
                 },
-                "name": "スギ薬局",
-                "icon": "pharmacy",
+                "name": "우리은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/トモズ (Tomod's)": {
+            "amenity/bank/국민은행": {
                 "tags": {
-                    "name": "トモズ (Tomod's)",
-                    "amenity": "pharmacy"
+                    "name": "국민은행",
+                    "name:en": "Gungmin Bank",
+                    "amenity": "bank"
                 },
-                "name": "トモズ (Tomod's)",
-                "icon": "pharmacy",
+                "name": "국민은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/ドラッグてらしま (Drug Terashima)": {
+            "amenity/bank/중소기업은행": {
                 "tags": {
-                    "name": "ドラッグてらしま (Drug Terashima)",
-                    "amenity": "pharmacy"
+                    "name": "중소기업은행",
+                    "name:en": "Industrial Bank of Korea",
+                    "amenity": "bank"
                 },
-                "name": "ドラッグてらしま (Drug Terashima)",
-                "icon": "pharmacy",
+                "name": "중소기업은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/マツモトキヨシ": {
+            "amenity/bank/광주은행": {
                 "tags": {
-                    "name": "マツモトキヨシ",
-                    "amenity": "pharmacy"
+                    "name": "광주은행",
+                    "name:en": "Gwangju Bank",
+                    "amenity": "bank"
                 },
-                "name": "マツモトキヨシ",
-                "icon": "pharmacy",
+                "name": "광주은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Cross Keys": {
+            "amenity/bank/Газпромбанк": {
                 "tags": {
-                    "name": "Cross Keys",
-                    "amenity": "pub"
+                    "name": "Газпромбанк",
+                    "amenity": "bank"
                 },
-                "name": "Cross Keys",
-                "icon": "beer",
+                "name": "Газпромбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Irish Pub": {
+            "amenity/bank/M&T Bank": {
                 "tags": {
-                    "name": "Irish Pub",
-                    "amenity": "pub"
+                    "name": "M&T Bank",
+                    "amenity": "bank"
                 },
-                "name": "Irish Pub",
-                "icon": "beer",
+                "name": "M&T Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Kings Arms": {
+            "amenity/bank/Caja de Burgos": {
                 "tags": {
-                    "name": "Kings Arms",
-                    "amenity": "pub"
+                    "name": "Caja de Burgos",
+                    "amenity": "bank"
                 },
-                "name": "Kings Arms",
-                "icon": "beer",
+                "name": "Caja de Burgos",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Kings Head": {
+            "amenity/bank/Santander Totta": {
                 "tags": {
-                    "name": "Kings Head",
-                    "amenity": "pub"
+                    "name": "Santander Totta",
+                    "amenity": "bank"
                 },
-                "name": "Kings Head",
-                "icon": "beer",
+                "name": "Santander Totta",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/New Inn": {
+            "amenity/bank/УкрСиббанк": {
                 "tags": {
-                    "name": "New Inn",
-                    "amenity": "pub"
+                    "name": "УкрСиббанк",
+                    "amenity": "bank"
                 },
-                "name": "New Inn",
-                "icon": "beer",
+                "name": "УкрСиббанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Prince of Wales": {
+            "amenity/bank/Ощадбанк": {
                 "tags": {
-                    "name": "Prince of Wales",
-                    "amenity": "pub"
+                    "name": "Ощадбанк",
+                    "amenity": "bank"
                 },
-                "name": "Prince of Wales",
-                "icon": "beer",
+                "name": "Ощадбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Red Lion": {
+            "amenity/bank/Уралсиб": {
                 "tags": {
-                    "name": "Red Lion",
-                    "amenity": "pub"
+                    "name": "Уралсиб",
+                    "amenity": "bank"
                 },
-                "name": "Red Lion",
-                "icon": "beer",
+                "name": "Уралсиб",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Rose & Crown": {
+            "amenity/bank/りそな銀行": {
                 "tags": {
-                    "name": "Rose & Crown",
-                    "amenity": "pub"
+                    "name": "りそな銀行",
+                    "name:en": "Mizuho Bank",
+                    "amenity": "bank"
                 },
-                "name": "Rose & Crown",
-                "icon": "beer",
+                "name": "りそな銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Rose and Crown": {
+            "amenity/bank/Cajero Automatico Bancared": {
                 "tags": {
-                    "name": "Rose and Crown",
-                    "amenity": "pub"
+                    "name": "Cajero Automatico Bancared",
+                    "amenity": "bank"
                 },
-                "name": "Rose and Crown",
-                "icon": "beer",
+                "name": "Cajero Automatico Bancared",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Royal Hotel": {
+            "amenity/bank/Промсвязьбанк": {
                 "tags": {
-                    "name": "Royal Hotel",
-                    "amenity": "pub"
+                    "name": "Промсвязьбанк",
+                    "amenity": "bank"
                 },
-                "name": "Royal Hotel",
-                "icon": "beer",
+                "name": "Промсвязьбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Royal Oak": {
+            "amenity/bank/三井住友銀行": {
                 "tags": {
-                    "name": "Royal Oak",
-                    "amenity": "pub"
+                    "name": "三井住友銀行",
+                    "amenity": "bank"
                 },
-                "name": "Royal Oak",
-                "icon": "beer",
+                "name": "三井住友銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Anchor": {
+            "amenity/bank/Banco Provincia": {
                 "tags": {
-                    "name": "The Anchor",
-                    "amenity": "pub"
+                    "name": "Banco Provincia",
+                    "amenity": "bank"
                 },
-                "name": "The Anchor",
-                "icon": "beer",
+                "name": "Banco Provincia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Angel": {
+            "amenity/bank/BB&T": {
                 "tags": {
-                    "name": "The Angel",
-                    "amenity": "pub"
+                    "name": "BB&T",
+                    "amenity": "bank"
                 },
-                "name": "The Angel",
-                "icon": "beer",
+                "name": "BB&T",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Bell": {
+            "amenity/bank/Возрождение": {
                 "tags": {
-                    "name": "The Bell",
-                    "amenity": "pub"
+                    "name": "Возрождение",
+                    "amenity": "bank"
                 },
-                "name": "The Bell",
-                "icon": "beer",
+                "name": "Возрождение",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Black Horse": {
+            "amenity/bank/Capital One": {
                 "tags": {
-                    "name": "The Black Horse",
-                    "amenity": "pub"
+                    "name": "Capital One",
+                    "amenity": "bank"
                 },
-                "name": "The Black Horse",
-                "icon": "beer",
+                "name": "Capital One",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Bull": {
+            "amenity/bank/Bank Mandiri": {
                 "tags": {
-                    "name": "The Bull",
-                    "amenity": "pub"
+                    "name": "Bank Mandiri",
+                    "amenity": "bank"
                 },
-                "name": "The Bull",
-                "icon": "beer",
+                "name": "Bank Mandiri",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Castle": {
+            "amenity/bank/Banco de la Nación": {
                 "tags": {
-                    "name": "The Castle",
-                    "amenity": "pub"
+                    "name": "Banco de la Nación",
+                    "amenity": "bank"
                 },
-                "name": "The Castle",
-                "icon": "beer",
+                "name": "Banco de la Nación",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Chequers": {
+            "amenity/bank/Banco G&T Continental": {
                 "tags": {
-                    "name": "The Chequers",
-                    "amenity": "pub"
+                    "name": "Banco G&T Continental",
+                    "amenity": "bank"
                 },
-                "name": "The Chequers",
-                "icon": "beer",
+                "name": "Banco G&T Continental",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Cross Keys": {
+            "amenity/bank/Peoples Bank": {
                 "tags": {
-                    "name": "The Cross Keys",
-                    "amenity": "pub"
+                    "name": "Peoples Bank",
+                    "amenity": "bank"
                 },
-                "name": "The Cross Keys",
-                "icon": "beer",
+                "name": "Peoples Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Crown": {
+            "amenity/bank/Совкомбанк": {
                 "tags": {
-                    "name": "The Crown",
-                    "amenity": "pub"
+                    "name": "Совкомбанк",
+                    "amenity": "bank"
                 },
-                "name": "The Crown",
-                "icon": "beer",
+                "name": "Совкомбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Crown Inn": {
+            "amenity/bank/Provincial": {
                 "tags": {
-                    "name": "The Crown Inn",
-                    "amenity": "pub"
+                    "name": "Provincial",
+                    "amenity": "bank"
                 },
-                "name": "The Crown Inn",
-                "icon": "beer",
+                "name": "Provincial",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Fox": {
+            "amenity/bank/Banco de Desarrollo Banrural": {
                 "tags": {
-                    "name": "The Fox",
-                    "amenity": "pub"
+                    "name": "Banco de Desarrollo Banrural",
+                    "amenity": "bank"
                 },
-                "name": "The Fox",
-                "icon": "beer",
+                "name": "Banco de Desarrollo Banrural",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The George": {
+            "amenity/bank/Banco Bradesco": {
                 "tags": {
-                    "name": "The George",
-                    "amenity": "pub"
+                    "name": "Banco Bradesco",
+                    "amenity": "bank"
                 },
-                "name": "The George",
-                "icon": "beer",
+                "name": "Banco Bradesco",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Green Man": {
+            "amenity/bank/Bicentenario": {
                 "tags": {
-                    "name": "The Green Man",
-                    "amenity": "pub"
+                    "name": "Bicentenario",
+                    "amenity": "bank"
                 },
-                "name": "The Green Man",
-                "icon": "beer",
+                "name": "Bicentenario",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Greyhound": {
+            "amenity/bank/ლიბერთი ბანკი": {
                 "tags": {
-                    "name": "The Greyhound",
-                    "amenity": "pub"
+                    "name": "ლიბერთი ბანკი",
+                    "name:en": "Liberty Bank",
+                    "amenity": "bank"
                 },
-                "name": "The Greyhound",
-                "icon": "beer",
+                "name": "ლიბერთი ბანკი",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Kings Arms": {
+            "amenity/bank/Banesco": {
                 "tags": {
-                    "name": "The Kings Arms",
-                    "amenity": "pub"
+                    "name": "Banesco",
+                    "amenity": "bank"
                 },
-                "name": "The Kings Arms",
-                "icon": "beer",
+                "name": "Banesco",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Kings Head": {
+            "amenity/bank/Mercantil": {
                 "tags": {
-                    "name": "The Kings Head",
-                    "amenity": "pub"
+                    "name": "Mercantil",
+                    "amenity": "bank"
                 },
-                "name": "The Kings Head",
-                "icon": "beer",
+                "name": "Mercantil",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The New Inn": {
+            "amenity/bank/Del Tesoro": {
                 "tags": {
-                    "name": "The New Inn",
-                    "amenity": "pub"
+                    "name": "Del Tesoro",
+                    "amenity": "bank"
                 },
-                "name": "The New Inn",
-                "icon": "beer",
+                "name": "Del Tesoro",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Plough": {
+            "amenity/bank/하나은행": {
                 "tags": {
-                    "name": "The Plough",
-                    "amenity": "pub"
+                    "name": "하나은행",
+                    "amenity": "bank"
                 },
-                "name": "The Plough",
-                "icon": "beer",
+                "name": "하나은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Prince of Wales": {
+            "amenity/bank/CityCommerce Bank": {
                 "tags": {
-                    "name": "The Prince of Wales",
-                    "amenity": "pub"
+                    "name": "CityCommerce Bank",
+                    "amenity": "bank"
                 },
-                "name": "The Prince of Wales",
-                "icon": "beer",
+                "name": "CityCommerce Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Queens Head": {
+            "amenity/bank/De Venezuela": {
                 "tags": {
-                    "name": "The Queens Head",
-                    "amenity": "pub"
+                    "name": "De Venezuela",
+                    "amenity": "bank"
                 },
-                "name": "The Queens Head",
-                "icon": "beer",
+                "name": "De Venezuela",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Railway": {
+            "amenity/car_rental/Europcar": {
                 "tags": {
-                    "name": "The Railway",
-                    "amenity": "pub"
+                    "name": "Europcar",
+                    "amenity": "car_rental"
                 },
-                "name": "The Railway",
-                "icon": "beer",
+                "name": "Europcar",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Red Lion": {
+            "amenity/car_rental/Budget": {
                 "tags": {
-                    "name": "The Red Lion",
-                    "amenity": "pub"
+                    "name": "Budget",
+                    "amenity": "car_rental"
                 },
-                "name": "The Red Lion",
-                "icon": "beer",
+                "name": "Budget",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Rising Sun": {
+            "amenity/car_rental/Sixt": {
                 "tags": {
-                    "name": "The Rising Sun",
-                    "amenity": "pub"
+                    "name": "Sixt",
+                    "amenity": "car_rental"
                 },
-                "name": "The Rising Sun",
-                "icon": "beer",
+                "name": "Sixt",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Royal Oak": {
+            "amenity/car_rental/Avis": {
                 "tags": {
-                    "name": "The Royal Oak",
-                    "amenity": "pub"
+                    "name": "Avis",
+                    "amenity": "car_rental"
                 },
-                "name": "The Royal Oak",
-                "icon": "beer",
+                "name": "Avis",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Ship": {
+            "amenity/car_rental/Hertz": {
                 "tags": {
-                    "name": "The Ship",
-                    "amenity": "pub"
+                    "name": "Hertz",
+                    "amenity": "car_rental"
                 },
-                "name": "The Ship",
-                "icon": "beer",
+                "name": "Hertz",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Ship Inn": {
+            "amenity/car_rental/Enterprise": {
                 "tags": {
-                    "name": "The Ship Inn",
-                    "amenity": "pub"
+                    "name": "Enterprise",
+                    "amenity": "car_rental"
                 },
-                "name": "The Ship Inn",
-                "icon": "beer",
+                "name": "Enterprise",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Star": {
+            "amenity/car_rental/stadtmobil CarSharing-Station": {
                 "tags": {
-                    "name": "The Star",
-                    "amenity": "pub"
+                    "name": "stadtmobil CarSharing-Station",
+                    "amenity": "car_rental"
                 },
-                "name": "The Star",
-                "icon": "beer",
+                "name": "stadtmobil CarSharing-Station",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Swan": {
+            "amenity/pharmacy/Rowlands Pharmacy": {
                 "tags": {
-                    "name": "The Swan",
-                    "amenity": "pub"
+                    "name": "Rowlands Pharmacy",
+                    "amenity": "pharmacy"
                 },
-                "name": "The Swan",
-                "icon": "beer",
+                "name": "Rowlands Pharmacy",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Victoria": {
+            "amenity/pharmacy/Boots": {
                 "tags": {
-                    "name": "The Victoria",
-                    "amenity": "pub"
+                    "name": "Boots",
+                    "amenity": "pharmacy"
                 },
-                "name": "The Victoria",
-                "icon": "beer",
+                "name": "Boots",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Wheatsheaf": {
+            "amenity/pharmacy/Marien-Apotheke": {
                 "tags": {
-                    "name": "The Wheatsheaf",
-                    "amenity": "pub"
+                    "name": "Marien-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "The Wheatsheaf",
-                "icon": "beer",
+                "name": "Marien-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The White Hart": {
+            "amenity/pharmacy/Mercury Drug": {
                 "tags": {
-                    "name": "The White Hart",
-                    "amenity": "pub"
+                    "name": "Mercury Drug",
+                    "amenity": "pharmacy"
                 },
-                "name": "The White Hart",
-                "icon": "beer",
+                "name": "Mercury Drug",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The White Horse": {
+            "amenity/pharmacy/Löwen-Apotheke": {
                 "tags": {
-                    "name": "The White Horse",
-                    "amenity": "pub"
+                    "name": "Löwen-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "The White Horse",
-                "icon": "beer",
+                "name": "Löwen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The White Lion": {
+            "amenity/pharmacy/Superdrug": {
                 "tags": {
-                    "name": "The White Lion",
-                    "amenity": "pub"
+                    "name": "Superdrug",
+                    "amenity": "pharmacy"
                 },
-                "name": "The White Lion",
-                "icon": "beer",
+                "name": "Superdrug",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Altglas": {
+            "amenity/pharmacy/Sonnen-Apotheke": {
                 "tags": {
-                    "name": "Altglas",
-                    "amenity": "recycling"
+                    "name": "Sonnen-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Altglas",
-                "icon": "recycling",
+                "name": "Sonnen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Déchèterie": {
+            "amenity/pharmacy/Rathaus-Apotheke": {
                 "tags": {
-                    "name": "Déchèterie",
-                    "amenity": "recycling"
+                    "name": "Rathaus-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Déchèterie",
-                "icon": "recycling",
+                "name": "Rathaus-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Glas": {
+            "amenity/pharmacy/Engel-Apotheke": {
                 "tags": {
-                    "name": "Glas",
-                    "amenity": "recycling"
+                    "name": "Engel-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Glas",
-                "icon": "recycling",
+                "name": "Engel-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Glascontainer": {
+            "amenity/pharmacy/Hirsch-Apotheke": {
                 "tags": {
-                    "name": "Glascontainer",
-                    "amenity": "recycling"
+                    "name": "Hirsch-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Glascontainer",
-                "icon": "recycling",
+                "name": "Hirsch-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Recyclinghof": {
+            "amenity/pharmacy/Stern-Apotheke": {
                 "tags": {
-                    "name": "Recyclinghof",
-                    "amenity": "recycling"
+                    "name": "Stern-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Recyclinghof",
-                "icon": "recycling",
+                "name": "Stern-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Wertstoffhof": {
+            "amenity/pharmacy/Lloyds Pharmacy": {
                 "tags": {
-                    "name": "Wertstoffhof",
-                    "amenity": "recycling"
+                    "name": "Lloyds Pharmacy",
+                    "amenity": "pharmacy"
                 },
-                "name": "Wertstoffhof",
-                "icon": "recycling",
+                "name": "Lloyds Pharmacy",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Adler": {
+            "amenity/pharmacy/Rosen-Apotheke": {
                 "tags": {
-                    "name": "Adler",
-                    "amenity": "restaurant"
+                    "name": "Rosen-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Adler",
-                "icon": "restaurant",
+                "name": "Rosen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Akropolis": {
+            "amenity/pharmacy/Stadt-Apotheke": {
                 "tags": {
-                    "name": "Akropolis",
-                    "amenity": "restaurant"
+                    "name": "Stadt-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Akropolis",
-                "icon": "restaurant",
+                "name": "Stadt-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Alte Post": {
+            "amenity/pharmacy/Markt-Apotheke": {
                 "tags": {
-                    "name": "Alte Post",
-                    "amenity": "restaurant"
+                    "name": "Markt-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Alte Post",
-                "icon": "restaurant",
+                "name": "Markt-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Applebee's": {
+            "amenity/pharmacy/Аптека": {
                 "tags": {
-                    "name": "Applebee's",
-                    "amenity": "restaurant"
+                    "name": "Аптека",
+                    "amenity": "pharmacy"
                 },
-                "name": "Applebee's",
-                "icon": "restaurant",
+                "name": "Аптека",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Athen": {
+            "amenity/pharmacy/Pharmasave": {
                 "tags": {
-                    "name": "Athen",
-                    "amenity": "restaurant"
+                    "name": "Pharmasave",
+                    "amenity": "pharmacy"
                 },
-                "name": "Athen",
-                "icon": "restaurant",
+                "name": "Pharmasave",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Bella Italia": {
+            "amenity/pharmacy/Brunnen-Apotheke": {
                 "tags": {
-                    "name": "Bella Italia",
-                    "amenity": "restaurant"
+                    "name": "Brunnen-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Bella Italia",
-                "icon": "restaurant",
+                "name": "Brunnen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Bob Evans": {
+            "amenity/pharmacy/Shoppers Drug Mart": {
                 "tags": {
-                    "name": "Bob Evans",
-                    "amenity": "restaurant"
+                    "name": "Shoppers Drug Mart",
+                    "amenity": "pharmacy"
                 },
-                "name": "Bob Evans",
-                "icon": "restaurant",
+                "name": "Shoppers Drug Mart",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Boston Pizza": {
+            "amenity/pharmacy/Apotheke am Markt": {
                 "tags": {
-                    "name": "Boston Pizza",
-                    "amenity": "restaurant"
+                    "name": "Apotheke am Markt",
+                    "amenity": "pharmacy"
                 },
-                "name": "Boston Pizza",
-                "icon": "restaurant",
+                "name": "Apotheke am Markt",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Buffalo Grill": {
+            "amenity/pharmacy/Alte Apotheke": {
                 "tags": {
-                    "name": "Buffalo Grill",
-                    "amenity": "restaurant"
+                    "name": "Alte Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Buffalo Grill",
-                "icon": "restaurant",
+                "name": "Alte Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Buffalo Wild Wings": {
+            "amenity/pharmacy/Neue Apotheke": {
                 "tags": {
-                    "name": "Buffalo Wild Wings",
-                    "amenity": "restaurant"
+                    "name": "Neue Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Buffalo Wild Wings",
-                "icon": "restaurant",
+                "name": "Neue Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Bären": {
+            "amenity/pharmacy/Gintarinė vaistinė": {
                 "tags": {
-                    "name": "Bären",
-                    "amenity": "restaurant"
+                    "name": "Gintarinė vaistinė",
+                    "amenity": "pharmacy"
                 },
-                "name": "Bären",
-                "icon": "restaurant",
+                "name": "Gintarinė vaistinė",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/California Pizza Kitchen": {
+            "amenity/pharmacy/Rats-Apotheke": {
                 "tags": {
-                    "name": "California Pizza Kitchen",
-                    "amenity": "restaurant"
+                    "name": "Rats-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "California Pizza Kitchen",
-                "icon": "restaurant",
+                "name": "Rats-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Chili's": {
+            "amenity/pharmacy/Adler Apotheke": {
                 "tags": {
-                    "name": "Chili's",
-                    "amenity": "restaurant"
+                    "name": "Adler Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Chili's",
-                "icon": "restaurant",
+                "name": "Adler Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/China Garden": {
+            "amenity/pharmacy/Pharmacie Centrale": {
                 "tags": {
-                    "name": "China Garden",
-                    "amenity": "restaurant"
+                    "name": "Pharmacie Centrale",
+                    "amenity": "pharmacy"
                 },
-                "name": "China Garden",
-                "icon": "restaurant",
+                "name": "Pharmacie Centrale",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/China Town": {
+            "amenity/pharmacy/Walgreens": {
                 "tags": {
-                    "name": "China Town",
-                    "amenity": "restaurant"
+                    "name": "Walgreens",
+                    "amenity": "pharmacy"
                 },
-                "name": "China Town",
-                "icon": "restaurant",
+                "name": "Walgreens",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Courtepaille": {
+            "amenity/pharmacy/Rite Aid": {
                 "tags": {
-                    "name": "Courtepaille",
-                    "amenity": "restaurant"
+                    "name": "Rite Aid",
+                    "amenity": "pharmacy"
                 },
-                "name": "Courtepaille",
-                "icon": "restaurant",
+                "name": "Rite Aid",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Cracker Barrel": {
+            "amenity/pharmacy/Apotheke": {
                 "tags": {
-                    "name": "Cracker Barrel",
-                    "amenity": "restaurant"
+                    "name": "Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Cracker Barrel",
-                "icon": "restaurant",
+                "name": "Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Da Vinci": {
+            "amenity/pharmacy/Linden-Apotheke": {
                 "tags": {
-                    "name": "Da Vinci",
-                    "amenity": "restaurant"
+                    "name": "Linden-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Da Vinci",
-                "icon": "restaurant",
+                "name": "Linden-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Delphi": {
+            "amenity/pharmacy/Bahnhof-Apotheke": {
                 "tags": {
-                    "name": "Delphi",
-                    "amenity": "restaurant"
+                    "name": "Bahnhof-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Delphi",
-                "icon": "restaurant",
+                "name": "Bahnhof-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Denny's": {
+            "amenity/pharmacy/Burg-Apotheke": {
                 "tags": {
-                    "name": "Denny's",
-                    "amenity": "restaurant"
+                    "name": "Burg-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Denny's",
-                "icon": "restaurant",
+                "name": "Burg-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Deutsches Haus": {
+            "amenity/pharmacy/Jean Coutu": {
                 "tags": {
-                    "name": "Deutsches Haus",
-                    "amenity": "restaurant"
+                    "name": "Jean Coutu",
+                    "amenity": "pharmacy"
                 },
-                "name": "Deutsches Haus",
-                "icon": "restaurant",
+                "name": "Jean Coutu",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Dionysos": {
+            "amenity/pharmacy/Pharmaprix": {
                 "tags": {
-                    "name": "Dionysos",
-                    "amenity": "restaurant"
+                    "name": "Pharmaprix",
+                    "amenity": "pharmacy"
                 },
-                "name": "Dionysos",
-                "icon": "restaurant",
+                "name": "Pharmaprix",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Dolce Vita": {
+            "amenity/pharmacy/Farmacias Ahumada": {
                 "tags": {
-                    "name": "Dolce Vita",
-                    "amenity": "restaurant"
+                    "name": "Farmacias Ahumada",
+                    "amenity": "pharmacy"
                 },
-                "name": "Dolce Vita",
-                "icon": "restaurant",
+                "name": "Farmacias Ahumada",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/El Greco": {
+            "amenity/pharmacy/Farmacia Comunale": {
                 "tags": {
-                    "name": "El Greco",
-                    "amenity": "restaurant"
+                    "name": "Farmacia Comunale",
+                    "amenity": "pharmacy"
                 },
-                "name": "El Greco",
-                "icon": "restaurant",
+                "name": "Farmacia Comunale",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Flunch": {
+            "amenity/pharmacy/Farmacias Cruz Verde": {
                 "tags": {
-                    "name": "Flunch",
-                    "amenity": "restaurant"
+                    "name": "Farmacias Cruz Verde",
+                    "amenity": "pharmacy"
                 },
-                "name": "Flunch",
-                "icon": "restaurant",
+                "name": "Farmacias Cruz Verde",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Frankie & Benny's": {
+            "amenity/pharmacy/Cruz Verde": {
                 "tags": {
-                    "name": "Frankie & Benny's",
-                    "amenity": "restaurant"
+                    "name": "Cruz Verde",
+                    "amenity": "pharmacy"
                 },
-                "name": "Frankie & Benny's",
-                "icon": "restaurant",
+                "name": "Cruz Verde",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Friendly's": {
+            "amenity/pharmacy/Hubertus Apotheke": {
                 "tags": {
-                    "name": "Friendly's",
-                    "amenity": "restaurant"
+                    "name": "Hubertus Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Friendly's",
-                "icon": "restaurant",
+                "name": "Hubertus Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Gasthaus Adler": {
+            "amenity/pharmacy/CVS": {
                 "tags": {
-                    "name": "Gasthaus Adler",
-                    "amenity": "restaurant"
+                    "name": "CVS",
+                    "amenity": "pharmacy"
                 },
-                "name": "Gasthaus Adler",
-                "icon": "restaurant",
+                "name": "CVS",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Gasthaus Krone": {
+            "amenity/pharmacy/Farmacias SalcoBrand": {
                 "tags": {
-                    "name": "Gasthaus Krone",
-                    "amenity": "restaurant"
+                    "name": "Farmacias SalcoBrand",
+                    "amenity": "pharmacy"
                 },
-                "name": "Gasthaus Krone",
-                "icon": "restaurant",
+                "name": "Farmacias SalcoBrand",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Gasthof zur Post": {
+            "amenity/pharmacy/Фармация": {
                 "tags": {
-                    "name": "Gasthof zur Post",
-                    "amenity": "restaurant"
+                    "name": "Фармация",
+                    "amenity": "pharmacy"
                 },
-                "name": "Gasthof zur Post",
-                "icon": "restaurant",
+                "name": "Фармация",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Golden Corral": {
+            "amenity/pharmacy/Bären-Apotheke": {
                 "tags": {
-                    "name": "Golden Corral",
-                    "amenity": "restaurant"
+                    "name": "Bären-Apotheke",
+                    "amenity": "pharmacy"
                 },
-                "name": "Golden Corral",
-                "icon": "restaurant",
+                "name": "Bären-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Grüner Baum": {
+            "amenity/pharmacy/Clicks": {
                 "tags": {
-                    "name": "Grüner Baum",
-                    "amenity": "restaurant"
+                    "name": "Clicks",
+                    "amenity": "pharmacy"
                 },
-                "name": "Grüner Baum",
-                "icon": "restaurant",
+                "name": "Clicks",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hard Rock Cafe": {
+            "amenity/pharmacy/セイジョー": {
                 "tags": {
-                    "name": "Hard Rock Cafe",
-                    "amenity": "restaurant"
+                    "name": "セイジョー",
+                    "amenity": "pharmacy"
                 },
-                "name": "Hard Rock Cafe",
-                "icon": "restaurant",
+                "name": "セイジョー",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hellas": {
+            "amenity/pharmacy/マツモトキヨシ": {
                 "tags": {
-                    "name": "Hellas",
-                    "amenity": "restaurant"
+                    "name": "マツモトキヨシ",
+                    "amenity": "pharmacy"
                 },
-                "name": "Hellas",
-                "icon": "restaurant",
+                "name": "マツモトキヨシ",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hippopotamus": {
+            "amenity/pharmacy/Вита": {
                 "tags": {
-                    "name": "Hippopotamus",
-                    "amenity": "restaurant"
+                    "name": "Вита",
+                    "amenity": "pharmacy"
                 },
-                "name": "Hippopotamus",
-                "icon": "restaurant",
+                "name": "Вита",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hirsch": {
+            "amenity/pharmacy/Радуга": {
                 "tags": {
-                    "name": "Hirsch",
-                    "amenity": "restaurant"
+                    "name": "Радуга",
+                    "amenity": "pharmacy"
                 },
-                "name": "Hirsch",
-                "icon": "restaurant",
+                "name": "Радуга",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hirschen": {
+            "amenity/pharmacy/サンドラッグ": {
                 "tags": {
-                    "name": "Hirschen",
-                    "amenity": "restaurant"
+                    "name": "サンドラッグ",
+                    "amenity": "pharmacy"
                 },
-                "name": "Hirschen",
-                "icon": "restaurant",
+                "name": "サンドラッグ",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hong Kong": {
+            "amenity/pharmacy/Apteka": {
                 "tags": {
-                    "name": "Hong Kong",
-                    "amenity": "restaurant"
+                    "name": "Apteka",
+                    "amenity": "pharmacy"
                 },
-                "name": "Hong Kong",
-                "icon": "restaurant",
+                "name": "Apteka",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hooters": {
+            "amenity/pharmacy/Первая помощь": {
                 "tags": {
-                    "name": "Hooters",
-                    "amenity": "restaurant"
+                    "name": "Первая помощь",
+                    "amenity": "pharmacy"
                 },
-                "name": "Hooters",
-                "icon": "restaurant",
+                "name": "Первая помощь",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/IHOP": {
+            "amenity/pharmacy/Ригла": {
                 "tags": {
-                    "name": "IHOP",
-                    "amenity": "restaurant"
+                    "name": "Ригла",
+                    "amenity": "pharmacy"
                 },
-                "name": "IHOP",
-                "icon": "restaurant",
+                "name": "Ригла",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kantine": {
+            "amenity/pharmacy/Имплозия": {
                 "tags": {
-                    "name": "Kantine",
-                    "amenity": "restaurant"
+                    "name": "Имплозия",
+                    "amenity": "pharmacy"
                 },
-                "name": "Kantine",
-                "icon": "restaurant",
+                "name": "Имплозия",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kelsey's": {
+            "amenity/pharmacy/Kinney Drugs": {
                 "tags": {
-                    "name": "Kelsey's",
-                    "amenity": "restaurant"
+                    "name": "Kinney Drugs",
+                    "amenity": "pharmacy"
                 },
-                "name": "Kelsey's",
-                "icon": "restaurant",
+                "name": "Kinney Drugs",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kirchenwirt": {
+            "amenity/pharmacy/Классика": {
                 "tags": {
-                    "name": "Kirchenwirt",
-                    "amenity": "restaurant"
+                    "name": "Классика",
+                    "amenity": "pharmacy"
                 },
-                "name": "Kirchenwirt",
-                "icon": "restaurant",
+                "name": "Классика",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kreuz": {
+            "amenity/pharmacy/Ljekarna": {
                 "tags": {
-                    "name": "Kreuz",
-                    "amenity": "restaurant"
+                    "name": "Ljekarna",
+                    "amenity": "pharmacy"
                 },
-                "name": "Kreuz",
-                "icon": "restaurant",
+                "name": "Ljekarna",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Krone": {
+            "amenity/pharmacy/SalcoBrand": {
                 "tags": {
-                    "name": "Krone",
-                    "amenity": "restaurant"
+                    "name": "SalcoBrand",
+                    "amenity": "pharmacy"
                 },
-                "name": "Krone",
-                "icon": "restaurant",
+                "name": "SalcoBrand",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Cantina": {
+            "amenity/pharmacy/Аптека 36,6": {
                 "tags": {
-                    "name": "La Cantina",
-                    "amenity": "restaurant"
+                    "name": "Аптека 36,6",
+                    "amenity": "pharmacy"
                 },
-                "name": "La Cantina",
-                "icon": "restaurant",
+                "name": "Аптека 36,6",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Dolce Vita": {
+            "amenity/pharmacy/Фармакор": {
                 "tags": {
-                    "name": "La Dolce Vita",
-                    "amenity": "restaurant"
+                    "name": "Фармакор",
+                    "amenity": "pharmacy"
                 },
-                "name": "La Dolce Vita",
-                "icon": "restaurant",
+                "name": "Фармакор",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Perla": {
+            "amenity/pharmacy/スギ薬局": {
                 "tags": {
-                    "name": "La Perla",
-                    "amenity": "restaurant"
+                    "name": "スギ薬局",
+                    "amenity": "pharmacy"
                 },
-                "name": "La Perla",
-                "icon": "restaurant",
+                "name": "スギ薬局",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Piazza": {
+            "amenity/pharmacy/Аптечный пункт": {
                 "tags": {
-                    "name": "La Piazza",
-                    "amenity": "restaurant"
+                    "name": "Аптечный пункт",
+                    "amenity": "pharmacy"
                 },
-                "name": "La Piazza",
-                "icon": "restaurant",
+                "name": "Аптечный пункт",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Lamm": {
+            "amenity/pharmacy/Невис": {
                 "tags": {
-                    "name": "Lamm",
-                    "amenity": "restaurant"
+                    "name": "Невис",
+                    "amenity": "pharmacy"
                 },
-                "name": "Lamm",
-                "icon": "restaurant",
+                "name": "Невис",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Linde": {
+            "amenity/pharmacy/トモズ (Tomod's)": {
                 "tags": {
-                    "name": "Linde",
-                    "amenity": "restaurant"
+                    "name": "トモズ (Tomod's)",
+                    "amenity": "pharmacy"
                 },
-                "name": "Linde",
-                "icon": "restaurant",
+                "name": "トモズ (Tomod's)",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Lindenhof": {
+            "amenity/pharmacy/Eurovaistinė": {
                 "tags": {
-                    "name": "Lindenhof",
-                    "amenity": "restaurant"
+                    "name": "Eurovaistinė",
+                    "amenity": "pharmacy"
                 },
-                "name": "Lindenhof",
-                "icon": "restaurant",
+                "name": "Eurovaistinė",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Little Chef": {
+            "amenity/pharmacy/Farmacity": {
                 "tags": {
-                    "name": "Little Chef",
-                    "amenity": "restaurant"
+                    "name": "Farmacity",
+                    "amenity": "pharmacy"
                 },
-                "name": "Little Chef",
-                "icon": "restaurant",
+                "name": "Farmacity",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Longhorn Steakhouse": {
+            "amenity/pharmacy/аптека": {
                 "tags": {
-                    "name": "Longhorn Steakhouse",
-                    "amenity": "restaurant"
+                    "name": "аптека",
+                    "amenity": "pharmacy"
                 },
-                "name": "Longhorn Steakhouse",
-                "icon": "restaurant",
+                "name": "аптека",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Lotus": {
+            "amenity/pharmacy/The Generics Pharmacy": {
                 "tags": {
-                    "name": "Lotus",
-                    "amenity": "restaurant"
+                    "name": "The Generics Pharmacy",
+                    "amenity": "pharmacy"
                 },
-                "name": "Lotus",
-                "icon": "restaurant",
+                "name": "The Generics Pharmacy",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Löwen": {
+            "amenity/pharmacy/Farmatodo": {
                 "tags": {
-                    "name": "Löwen",
-                    "amenity": "restaurant"
+                    "name": "Farmatodo",
+                    "amenity": "pharmacy"
                 },
-                "name": "Löwen",
-                "icon": "restaurant",
+                "name": "Farmatodo",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mamma Mia": {
+            "amenity/pharmacy/Фармленд": {
                 "tags": {
-                    "name": "Mamma Mia",
-                    "amenity": "restaurant"
+                    "name": "Фармленд",
+                    "amenity": "pharmacy"
                 },
-                "name": "Mamma Mia",
-                "icon": "restaurant",
+                "name": "Фармленд",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mandarin": {
+            "amenity/pharmacy/ドラッグてらしま (Drug Terashima)": {
                 "tags": {
-                    "name": "Mandarin",
-                    "amenity": "restaurant"
+                    "name": "ドラッグてらしま (Drug Terashima)",
+                    "amenity": "pharmacy"
                 },
-                "name": "Mandarin",
-                "icon": "restaurant",
+                "name": "ドラッグてらしま (Drug Terashima)",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mang Inasal": {
+            "amenity/pharmacy/ავერსი (Aversi)": {
                 "tags": {
-                    "name": "Mang Inasal",
-                    "amenity": "restaurant"
+                    "name": "ავერსი (Aversi)",
+                    "amenity": "pharmacy"
                 },
-                "name": "Mang Inasal",
-                "icon": "restaurant",
+                "name": "ავერსი (Aversi)",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mensa": {
+            "amenity/pharmacy/Farmahorro": {
                 "tags": {
-                    "name": "Mensa",
-                    "amenity": "restaurant"
+                    "name": "Farmahorro",
+                    "amenity": "pharmacy"
                 },
-                "name": "Mensa",
-                "icon": "restaurant",
+                "name": "Farmahorro",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Milano": {
+            "amenity/cafe/Starbucks": {
                 "tags": {
-                    "name": "Milano",
-                    "amenity": "restaurant"
+                    "name": "Starbucks",
+                    "cuisine": "coffee_shop",
+                    "amenity": "cafe"
                 },
-                "name": "Milano",
-                "icon": "restaurant",
+                "name": "Starbucks",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80847,19 +84261,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mykonos": {
+            "amenity/cafe/Cafeteria": {
                 "tags": {
-                    "name": "Mykonos",
-                    "amenity": "restaurant"
+                    "name": "Cafeteria",
+                    "amenity": "cafe"
                 },
-                "name": "Mykonos",
-                "icon": "restaurant",
+                "name": "Cafeteria",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80867,19 +84282,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Nando's": {
+            "amenity/cafe/Costa": {
                 "tags": {
-                    "name": "Nando's",
-                    "amenity": "restaurant"
+                    "name": "Costa",
+                    "amenity": "cafe"
                 },
-                "name": "Nando's",
-                "icon": "restaurant",
+                "name": "Costa",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80887,19 +84303,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Ochsen": {
+            "amenity/cafe/Caffè Nero": {
                 "tags": {
-                    "name": "Ochsen",
-                    "amenity": "restaurant"
+                    "name": "Caffè Nero",
+                    "amenity": "cafe"
                 },
-                "name": "Ochsen",
-                "icon": "restaurant",
+                "name": "Caffè Nero",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80907,19 +84324,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Olive Garden": {
+            "amenity/cafe/Кафе": {
                 "tags": {
-                    "name": "Olive Garden",
-                    "amenity": "restaurant"
+                    "name": "Кафе",
+                    "amenity": "cafe"
                 },
-                "name": "Olive Garden",
-                "icon": "restaurant",
+                "name": "Кафе",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80927,19 +84345,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Olympia": {
+            "amenity/cafe/Café Central": {
                 "tags": {
-                    "name": "Olympia",
-                    "amenity": "restaurant"
+                    "name": "Café Central",
+                    "amenity": "cafe"
                 },
-                "name": "Olympia",
-                "icon": "restaurant",
+                "name": "Café Central",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80947,19 +84366,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Outback Steakhouse": {
+            "amenity/cafe/Second Cup": {
                 "tags": {
-                    "name": "Outback Steakhouse",
-                    "amenity": "restaurant"
+                    "name": "Second Cup",
+                    "amenity": "cafe"
                 },
-                "name": "Outback Steakhouse",
-                "icon": "restaurant",
+                "name": "Second Cup",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80967,19 +84387,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Panera Bread": {
+            "amenity/cafe/Eisdiele": {
                 "tags": {
-                    "name": "Panera Bread",
-                    "amenity": "restaurant"
+                    "name": "Eisdiele",
+                    "amenity": "cafe"
                 },
-                "name": "Panera Bread",
-                "icon": "restaurant",
+                "name": "Eisdiele",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80987,19 +84408,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Panorama": {
+            "amenity/cafe/Dunkin Donuts": {
                 "tags": {
-                    "name": "Panorama",
-                    "amenity": "restaurant"
+                    "name": "Dunkin Donuts",
+                    "cuisine": "donut",
+                    "amenity": "cafe"
                 },
-                "name": "Panorama",
-                "icon": "restaurant",
+                "name": "Dunkin Donuts",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81007,19 +84430,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Peking": {
+            "amenity/cafe/Segafredo": {
                 "tags": {
-                    "name": "Peking",
-                    "amenity": "restaurant"
+                    "name": "Segafredo",
+                    "amenity": "cafe"
                 },
-                "name": "Peking",
-                "icon": "restaurant",
+                "name": "Segafredo",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81027,19 +84451,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Perkins": {
+            "amenity/cafe/Coffee Time": {
                 "tags": {
-                    "name": "Perkins",
-                    "amenity": "restaurant"
+                    "name": "Coffee Time",
+                    "amenity": "cafe"
                 },
-                "name": "Perkins",
-                "icon": "restaurant",
+                "name": "Coffee Time",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81047,19 +84472,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Pizza Express": {
+            "amenity/cafe/Cafe Coffee Day": {
                 "tags": {
-                    "name": "Pizza Express",
-                    "amenity": "restaurant"
+                    "name": "Cafe Coffee Day",
+                    "amenity": "cafe"
                 },
-                "name": "Pizza Express",
-                "icon": "restaurant",
+                "name": "Cafe Coffee Day",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81067,19 +84493,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Pizza Hut": {
+            "amenity/cafe/Eiscafe Venezia": {
                 "tags": {
-                    "name": "Pizza Hut",
-                    "amenity": "restaurant"
+                    "name": "Eiscafe Venezia",
+                    "amenity": "cafe"
                 },
-                "name": "Pizza Hut",
-                "icon": "restaurant",
+                "name": "Eiscafe Venezia",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81087,19 +84514,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Poseidon": {
+            "amenity/cafe/スターバックス": {
                 "tags": {
-                    "name": "Poseidon",
-                    "amenity": "restaurant"
+                    "name": "スターバックス",
+                    "name:en": "Starbucks",
+                    "amenity": "cafe"
                 },
-                "name": "Poseidon",
-                "icon": "restaurant",
+                "name": "スターバックス",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81107,19 +84536,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Prezzo": {
+            "amenity/cafe/Шоколадница": {
                 "tags": {
-                    "name": "Prezzo",
-                    "amenity": "restaurant"
+                    "name": "Шоколадница",
+                    "amenity": "cafe"
                 },
-                "name": "Prezzo",
-                "icon": "restaurant",
+                "name": "Шоколадница",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81127,19 +84557,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Ratskeller": {
+            "amenity/cafe/Pret A Manger": {
                 "tags": {
-                    "name": "Ratskeller",
-                    "amenity": "restaurant"
+                    "name": "Pret A Manger",
+                    "amenity": "cafe"
                 },
-                "name": "Ratskeller",
-                "icon": "restaurant",
+                "name": "Pret A Manger",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81147,19 +84578,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Red Lobster": {
+            "amenity/cafe/Столовая": {
                 "tags": {
-                    "name": "Red Lobster",
-                    "amenity": "restaurant"
+                    "name": "Столовая",
+                    "amenity": "cafe"
                 },
-                "name": "Red Lobster",
-                "icon": "restaurant",
+                "name": "Столовая",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81167,19 +84599,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Red Robin": {
+            "amenity/cafe/ドトール": {
                 "tags": {
-                    "name": "Red Robin",
-                    "amenity": "restaurant"
+                    "name": "ドトール",
+                    "name:en": "DOUTOR",
+                    "amenity": "cafe"
                 },
-                "name": "Red Robin",
-                "icon": "restaurant",
+                "name": "ドトール",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81187,19 +84621,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Rhodos": {
+            "amenity/cafe/Tchibo": {
                 "tags": {
-                    "name": "Rhodos",
-                    "amenity": "restaurant"
+                    "name": "Tchibo",
+                    "amenity": "cafe"
                 },
-                "name": "Rhodos",
-                "icon": "restaurant",
+                "name": "Tchibo",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81207,19 +84642,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Roma": {
+            "amenity/cafe/Кофе Хауз": {
                 "tags": {
-                    "name": "Roma",
-                    "amenity": "restaurant"
+                    "name": "Кофе Хауз",
+                    "amenity": "cafe"
                 },
-                "name": "Roma",
-                "icon": "restaurant",
+                "name": "Кофе Хауз",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81227,19 +84663,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Ruby Tuesday": {
+            "amenity/cafe/Caribou Coffee": {
                 "tags": {
-                    "name": "Ruby Tuesday",
-                    "amenity": "restaurant"
+                    "name": "Caribou Coffee",
+                    "amenity": "cafe"
                 },
-                "name": "Ruby Tuesday",
-                "icon": "restaurant",
+                "name": "Caribou Coffee",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81247,19 +84684,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Rössli": {
+            "amenity/cafe/Уют": {
                 "tags": {
-                    "name": "Rössli",
-                    "amenity": "restaurant"
+                    "name": "Уют",
+                    "amenity": "cafe"
                 },
-                "name": "Rössli",
-                "icon": "restaurant",
+                "name": "Уют",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81267,19 +84705,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sakura": {
+            "amenity/cafe/Шашлычная": {
                 "tags": {
-                    "name": "Sakura",
-                    "amenity": "restaurant"
+                    "name": "Шашлычная",
+                    "amenity": "cafe"
                 },
-                "name": "Sakura",
-                "icon": "restaurant",
+                "name": "Шашлычная",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81287,19 +84726,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/San Marco": {
+            "amenity/cafe/คาเฟ่ อเมซอน": {
                 "tags": {
-                    "name": "San Marco",
-                    "amenity": "restaurant"
+                    "name": "คาเฟ่ อเมซอน",
+                    "amenity": "cafe"
                 },
-                "name": "San Marco",
-                "icon": "restaurant",
+                "name": "คาเฟ่ อเมซอน",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81307,19 +84747,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Schwarzer Adler": {
+            "amenity/cafe/Traveler's Coffee": {
                 "tags": {
-                    "name": "Schwarzer Adler",
-                    "amenity": "restaurant"
+                    "name": "Traveler's Coffee",
+                    "amenity": "cafe"
                 },
-                "name": "Schwarzer Adler",
-                "icon": "restaurant",
+                "name": "Traveler's Coffee",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81327,19 +84768,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Schützenhaus": {
+            "amenity/cafe/カフェ・ド・クリエ": {
                 "tags": {
-                    "name": "Schützenhaus",
-                    "amenity": "restaurant"
+                    "name": "カフェ・ド・クリエ",
+                    "name:en": "Cafe de CRIE",
+                    "amenity": "cafe"
                 },
-                "name": "Schützenhaus",
-                "icon": "restaurant",
+                "name": "カフェ・ド・クリエ",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81347,19 +84790,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Seeblick": {
+            "amenity/cafe/Cafe Amazon": {
                 "tags": {
-                    "name": "Seeblick",
-                    "amenity": "restaurant"
+                    "name": "Cafe Amazon",
+                    "amenity": "cafe"
                 },
-                "name": "Seeblick",
-                "icon": "restaurant",
+                "name": "Cafe Amazon",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81367,4306 +84811,4294 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Shanghai": {
+            "shop/supermarket/Budgens": {
                 "tags": {
-                    "name": "Shanghai",
-                    "amenity": "restaurant"
+                    "name": "Budgens",
+                    "shop": "supermarket"
                 },
-                "name": "Shanghai",
-                "icon": "restaurant",
+                "name": "Budgens",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Shari's": {
+            "shop/supermarket/Interspar": {
                 "tags": {
-                    "name": "Shari's",
-                    "amenity": "restaurant"
+                    "name": "Interspar",
+                    "shop": "supermarket"
                 },
-                "name": "Shari's",
-                "icon": "restaurant",
+                "name": "Interspar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sonne": {
+            "shop/supermarket/Merkur": {
                 "tags": {
-                    "name": "Sonne",
-                    "amenity": "restaurant"
+                    "name": "Merkur",
+                    "shop": "supermarket"
                 },
-                "name": "Sonne",
-                "icon": "restaurant",
+                "name": "Merkur",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sportheim": {
+            "shop/supermarket/Lidl": {
                 "tags": {
-                    "name": "Sportheim",
-                    "amenity": "restaurant"
+                    "name": "Lidl",
+                    "shop": "supermarket"
                 },
-                "name": "Sportheim",
-                "icon": "restaurant",
+                "name": "Lidl",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Spur": {
+            "shop/supermarket/EDEKA": {
                 "tags": {
-                    "name": "Spur",
-                    "amenity": "restaurant"
+                    "name": "EDEKA",
+                    "shop": "supermarket"
                 },
-                "name": "Spur",
-                "icon": "restaurant",
+                "name": "EDEKA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sternen": {
+            "shop/supermarket/Coles": {
                 "tags": {
-                    "name": "Sternen",
-                    "amenity": "restaurant"
+                    "name": "Coles",
+                    "shop": "supermarket"
                 },
-                "name": "Sternen",
-                "icon": "restaurant",
+                "name": "Coles",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Swiss Chalet": {
+            "shop/supermarket/Iceland": {
                 "tags": {
-                    "name": "Swiss Chalet",
-                    "amenity": "restaurant"
+                    "name": "Iceland",
+                    "shop": "supermarket"
                 },
-                "name": "Swiss Chalet",
-                "icon": "restaurant",
+                "name": "Iceland",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/TGI Friday's": {
+            "shop/supermarket/Woolworths": {
                 "tags": {
-                    "name": "TGI Friday's",
-                    "amenity": "restaurant"
+                    "name": "Woolworths",
+                    "shop": "supermarket"
                 },
-                "name": "TGI Friday's",
-                "icon": "restaurant",
+                "name": "Woolworths",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Taj Mahal": {
+            "shop/supermarket/Zielpunkt": {
                 "tags": {
-                    "name": "Taj Mahal",
-                    "amenity": "restaurant"
+                    "name": "Zielpunkt",
+                    "shop": "supermarket"
                 },
-                "name": "Taj Mahal",
-                "icon": "restaurant",
+                "name": "Zielpunkt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Texas Roadhouse": {
+            "shop/supermarket/Nahkauf": {
                 "tags": {
-                    "name": "Texas Roadhouse",
-                    "amenity": "restaurant"
+                    "name": "Nahkauf",
+                    "shop": "supermarket"
                 },
-                "name": "Texas Roadhouse",
-                "icon": "restaurant",
+                "name": "Nahkauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/The Keg": {
+            "shop/supermarket/Billa": {
                 "tags": {
-                    "name": "The Keg",
-                    "amenity": "restaurant"
+                    "name": "Billa",
+                    "shop": "supermarket"
                 },
-                "name": "The Keg",
-                "icon": "restaurant",
+                "name": "Billa",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Traube": {
+            "shop/supermarket/Kaufland": {
                 "tags": {
-                    "name": "Traube",
-                    "amenity": "restaurant"
+                    "name": "Kaufland",
+                    "shop": "supermarket"
                 },
-                "name": "Traube",
-                "icon": "restaurant",
+                "name": "Kaufland",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Vapiano": {
+            "shop/supermarket/Plus": {
                 "tags": {
-                    "name": "Vapiano",
-                    "amenity": "restaurant"
+                    "name": "Plus",
+                    "shop": "supermarket"
                 },
-                "name": "Vapiano",
-                "icon": "restaurant",
+                "name": "Plus",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Village Inn": {
+            "shop/supermarket/ALDI": {
                 "tags": {
-                    "name": "Village Inn",
-                    "amenity": "restaurant"
+                    "name": "ALDI",
+                    "shop": "supermarket"
                 },
-                "name": "Village Inn",
-                "icon": "restaurant",
+                "name": "ALDI",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Vips": {
+            "shop/supermarket/Checkers": {
                 "tags": {
-                    "name": "Vips",
-                    "amenity": "restaurant"
+                    "name": "Checkers",
+                    "shop": "supermarket"
                 },
-                "name": "Vips",
-                "icon": "restaurant",
+                "name": "Checkers",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Waffle House": {
+            "shop/supermarket/Tesco Metro": {
                 "tags": {
-                    "name": "Waffle House",
-                    "amenity": "restaurant"
+                    "name": "Tesco Metro",
+                    "shop": "supermarket"
                 },
-                "name": "Waffle House",
-                "icon": "restaurant",
+                "name": "Tesco Metro",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Wagamama": {
+            "shop/supermarket/NP": {
                 "tags": {
-                    "name": "Wagamama",
-                    "amenity": "restaurant"
+                    "name": "NP",
+                    "shop": "supermarket"
                 },
-                "name": "Wagamama",
-                "icon": "restaurant",
+                "name": "NP",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Waldschänke": {
+            "shop/supermarket/Penny": {
                 "tags": {
-                    "name": "Waldschänke",
-                    "amenity": "restaurant"
+                    "name": "Penny",
+                    "shop": "supermarket"
                 },
-                "name": "Waldschänke",
-                "icon": "restaurant",
+                "name": "Penny",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zizzi": {
+            "shop/supermarket/Norma": {
                 "tags": {
-                    "name": "Zizzi",
-                    "amenity": "restaurant"
+                    "name": "Norma",
+                    "shop": "supermarket"
                 },
-                "name": "Zizzi",
-                "icon": "restaurant",
+                "name": "Norma",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zum Löwen": {
+            "shop/supermarket/Asda": {
                 "tags": {
-                    "name": "Zum Löwen",
-                    "amenity": "restaurant"
+                    "name": "Asda",
+                    "shop": "supermarket"
                 },
-                "name": "Zum Löwen",
-                "icon": "restaurant",
+                "name": "Asda",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Krone": {
+            "shop/supermarket/Netto": {
                 "tags": {
-                    "name": "Zur Krone",
-                    "amenity": "restaurant"
+                    "name": "Netto",
+                    "shop": "supermarket"
                 },
-                "name": "Zur Krone",
-                "icon": "restaurant",
+                "name": "Netto",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Linde": {
+            "shop/supermarket/REWE": {
                 "tags": {
-                    "name": "Zur Linde",
-                    "amenity": "restaurant"
+                    "name": "REWE",
+                    "shop": "supermarket"
                 },
-                "name": "Zur Linde",
-                "icon": "restaurant",
+                "name": "REWE",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Post": {
+            "shop/supermarket/Rewe": {
                 "tags": {
-                    "name": "Zur Post",
-                    "amenity": "restaurant"
+                    "name": "Rewe",
+                    "shop": "supermarket"
                 },
-                "name": "Zur Post",
-                "icon": "restaurant",
+                "name": "Rewe",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Sonne": {
+            "shop/supermarket/Aldi Süd": {
                 "tags": {
-                    "name": "Zur Sonne",
-                    "amenity": "restaurant"
+                    "name": "Aldi Süd",
+                    "shop": "supermarket"
                 },
-                "name": "Zur Sonne",
-                "icon": "restaurant",
+                "name": "Aldi Süd",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Евразия": {
+            "shop/supermarket/Real": {
                 "tags": {
-                    "name": "Евразия",
-                    "amenity": "restaurant"
+                    "name": "Real",
+                    "shop": "supermarket"
                 },
-                "name": "Евразия",
-                "icon": "restaurant",
+                "name": "Real",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Якитория": {
+            "shop/supermarket/Tesco Express": {
                 "tags": {
-                    "name": "Якитория",
-                    "amenity": "restaurant"
+                    "name": "Tesco Express",
+                    "shop": "supermarket"
                 },
-                "name": "Якитория",
-                "icon": "restaurant",
+                "name": "Tesco Express",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/ガスト": {
+            "shop/supermarket/King Soopers": {
                 "tags": {
-                    "name": "ガスト",
-                    "name:en": "Gusto",
-                    "amenity": "restaurant"
+                    "name": "King Soopers",
+                    "shop": "supermarket"
                 },
-                "name": "ガスト",
-                "icon": "restaurant",
+                "name": "King Soopers",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/サイゼリヤ": {
+            "shop/supermarket/Kiwi": {
                 "tags": {
-                    "name": "サイゼリヤ",
-                    "amenity": "restaurant"
+                    "name": "Kiwi",
+                    "shop": "supermarket"
                 },
-                "name": "サイゼリヤ",
-                "icon": "restaurant",
+                "name": "Kiwi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/ジョナサン": {
+            "shop/supermarket/Edeka": {
                 "tags": {
-                    "name": "ジョナサン",
-                    "amenity": "restaurant"
+                    "name": "Edeka",
+                    "shop": "supermarket"
                 },
-                "name": "ジョナサン",
-                "icon": "restaurant",
+                "name": "Edeka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/デニーズ": {
+            "shop/supermarket/Pick n Pay": {
                 "tags": {
-                    "name": "デニーズ",
-                    "amenity": "restaurant"
+                    "name": "Pick n Pay",
+                    "shop": "supermarket"
                 },
-                "name": "デニーズ",
-                "icon": "restaurant",
+                "name": "Pick n Pay",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/바다횟집 (Bada Fish Restaurant)": {
+            "shop/supermarket/ICA": {
                 "tags": {
-                    "name": "바다횟집 (Bada Fish Restaurant)",
-                    "amenity": "restaurant"
+                    "name": "ICA",
+                    "shop": "supermarket"
                 },
-                "name": "바다횟집 (Bada Fish Restaurant)",
-                "icon": "restaurant",
+                "name": "ICA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Alko": {
+            "shop/supermarket/Tengelmann": {
                 "tags": {
-                    "name": "Alko",
-                    "shop": "alcohol"
+                    "name": "Tengelmann",
+                    "shop": "supermarket"
                 },
-                "name": "Alko",
-                "icon": "alcohol-shop",
+                "name": "Tengelmann",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/BWS": {
+            "shop/supermarket/Waitrose": {
                 "tags": {
-                    "name": "BWS",
-                    "shop": "alcohol"
+                    "name": "Waitrose",
+                    "shop": "supermarket"
                 },
-                "name": "BWS",
-                "icon": "alcohol-shop",
+                "name": "Waitrose",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Bargain Booze": {
+            "shop/supermarket/Spar": {
                 "tags": {
-                    "name": "Bargain Booze",
-                    "shop": "alcohol"
+                    "name": "Spar",
+                    "shop": "supermarket"
                 },
-                "name": "Bargain Booze",
-                "icon": "alcohol-shop",
+                "name": "Spar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Botilleria": {
+            "shop/supermarket/Hofer": {
                 "tags": {
-                    "name": "Botilleria",
-                    "shop": "alcohol"
+                    "name": "Hofer",
+                    "shop": "supermarket"
                 },
-                "name": "Botilleria",
-                "icon": "alcohol-shop",
+                "name": "Hofer",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Gall & Gall": {
+            "shop/supermarket/M-Preis": {
                 "tags": {
-                    "name": "Gall & Gall",
-                    "shop": "alcohol"
+                    "name": "M-Preis",
+                    "shop": "supermarket"
                 },
-                "name": "Gall & Gall",
-                "icon": "alcohol-shop",
+                "name": "M-Preis",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/LCBO": {
+            "shop/supermarket/LIDL": {
                 "tags": {
-                    "name": "LCBO",
-                    "shop": "alcohol"
+                    "name": "LIDL",
+                    "shop": "supermarket"
                 },
-                "name": "LCBO",
-                "icon": "alcohol-shop",
+                "name": "LIDL",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Nicolas": {
+            "shop/supermarket/tegut": {
                 "tags": {
-                    "name": "Nicolas",
-                    "shop": "alcohol"
+                    "name": "tegut",
+                    "shop": "supermarket"
                 },
-                "name": "Nicolas",
-                "icon": "alcohol-shop",
+                "name": "tegut",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/SAQ": {
+            "shop/supermarket/Sainsbury's Local": {
                 "tags": {
-                    "name": "SAQ",
-                    "shop": "alcohol"
+                    "name": "Sainsbury's Local",
+                    "shop": "supermarket"
                 },
-                "name": "SAQ",
-                "icon": "alcohol-shop",
+                "name": "Sainsbury's Local",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Systembolaget": {
+            "shop/supermarket/E-Center": {
                 "tags": {
-                    "name": "Systembolaget",
-                    "shop": "alcohol"
+                    "name": "E-Center",
+                    "shop": "supermarket"
                 },
-                "name": "Systembolaget",
-                "icon": "alcohol-shop",
+                "name": "E-Center",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/The Beer Store": {
+            "shop/supermarket/Aldi Nord": {
                 "tags": {
-                    "name": "The Beer Store",
-                    "shop": "alcohol"
+                    "name": "Aldi Nord",
+                    "shop": "supermarket"
                 },
-                "name": "The Beer Store",
-                "icon": "alcohol-shop",
+                "name": "Aldi Nord",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Ароматный мир": {
+            "shop/supermarket/nahkauf": {
                 "tags": {
-                    "name": "Ароматный мир",
-                    "shop": "alcohol"
+                    "name": "nahkauf",
+                    "shop": "supermarket"
                 },
-                "name": "Ароматный мир",
-                "icon": "alcohol-shop",
+                "name": "nahkauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Живое пиво": {
+            "shop/supermarket/Meijer": {
                 "tags": {
-                    "name": "Живое пиво",
-                    "shop": "alcohol"
+                    "name": "Meijer",
+                    "shop": "supermarket"
                 },
-                "name": "Живое пиво",
-                "icon": "alcohol-shop",
+                "name": "Meijer",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Anker": {
+            "shop/supermarket/Safeway": {
                 "tags": {
-                    "name": "Anker",
-                    "shop": "bakery"
+                    "name": "Safeway",
+                    "shop": "supermarket"
                 },
-                "name": "Anker",
-                "icon": "bakery",
+                "name": "Safeway",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Backwerk": {
+            "shop/supermarket/Costco": {
                 "tags": {
-                    "name": "Backwerk",
-                    "shop": "bakery"
+                    "name": "Costco",
+                    "shop": "supermarket"
                 },
-                "name": "Backwerk",
-                "icon": "bakery",
+                "name": "Costco",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Boulangerie": {
+            "shop/supermarket/Albert": {
                 "tags": {
-                    "name": "Boulangerie",
-                    "shop": "bakery"
+                    "name": "Albert",
+                    "shop": "supermarket"
                 },
-                "name": "Boulangerie",
-                "icon": "bakery",
+                "name": "Albert",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Boulangerie Patisserie": {
+            "shop/supermarket/Jumbo": {
                 "tags": {
-                    "name": "Boulangerie Patisserie",
-                    "shop": "bakery"
+                    "name": "Jumbo",
+                    "shop": "supermarket"
                 },
-                "name": "Boulangerie Patisserie",
-                "icon": "bakery",
+                "name": "Jumbo",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Bäcker": {
+            "shop/supermarket/Shoprite": {
                 "tags": {
-                    "name": "Bäcker",
-                    "shop": "bakery"
+                    "name": "Shoprite",
+                    "shop": "supermarket"
                 },
-                "name": "Bäcker",
-                "icon": "bakery",
+                "name": "Shoprite",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Bäckerei": {
+            "shop/supermarket/MPreis": {
                 "tags": {
-                    "name": "Bäckerei",
-                    "shop": "bakery"
+                    "name": "MPreis",
+                    "shop": "supermarket"
                 },
-                "name": "Bäckerei",
-                "icon": "bakery",
+                "name": "MPreis",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Bäckerei Schmidt": {
+            "shop/supermarket/Penny Market": {
                 "tags": {
-                    "name": "Bäckerei Schmidt",
-                    "shop": "bakery"
+                    "name": "Penny Market",
+                    "shop": "supermarket"
                 },
-                "name": "Bäckerei Schmidt",
-                "icon": "bakery",
+                "name": "Penny Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Dat Backhus": {
+            "shop/supermarket/Tesco Extra": {
                 "tags": {
-                    "name": "Dat Backhus",
-                    "shop": "bakery"
+                    "name": "Tesco Extra",
+                    "shop": "supermarket"
                 },
-                "name": "Dat Backhus",
-                "icon": "bakery",
+                "name": "Tesco Extra",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Der Beck": {
+            "shop/supermarket/Albert Heijn": {
                 "tags": {
-                    "name": "Der Beck",
-                    "shop": "bakery"
+                    "name": "Albert Heijn",
+                    "shop": "supermarket"
                 },
-                "name": "Der Beck",
-                "icon": "bakery",
+                "name": "Albert Heijn",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Goeken backen": {
+            "shop/supermarket/IGA": {
                 "tags": {
-                    "name": "Goeken backen",
-                    "shop": "bakery"
+                    "name": "IGA",
+                    "shop": "supermarket"
                 },
-                "name": "Goeken backen",
-                "icon": "bakery",
+                "name": "IGA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Goldilocks": {
+            "shop/supermarket/Metro": {
                 "tags": {
-                    "name": "Goldilocks",
-                    "shop": "bakery"
+                    "name": "Metro",
+                    "shop": "supermarket"
                 },
-                "name": "Goldilocks",
-                "icon": "bakery",
+                "name": "Metro",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Greggs": {
+            "shop/supermarket/Neukauf": {
                 "tags": {
-                    "name": "Greggs",
-                    "shop": "bakery"
+                    "name": "Neukauf",
+                    "shop": "supermarket"
                 },
-                "name": "Greggs",
-                "icon": "bakery",
+                "name": "Neukauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Hofpfisterei": {
+            "shop/supermarket/Migros": {
                 "tags": {
-                    "name": "Hofpfisterei",
-                    "shop": "bakery"
+                    "name": "Migros",
+                    "shop": "supermarket"
                 },
-                "name": "Hofpfisterei",
-                "icon": "bakery",
+                "name": "Migros",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Ihle": {
+            "shop/supermarket/Marktkauf": {
                 "tags": {
-                    "name": "Ihle",
-                    "shop": "bakery"
+                    "name": "Marktkauf",
+                    "shop": "supermarket"
                 },
-                "name": "Ihle",
-                "icon": "bakery",
+                "name": "Marktkauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/K&U": {
+            "shop/supermarket/Delikatesy Centrum": {
                 "tags": {
-                    "name": "K&U",
-                    "shop": "bakery"
+                    "name": "Delikatesy Centrum",
+                    "shop": "supermarket"
                 },
-                "name": "K&U",
-                "icon": "bakery",
+                "name": "Delikatesy Centrum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Kamps": {
+            "shop/supermarket/C1000": {
                 "tags": {
-                    "name": "Kamps",
-                    "shop": "bakery"
+                    "name": "C1000",
+                    "shop": "supermarket"
                 },
-                "name": "Kamps",
-                "icon": "bakery",
+                "name": "C1000",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Oebel": {
+            "shop/supermarket/Hoogvliet": {
                 "tags": {
-                    "name": "Oebel",
-                    "shop": "bakery"
+                    "name": "Hoogvliet",
+                    "shop": "supermarket"
                 },
-                "name": "Oebel",
-                "icon": "bakery",
+                "name": "Hoogvliet",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Panaderia": {
+            "shop/supermarket/COOP": {
                 "tags": {
-                    "name": "Panaderia",
-                    "shop": "bakery"
+                    "name": "COOP",
+                    "shop": "supermarket"
                 },
-                "name": "Panaderia",
-                "icon": "bakery",
+                "name": "COOP",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Panificio": {
+            "shop/supermarket/Food Basics": {
                 "tags": {
-                    "name": "Panificio",
-                    "shop": "bakery"
+                    "name": "Food Basics",
+                    "shop": "supermarket"
                 },
-                "name": "Panificio",
-                "icon": "bakery",
+                "name": "Food Basics",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Paul": {
+            "shop/supermarket/Casino": {
                 "tags": {
-                    "name": "Paul",
-                    "shop": "bakery"
+                    "name": "Casino",
+                    "shop": "supermarket"
                 },
-                "name": "Paul",
-                "icon": "bakery",
+                "name": "Casino",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Piekarnia": {
+            "shop/supermarket/Penny Markt": {
                 "tags": {
-                    "name": "Piekarnia",
-                    "shop": "bakery"
+                    "name": "Penny Markt",
+                    "shop": "supermarket"
                 },
-                "name": "Piekarnia",
-                "icon": "bakery",
+                "name": "Penny Markt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Stadtbäckerei": {
+            "shop/supermarket/Giant": {
                 "tags": {
-                    "name": "Stadtbäckerei",
-                    "shop": "bakery"
+                    "name": "Giant",
+                    "shop": "supermarket"
                 },
-                "name": "Stadtbäckerei",
-                "icon": "bakery",
+                "name": "Giant",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Stadtbäckerei Junge": {
+            "shop/supermarket/COOP Jednota": {
                 "tags": {
-                    "name": "Stadtbäckerei Junge",
-                    "shop": "bakery"
+                    "name": "COOP Jednota",
+                    "shop": "supermarket"
                 },
-                "name": "Stadtbäckerei Junge",
-                "icon": "bakery",
+                "name": "COOP Jednota",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Steinecke": {
+            "shop/supermarket/Rema 1000": {
                 "tags": {
-                    "name": "Steinecke",
-                    "shop": "bakery"
+                    "name": "Rema 1000",
+                    "shop": "supermarket"
                 },
-                "name": "Steinecke",
-                "icon": "bakery",
+                "name": "Rema 1000",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Thürmann": {
+            "shop/supermarket/Kaufpark": {
                 "tags": {
-                    "name": "Thürmann",
-                    "shop": "bakery"
+                    "name": "Kaufpark",
+                    "shop": "supermarket"
                 },
-                "name": "Thürmann",
-                "icon": "bakery",
+                "name": "Kaufpark",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Хлеб": {
+            "shop/supermarket/ALDI SÜD": {
                 "tags": {
-                    "name": "Хлеб",
-                    "shop": "bakery"
+                    "name": "ALDI SÜD",
+                    "shop": "supermarket"
                 },
-                "name": "Хлеб",
-                "icon": "bakery",
+                "name": "ALDI SÜD",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/books/Barnes & Noble": {
+            "shop/supermarket/Simply Market": {
                 "tags": {
-                    "name": "Barnes & Noble",
-                    "shop": "books"
+                    "name": "Simply Market",
+                    "shop": "supermarket"
                 },
-                "name": "Barnes & Noble",
-                "icon": "shop",
+                "name": "Simply Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/books/Bruna": {
+            "shop/supermarket/Konzum": {
                 "tags": {
-                    "name": "Bruna",
-                    "shop": "books"
+                    "name": "Konzum",
+                    "shop": "supermarket"
                 },
-                "name": "Bruna",
-                "icon": "shop",
+                "name": "Konzum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/books/Libro": {
+            "shop/supermarket/Carrefour Express": {
                 "tags": {
-                    "name": "Libro",
-                    "shop": "books"
+                    "name": "Carrefour Express",
+                    "shop": "supermarket"
                 },
-                "name": "Libro",
-                "icon": "shop",
+                "name": "Carrefour Express",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/books/Thalia": {
+            "shop/supermarket/Eurospar": {
                 "tags": {
-                    "name": "Thalia",
-                    "shop": "books"
+                    "name": "Eurospar",
+                    "shop": "supermarket"
                 },
-                "name": "Thalia",
-                "icon": "shop",
+                "name": "Eurospar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/books/Waterstones": {
+            "shop/supermarket/Mercator": {
                 "tags": {
-                    "name": "Waterstones",
-                    "shop": "books"
+                    "name": "Mercator",
+                    "shop": "supermarket"
                 },
-                "name": "Waterstones",
-                "icon": "shop",
+                "name": "Mercator",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/books/Weltbild": {
+            "shop/supermarket/Mercadona": {
                 "tags": {
-                    "name": "Weltbild",
-                    "shop": "books"
+                    "name": "Mercadona",
+                    "shop": "supermarket"
                 },
-                "name": "Weltbild",
-                "icon": "shop",
+                "name": "Mercadona",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/books/Книги": {
+            "shop/supermarket/Famila": {
                 "tags": {
-                    "name": "Книги",
-                    "shop": "books"
+                    "name": "Famila",
+                    "shop": "supermarket"
                 },
-                "name": "Книги",
-                "icon": "shop",
+                "name": "Famila",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/ATU": {
+            "shop/supermarket/Hemköp": {
                 "tags": {
-                    "name": "ATU",
-                    "shop": "car_repair"
+                    "name": "Hemköp",
+                    "shop": "supermarket"
                 },
-                "name": "ATU",
-                "icon": "shop",
+                "name": "Hemköp",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/AutoZone": {
+            "shop/supermarket/real,-": {
                 "tags": {
-                    "name": "AutoZone",
-                    "shop": "car_repair"
+                    "name": "real,-",
+                    "shop": "supermarket"
                 },
-                "name": "AutoZone",
-                "icon": "shop",
+                "name": "real,-",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Carglass": {
+            "shop/supermarket/Markant": {
                 "tags": {
-                    "name": "Carglass",
-                    "shop": "car_repair"
+                    "name": "Markant",
+                    "shop": "supermarket"
                 },
-                "name": "Carglass",
-                "icon": "shop",
+                "name": "Markant",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Euromaster": {
+            "shop/supermarket/Volg": {
                 "tags": {
-                    "name": "Euromaster",
-                    "shop": "car_repair"
+                    "name": "Volg",
+                    "shop": "supermarket"
                 },
-                "name": "Euromaster",
-                "icon": "shop",
+                "name": "Volg",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Feu Vert": {
+            "shop/supermarket/Leader Price": {
                 "tags": {
-                    "name": "Feu Vert",
-                    "shop": "car_repair"
+                    "name": "Leader Price",
+                    "shop": "supermarket"
                 },
-                "name": "Feu Vert",
-                "icon": "shop",
+                "name": "Leader Price",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Firestone": {
+            "shop/supermarket/Treff 3000": {
                 "tags": {
-                    "name": "Firestone",
-                    "shop": "car_repair"
+                    "name": "Treff 3000",
+                    "shop": "supermarket"
                 },
-                "name": "Firestone",
-                "icon": "shop",
+                "name": "Treff 3000",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Jiffy Lube": {
+            "shop/supermarket/SuperBrugsen": {
                 "tags": {
-                    "name": "Jiffy Lube",
-                    "shop": "car_repair"
+                    "name": "SuperBrugsen",
+                    "shop": "supermarket"
                 },
-                "name": "Jiffy Lube",
-                "icon": "shop",
+                "name": "SuperBrugsen",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Kwik Fit": {
+            "shop/supermarket/Kaiser's": {
                 "tags": {
-                    "name": "Kwik Fit",
-                    "shop": "car_repair"
+                    "name": "Kaiser's",
+                    "shop": "supermarket"
                 },
-                "name": "Kwik Fit",
-                "icon": "shop",
+                "name": "Kaiser's",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Midas": {
+            "shop/supermarket/K+K": {
                 "tags": {
-                    "name": "Midas",
-                    "shop": "car_repair"
+                    "name": "K+K",
+                    "shop": "supermarket"
                 },
-                "name": "Midas",
-                "icon": "shop",
+                "name": "K+K",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Norauto": {
+            "shop/supermarket/Unimarkt": {
                 "tags": {
-                    "name": "Norauto",
-                    "shop": "car_repair"
+                    "name": "Unimarkt",
+                    "shop": "supermarket"
                 },
-                "name": "Norauto",
-                "icon": "shop",
+                "name": "Unimarkt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/O'Reilly Auto Parts": {
+            "shop/supermarket/Sobeys": {
                 "tags": {
-                    "name": "O'Reilly Auto Parts",
-                    "shop": "car_repair"
+                    "name": "Sobeys",
+                    "shop": "supermarket"
                 },
-                "name": "O'Reilly Auto Parts",
-                "icon": "shop",
+                "name": "Sobeys",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Peugeot": {
+            "shop/supermarket/S-Market": {
                 "tags": {
-                    "name": "Peugeot",
-                    "shop": "car_repair"
+                    "name": "S-Market",
+                    "shop": "supermarket"
                 },
-                "name": "Peugeot",
-                "icon": "shop",
+                "name": "S-Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Pit Stop": {
+            "shop/supermarket/Combi": {
                 "tags": {
-                    "name": "Pit Stop",
-                    "shop": "car_repair"
+                    "name": "Combi",
+                    "shop": "supermarket"
                 },
-                "name": "Pit Stop",
-                "icon": "shop",
+                "name": "Combi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Renault": {
+            "shop/supermarket/Denner": {
                 "tags": {
-                    "name": "Renault",
-                    "shop": "car_repair"
+                    "name": "Denner",
+                    "shop": "supermarket"
                 },
-                "name": "Renault",
-                "icon": "shop",
+                "name": "Denner",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Roady": {
+            "shop/supermarket/Konsum": {
                 "tags": {
-                    "name": "Roady",
-                    "shop": "car_repair"
+                    "name": "Konsum",
+                    "shop": "supermarket"
                 },
-                "name": "Roady",
-                "icon": "shop",
+                "name": "Konsum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Speedy": {
+            "shop/supermarket/Franprix": {
                 "tags": {
-                    "name": "Speedy",
-                    "shop": "car_repair"
+                    "name": "Franprix",
+                    "shop": "supermarket"
                 },
-                "name": "Speedy",
-                "icon": "shop",
+                "name": "Franprix",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/ÖAMTC": {
+            "shop/supermarket/Monoprix": {
                 "tags": {
-                    "name": "ÖAMTC",
-                    "shop": "car_repair"
+                    "name": "Monoprix",
+                    "shop": "supermarket"
                 },
-                "name": "ÖAMTC",
-                "icon": "shop",
+                "name": "Monoprix",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Автозапчасти": {
+            "shop/supermarket/Diska": {
                 "tags": {
-                    "name": "Автозапчасти",
-                    "shop": "car_repair"
+                    "name": "Diska",
+                    "shop": "supermarket"
                 },
-                "name": "Автозапчасти",
-                "icon": "shop",
+                "name": "Diska",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Автосервис": {
+            "shop/supermarket/PENNY": {
                 "tags": {
-                    "name": "Автосервис",
-                    "shop": "car_repair"
+                    "name": "PENNY",
+                    "shop": "supermarket"
                 },
-                "name": "Автосервис",
-                "icon": "shop",
+                "name": "PENNY",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/СТО": {
+            "shop/supermarket/Dia": {
                 "tags": {
-                    "name": "СТО",
-                    "shop": "car_repair"
+                    "name": "Dia",
+                    "shop": "supermarket"
                 },
-                "name": "СТО",
-                "icon": "shop",
+                "name": "Dia",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Шиномонтаж": {
+            "shop/supermarket/Giant Eagle": {
                 "tags": {
-                    "name": "Шиномонтаж",
-                    "shop": "car_repair"
+                    "name": "Giant Eagle",
+                    "shop": "supermarket"
                 },
-                "name": "Шиномонтаж",
-                "icon": "shop",
+                "name": "Giant Eagle",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Audi": {
+            "shop/supermarket/NORMA": {
                 "tags": {
-                    "name": "Audi",
-                    "shop": "car"
+                    "name": "NORMA",
+                    "shop": "supermarket"
                 },
-                "name": "Audi",
-                "icon": "car",
+                "name": "NORMA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/BMW": {
+            "shop/supermarket/AD Delhaize": {
                 "tags": {
-                    "name": "BMW",
-                    "shop": "car"
+                    "name": "AD Delhaize",
+                    "shop": "supermarket"
                 },
-                "name": "BMW",
-                "icon": "car",
+                "name": "AD Delhaize",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Chevrolet": {
+            "shop/supermarket/Consum": {
                 "tags": {
-                    "name": "Chevrolet",
-                    "shop": "car"
+                    "name": "Consum",
+                    "shop": "supermarket"
                 },
-                "name": "Chevrolet",
-                "icon": "car",
+                "name": "Consum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Citroen": {
+            "shop/supermarket/Carrefour Market": {
                 "tags": {
-                    "name": "Citroen",
-                    "shop": "car"
+                    "name": "Carrefour Market",
+                    "shop": "supermarket"
                 },
-                "name": "Citroen",
-                "icon": "car",
+                "name": "Carrefour Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Fiat": {
+            "shop/supermarket/Carrefour City": {
                 "tags": {
-                    "name": "Fiat",
-                    "shop": "car"
+                    "name": "Carrefour City",
+                    "shop": "supermarket"
                 },
-                "name": "Fiat",
-                "icon": "car",
+                "name": "Carrefour City",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Ford": {
+            "shop/supermarket/Pam": {
                 "tags": {
-                    "name": "Ford",
-                    "shop": "car"
+                    "name": "Pam",
+                    "shop": "supermarket"
                 },
-                "name": "Ford",
-                "icon": "car",
+                "name": "Pam",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Honda": {
+            "shop/supermarket/Despar": {
                 "tags": {
-                    "name": "Honda",
-                    "shop": "car"
+                    "name": "Despar",
+                    "shop": "supermarket"
                 },
-                "name": "Honda",
-                "icon": "car",
+                "name": "Despar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Hyundai": {
+            "shop/supermarket/Eroski": {
                 "tags": {
-                    "name": "Hyundai",
-                    "shop": "car"
+                    "name": "Eroski",
+                    "shop": "supermarket"
                 },
-                "name": "Hyundai",
-                "icon": "car",
+                "name": "Eroski",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Mazda": {
+            "shop/supermarket/Costcutter": {
                 "tags": {
-                    "name": "Mazda",
-                    "shop": "car"
+                    "name": "Costcutter",
+                    "shop": "supermarket"
                 },
-                "name": "Mazda",
-                "icon": "car",
+                "name": "Costcutter",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Mercedes-Benz": {
+            "shop/supermarket/Maxi": {
                 "tags": {
-                    "name": "Mercedes-Benz",
-                    "shop": "car"
+                    "name": "Maxi",
+                    "shop": "supermarket"
                 },
-                "name": "Mercedes-Benz",
-                "icon": "car",
+                "name": "Maxi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Mitsubishi": {
+            "shop/supermarket/Colruyt": {
                 "tags": {
-                    "name": "Mitsubishi",
-                    "shop": "car"
+                    "name": "Colruyt",
+                    "shop": "supermarket"
                 },
-                "name": "Mitsubishi",
-                "icon": "car",
+                "name": "Colruyt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Nissan": {
+            "shop/supermarket/The Co-operative": {
                 "tags": {
-                    "name": "Nissan",
-                    "shop": "car"
+                    "name": "The Co-operative",
+                    "shop": "supermarket"
                 },
-                "name": "Nissan",
-                "icon": "car",
+                "name": "The Co-operative",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Opel": {
+            "shop/supermarket/sky": {
                 "tags": {
-                    "name": "Opel",
-                    "shop": "car"
+                    "name": "sky",
+                    "shop": "supermarket"
                 },
-                "name": "Opel",
-                "icon": "car",
+                "name": "sky",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Skoda": {
+            "shop/supermarket/Delhaize": {
                 "tags": {
-                    "name": "Skoda",
-                    "shop": "car"
+                    "name": "Delhaize",
+                    "shop": "supermarket"
                 },
-                "name": "Skoda",
-                "icon": "car",
+                "name": "Delhaize",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Suzuki": {
+            "shop/supermarket/CBA": {
                 "tags": {
-                    "name": "Suzuki",
-                    "shop": "car"
+                    "name": "CBA",
+                    "shop": "supermarket"
                 },
-                "name": "Suzuki",
-                "icon": "car",
+                "name": "CBA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Toyota": {
+            "shop/supermarket/Shopi": {
                 "tags": {
-                    "name": "Toyota",
-                    "shop": "car"
+                    "name": "Shopi",
+                    "shop": "supermarket"
                 },
-                "name": "Toyota",
-                "icon": "car",
+                "name": "Shopi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Volkswagen": {
+            "shop/supermarket/Walmart": {
                 "tags": {
-                    "name": "Volkswagen",
-                    "shop": "car"
+                    "name": "Walmart",
+                    "shop": "supermarket"
                 },
-                "name": "Volkswagen",
-                "icon": "car",
+                "name": "Walmart",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Volvo": {
+            "shop/supermarket/Kroger": {
                 "tags": {
-                    "name": "Volvo",
-                    "shop": "car"
+                    "name": "Kroger",
+                    "shop": "supermarket"
                 },
-                "name": "Volvo",
-                "icon": "car",
+                "name": "Kroger",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/car/Автомагазин": {
+            "shop/supermarket/Albertsons": {
                 "tags": {
-                    "name": "Автомагазин",
-                    "shop": "car"
+                    "name": "Albertsons",
+                    "shop": "supermarket"
                 },
-                "name": "Автомагазин",
-                "icon": "car",
+                "name": "Albertsons",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Bipa": {
+            "shop/supermarket/Trader Joe's": {
                 "tags": {
-                    "name": "Bipa",
-                    "shop": "chemist"
+                    "name": "Trader Joe's",
+                    "shop": "supermarket"
                 },
-                "name": "Bipa",
-                "icon": "shop",
+                "name": "Trader Joe's",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/dm": {
+            "shop/supermarket/Feneberg": {
                 "tags": {
-                    "name": "dm",
-                    "shop": "chemist"
+                    "name": "Feneberg",
+                    "shop": "supermarket"
                 },
-                "name": "dm",
-                "icon": "shop",
+                "name": "Feneberg",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Douglas": {
+            "shop/supermarket/dm": {
                 "tags": {
-                    "name": "Douglas",
-                    "shop": "chemist"
+                    "name": "dm",
+                    "shop": "supermarket"
                 },
-                "name": "Douglas",
-                "icon": "shop",
+                "name": "dm",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Etos": {
+            "shop/supermarket/Kvickly": {
                 "tags": {
-                    "name": "Etos",
-                    "shop": "chemist"
+                    "name": "Kvickly",
+                    "shop": "supermarket"
                 },
-                "name": "Etos",
-                "icon": "shop",
+                "name": "Kvickly",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Ihr Platz": {
+            "shop/supermarket/Makro": {
                 "tags": {
-                    "name": "Ihr Platz",
-                    "shop": "chemist"
+                    "name": "Makro",
+                    "shop": "supermarket"
                 },
-                "name": "Ihr Platz",
-                "icon": "shop",
+                "name": "Makro",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Kruidvat": {
+            "shop/supermarket/Nah & Frisch": {
                 "tags": {
-                    "name": "Kruidvat",
-                    "shop": "chemist"
+                    "name": "Nah & Frisch",
+                    "shop": "supermarket"
                 },
-                "name": "Kruidvat",
-                "icon": "shop",
+                "name": "Nah & Frisch",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Müller": {
+            "shop/supermarket/Champion": {
                 "tags": {
-                    "name": "Müller",
-                    "shop": "chemist"
+                    "name": "Champion",
+                    "shop": "supermarket"
                 },
-                "name": "Müller",
-                "icon": "shop",
+                "name": "Champion",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Rossmann": {
+            "shop/supermarket/Fakta": {
                 "tags": {
-                    "name": "Rossmann",
-                    "shop": "chemist"
+                    "name": "Fakta",
+                    "shop": "supermarket"
                 },
-                "name": "Rossmann",
-                "icon": "shop",
+                "name": "Fakta",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Schlecker": {
+            "shop/supermarket/Магнит": {
                 "tags": {
-                    "name": "Schlecker",
-                    "shop": "chemist"
+                    "name": "Магнит",
+                    "shop": "supermarket"
                 },
-                "name": "Schlecker",
-                "icon": "shop",
+                "name": "Магнит",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/AWG": {
+            "shop/supermarket/Caprabo": {
                 "tags": {
-                    "name": "AWG",
-                    "shop": "clothes"
+                    "name": "Caprabo",
+                    "shop": "supermarket"
                 },
-                "name": "AWG",
-                "icon": "clothing-store",
+                "name": "Caprabo",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ackermans": {
+            "shop/supermarket/Famiglia Cooperativa": {
                 "tags": {
-                    "name": "Ackermans",
-                    "shop": "clothes"
+                    "name": "Famiglia Cooperativa",
+                    "shop": "supermarket"
                 },
-                "name": "Ackermans",
-                "icon": "clothing-store",
+                "name": "Famiglia Cooperativa",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Adidas": {
+            "shop/supermarket/Народная 7Я семьЯ": {
                 "tags": {
-                    "name": "Adidas",
-                    "shop": "clothes"
+                    "name": "Народная 7Я семьЯ",
+                    "shop": "supermarket"
                 },
-                "name": "Adidas",
-                "icon": "clothing-store",
+                "name": "Народная 7Я семьЯ",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/American Apparel": {
+            "shop/supermarket/Esselunga": {
                 "tags": {
-                    "name": "American Apparel",
-                    "shop": "clothes"
+                    "name": "Esselunga",
+                    "shop": "supermarket"
                 },
-                "name": "American Apparel",
-                "icon": "clothing-store",
+                "name": "Esselunga",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Benetton": {
+            "shop/supermarket/Maxima": {
                 "tags": {
-                    "name": "Benetton",
-                    "shop": "clothes"
+                    "name": "Maxima",
+                    "shop": "supermarket"
                 },
-                "name": "Benetton",
-                "icon": "clothing-store",
+                "name": "Maxima",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Bonita": {
+            "shop/supermarket/Petit Casino": {
                 "tags": {
-                    "name": "Bonita",
-                    "shop": "clothes"
+                    "name": "Petit Casino",
+                    "shop": "supermarket"
                 },
-                "name": "Bonita",
-                "icon": "clothing-store",
+                "name": "Petit Casino",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/C&A": {
+            "shop/supermarket/Wasgau": {
                 "tags": {
-                    "name": "C&A",
-                    "shop": "clothes"
+                    "name": "Wasgau",
+                    "shop": "supermarket"
                 },
-                "name": "C&A",
-                "icon": "clothing-store",
+                "name": "Wasgau",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Calzedonia": {
+            "shop/supermarket/Pingo Doce": {
                 "tags": {
-                    "name": "Calzedonia",
-                    "shop": "clothes"
+                    "name": "Pingo Doce",
+                    "shop": "supermarket"
                 },
-                "name": "Calzedonia",
-                "icon": "clothing-store",
+                "name": "Pingo Doce",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Cecil": {
+            "shop/supermarket/Match": {
                 "tags": {
-                    "name": "Cecil",
-                    "shop": "clothes"
+                    "name": "Match",
+                    "shop": "supermarket"
                 },
-                "name": "Cecil",
-                "icon": "clothing-store",
+                "name": "Match",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Celio": {
+            "shop/supermarket/Profi": {
                 "tags": {
-                    "name": "Celio",
-                    "shop": "clothes"
+                    "name": "Profi",
+                    "shop": "supermarket"
                 },
-                "name": "Celio",
-                "icon": "clothing-store",
+                "name": "Profi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Charles Vögele": {
+            "shop/supermarket/Lider": {
                 "tags": {
-                    "name": "Charles Vögele",
-                    "shop": "clothes"
+                    "name": "Lider",
+                    "shop": "supermarket"
                 },
-                "name": "Charles Vögele",
-                "icon": "clothing-store",
+                "name": "Lider",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Deichmann": {
+            "shop/supermarket/Unimarc": {
                 "tags": {
-                    "name": "Deichmann",
-                    "shop": "clothes"
+                    "name": "Unimarc",
+                    "shop": "supermarket"
                 },
-                "name": "Deichmann",
-                "icon": "clothing-store",
+                "name": "Unimarc",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Dorothy Perkins": {
+            "shop/supermarket/Co-operative Food": {
                 "tags": {
-                    "name": "Dorothy Perkins",
-                    "shop": "clothes"
+                    "name": "Co-operative Food",
+                    "shop": "supermarket"
                 },
-                "name": "Dorothy Perkins",
-                "icon": "clothing-store",
+                "name": "Co-operative Food",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Edgars": {
+            "shop/supermarket/Santa Isabel": {
                 "tags": {
-                    "name": "Edgars",
-                    "shop": "clothes"
+                    "name": "Santa Isabel",
+                    "shop": "supermarket"
                 },
-                "name": "Edgars",
-                "icon": "clothing-store",
+                "name": "Santa Isabel",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ernsting's family": {
+            "shop/supermarket/Седьмой континент": {
                 "tags": {
-                    "name": "Ernsting's family",
-                    "shop": "clothes"
+                    "name": "Седьмой континент",
+                    "shop": "supermarket"
                 },
-                "name": "Ernsting's family",
-                "icon": "clothing-store",
+                "name": "Седьмой континент",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Esprit": {
+            "shop/supermarket/HIT": {
                 "tags": {
-                    "name": "Esprit",
-                    "shop": "clothes"
+                    "name": "HIT",
+                    "shop": "supermarket"
                 },
-                "name": "Esprit",
-                "icon": "clothing-store",
+                "name": "HIT",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Etam": {
+            "shop/supermarket/Rimi": {
                 "tags": {
-                    "name": "Etam",
-                    "shop": "clothes"
+                    "name": "Rimi",
+                    "shop": "supermarket"
                 },
-                "name": "Etam",
-                "icon": "clothing-store",
+                "name": "Rimi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Gap": {
+            "shop/supermarket/Conad": {
                 "tags": {
-                    "name": "Gap",
-                    "shop": "clothes"
+                    "name": "Conad",
+                    "shop": "supermarket"
                 },
-                "name": "Gap",
-                "icon": "clothing-store",
+                "name": "Conad",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Gerry Weber": {
+            "shop/supermarket/Фуршет": {
                 "tags": {
-                    "name": "Gerry Weber",
-                    "shop": "clothes"
+                    "name": "Фуршет",
+                    "shop": "supermarket"
                 },
-                "name": "Gerry Weber",
-                "icon": "clothing-store",
+                "name": "Фуршет",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/H&M": {
+            "shop/supermarket/Willys": {
                 "tags": {
-                    "name": "H&M",
-                    "shop": "clothes"
+                    "name": "Willys",
+                    "shop": "supermarket"
                 },
-                "name": "H&M",
-                "icon": "clothing-store",
+                "name": "Willys",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Jack & Jones": {
+            "shop/supermarket/Farmfoods": {
                 "tags": {
-                    "name": "Jack & Jones",
-                    "shop": "clothes"
+                    "name": "Farmfoods",
+                    "shop": "supermarket"
                 },
-                "name": "Jack & Jones",
-                "icon": "clothing-store",
+                "name": "Farmfoods",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Jack Wolfskin": {
+            "shop/supermarket/Фора": {
                 "tags": {
-                    "name": "Jack Wolfskin",
-                    "shop": "clothes"
+                    "name": "Фора",
+                    "shop": "supermarket"
                 },
-                "name": "Jack Wolfskin",
-                "icon": "clothing-store",
+                "name": "Фора",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Jules": {
+            "shop/supermarket/Dunnes Stores": {
                 "tags": {
-                    "name": "Jules",
-                    "shop": "clothes"
+                    "name": "Dunnes Stores",
+                    "shop": "supermarket"
                 },
-                "name": "Jules",
-                "icon": "clothing-store",
+                "name": "Dunnes Stores",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/KiK": {
+            "shop/supermarket/Сільпо": {
                 "tags": {
-                    "name": "KiK",
-                    "shop": "clothes"
+                    "name": "Сільпо",
+                    "shop": "supermarket"
                 },
-                "name": "KiK",
-                "icon": "clothing-store",
+                "name": "Сільпо",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Kiabi": {
+            "shop/supermarket/マルエツ": {
                 "tags": {
-                    "name": "Kiabi",
-                    "shop": "clothes"
+                    "name": "マルエツ",
+                    "shop": "supermarket"
                 },
-                "name": "Kiabi",
-                "icon": "clothing-store",
+                "name": "マルエツ",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Lacoste": {
+            "shop/supermarket/Piggly Wiggly": {
                 "tags": {
-                    "name": "Lacoste",
-                    "shop": "clothes"
+                    "name": "Piggly Wiggly",
+                    "shop": "supermarket"
                 },
-                "name": "Lacoste",
-                "icon": "clothing-store",
+                "name": "Piggly Wiggly",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Levi's": {
+            "shop/supermarket/Crai": {
                 "tags": {
-                    "name": "Levi's",
-                    "shop": "clothes"
+                    "name": "Crai",
+                    "shop": "supermarket"
                 },
-                "name": "Levi's",
-                "icon": "clothing-store",
+                "name": "Crai",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Lindex": {
+            "shop/supermarket/Biedronka": {
                 "tags": {
-                    "name": "Lindex",
-                    "shop": "clothes"
+                    "name": "Biedronka",
+                    "shop": "supermarket"
                 },
-                "name": "Lindex",
-                "icon": "clothing-store",
+                "name": "Biedronka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Mango": {
+            "shop/supermarket/El Árbol": {
                 "tags": {
-                    "name": "Mango",
-                    "shop": "clothes"
+                    "name": "El Árbol",
+                    "shop": "supermarket"
                 },
-                "name": "Mango",
-                "icon": "clothing-store",
+                "name": "El Árbol",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Matalan": {
+            "shop/supermarket/Centre Commercial E. Leclerc": {
                 "tags": {
-                    "name": "Matalan",
-                    "shop": "clothes"
+                    "name": "Centre Commercial E. Leclerc",
+                    "shop": "supermarket"
                 },
-                "name": "Matalan",
-                "icon": "clothing-store",
+                "name": "Centre Commercial E. Leclerc",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Mexx": {
+            "shop/supermarket/Foodland": {
                 "tags": {
-                    "name": "Mexx",
-                    "shop": "clothes"
+                    "name": "Foodland",
+                    "shop": "supermarket"
                 },
-                "name": "Mexx",
-                "icon": "clothing-store",
+                "name": "Foodland",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Mr Price": {
+            "shop/supermarket/Super Brugsen": {
                 "tags": {
-                    "name": "Mr Price",
-                    "shop": "clothes"
+                    "name": "Super Brugsen",
+                    "shop": "supermarket"
                 },
-                "name": "Mr Price",
-                "icon": "clothing-store",
+                "name": "Super Brugsen",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/NKD": {
+            "shop/supermarket/Дикси": {
                 "tags": {
-                    "name": "NKD",
-                    "shop": "clothes"
+                    "name": "Дикси",
+                    "shop": "supermarket"
                 },
-                "name": "NKD",
-                "icon": "clothing-store",
+                "name": "Дикси",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/New Look": {
+            "shop/supermarket/Пятёрочка": {
                 "tags": {
-                    "name": "New Look",
-                    "shop": "clothes"
+                    "name": "Пятёрочка",
+                    "shop": "supermarket"
                 },
-                "name": "New Look",
-                "icon": "clothing-store",
+                "name": "Пятёрочка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/New Yorker": {
+            "shop/supermarket/Publix": {
                 "tags": {
-                    "name": "New Yorker",
-                    "shop": "clothes"
+                    "name": "Publix",
+                    "shop": "supermarket"
                 },
-                "name": "New Yorker",
-                "icon": "clothing-store",
+                "name": "Publix",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Next": {
+            "shop/supermarket/Whole Foods": {
                 "tags": {
-                    "name": "Next",
-                    "shop": "clothes"
+                    "name": "Whole Foods",
+                    "shop": "supermarket"
                 },
-                "name": "Next",
-                "icon": "clothing-store",
+                "name": "Whole Foods",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Old Navy": {
+            "shop/supermarket/Føtex": {
                 "tags": {
-                    "name": "Old Navy",
-                    "shop": "clothes"
+                    "name": "Føtex",
+                    "shop": "supermarket"
                 },
-                "name": "Old Navy",
-                "icon": "clothing-store",
+                "name": "Føtex",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Orsay": {
+            "shop/supermarket/coop": {
                 "tags": {
-                    "name": "Orsay",
-                    "shop": "clothes"
+                    "name": "coop",
+                    "shop": "supermarket"
                 },
-                "name": "Orsay",
-                "icon": "clothing-store",
+                "name": "coop",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Peacocks": {
+            "shop/supermarket/Fressnapf": {
                 "tags": {
-                    "name": "Peacocks",
-                    "shop": "clothes"
+                    "name": "Fressnapf",
+                    "shop": "supermarket"
                 },
-                "name": "Peacocks",
-                "icon": "clothing-store",
+                "name": "Fressnapf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Pep": {
+            "shop/supermarket/Coop Konsum": {
                 "tags": {
-                    "name": "Pep",
-                    "shop": "clothes"
+                    "name": "Coop Konsum",
+                    "shop": "supermarket"
                 },
-                "name": "Pep",
-                "icon": "clothing-store",
+                "name": "Coop Konsum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Pimkie": {
+            "shop/supermarket/Carrefour Contact": {
                 "tags": {
-                    "name": "Pimkie",
-                    "shop": "clothes"
+                    "name": "Carrefour Contact",
+                    "shop": "supermarket"
                 },
-                "name": "Pimkie",
-                "icon": "clothing-store",
+                "name": "Carrefour Contact",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Primark": {
+            "shop/supermarket/SPAR": {
                 "tags": {
-                    "name": "Primark",
-                    "shop": "clothes"
+                    "name": "SPAR",
+                    "shop": "supermarket"
                 },
-                "name": "Primark",
-                "icon": "clothing-store",
+                "name": "SPAR",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Promod": {
+            "shop/supermarket/No Frills": {
                 "tags": {
-                    "name": "Promod",
-                    "shop": "clothes"
+                    "name": "No Frills",
+                    "shop": "supermarket"
                 },
-                "name": "Promod",
-                "icon": "clothing-store",
+                "name": "No Frills",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/River Island": {
+            "shop/supermarket/The Co-operative Food": {
                 "tags": {
-                    "name": "River Island",
-                    "shop": "clothes"
+                    "name": "The Co-operative Food",
+                    "shop": "supermarket"
                 },
-                "name": "River Island",
-                "icon": "clothing-store",
+                "name": "The Co-operative Food",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ross": {
+            "shop/supermarket/Plodine": {
                 "tags": {
-                    "name": "Ross",
-                    "shop": "clothes"
+                    "name": "Plodine",
+                    "shop": "supermarket"
                 },
-                "name": "Ross",
-                "icon": "clothing-store",
+                "name": "Plodine",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Street One": {
+            "shop/supermarket/ADEG": {
                 "tags": {
-                    "name": "Street One",
-                    "shop": "clothes"
+                    "name": "ADEG",
+                    "shop": "supermarket"
                 },
-                "name": "Street One",
-                "icon": "clothing-store",
+                "name": "ADEG",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/TK Maxx": {
+            "shop/supermarket/Minipreço": {
                 "tags": {
-                    "name": "TK Maxx",
-                    "shop": "clothes"
+                    "name": "Minipreço",
+                    "shop": "supermarket"
                 },
-                "name": "TK Maxx",
-                "icon": "clothing-store",
+                "name": "Minipreço",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Takko": {
+            "shop/supermarket/Eurospin": {
                 "tags": {
-                    "name": "Takko",
-                    "shop": "clothes"
+                    "name": "Eurospin",
+                    "shop": "supermarket"
                 },
-                "name": "Takko",
-                "icon": "clothing-store",
+                "name": "Eurospin",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Tally Weijl": {
+            "shop/supermarket/Семья": {
                 "tags": {
-                    "name": "Tally Weijl",
-                    "shop": "clothes"
+                    "name": "Семья",
+                    "shop": "supermarket"
                 },
-                "name": "Tally Weijl",
-                "icon": "clothing-store",
+                "name": "Семья",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Tommy Hilfiger": {
+            "shop/supermarket/Евроопт": {
                 "tags": {
-                    "name": "Tommy Hilfiger",
-                    "shop": "clothes"
+                    "name": "Евроопт",
+                    "shop": "supermarket"
                 },
-                "name": "Tommy Hilfiger",
-                "icon": "clothing-store",
+                "name": "Евроопт",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Truworths": {
+            "shop/supermarket/Centra": {
                 "tags": {
-                    "name": "Truworths",
-                    "shop": "clothes"
+                    "name": "Centra",
+                    "shop": "supermarket"
                 },
-                "name": "Truworths",
-                "icon": "clothing-store",
+                "name": "Centra",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ulla Popken": {
+            "shop/supermarket/Квартал": {
                 "tags": {
-                    "name": "Ulla Popken",
-                    "shop": "clothes"
+                    "name": "Квартал",
+                    "shop": "supermarket"
                 },
-                "name": "Ulla Popken",
-                "icon": "clothing-store",
+                "name": "Квартал",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/United Colors of Benetton": {
+            "shop/supermarket/New World": {
                 "tags": {
-                    "name": "United Colors of Benetton",
-                    "shop": "clothes"
+                    "name": "New World",
+                    "shop": "supermarket"
                 },
-                "name": "United Colors of Benetton",
-                "icon": "clothing-store",
+                "name": "New World",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Urban Outfitters": {
+            "shop/supermarket/Countdown": {
                 "tags": {
-                    "name": "Urban Outfitters",
-                    "shop": "clothes"
+                    "name": "Countdown",
+                    "shop": "supermarket"
                 },
-                "name": "Urban Outfitters",
-                "icon": "clothing-store",
+                "name": "Countdown",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Vero Moda": {
+            "shop/supermarket/Reliance Fresh": {
                 "tags": {
-                    "name": "Vero Moda",
-                    "shop": "clothes"
+                    "name": "Reliance Fresh",
+                    "shop": "supermarket"
                 },
-                "name": "Vero Moda",
-                "icon": "clothing-store",
+                "name": "Reliance Fresh",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Vögele": {
+            "shop/supermarket/Stokrotka": {
                 "tags": {
-                    "name": "Vögele",
-                    "shop": "clothes"
+                    "name": "Stokrotka",
+                    "shop": "supermarket"
                 },
-                "name": "Vögele",
-                "icon": "clothing-store",
+                "name": "Stokrotka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Winners": {
+            "shop/supermarket/Coop Jednota": {
                 "tags": {
-                    "name": "Winners",
-                    "shop": "clothes"
+                    "name": "Coop Jednota",
+                    "shop": "supermarket"
                 },
-                "name": "Winners",
-                "icon": "clothing-store",
+                "name": "Coop Jednota",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Woolworths": {
+            "shop/supermarket/Fred Meyer": {
                 "tags": {
-                    "name": "Woolworths",
-                    "shop": "clothes"
+                    "name": "Fred Meyer",
+                    "shop": "supermarket"
                 },
-                "name": "Woolworths",
-                "icon": "clothing-store",
+                "name": "Fred Meyer",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Zara": {
+            "shop/supermarket/Irma": {
                 "tags": {
-                    "name": "Zara",
-                    "shop": "clothes"
+                    "name": "Irma",
+                    "shop": "supermarket"
                 },
-                "name": "Zara",
-                "icon": "clothing-store",
+                "name": "Irma",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Zeeman": {
+            "shop/supermarket/Continente": {
                 "tags": {
-                    "name": "Zeeman",
-                    "shop": "clothes"
+                    "name": "Continente",
+                    "shop": "supermarket"
                 },
-                "name": "Zeeman",
-                "icon": "clothing-store",
+                "name": "Continente",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/s.Oliver": {
+            "shop/supermarket/Price Chopper": {
                 "tags": {
-                    "name": "s.Oliver",
-                    "shop": "clothes"
+                    "name": "Price Chopper",
+                    "shop": "supermarket"
                 },
-                "name": "s.Oliver",
-                "icon": "clothing-store",
+                "name": "Price Chopper",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Одежда": {
+            "shop/supermarket/Wegmans": {
                 "tags": {
-                    "name": "Одежда",
-                    "shop": "clothes"
+                    "name": "Wegmans",
+                    "shop": "supermarket"
                 },
-                "name": "Одежда",
-                "icon": "clothing-store",
+                "name": "Wegmans",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/洋服の青山": {
+            "shop/supermarket/Game": {
                 "tags": {
-                    "name": "洋服の青山",
-                    "shop": "clothes"
+                    "name": "Game",
+                    "shop": "supermarket"
                 },
-                "name": "洋服の青山",
-                "icon": "clothing-store",
+                "name": "Game",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/computer/DNS": {
+            "shop/supermarket/Soriana": {
                 "tags": {
-                    "name": "DNS",
-                    "shop": "computer"
+                    "name": "Soriana",
+                    "shop": "supermarket"
                 },
-                "name": "DNS",
-                "icon": "shop",
+                "name": "Soriana",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/computer/PC World": {
+            "shop/supermarket/Alimerka": {
                 "tags": {
-                    "name": "PC World",
-                    "shop": "computer"
+                    "name": "Alimerka",
+                    "shop": "supermarket"
                 },
-                "name": "PC World",
-                "icon": "shop",
+                "name": "Alimerka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/24 часа": {
+            "shop/supermarket/Piotr i Paweł": {
                 "tags": {
-                    "name": "24 часа",
-                    "shop": "convenience"
+                    "name": "Piotr i Paweł",
+                    "shop": "supermarket"
                 },
-                "name": "24 часа",
-                "icon": "shop",
+                "name": "Piotr i Paweł",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/8 à Huit": {
+            "shop/supermarket/Перекресток": {
                 "tags": {
-                    "name": "8 à Huit",
-                    "shop": "convenience"
+                    "name": "Перекресток",
+                    "shop": "supermarket"
                 },
-                "name": "8 à Huit",
-                "icon": "shop",
+                "name": "Перекресток",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Alepa": {
+            "shop/supermarket/Maxima X": {
                 "tags": {
-                    "name": "Alepa",
-                    "shop": "convenience"
+                    "name": "Maxima X",
+                    "shop": "supermarket"
                 },
-                "name": "Alepa",
-                "icon": "shop",
+                "name": "Maxima X",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Alfamart": {
+            "shop/supermarket/Карусель": {
                 "tags": {
-                    "name": "Alfamart",
-                    "shop": "convenience"
+                    "name": "Карусель",
+                    "shop": "supermarket"
                 },
-                "name": "Alfamart",
-                "icon": "shop",
+                "name": "Карусель",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Almacen": {
+            "shop/supermarket/Tesco Lotus": {
                 "tags": {
-                    "name": "Almacen",
-                    "shop": "convenience"
+                    "name": "Tesco Lotus",
+                    "shop": "supermarket"
                 },
-                "name": "Almacen",
-                "icon": "shop",
+                "name": "Tesco Lotus",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Biedronka": {
+            "shop/supermarket/Condis": {
                 "tags": {
-                    "name": "Biedronka",
-                    "shop": "convenience"
+                    "name": "Condis",
+                    "shop": "supermarket"
                 },
-                "name": "Biedronka",
-                "icon": "shop",
+                "name": "Condis",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/CBA": {
+            "shop/supermarket/Sam's Club": {
                 "tags": {
-                    "name": "CBA",
-                    "shop": "convenience"
+                    "name": "Sam's Club",
+                    "shop": "supermarket"
                 },
-                "name": "CBA",
-                "icon": "shop",
+                "name": "Sam's Club",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/COOP": {
+            "shop/supermarket/Копейка": {
                 "tags": {
-                    "name": "COOP",
-                    "shop": "convenience"
+                    "name": "Копейка",
+                    "shop": "supermarket"
                 },
-                "name": "COOP",
-                "icon": "shop",
+                "name": "Копейка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/COOP Jednota": {
+            "shop/supermarket/Géant Casino": {
                 "tags": {
-                    "name": "COOP Jednota",
-                    "shop": "convenience"
+                    "name": "Géant Casino",
+                    "shop": "supermarket"
                 },
-                "name": "COOP Jednota",
-                "icon": "shop",
+                "name": "Géant Casino",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Carrefour City": {
+            "shop/supermarket/ASDA": {
                 "tags": {
-                    "name": "Carrefour City",
-                    "shop": "convenience"
+                    "name": "ASDA",
+                    "shop": "supermarket"
                 },
-                "name": "Carrefour City",
-                "icon": "shop",
+                "name": "ASDA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Carrefour Express": {
+            "shop/supermarket/Intermarche": {
                 "tags": {
-                    "name": "Carrefour Express",
-                    "shop": "convenience"
+                    "name": "Intermarche",
+                    "shop": "supermarket"
                 },
-                "name": "Carrefour Express",
-                "icon": "shop",
+                "name": "Intermarche",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Casino": {
+            "shop/supermarket/Stop & Shop": {
                 "tags": {
-                    "name": "Casino",
-                    "shop": "convenience"
+                    "name": "Stop & Shop",
+                    "shop": "supermarket"
                 },
-                "name": "Casino",
-                "icon": "shop",
+                "name": "Stop & Shop",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Centra": {
+            "shop/supermarket/Food Lion": {
                 "tags": {
-                    "name": "Centra",
-                    "shop": "convenience"
+                    "name": "Food Lion",
+                    "shop": "supermarket"
                 },
-                "name": "Centra",
-                "icon": "shop",
+                "name": "Food Lion",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Central Convenience Store": {
+            "shop/supermarket/Harris Teeter": {
                 "tags": {
-                    "name": "Central Convenience Store",
-                    "shop": "convenience"
+                    "name": "Harris Teeter",
+                    "shop": "supermarket"
                 },
-                "name": "Central Convenience Store",
-                "icon": "shop",
+                "name": "Harris Teeter",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Coop Jednota": {
+            "shop/supermarket/H-E-B": {
                 "tags": {
-                    "name": "Coop Jednota",
-                    "shop": "convenience"
+                    "name": "H-E-B",
+                    "shop": "supermarket"
                 },
-                "name": "Coop Jednota",
-                "icon": "shop",
+                "name": "H-E-B",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Costcutter": {
+            "shop/supermarket/Foodworks": {
                 "tags": {
-                    "name": "Costcutter",
-                    "shop": "convenience"
+                    "name": "Foodworks",
+                    "shop": "supermarket"
                 },
-                "name": "Costcutter",
-                "icon": "shop",
+                "name": "Foodworks",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Cumberland Farms": {
+            "shop/supermarket/Polo Market": {
                 "tags": {
-                    "name": "Cumberland Farms",
-                    "shop": "convenience"
+                    "name": "Polo Market",
+                    "shop": "supermarket"
                 },
-                "name": "Cumberland Farms",
-                "icon": "shop",
+                "name": "Polo Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Delikatesy": {
+            "shop/supermarket/西友 (SEIYU)": {
                 "tags": {
-                    "name": "Delikatesy",
-                    "shop": "convenience"
+                    "name": "西友 (SEIYU)",
+                    "shop": "supermarket"
                 },
-                "name": "Delikatesy",
-                "icon": "shop",
+                "name": "西友 (SEIYU)",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Dollar General": {
+            "shop/supermarket/Полушка": {
                 "tags": {
-                    "name": "Dollar General",
-                    "shop": "convenience"
+                    "name": "Полушка",
+                    "shop": "supermarket"
                 },
-                "name": "Dollar General",
-                "icon": "shop",
+                "name": "Полушка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Dorfladen": {
+            "shop/supermarket/Extra": {
                 "tags": {
-                    "name": "Dorfladen",
-                    "shop": "convenience"
+                    "name": "Extra",
+                    "shop": "supermarket"
                 },
-                "name": "Dorfladen",
-                "icon": "shop",
+                "name": "Extra",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Epicerie": {
+            "shop/supermarket/Lewiatan": {
                 "tags": {
-                    "name": "Epicerie",
-                    "shop": "convenience"
+                    "name": "Lewiatan",
+                    "shop": "supermarket"
                 },
-                "name": "Epicerie",
-                "icon": "shop",
+                "name": "Lewiatan",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/FamilyMart": {
+            "shop/supermarket/АТБ": {
                 "tags": {
-                    "name": "FamilyMart",
-                    "shop": "convenience"
+                    "name": "АТБ",
+                    "shop": "supermarket"
                 },
-                "name": "FamilyMart",
-                "icon": "shop",
+                "name": "АТБ",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Food Mart": {
+            "shop/supermarket/Społem": {
                 "tags": {
-                    "name": "Food Mart",
-                    "shop": "convenience"
+                    "name": "Społem",
+                    "shop": "supermarket"
                 },
-                "name": "Food Mart",
-                "icon": "shop",
+                "name": "Społem",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Four Square": {
+            "shop/supermarket/Bodega Aurrera": {
                 "tags": {
-                    "name": "Four Square",
-                    "shop": "convenience"
+                    "name": "Bodega Aurrera",
+                    "shop": "supermarket"
                 },
-                "name": "Four Square",
-                "icon": "shop",
+                "name": "Bodega Aurrera",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Franprix": {
+            "shop/supermarket/Мария-Ра": {
                 "tags": {
-                    "name": "Franprix",
-                    "shop": "convenience"
+                    "name": "Мария-Ра",
+                    "shop": "supermarket"
                 },
-                "name": "Franprix",
-                "icon": "shop",
+                "name": "Мария-Ра",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Groszek": {
+            "shop/supermarket/Магнолия": {
                 "tags": {
-                    "name": "Groszek",
-                    "shop": "convenience"
+                    "name": "Магнолия",
+                    "shop": "supermarket"
                 },
-                "name": "Groszek",
-                "icon": "shop",
+                "name": "Магнолия",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Hasty Market": {
+            "shop/supermarket/Магазин": {
                 "tags": {
-                    "name": "Hasty Market",
-                    "shop": "convenience"
+                    "name": "Магазин",
+                    "shop": "supermarket"
                 },
-                "name": "Hasty Market",
-                "icon": "shop",
+                "name": "Магазин",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Indomaret": {
+            "shop/supermarket/Монетка": {
                 "tags": {
-                    "name": "Indomaret",
-                    "shop": "convenience"
+                    "name": "Монетка",
+                    "shop": "supermarket"
                 },
-                "name": "Indomaret",
-                "icon": "shop",
+                "name": "Монетка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Jednota": {
+            "shop/supermarket/Hy-Vee": {
                 "tags": {
-                    "name": "Jednota",
-                    "shop": "convenience"
+                    "name": "Hy-Vee",
+                    "shop": "supermarket"
                 },
-                "name": "Jednota",
-                "icon": "shop",
+                "name": "Hy-Vee",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/K-Market": {
+            "shop/supermarket/Walmart Supercenter": {
                 "tags": {
-                    "name": "K-Market",
-                    "shop": "convenience"
+                    "name": "Walmart Supercenter",
+                    "shop": "supermarket"
                 },
-                "name": "K-Market",
-                "icon": "shop",
+                "name": "Walmart Supercenter",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Konzum": {
+            "shop/supermarket/Hannaford": {
                 "tags": {
-                    "name": "Konzum",
-                    "shop": "convenience"
+                    "name": "Hannaford",
+                    "shop": "supermarket"
                 },
-                "name": "Konzum",
-                "icon": "shop",
+                "name": "Hannaford",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/LAWSON": {
+            "shop/supermarket/業務スーパー": {
                 "tags": {
-                    "name": "LAWSON",
-                    "shop": "convenience"
+                    "name": "業務スーパー",
+                    "shop": "supermarket"
                 },
-                "name": "LAWSON",
-                "icon": "shop",
+                "name": "業務スーパー",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Lewiatan": {
+            "shop/supermarket/Norfa XL": {
                 "tags": {
-                    "name": "Lewiatan",
-                    "shop": "convenience"
+                    "name": "Norfa XL",
+                    "shop": "supermarket"
                 },
-                "name": "Lewiatan",
-                "icon": "shop",
+                "name": "Norfa XL",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Londis": {
+            "shop/supermarket/ヨークマート (YorkMart)": {
                 "tags": {
-                    "name": "Londis",
-                    "shop": "convenience"
+                    "name": "ヨークマート (YorkMart)",
+                    "shop": "supermarket"
                 },
-                "name": "Londis",
-                "icon": "shop",
+                "name": "ヨークマート (YorkMart)",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mac's": {
+            "shop/supermarket/Leclerc Drive": {
                 "tags": {
-                    "name": "Mac's",
-                    "shop": "convenience"
+                    "name": "Leclerc Drive",
+                    "shop": "supermarket"
                 },
-                "name": "Mac's",
-                "icon": "shop",
+                "name": "Leclerc Drive",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mace": {
+            "shop/electronics/Media Markt": {
                 "tags": {
-                    "name": "Mace",
-                    "shop": "convenience"
+                    "name": "Media Markt",
+                    "shop": "electronics"
                 },
-                "name": "Mace",
+                "name": "Media Markt",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85680,12 +89112,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/McColl's": {
+            "shop/electronics/Maplin": {
                 "tags": {
-                    "name": "McColl's",
-                    "shop": "convenience"
+                    "name": "Maplin",
+                    "shop": "electronics"
                 },
-                "name": "McColl's",
+                "name": "Maplin",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85699,12 +89131,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mercator": {
+            "shop/electronics/Best Buy": {
                 "tags": {
-                    "name": "Mercator",
-                    "shop": "convenience"
+                    "name": "Best Buy",
+                    "shop": "electronics"
                 },
-                "name": "Mercator",
+                "name": "Best Buy",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85718,12 +89150,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mini Market": {
+            "shop/electronics/Future Shop": {
                 "tags": {
-                    "name": "Mini Market",
-                    "shop": "convenience"
+                    "name": "Future Shop",
+                    "shop": "electronics"
                 },
-                "name": "Mini Market",
+                "name": "Future Shop",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85737,12 +89169,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mini Stop": {
+            "shop/electronics/Saturn": {
                 "tags": {
-                    "name": "Mini Stop",
-                    "shop": "convenience"
+                    "name": "Saturn",
+                    "shop": "electronics"
                 },
-                "name": "Mini Stop",
+                "name": "Saturn",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85756,12 +89188,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Nisa": {
+            "shop/electronics/Currys": {
                 "tags": {
-                    "name": "Nisa",
-                    "shop": "convenience"
+                    "name": "Currys",
+                    "shop": "electronics"
                 },
-                "name": "Nisa",
+                "name": "Currys",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85775,12 +89207,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Nisa Local": {
+            "shop/electronics/Radio Shack": {
                 "tags": {
-                    "name": "Nisa Local",
-                    "shop": "convenience"
+                    "name": "Radio Shack",
+                    "shop": "electronics"
                 },
-                "name": "Nisa Local",
+                "name": "Radio Shack",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85794,12 +89226,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Oxxo": {
+            "shop/electronics/Comet": {
                 "tags": {
-                    "name": "Oxxo",
-                    "shop": "convenience"
+                    "name": "Comet",
+                    "shop": "electronics"
                 },
-                "name": "Oxxo",
+                "name": "Comet",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85813,12 +89245,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/One Stop": {
+            "shop/electronics/Euronics": {
                 "tags": {
-                    "name": "One Stop",
-                    "shop": "convenience"
+                    "name": "Euronics",
+                    "shop": "electronics"
                 },
-                "name": "One Stop",
+                "name": "Euronics",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85832,12 +89264,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Petit Casino": {
+            "shop/electronics/Expert": {
                 "tags": {
-                    "name": "Petit Casino",
-                    "shop": "convenience"
+                    "name": "Expert",
+                    "shop": "electronics"
                 },
-                "name": "Petit Casino",
+                "name": "Expert",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85851,12 +89283,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Picard": {
+            "shop/electronics/Эльдорадо": {
                 "tags": {
-                    "name": "Picard",
-                    "shop": "convenience"
+                    "name": "Эльдорадо",
+                    "shop": "electronics"
                 },
-                "name": "Picard",
+                "name": "Эльдорадо",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85870,12 +89302,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Potraviny": {
+            "shop/electronics/Darty": {
                 "tags": {
-                    "name": "Potraviny",
-                    "shop": "convenience"
+                    "name": "Darty",
+                    "shop": "electronics"
                 },
-                "name": "Potraviny",
+                "name": "Darty",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85889,12 +89321,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Premier": {
+            "shop/electronics/М.Видео": {
                 "tags": {
-                    "name": "Premier",
-                    "shop": "convenience"
+                    "name": "М.Видео",
+                    "shop": "electronics"
                 },
-                "name": "Premier",
+                "name": "М.Видео",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85908,12 +89340,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Proxi": {
+            "shop/convenience/McColl's": {
                 "tags": {
-                    "name": "Proxi",
+                    "name": "McColl's",
                     "shop": "convenience"
                 },
-                "name": "Proxi",
+                "name": "McColl's",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85927,12 +89359,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/SPAR": {
+            "shop/convenience/One Stop": {
                 "tags": {
-                    "name": "SPAR",
+                    "name": "One Stop",
                     "shop": "convenience"
                 },
-                "name": "SPAR",
+                "name": "One Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85946,12 +89378,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Sainsbury's Local": {
+            "shop/convenience/Londis": {
                 "tags": {
-                    "name": "Sainsbury's Local",
+                    "name": "Londis",
                     "shop": "convenience"
                 },
-                "name": "Sainsbury's Local",
+                "name": "Londis",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85984,12 +89416,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Select": {
+            "shop/convenience/Siwa": {
                 "tags": {
-                    "name": "Select",
+                    "name": "Siwa",
                     "shop": "convenience"
                 },
-                "name": "Select",
+                "name": "Siwa",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86003,12 +89435,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Siwa": {
+            "shop/convenience/Mac's": {
                 "tags": {
-                    "name": "Siwa",
+                    "name": "Mac's",
                     "shop": "convenience"
                 },
-                "name": "Siwa",
+                "name": "Mac's",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86022,12 +89454,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Sklep spożywczy": {
+            "shop/convenience/Alepa": {
                 "tags": {
-                    "name": "Sklep spożywczy",
+                    "name": "Alepa",
                     "shop": "convenience"
                 },
-                "name": "Sklep spożywczy",
+                "name": "Alepa",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86041,12 +89473,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Spar": {
+            "shop/convenience/Hasty Market": {
                 "tags": {
-                    "name": "Spar",
+                    "name": "Hasty Market",
                     "shop": "convenience"
                 },
-                "name": "Spar",
+                "name": "Hasty Market",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86060,12 +89492,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Społem": {
+            "shop/convenience/K-Market": {
                 "tags": {
-                    "name": "Społem",
+                    "name": "K-Market",
                     "shop": "convenience"
                 },
-                "name": "Społem",
+                "name": "K-Market",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86079,12 +89511,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Spożywczy": {
+            "shop/convenience/Valintatalo": {
                 "tags": {
-                    "name": "Spożywczy",
+                    "name": "Valintatalo",
                     "shop": "convenience"
                 },
-                "name": "Spożywczy",
+                "name": "Valintatalo",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86098,12 +89530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Stores": {
+            "shop/convenience/セブンイレブン": {
                 "tags": {
-                    "name": "Stores",
+                    "name": "セブンイレブン",
+                    "name:en": "7-Eleven",
                     "shop": "convenience"
                 },
-                "name": "Stores",
+                "name": "セブンイレブン",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86117,12 +89550,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Studenac": {
+            "shop/convenience/ローソン": {
                 "tags": {
-                    "name": "Studenac",
+                    "name": "ローソン",
+                    "name:en": "LAWSON",
                     "shop": "convenience"
                 },
-                "name": "Studenac",
+                "name": "ローソン",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86136,12 +89570,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Sunkus": {
+            "shop/convenience/Mace": {
                 "tags": {
-                    "name": "Sunkus",
+                    "name": "Mace",
                     "shop": "convenience"
                 },
-                "name": "Sunkus",
+                "name": "Mace",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86155,12 +89589,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Tesco Express": {
+            "shop/convenience/Mini Market": {
                 "tags": {
-                    "name": "Tesco Express",
+                    "name": "Mini Market",
                     "shop": "convenience"
                 },
-                "name": "Tesco Express",
+                "name": "Mini Market",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86174,12 +89608,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/The Co-operative Food": {
+            "shop/convenience/Nisa Local": {
                 "tags": {
-                    "name": "The Co-operative Food",
+                    "name": "Nisa Local",
                     "shop": "convenience"
                 },
-                "name": "The Co-operative Food",
+                "name": "Nisa Local",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86193,12 +89627,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Valintatalo": {
+            "shop/convenience/Dorfladen": {
                 "tags": {
-                    "name": "Valintatalo",
+                    "name": "Dorfladen",
                     "shop": "convenience"
                 },
-                "name": "Valintatalo",
+                "name": "Dorfladen",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86212,12 +89646,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Vival": {
+            "shop/convenience/Продукты": {
                 "tags": {
-                    "name": "Vival",
+                    "name": "Продукты",
                     "shop": "convenience"
                 },
-                "name": "Vival",
+                "name": "Продукты",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86231,12 +89665,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Volg": {
+            "shop/convenience/Mini Stop": {
                 "tags": {
-                    "name": "Volg",
+                    "name": "Mini Stop",
                     "shop": "convenience"
                 },
-                "name": "Volg",
+                "name": "Mini Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86250,12 +89684,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/abc": {
+            "shop/convenience/LAWSON": {
                 "tags": {
-                    "name": "abc",
+                    "name": "LAWSON",
                     "shop": "convenience"
                 },
-                "name": "abc",
+                "name": "LAWSON",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86269,12 +89703,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Żabka": {
+            "shop/convenience/デイリーヤマザキ": {
                 "tags": {
-                    "name": "Żabka",
+                    "name": "デイリーヤマザキ",
                     "shop": "convenience"
                 },
-                "name": "Żabka",
+                "name": "デイリーヤマザキ",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86288,12 +89722,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Ð\90воÑ\81Ñ\8cка": {
+            "shop/convenience/Ð\9dадежда": {
                 "tags": {
-                    "name": "Ð\90воÑ\81Ñ\8cка",
+                    "name": "Ð\9dадежда",
                     "shop": "convenience"
                 },
-                "name": "Ð\90воÑ\81Ñ\8cка",
+                "name": "Ð\9dадежда",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86307,12 +89741,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Березка": {
+            "shop/convenience/Nisa": {
                 "tags": {
-                    "name": "Березка",
+                    "name": "Nisa",
                     "shop": "convenience"
                 },
-                "name": "Березка",
+                "name": "Nisa",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86326,12 +89760,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Весна": {
+            "shop/convenience/Premier": {
                 "tags": {
-                    "name": "Весна",
+                    "name": "Premier",
                     "shop": "convenience"
                 },
-                "name": "Весна",
+                "name": "Premier",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86345,12 +89779,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Визит": {
+            "shop/convenience/ミニストップ": {
                 "tags": {
-                    "name": "Визит",
+                    "name": "ミニストップ",
+                    "name:en": "MINISTOP",
                     "shop": "convenience"
                 },
-                "name": "Визит",
+                "name": "ミニストップ",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86364,12 +89799,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Виктория": {
+            "shop/convenience/サンクス": {
                 "tags": {
-                    "name": "Виктория",
+                    "name": "サンクス",
+                    "name:en": "sunkus",
                     "shop": "convenience"
                 },
-                "name": "Виктория",
+                "name": "サンクス",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86383,12 +89819,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Гастроном": {
+            "shop/convenience/スリーエフ": {
                 "tags": {
-                    "name": "Гастроном",
+                    "name": "スリーエフ",
                     "shop": "convenience"
                 },
-                "name": "Гастроном",
+                "name": "スリーエフ",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86402,12 +89838,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Дикси": {
+            "shop/convenience/8 à Huit": {
                 "tags": {
-                    "name": "Дикси",
+                    "name": "8 à Huit",
                     "shop": "convenience"
                 },
-                "name": "Дикси",
+                "name": "8 à Huit",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86421,12 +89857,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Кировский": {
+            "shop/convenience/Żabka": {
                 "tags": {
-                    "name": "Кировский",
+                    "name": "Żabka",
                     "shop": "convenience"
                 },
-                "name": "Кировский",
+                "name": "Żabka",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86440,12 +89876,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Копеечка": {
+            "shop/convenience/Almacen": {
                 "tags": {
-                    "name": "Копеечка",
+                    "name": "Almacen",
                     "shop": "convenience"
                 },
-                "name": "Копеечка",
+                "name": "Almacen",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86459,12 +89895,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Кулинария": {
+            "shop/convenience/Vival": {
                 "tags": {
-                    "name": "Кулинария",
+                    "name": "Vival",
                     "shop": "convenience"
                 },
-                "name": "Кулинария",
+                "name": "Vival",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86478,12 +89914,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Магазин": {
+            "shop/convenience/FamilyMart": {
                 "tags": {
-                    "name": "Магазин",
+                    "name": "FamilyMart",
                     "shop": "convenience"
                 },
-                "name": "Магазин",
+                "name": "FamilyMart",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86497,12 +89933,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Магнит": {
+            "shop/convenience/ファミリーマート": {
                 "tags": {
-                    "name": "Магнит",
+                    "name": "ファミリーマート",
+                    "name:en": "FamilyMart",
                     "shop": "convenience"
                 },
-                "name": "Магнит",
+                "name": "ファミリーマート",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86516,12 +89953,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Мария-Ра": {
+            "shop/convenience/Sunkus": {
                 "tags": {
-                    "name": "Мария-Ра",
+                    "name": "Sunkus",
                     "shop": "convenience"
                 },
-                "name": "Мария-Ра",
+                "name": "Sunkus",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86535,12 +89972,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Мечта": {
+            "shop/convenience/セブンイレブン(Seven-Eleven)": {
                 "tags": {
-                    "name": "Мечта",
+                    "name": "セブンイレブン(Seven-Eleven)",
                     "shop": "convenience"
                 },
-                "name": "Мечта",
+                "name": "セブンイレブン(Seven-Eleven)",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86554,12 +89991,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Минимаркет": {
+            "shop/convenience/Jednota": {
                 "tags": {
-                    "name": "Минимаркет",
+                    "name": "Jednota",
                     "shop": "convenience"
                 },
-                "name": "Минимаркет",
+                "name": "Jednota",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86573,12 +90010,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Ð\9cонеÑ\82ка": {
+            "shop/convenience/Ð\93аÑ\81Ñ\82Ñ\80оном": {
                 "tags": {
-                    "name": "Ð\9cонеÑ\82ка",
+                    "name": "Ð\93аÑ\81Ñ\82Ñ\80оном",
                     "shop": "convenience"
                 },
-                "name": "Ð\9cонеÑ\82ка",
+                "name": "Ð\93аÑ\81Ñ\82Ñ\80оном",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86592,12 +90029,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Надежда": {
+            "shop/convenience/Sklep spożywczy": {
                 "tags": {
-                    "name": "Надежда",
+                    "name": "Sklep spożywczy",
                     "shop": "convenience"
                 },
-                "name": "Надежда",
+                "name": "Sklep spożywczy",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86611,12 +90048,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Перекресток": {
+            "shop/convenience/サークルK": {
                 "tags": {
-                    "name": "Перекресток",
+                    "name": "サークルK",
+                    "name:en": "Circle K",
                     "shop": "convenience"
                 },
-                "name": "Перекресток",
+                "name": "サークルK",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86630,12 +90068,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Продукти": {
+            "shop/convenience/Proxi": {
                 "tags": {
-                    "name": "Продукти",
+                    "name": "Proxi",
                     "shop": "convenience"
                 },
-                "name": "Продукти",
+                "name": "Proxi",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86649,12 +90087,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Ð\9fÑ\80одÑ\83кÑ\82овÑ\8bй": {
+            "shop/convenience/УнивеÑ\80Ñ\81ам": {
                 "tags": {
-                    "name": "Ð\9fÑ\80одÑ\83кÑ\82овÑ\8bй",
+                    "name": "УнивеÑ\80Ñ\81ам",
                     "shop": "convenience"
                 },
-                "name": "Ð\9fÑ\80одÑ\83кÑ\82овÑ\8bй",
+                "name": "УнивеÑ\80Ñ\81ам",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86668,12 +90106,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Продуктовый магазин": {
+            "shop/convenience/Groszek": {
                 "tags": {
-                    "name": "Продуктовый магазин",
+                    "name": "Groszek",
                     "shop": "convenience"
                 },
-                "name": "Продуктовый магазин",
+                "name": "Groszek",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86687,12 +90125,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Продукты": {
+            "shop/convenience/Select": {
                 "tags": {
-                    "name": "Продукты",
+                    "name": "Select",
                     "shop": "convenience"
                 },
-                "name": "Продукты",
+                "name": "Select",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86706,12 +90144,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Пятёрочка": {
+            "shop/convenience/Potraviny": {
                 "tags": {
-                    "name": "Пятёрочка",
+                    "name": "Potraviny",
                     "shop": "convenience"
                 },
-                "name": "Пятёрочка",
+                "name": "Potraviny",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86744,12 +90182,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/УнивеÑ\80Ñ\81ам": {
+            "shop/convenience/Эконом": {
                 "tags": {
-                    "name": "УнивеÑ\80Ñ\81ам",
+                    "name": "Эконом",
                     "shop": "convenience"
                 },
-                "name": "УнивеÑ\80Ñ\81ам",
+                "name": "Эконом",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86763,12 +90201,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/магазин": {
+            "shop/convenience/Ð\91еÑ\80езка": {
                 "tags": {
-                    "name": "магазин",
+                    "name": "Ð\91еÑ\80езка",
                     "shop": "convenience"
                 },
-                "name": "магазин",
+                "name": "Ð\91еÑ\80езка",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86782,12 +90220,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/продукты": {
+            "shop/convenience/Cumberland Farms": {
                 "tags": {
-                    "name": "продукты",
+                    "name": "Cumberland Farms",
                     "shop": "convenience"
                 },
-                "name": "продукты",
+                "name": "Cumberland Farms",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86801,12 +90239,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/เซเว่นอีเลฟเว่น": {
+            "shop/convenience/Tesco Lotus Express": {
                 "tags": {
-                    "name": "เซเว่นอีเลฟเว่น",
+                    "name": "Tesco Lotus Express",
                     "shop": "convenience"
                 },
-                "name": "เซเว่นอีเลฟเว่น",
+                "name": "Tesco Lotus Express",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86820,12 +90258,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/მარკეტი (Market)": {
+            "shop/convenience/24 часа": {
                 "tags": {
-                    "name": "მარკეტი (Market)",
+                    "name": "24 часа",
                     "shop": "convenience"
                 },
-                "name": "მარკეტი (Market)",
+                "name": "24 часа",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86839,13 +90277,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/サンクス": {
+            "shop/convenience/Минимаркет": {
                 "tags": {
-                    "name": "サンクス",
-                    "name:en": "sunkus",
+                    "name": "Минимаркет",
                     "shop": "convenience"
                 },
-                "name": "サンクス",
+                "name": "Минимаркет",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86859,13 +90296,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/サークルK": {
+            "shop/convenience/Oxxo": {
                 "tags": {
-                    "name": "サークルK",
-                    "name:en": "Circle K",
+                    "name": "Oxxo",
                     "shop": "convenience"
                 },
-                "name": "サークルK",
+                "name": "Oxxo",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86879,12 +90315,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/スリーエフ": {
+            "shop/convenience/abc": {
                 "tags": {
-                    "name": "スリーエフ",
+                    "name": "abc",
                     "shop": "convenience"
                 },
-                "name": "スリーエフ",
+                "name": "abc",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86898,12 +90334,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/セイコーマート (Seicomart)": {
+            "shop/convenience/Продукти": {
                 "tags": {
-                    "name": "セイコーマート (Seicomart)",
+                    "name": "Продукти",
                     "shop": "convenience"
                 },
-                "name": "セイコーマート (Seicomart)",
+                "name": "Продукти",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86917,13 +90353,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ã\82»ã\83\96ã\83³ã\82¤ã\83¬ã\83\96ã\83³": {
+            "shop/convenience/ã\83­ã\83¼ã\82½ã\83³ã\82¹ã\83\88ã\82¢100 (LAWSON STORE 100)": {
                 "tags": {
-                    "name": "セブンイレブン",
-                    "name:en": "7-Eleven",
+                    "name": "ローソンストア100 (LAWSON STORE 100)",
                     "shop": "convenience"
                 },
-                "name": "ã\82»ã\83\96ã\83³ã\82¤ã\83¬ã\83\96ã\83³",
+                "name": "ã\83­ã\83¼ã\82½ã\83³ã\82¹ã\83\88ã\82¢100 (LAWSON STORE 100)",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86937,12 +90372,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ã\83\87ã\82¤ã\83ªã\83¼ã\83¤ã\83\9eã\82¶ã\82­": {
+            "shop/convenience/ã\83­ã\83¼ã\82½ã\83³ã\82¹ã\83\88ã\82¢100": {
                 "tags": {
-                    "name": "ã\83\87ã\82¤ã\83ªã\83¼ã\83¤ã\83\9eã\82¶ã\82­",
+                    "name": "ã\83­ã\83¼ã\82½ã\83³ã\82¹ã\83\88ã\82¢100",
                     "shop": "convenience"
                 },
-                "name": "ã\83\87ã\82¤ã\83ªã\83¼ã\83¤ã\83\9eã\82¶ã\82­",
+                "name": "ã\83­ã\83¼ã\82½ã\83³ã\82¹ã\83\88ã\82¢100",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86956,13 +90391,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ファミリーマート": {
+            "shop/convenience/เซเว่นอีเลฟเว่น": {
                 "tags": {
-                    "name": "ファミリーマート",
-                    "name:en": "FamilyMart",
+                    "name": "เซเว่นอีเลฟเว่น",
                     "shop": "convenience"
                 },
-                "name": "ファミリーマート",
+                "name": "เซเว่นอีเลฟเว่น",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86976,13 +90410,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ミニストップ": {
+            "shop/convenience/Spożywczy": {
                 "tags": {
-                    "name": "ミニストップ",
-                    "name:en": "MINISTOP",
+                    "name": "Spożywczy",
                     "shop": "convenience"
                 },
-                "name": "ミニストップ",
+                "name": "Spożywczy",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86996,13 +90429,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ローソン": {
+            "shop/convenience/Фортуна": {
                 "tags": {
-                    "name": "ローソン",
-                    "name:en": "LAWSON",
+                    "name": "Фортуна",
                     "shop": "convenience"
                 },
-                "name": "ローソン",
+                "name": "Фортуна",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87016,12 +90448,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ローソンストア100": {
+            "shop/convenience/Picard": {
                 "tags": {
-                    "name": "ローソンストア100",
+                    "name": "Picard",
                     "shop": "convenience"
                 },
-                "name": "ローソンストア100",
+                "name": "Picard",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87035,12 +90467,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ローソンストア100 (LAWSON STORE 100)": {
+            "shop/convenience/Four Square": {
                 "tags": {
-                    "name": "ローソンストア100 (LAWSON STORE 100)",
+                    "name": "Four Square",
                     "shop": "convenience"
                 },
-                "name": "ローソンストア100 (LAWSON STORE 100)",
+                "name": "Four Square",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87054,12 +90486,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/全家": {
+            "shop/convenience/Визит": {
                 "tags": {
-                    "name": "全家",
+                    "name": "Визит",
                     "shop": "convenience"
                 },
-                "name": "全家",
+                "name": "Визит",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87073,50 +90505,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/全家便利商店": {
+            "shop/convenience/Авоська": {
                 "tags": {
-                    "name": "全家便利商店",
+                    "name": "Авоська",
                     "shop": "convenience"
                 },
-                "name": "全家便利商店",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/department_store/Big W": {
-                "tags": {
-                    "name": "Big W",
-                    "shop": "department_store"
-                },
-                "name": "Big W",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/department_store/Debenhams": {
-                "tags": {
-                    "name": "Debenhams",
-                    "shop": "department_store"
-                },
-                "name": "Debenhams",
+                "name": "Авоська",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87130,12 +90524,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Galeria Kaufhof": {
+            "shop/convenience/Dollar General": {
                 "tags": {
-                    "name": "Galeria Kaufhof",
-                    "shop": "department_store"
+                    "name": "Dollar General",
+                    "shop": "convenience"
                 },
-                "name": "Galeria Kaufhof",
+                "name": "Dollar General",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87149,12 +90543,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Karstadt": {
+            "shop/convenience/Studenac": {
                 "tags": {
-                    "name": "Karstadt",
-                    "shop": "department_store"
+                    "name": "Studenac",
+                    "shop": "convenience"
                 },
-                "name": "Karstadt",
+                "name": "Studenac",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87168,12 +90562,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Kmart": {
+            "shop/convenience/Central Convenience Store": {
                 "tags": {
-                    "name": "Kmart",
-                    "shop": "department_store"
+                    "name": "Central Convenience Store",
+                    "shop": "convenience"
                 },
-                "name": "Kmart",
+                "name": "Central Convenience Store",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87187,12 +90581,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Kohl's": {
+            "shop/convenience/продукты": {
                 "tags": {
-                    "name": "Kohl's",
-                    "shop": "department_store"
+                    "name": "продукты",
+                    "shop": "convenience"
                 },
-                "name": "Kohl's",
+                "name": "продукты",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87206,12 +90600,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Macy's": {
+            "shop/convenience/Кулинария": {
                 "tags": {
-                    "name": "Macy's",
-                    "shop": "department_store"
+                    "name": "Кулинария",
+                    "shop": "convenience"
                 },
-                "name": "Macy's",
+                "name": "Кулинария",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87225,12 +90619,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Marks & Spencer": {
+            "shop/convenience/全家": {
                 "tags": {
-                    "name": "Marks & Spencer",
-                    "shop": "department_store"
+                    "name": "全家",
+                    "shop": "convenience"
                 },
-                "name": "Marks & Spencer",
+                "name": "全家",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87244,12 +90638,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Sears": {
+            "shop/convenience/Мечта": {
                 "tags": {
-                    "name": "Sears",
-                    "shop": "department_store"
+                    "name": "Мечта",
+                    "shop": "convenience"
                 },
-                "name": "Sears",
+                "name": "Мечта",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87263,12 +90657,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Target": {
+            "shop/convenience/Epicerie": {
                 "tags": {
-                    "name": "Target",
-                    "shop": "department_store"
+                    "name": "Epicerie",
+                    "shop": "convenience"
                 },
-                "name": "Target",
+                "name": "Epicerie",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87282,12 +90676,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Walmart": {
+            "shop/convenience/Кировский": {
                 "tags": {
-                    "name": "Walmart",
-                    "shop": "department_store"
+                    "name": "Кировский",
+                    "shop": "convenience"
                 },
-                "name": "Walmart",
+                "name": "Кировский",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87301,12 +90695,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Walmart Supercenter": {
+            "shop/convenience/Food Mart": {
                 "tags": {
-                    "name": "Walmart Supercenter",
-                    "shop": "department_store"
+                    "name": "Food Mart",
+                    "shop": "convenience"
                 },
-                "name": "Walmart Supercenter",
+                "name": "Food Mart",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87320,12 +90714,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Woolworth": {
+            "shop/convenience/Delikatesy": {
                 "tags": {
-                    "name": "Woolworth",
-                    "shop": "department_store"
+                    "name": "Delikatesy",
+                    "shop": "convenience"
                 },
-                "name": "Woolworth",
+                "name": "Delikatesy",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87339,12 +90733,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Универмаг": {
+            "shop/convenience/ポプラ": {
                 "tags": {
-                    "name": "Универмаг",
-                    "shop": "department_store"
+                    "name": "ポプラ",
+                    "shop": "convenience"
                 },
-                "name": "Универмаг",
+                "name": "ポプラ",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87358,12 +90752,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Ace Hardware": {
+            "shop/convenience/Продуктовый магазин": {
                 "tags": {
-                    "name": "Ace Hardware",
-                    "shop": "doityourself"
+                    "name": "Продуктовый магазин",
+                    "shop": "convenience"
                 },
-                "name": "Ace Hardware",
+                "name": "Продуктовый магазин",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87377,12 +90771,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/B&Q": {
+            "shop/convenience/Продуктовый": {
                 "tags": {
-                    "name": "B&Q",
-                    "shop": "doityourself"
+                    "name": "Продуктовый",
+                    "shop": "convenience"
                 },
-                "name": "B&Q",
+                "name": "Продуктовый",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87396,12 +90790,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bauhaus": {
+            "shop/convenience/セイコーマート (Seicomart)": {
                 "tags": {
-                    "name": "Bauhaus",
-                    "shop": "doityourself"
+                    "name": "セイコーマート (Seicomart)",
+                    "shop": "convenience"
                 },
-                "name": "Bauhaus",
+                "name": "セイコーマート (Seicomart)",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87415,12 +90809,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Baumax": {
+            "shop/convenience/Виктория": {
                 "tags": {
-                    "name": "Baumax",
-                    "shop": "doityourself"
+                    "name": "Виктория",
+                    "shop": "convenience"
                 },
-                "name": "Baumax",
+                "name": "Виктория",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87434,12 +90828,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Brico": {
+            "shop/convenience/Весна": {
                 "tags": {
-                    "name": "Brico",
-                    "shop": "doityourself"
+                    "name": "Весна",
+                    "shop": "convenience"
                 },
-                "name": "Brico",
+                "name": "Весна",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87453,12 +90847,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bricomarché": {
+            "shop/convenience/Mini Market Non-Stop": {
                 "tags": {
-                    "name": "Bricomarché",
-                    "shop": "doityourself"
+                    "name": "Mini Market Non-Stop",
+                    "shop": "convenience"
                 },
-                "name": "Bricomarché",
+                "name": "Mini Market Non-Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87472,12 +90866,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bricorama": {
+            "shop/convenience/Копеечка": {
                 "tags": {
-                    "name": "Bricorama",
-                    "shop": "doityourself"
+                    "name": "Копеечка",
+                    "shop": "convenience"
                 },
-                "name": "Bricorama",
+                "name": "Копеечка",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87491,12 +90885,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bunnings Warehouse": {
+            "shop/convenience/Royal Farms": {
                 "tags": {
-                    "name": "Bunnings Warehouse",
-                    "shop": "doityourself"
+                    "name": "Royal Farms",
+                    "shop": "convenience"
                 },
-                "name": "Bunnings Warehouse",
+                "name": "Royal Farms",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87510,12 +90904,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Castorama": {
+            "shop/convenience/Alfamart": {
                 "tags": {
-                    "name": "Castorama",
-                    "shop": "doityourself"
+                    "name": "Alfamart",
+                    "shop": "convenience"
                 },
-                "name": "Castorama",
+                "name": "Alfamart",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87529,12 +90923,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Gamma": {
+            "shop/convenience/Indomaret": {
                 "tags": {
-                    "name": "Gamma",
-                    "shop": "doityourself"
+                    "name": "Indomaret",
+                    "shop": "convenience"
                 },
-                "name": "Gamma",
+                "name": "Indomaret",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87548,12 +90942,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hagebau": {
+            "shop/convenience/магазин": {
                 "tags": {
-                    "name": "Hagebau",
-                    "shop": "doityourself"
+                    "name": "магазин",
+                    "shop": "convenience"
                 },
-                "name": "Hagebau",
+                "name": "магазин",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87567,12 +90961,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hagebaumarkt": {
+            "shop/convenience/全家便利商店": {
                 "tags": {
-                    "name": "Hagebaumarkt",
-                    "shop": "doityourself"
+                    "name": "全家便利商店",
+                    "shop": "convenience"
                 },
-                "name": "Hagebaumarkt",
+                "name": "全家便利商店",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87586,12 +90980,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hellweg": {
+            "shop/convenience/მარკეტი (Market)": {
                 "tags": {
-                    "name": "Hellweg",
-                    "shop": "doityourself"
+                    "name": "მარკეტი (Market)",
+                    "shop": "convenience"
                 },
-                "name": "Hellweg",
+                "name": "მარკეტი (Market)",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87605,12 +90999,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Home Depot": {
+            "shop/convenience/Stores": {
                 "tags": {
-                    "name": "Home Depot",
-                    "shop": "doityourself"
+                    "name": "Stores",
+                    "shop": "convenience"
                 },
-                "name": "Home Depot",
+                "name": "Stores",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87624,12 +91018,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Home Hardware": {
+            "shop/chemist/Müller": {
                 "tags": {
-                    "name": "Home Hardware",
-                    "shop": "doityourself"
+                    "name": "Müller",
+                    "shop": "chemist"
                 },
-                "name": "Home Hardware",
+                "name": "Müller",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87643,12 +91037,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Homebase": {
+            "shop/chemist/Schlecker": {
                 "tags": {
-                    "name": "Homebase",
-                    "shop": "doityourself"
+                    "name": "Schlecker",
+                    "shop": "chemist"
                 },
-                "name": "Homebase",
+                "name": "Schlecker",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87662,12 +91056,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hornbach": {
+            "shop/chemist/Etos": {
                 "tags": {
-                    "name": "Hornbach",
-                    "shop": "doityourself"
+                    "name": "Etos",
+                    "shop": "chemist"
                 },
-                "name": "Hornbach",
+                "name": "Etos",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87681,12 +91075,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hubo": {
+            "shop/chemist/Bipa": {
                 "tags": {
-                    "name": "Hubo",
-                    "shop": "doityourself"
+                    "name": "Bipa",
+                    "shop": "chemist"
                 },
-                "name": "Hubo",
+                "name": "Bipa",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87700,12 +91094,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Lagerhaus": {
+            "shop/chemist/Rossmann": {
                 "tags": {
-                    "name": "Lagerhaus",
-                    "shop": "doityourself"
+                    "name": "Rossmann",
+                    "shop": "chemist"
                 },
-                "name": "Lagerhaus",
+                "name": "Rossmann",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87719,12 +91113,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Leroy Merlin": {
+            "shop/chemist/Ihr Platz": {
                 "tags": {
-                    "name": "Leroy Merlin",
-                    "shop": "doityourself"
+                    "name": "Ihr Platz",
+                    "shop": "chemist"
                 },
-                "name": "Leroy Merlin",
+                "name": "Ihr Platz",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87738,12 +91132,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Lowes": {
+            "shop/chemist/Douglas": {
                 "tags": {
-                    "name": "Lowes",
-                    "shop": "doityourself"
+                    "name": "Douglas",
+                    "shop": "chemist"
                 },
-                "name": "Lowes",
+                "name": "Douglas",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87757,12 +91151,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Max Bahr": {
+            "shop/chemist/Kruidvat": {
                 "tags": {
-                    "name": "Max Bahr",
-                    "shop": "doityourself"
+                    "name": "Kruidvat",
+                    "shop": "chemist"
                 },
-                "name": "Max Bahr",
+                "name": "Kruidvat",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87776,12 +91170,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Menards": {
+            "shop/car_repair/Peugeot": {
                 "tags": {
-                    "name": "Menards",
-                    "shop": "doityourself"
+                    "name": "Peugeot",
+                    "shop": "car_repair"
                 },
-                "name": "Menards",
+                "name": "Peugeot",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87795,12 +91189,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Mr Bricolage": {
+            "shop/car_repair/Kwik Fit": {
                 "tags": {
-                    "name": "Mr Bricolage",
-                    "shop": "doityourself"
+                    "name": "Kwik Fit",
+                    "shop": "car_repair"
                 },
-                "name": "Mr Bricolage",
+                "name": "Kwik Fit",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87814,12 +91208,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/OBI": {
+            "shop/car_repair/ATU": {
                 "tags": {
-                    "name": "OBI",
-                    "shop": "doityourself"
+                    "name": "ATU",
+                    "shop": "car_repair"
                 },
-                "name": "OBI",
+                "name": "ATU",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87833,12 +91227,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Praktiker": {
+            "shop/car_repair/Kwik-Fit": {
                 "tags": {
-                    "name": "Praktiker",
-                    "shop": "doityourself"
+                    "name": "Kwik-Fit",
+                    "shop": "car_repair"
                 },
-                "name": "Praktiker",
+                "name": "Kwik-Fit",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87852,12 +91246,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Rona": {
+            "shop/car_repair/Midas": {
                 "tags": {
-                    "name": "Rona",
-                    "shop": "doityourself"
+                    "name": "Midas",
+                    "shop": "car_repair"
                 },
-                "name": "Rona",
+                "name": "Midas",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87871,12 +91265,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Toom": {
+            "shop/car_repair/Feu Vert": {
                 "tags": {
-                    "name": "Toom",
-                    "shop": "doityourself"
+                    "name": "Feu Vert",
+                    "shop": "car_repair"
                 },
-                "name": "Toom",
+                "name": "Feu Vert",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87890,12 +91284,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Toom Baumarkt": {
+            "shop/car_repair/Norauto": {
                 "tags": {
-                    "name": "Toom Baumarkt",
-                    "shop": "doityourself"
+                    "name": "Norauto",
+                    "shop": "car_repair"
                 },
-                "name": "Toom Baumarkt",
+                "name": "Norauto",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87909,12 +91303,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Weldom": {
+            "shop/car_repair/Speedy": {
                 "tags": {
-                    "name": "Weldom",
-                    "shop": "doityourself"
+                    "name": "Speedy",
+                    "shop": "car_repair"
                 },
-                "name": "Weldom",
+                "name": "Speedy",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87928,12 +91322,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Wickes": {
+            "shop/car_repair/Автозапчасти": {
                 "tags": {
-                    "name": "Wickes",
-                    "shop": "doityourself"
+                    "name": "Автозапчасти",
+                    "shop": "car_repair"
                 },
-                "name": "Wickes",
+                "name": "Автозапчасти",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87947,12 +91341,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Стройматериалы": {
+            "shop/car_repair/Renault": {
                 "tags": {
-                    "name": "Стройматериалы",
-                    "shop": "doityourself"
+                    "name": "Renault",
+                    "shop": "car_repair"
                 },
-                "name": "Стройматериалы",
+                "name": "Renault",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87966,12 +91360,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Хозтовары": {
+            "shop/car_repair/Pit Stop": {
                 "tags": {
-                    "name": "Хозтовары",
-                    "shop": "doityourself"
+                    "name": "Pit Stop",
+                    "shop": "car_repair"
                 },
-                "name": "Хозтовары",
+                "name": "Pit Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87985,12 +91379,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Best Buy": {
+            "shop/car_repair/Jiffy Lube": {
                 "tags": {
-                    "name": "Best Buy",
-                    "shop": "electronics"
+                    "name": "Jiffy Lube",
+                    "shop": "car_repair"
                 },
-                "name": "Best Buy",
+                "name": "Jiffy Lube",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88004,12 +91398,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Comet": {
+            "shop/car_repair/Шиномонтаж": {
                 "tags": {
-                    "name": "Comet",
-                    "shop": "electronics"
+                    "name": "Шиномонтаж",
+                    "shop": "car_repair"
                 },
-                "name": "Comet",
+                "name": "Шиномонтаж",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88023,12 +91417,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Currys": {
+            "shop/car_repair/СТО": {
                 "tags": {
-                    "name": "Currys",
-                    "shop": "electronics"
+                    "name": "СТО",
+                    "shop": "car_repair"
                 },
-                "name": "Currys",
+                "name": "СТО",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88042,12 +91436,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Darty": {
+            "shop/car_repair/O'Reilly Auto Parts": {
                 "tags": {
-                    "name": "Darty",
-                    "shop": "electronics"
+                    "name": "O'Reilly Auto Parts",
+                    "shop": "car_repair"
                 },
-                "name": "Darty",
+                "name": "O'Reilly Auto Parts",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88061,12 +91455,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Euronics": {
+            "shop/car_repair/Carglass": {
                 "tags": {
-                    "name": "Euronics",
-                    "shop": "electronics"
+                    "name": "Carglass",
+                    "shop": "car_repair"
                 },
-                "name": "Euronics",
+                "name": "Carglass",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88080,12 +91474,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Expert": {
+            "shop/car_repair/шиномонтаж": {
                 "tags": {
-                    "name": "Expert",
-                    "shop": "electronics"
+                    "name": "шиномонтаж",
+                    "shop": "car_repair"
                 },
-                "name": "Expert",
+                "name": "шиномонтаж",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88099,12 +91493,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Future Shop": {
+            "shop/car_repair/Euromaster": {
                 "tags": {
-                    "name": "Future Shop",
-                    "shop": "electronics"
+                    "name": "Euromaster",
+                    "shop": "car_repair"
                 },
-                "name": "Future Shop",
+                "name": "Euromaster",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88118,12 +91512,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Maplin": {
+            "shop/car_repair/Firestone": {
                 "tags": {
-                    "name": "Maplin",
-                    "shop": "electronics"
+                    "name": "Firestone",
+                    "shop": "car_repair"
                 },
-                "name": "Maplin",
+                "name": "Firestone",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88137,12 +91531,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Media Markt": {
+            "shop/car_repair/AutoZone": {
                 "tags": {
-                    "name": "Media Markt",
-                    "shop": "electronics"
+                    "name": "AutoZone",
+                    "shop": "car_repair"
                 },
-                "name": "Media Markt",
+                "name": "AutoZone",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88156,12 +91550,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Radio Shack": {
+            "shop/car_repair/Автосервис": {
                 "tags": {
-                    "name": "Radio Shack",
-                    "shop": "electronics"
+                    "name": "Автосервис",
+                    "shop": "car_repair"
                 },
-                "name": "Radio Shack",
+                "name": "Автосервис",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88175,12 +91569,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Saturn": {
+            "shop/car_repair/Roady": {
                 "tags": {
-                    "name": "Saturn",
-                    "shop": "electronics"
+                    "name": "Roady",
+                    "shop": "car_repair"
                 },
-                "name": "Saturn",
+                "name": "Roady",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88194,12 +91588,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/М.Видео": {
+            "shop/furniture/IKEA": {
                 "tags": {
-                    "name": "М.Видео",
-                    "shop": "electronics"
+                    "name": "IKEA",
+                    "shop": "furniture"
                 },
-                "name": "М.Видео",
+                "name": "IKEA",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88213,12 +91607,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Эльдорадо": {
+            "shop/furniture/Jysk": {
                 "tags": {
-                    "name": "Эльдорадо",
-                    "shop": "electronics"
+                    "name": "Jysk",
+                    "shop": "furniture"
                 },
-                "name": "Эльдорадо",
+                "name": "Jysk",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88232,12 +91626,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/But": {
+            "shop/furniture/Roller": {
                 "tags": {
-                    "name": "But",
+                    "name": "Roller",
                     "shop": "furniture"
                 },
-                "name": "But",
+                "name": "Roller",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88251,12 +91645,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Conforama": {
+            "shop/furniture/Dänisches Bettenlager": {
                 "tags": {
-                    "name": "Conforama",
+                    "name": "Dänisches Bettenlager",
                     "shop": "furniture"
                 },
-                "name": "Conforama",
+                "name": "Dänisches Bettenlager",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88270,12 +91664,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Dänisches Bettenlager": {
+            "shop/furniture/Conforama": {
                 "tags": {
-                    "name": "Dänisches Bettenlager",
+                    "name": "Conforama",
                     "shop": "furniture"
                 },
-                "name": "Dänisches Bettenlager",
+                "name": "Conforama",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88289,12 +91683,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/IKEA": {
+            "shop/furniture/Matratzen Concord": {
                 "tags": {
-                    "name": "IKEA",
+                    "name": "Matratzen Concord",
                     "shop": "furniture"
                 },
-                "name": "IKEA",
+                "name": "Matratzen Concord",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88308,12 +91702,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Jysk": {
+            "shop/furniture/Мебель": {
                 "tags": {
-                    "name": "Jysk",
+                    "name": "Мебель",
                     "shop": "furniture"
                 },
-                "name": "Jysk",
+                "name": "Мебель",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88327,12 +91721,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Matratzen Concord": {
+            "shop/furniture/But": {
                 "tags": {
-                    "name": "Matratzen Concord",
+                    "name": "But",
                     "shop": "furniture"
                 },
-                "name": "Matratzen Concord",
+                "name": "But",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88346,12 +91740,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Roller": {
+            "shop/doityourself/Hornbach": {
                 "tags": {
-                    "name": "Roller",
-                    "shop": "furniture"
+                    "name": "Hornbach",
+                    "shop": "doityourself"
                 },
-                "name": "Roller",
+                "name": "Hornbach",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88365,12 +91759,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Мебель": {
+            "shop/doityourself/B&Q": {
                 "tags": {
-                    "name": "Мебель",
-                    "shop": "furniture"
+                    "name": "B&Q",
+                    "shop": "doityourself"
                 },
-                "name": "Мебель",
+                "name": "B&Q",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88384,12 +91778,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Coiffeur": {
+            "shop/doityourself/Hubo": {
                 "tags": {
-                    "name": "Coiffeur",
-                    "shop": "hairdresser"
+                    "name": "Hubo",
+                    "shop": "doityourself"
                 },
-                "name": "Coiffeur",
+                "name": "Hubo",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88403,12 +91797,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Franck Provost": {
+            "shop/doityourself/Mr Bricolage": {
                 "tags": {
-                    "name": "Franck Provost",
-                    "shop": "hairdresser"
+                    "name": "Mr Bricolage",
+                    "shop": "doityourself"
                 },
-                "name": "Franck Provost",
+                "name": "Mr Bricolage",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88422,12 +91816,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Friseur": {
+            "shop/doityourself/Gamma": {
                 "tags": {
-                    "name": "Friseur",
-                    "shop": "hairdresser"
+                    "name": "Gamma",
+                    "shop": "doityourself"
                 },
-                "name": "Friseur",
+                "name": "Gamma",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88441,12 +91835,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Great Clips": {
+            "shop/doityourself/OBI": {
                 "tags": {
-                    "name": "Great Clips",
-                    "shop": "hairdresser"
+                    "name": "OBI",
+                    "shop": "doityourself"
                 },
-                "name": "Great Clips",
+                "name": "OBI",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88460,12 +91854,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Klier": {
+            "shop/doityourself/Lowes": {
                 "tags": {
-                    "name": "Klier",
-                    "shop": "hairdresser"
+                    "name": "Lowes",
+                    "shop": "doityourself"
                 },
-                "name": "Klier",
+                "name": "Lowes",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88479,12 +91873,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Peluqueria": {
+            "shop/doityourself/Wickes": {
                 "tags": {
-                    "name": "Peluqueria",
-                    "shop": "hairdresser"
+                    "name": "Wickes",
+                    "shop": "doityourself"
                 },
-                "name": "Peluqueria",
+                "name": "Wickes",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88498,12 +91892,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Supercuts": {
+            "shop/doityourself/Hagebau": {
                 "tags": {
-                    "name": "Supercuts",
-                    "shop": "hairdresser"
+                    "name": "Hagebau",
+                    "shop": "doityourself"
                 },
-                "name": "Supercuts",
+                "name": "Hagebau",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88517,12 +91911,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Парикмахерская": {
+            "shop/doityourself/Max Bahr": {
                 "tags": {
-                    "name": "Парикмахерская",
-                    "shop": "hairdresser"
+                    "name": "Max Bahr",
+                    "shop": "doityourself"
                 },
-                "name": "Парикмахерская",
+                "name": "Max Bahr",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88536,12 +91930,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Салон красоты": {
+            "shop/doityourself/Castorama": {
                 "tags": {
-                    "name": "Салон красоты",
-                    "shop": "hairdresser"
+                    "name": "Castorama",
+                    "shop": "doityourself"
                 },
-                "name": "Салон красоты",
+                "name": "Castorama",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88555,12 +91949,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/hardware/1000 мелочей": {
+            "shop/doityourself/Rona": {
                 "tags": {
-                    "name": "1000 мелочей",
-                    "shop": "hardware"
+                    "name": "Rona",
+                    "shop": "doityourself"
                 },
-                "name": "1000 мелочей",
+                "name": "Rona",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88574,12 +91968,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/jewelry/Bijou Brigitte": {
+            "shop/doityourself/Home Depot": {
                 "tags": {
-                    "name": "Bijou Brigitte",
-                    "shop": "jewelry"
+                    "name": "Home Depot",
+                    "shop": "doityourself"
                 },
-                "name": "Bijou Brigitte",
+                "name": "Home Depot",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88593,12 +91987,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/jewelry/Christ": {
+            "shop/doityourself/Toom Baumarkt": {
                 "tags": {
-                    "name": "Christ",
-                    "shop": "jewelry"
+                    "name": "Toom Baumarkt",
+                    "shop": "doityourself"
                 },
-                "name": "Christ",
+                "name": "Toom Baumarkt",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88612,12 +92006,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/jewelry/Swarovski": {
+            "shop/doityourself/Homebase": {
                 "tags": {
-                    "name": "Swarovski",
-                    "shop": "jewelry"
+                    "name": "Homebase",
+                    "shop": "doityourself"
                 },
-                "name": "Swarovski",
+                "name": "Homebase",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88631,12 +92025,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/AT&T": {
+            "shop/doityourself/Baumax": {
                 "tags": {
-                    "name": "AT&T",
-                    "shop": "mobile_phone"
+                    "name": "Baumax",
+                    "shop": "doityourself"
                 },
-                "name": "AT&T",
+                "name": "Baumax",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88650,12 +92044,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Bell": {
+            "shop/doityourself/Lagerhaus": {
                 "tags": {
-                    "name": "Bell",
-                    "shop": "mobile_phone"
+                    "name": "Lagerhaus",
+                    "shop": "doityourself"
                 },
-                "name": "Bell",
+                "name": "Lagerhaus",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88669,12 +92063,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Bitė": {
+            "shop/doityourself/Bauhaus": {
                 "tags": {
-                    "name": "Bitė",
-                    "shop": "mobile_phone"
+                    "name": "Bauhaus",
+                    "shop": "doityourself"
                 },
-                "name": "Bitė",
+                "name": "Bauhaus",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88688,12 +92082,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Carphone Warehouse": {
+            "shop/doityourself/Leroy Merlin": {
                 "tags": {
-                    "name": "Carphone Warehouse",
-                    "shop": "mobile_phone"
+                    "name": "Leroy Merlin",
+                    "shop": "doityourself"
                 },
-                "name": "Carphone Warehouse",
+                "name": "Leroy Merlin",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88707,12 +92101,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Movistar": {
+            "shop/doityourself/Hellweg": {
                 "tags": {
-                    "name": "Movistar",
-                    "shop": "mobile_phone"
+                    "name": "Hellweg",
+                    "shop": "doityourself"
                 },
-                "name": "Movistar",
+                "name": "Hellweg",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88726,12 +92120,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/O2": {
+            "shop/doityourself/Brico": {
                 "tags": {
-                    "name": "O2",
-                    "shop": "mobile_phone"
+                    "name": "Brico",
+                    "shop": "doityourself"
                 },
-                "name": "O2",
+                "name": "Brico",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88745,12 +92139,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Orange": {
+            "shop/doityourself/Bricomarché": {
                 "tags": {
-                    "name": "Orange",
-                    "shop": "mobile_phone"
+                    "name": "Bricomarché",
+                    "shop": "doityourself"
                 },
-                "name": "Orange",
+                "name": "Bricomarché",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88764,12 +92158,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/SFR": {
+            "shop/doityourself/Toom": {
                 "tags": {
-                    "name": "SFR",
-                    "shop": "mobile_phone"
+                    "name": "Toom",
+                    "shop": "doityourself"
                 },
-                "name": "SFR",
+                "name": "Toom",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88783,12 +92177,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Sprint": {
+            "shop/doityourself/Praktiker": {
                 "tags": {
-                    "name": "Sprint",
-                    "shop": "mobile_phone"
+                    "name": "Praktiker",
+                    "shop": "doityourself"
                 },
-                "name": "Sprint",
+                "name": "Praktiker",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88802,12 +92196,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/T-Mobile": {
+            "shop/doityourself/Hagebaumarkt": {
                 "tags": {
-                    "name": "T-Mobile",
-                    "shop": "mobile_phone"
+                    "name": "Hagebaumarkt",
+                    "shop": "doityourself"
                 },
-                "name": "T-Mobile",
+                "name": "Hagebaumarkt",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88821,12 +92215,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/The Phone House": {
+            "shop/doityourself/Menards": {
                 "tags": {
-                    "name": "The Phone House",
-                    "shop": "mobile_phone"
+                    "name": "Menards",
+                    "shop": "doityourself"
                 },
-                "name": "The Phone House",
+                "name": "Menards",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88840,12 +92234,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Verizon Wireless": {
+            "shop/doityourself/Weldom": {
                 "tags": {
-                    "name": "Verizon Wireless",
-                    "shop": "mobile_phone"
+                    "name": "Weldom",
+                    "shop": "doityourself"
                 },
-                "name": "Verizon Wireless",
+                "name": "Weldom",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88859,12 +92253,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Vodafone": {
+            "shop/doityourself/Bunnings Warehouse": {
                 "tags": {
-                    "name": "Vodafone",
-                    "shop": "mobile_phone"
+                    "name": "Bunnings Warehouse",
+                    "shop": "doityourself"
                 },
-                "name": "Vodafone",
+                "name": "Bunnings Warehouse",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88878,12 +92272,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/au": {
+            "shop/doityourself/Ace Hardware": {
                 "tags": {
-                    "name": "au",
-                    "shop": "mobile_phone"
+                    "name": "Ace Hardware",
+                    "shop": "doityourself"
                 },
-                "name": "au",
+                "name": "Ace Hardware",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88897,12 +92291,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Билайн": {
+            "shop/doityourself/Home Hardware": {
                 "tags": {
-                    "name": "Билайн",
-                    "shop": "mobile_phone"
+                    "name": "Home Hardware",
+                    "shop": "doityourself"
                 },
-                "name": "Билайн",
+                "name": "Home Hardware",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88916,12 +92310,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Евросеть": {
+            "shop/doityourself/Хозтовары": {
                 "tags": {
-                    "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
-                    "shop": "mobile_phone"
+                    "name": "ХозÑ\82оваÑ\80Ñ\8b",
+                    "shop": "doityourself"
                 },
-                "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
+                "name": "ХозÑ\82оваÑ\80Ñ\8b",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88935,12 +92329,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/МТС": {
+            "shop/doityourself/Стройматериалы": {
                 "tags": {
-                    "name": "Ð\9cТС",
-                    "shop": "mobile_phone"
+                    "name": "СÑ\82Ñ\80оймаÑ\82еÑ\80иалÑ\8b",
+                    "shop": "doityourself"
                 },
-                "name": "Ð\9cТС",
+                "name": "СÑ\82Ñ\80оймаÑ\82еÑ\80иалÑ\8b",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88954,12 +92348,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Мегафон": {
+            "shop/doityourself/Bricorama": {
                 "tags": {
-                    "name": "Мегафон",
-                    "shop": "mobile_phone"
+                    "name": "Bricorama",
+                    "shop": "doityourself"
                 },
-                "name": "Мегафон",
+                "name": "Bricorama",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88973,12 +92367,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Связной": {
+            "shop/doityourself/Point P": {
                 "tags": {
-                    "name": "Связной",
-                    "shop": "mobile_phone"
+                    "name": "Point P",
+                    "shop": "doityourself"
                 },
-                "name": "Связной",
+                "name": "Point P",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88992,12 +92386,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/ソフトバンクショップ (SoftBank shop)": {
+            "shop/department_store/Target": {
                 "tags": {
-                    "name": "ソフトバンクショップ (SoftBank shop)",
-                    "shop": "mobile_phone"
+                    "name": "Target",
+                    "shop": "department_store"
                 },
-                "name": "ソフトバンクショップ (SoftBank shop)",
+                "name": "Target",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89011,12 +92405,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/ドコモショップ (docomo shop)": {
+            "shop/department_store/Debenhams": {
                 "tags": {
-                    "name": "ドコモショップ (docomo shop)",
-                    "shop": "mobile_phone"
+                    "name": "Debenhams",
+                    "shop": "department_store"
                 },
-                "name": "ドコモショップ (docomo shop)",
+                "name": "Debenhams",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89030,12 +92424,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/motorcycle/Yamaha": {
+            "shop/department_store/Karstadt": {
                 "tags": {
-                    "name": "Yamaha",
-                    "shop": "motorcycle"
+                    "name": "Karstadt",
+                    "shop": "department_store"
                 },
-                "name": "Yamaha",
+                "name": "Karstadt",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89049,12 +92443,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Alain Afflelou": {
+            "shop/department_store/Kmart": {
                 "tags": {
-                    "name": "Alain Afflelou",
-                    "shop": "optician"
+                    "name": "Kmart",
+                    "shop": "department_store"
                 },
-                "name": "Alain Afflelou",
+                "name": "Kmart",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89068,12 +92462,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Apollo Optik": {
+            "shop/department_store/Galeria Kaufhof": {
                 "tags": {
-                    "name": "Apollo Optik",
-                    "shop": "optician"
+                    "name": "Galeria Kaufhof",
+                    "shop": "department_store"
                 },
-                "name": "Apollo Optik",
+                "name": "Galeria Kaufhof",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89087,12 +92481,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Fielmann": {
+            "shop/department_store/Marks & Spencer": {
                 "tags": {
-                    "name": "Fielmann",
-                    "shop": "optician"
+                    "name": "Marks & Spencer",
+                    "shop": "department_store"
                 },
-                "name": "Fielmann",
+                "name": "Marks & Spencer",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89106,12 +92500,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Krys": {
+            "shop/department_store/Big W": {
                 "tags": {
-                    "name": "Krys",
-                    "shop": "optician"
+                    "name": "Big W",
+                    "shop": "department_store"
                 },
-                "name": "Krys",
+                "name": "Big W",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89125,12 +92519,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Optic 2000": {
+            "shop/department_store/Woolworth": {
                 "tags": {
-                    "name": "Optic 2000",
-                    "shop": "optician"
+                    "name": "Woolworth",
+                    "shop": "department_store"
                 },
-                "name": "Optic 2000",
+                "name": "Woolworth",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89144,12 +92538,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Specsavers": {
+            "shop/department_store/Универмаг": {
                 "tags": {
-                    "name": "Specsavers",
-                    "shop": "optician"
+                    "name": "Универмаг",
+                    "shop": "department_store"
                 },
-                "name": "Specsavers",
+                "name": "Универмаг",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89163,12 +92557,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Vision Express": {
+            "shop/department_store/Sears": {
                 "tags": {
-                    "name": "Vision Express",
-                    "shop": "optician"
+                    "name": "Sears",
+                    "shop": "department_store"
                 },
-                "name": "Vision Express",
+                "name": "Sears",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89182,12 +92576,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/optician/Оптика": {
+            "shop/department_store/Kohl's": {
                 "tags": {
-                    "name": "Оптика",
-                    "shop": "optician"
+                    "name": "Kohl's",
+                    "shop": "department_store"
                 },
-                "name": "Оптика",
+                "name": "Kohl's",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89201,13 +92595,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/pet/Das Futterhaus": {
+            "shop/department_store/Macy's": {
                 "tags": {
-                    "name": "Das Futterhaus",
-                    "shop": "pet"
+                    "name": "Macy's",
+                    "shop": "department_store"
                 },
-                "name": "Das Futterhaus",
-                "icon": "dog-park",
+                "name": "Macy's",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89220,13 +92614,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/pet/Fressnapf": {
+            "shop/department_store/JCPenney": {
                 "tags": {
-                    "name": "Fressnapf",
-                    "shop": "pet"
+                    "name": "JCPenney",
+                    "shop": "department_store"
                 },
-                "name": "Fressnapf",
-                "icon": "dog-park",
+                "name": "JCPenney",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89239,13 +92633,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/pet/PetSmart": {
+            "shop/stationery/Staples": {
                 "tags": {
-                    "name": "PetSmart",
-                    "shop": "pet"
+                    "name": "Staples",
+                    "shop": "stationery"
                 },
-                "name": "PetSmart",
-                "icon": "dog-park",
+                "name": "Staples",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89258,13 +92652,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/pet/Petco": {
+            "shop/stationery/McPaper": {
                 "tags": {
-                    "name": "Petco",
-                    "shop": "pet"
+                    "name": "McPaper",
+                    "shop": "stationery"
                 },
-                "name": "Petco",
-                "icon": "dog-park",
+                "name": "McPaper",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89277,13 +92671,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/pet/Pets at Home": {
+            "shop/stationery/Office Depot": {
                 "tags": {
-                    "name": "Pets at Home",
-                    "shop": "pet"
+                    "name": "Office Depot",
+                    "shop": "stationery"
                 },
-                "name": "Pets at Home",
-                "icon": "dog-park",
+                "name": "Office Depot",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89296,13 +92690,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/pet/Зоомагазин": {
+            "shop/stationery/Канцтовары": {
                 "tags": {
-                    "name": "Ð\97оомагазин",
-                    "shop": "pet"
+                    "name": "Ð\9aанÑ\86Ñ\82оваÑ\80Ñ\8b",
+                    "shop": "stationery"
                 },
-                "name": "Ð\97оомагазин",
-                "icon": "dog-park",
+                "name": "Ð\9aанÑ\86Ñ\82оваÑ\80Ñ\8b",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89315,13 +92709,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Bata": {
+            "shop/car/Skoda": {
                 "tags": {
-                    "name": "Bata",
-                    "shop": "shoes"
+                    "name": "Skoda",
+                    "shop": "car"
                 },
-                "name": "Bata",
-                "icon": "shop",
+                "name": "Skoda",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89329,18 +92723,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Brantano": {
+            "shop/car/BMW": {
                 "tags": {
-                    "name": "Brantano",
-                    "shop": "shoes"
+                    "name": "BMW",
+                    "shop": "car"
                 },
-                "name": "Brantano",
-                "icon": "shop",
+                "name": "BMW",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89348,18 +92741,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Clarks": {
+            "shop/car/Citroen": {
                 "tags": {
-                    "name": "Clarks",
-                    "shop": "shoes"
+                    "name": "Citroen",
+                    "shop": "car"
                 },
-                "name": "Clarks",
-                "icon": "shop",
+                "name": "Citroen",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89367,18 +92759,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Ecco": {
+            "shop/car/Mercedes-Benz": {
                 "tags": {
-                    "name": "Ecco",
-                    "shop": "shoes"
+                    "name": "Mercedes-Benz",
+                    "shop": "car"
                 },
-                "name": "Ecco",
-                "icon": "shop",
+                "name": "Mercedes-Benz",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89386,18 +92777,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Foot Locker": {
+            "shop/car/Volvo": {
                 "tags": {
-                    "name": "Foot Locker",
-                    "shop": "shoes"
+                    "name": "Volvo",
+                    "shop": "car"
                 },
-                "name": "Foot Locker",
-                "icon": "shop",
+                "name": "Volvo",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89405,18 +92795,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/La Halle aux Chaussures": {
+            "shop/car/Ford": {
                 "tags": {
-                    "name": "La Halle aux Chaussures",
-                    "shop": "shoes"
+                    "name": "Ford",
+                    "shop": "car"
                 },
-                "name": "La Halle aux Chaussures",
-                "icon": "shop",
+                "name": "Ford",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89424,18 +92813,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Payless Shoe Source": {
+            "shop/car/Volkswagen": {
                 "tags": {
-                    "name": "Payless Shoe Source",
-                    "shop": "shoes"
+                    "name": "Volkswagen",
+                    "shop": "car"
                 },
-                "name": "Payless Shoe Source",
-                "icon": "shop",
+                "name": "Volkswagen",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89443,18 +92831,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Quick Schuh": {
+            "shop/car/Mazda": {
                 "tags": {
-                    "name": "Quick Schuh",
-                    "shop": "shoes"
+                    "name": "Mazda",
+                    "shop": "car"
                 },
-                "name": "Quick Schuh",
-                "icon": "shop",
+                "name": "Mazda",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89462,18 +92849,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Reno": {
+            "shop/car/Mitsubishi": {
                 "tags": {
-                    "name": "Reno",
-                    "shop": "shoes"
+                    "name": "Mitsubishi",
+                    "shop": "car"
                 },
-                "name": "Reno",
-                "icon": "shop",
+                "name": "Mitsubishi",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89481,18 +92867,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Salamander": {
+            "shop/car/Fiat": {
                 "tags": {
-                    "name": "Salamander",
-                    "shop": "shoes"
+                    "name": "Fiat",
+                    "shop": "car"
                 },
-                "name": "Salamander",
-                "icon": "shop",
+                "name": "Fiat",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89500,18 +92885,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Обувь": {
+            "shop/car/Opel": {
                 "tags": {
-                    "name": "Обувь",
-                    "shop": "shoes"
+                    "name": "Opel",
+                    "shop": "car"
                 },
-                "name": "Обувь",
-                "icon": "shop",
+                "name": "Opel",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89519,18 +92903,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Decathlon": {
+            "shop/car/Audi": {
                 "tags": {
-                    "name": "Decathlon",
-                    "shop": "sports"
+                    "name": "Audi",
+                    "shop": "car"
                 },
-                "name": "Decathlon",
-                "icon": "shop",
+                "name": "Audi",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89538,18 +92921,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Dick's Sporting Goods": {
+            "shop/car/Toyota": {
                 "tags": {
-                    "name": "Dick's Sporting Goods",
-                    "shop": "sports"
+                    "name": "Toyota",
+                    "shop": "car"
                 },
-                "name": "Dick's Sporting Goods",
-                "icon": "shop",
+                "name": "Toyota",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89557,18 +92939,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Intersport": {
+            "shop/car/Nissan": {
                 "tags": {
-                    "name": "Intersport",
-                    "shop": "sports"
+                    "name": "Nissan",
+                    "shop": "car"
                 },
-                "name": "Intersport",
-                "icon": "shop",
+                "name": "Nissan",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89576,18 +92957,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Sport 2000": {
+            "shop/car/Suzuki": {
                 "tags": {
-                    "name": "Sport 2000",
-                    "shop": "sports"
+                    "name": "Suzuki",
+                    "shop": "car"
                 },
-                "name": "Sport 2000",
-                "icon": "shop",
+                "name": "Suzuki",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89595,18 +92975,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Sports Authority": {
+            "shop/car/Honda": {
                 "tags": {
-                    "name": "Sports Authority",
-                    "shop": "sports"
+                    "name": "Honda",
+                    "shop": "car"
                 },
-                "name": "Sports Authority",
-                "icon": "shop",
+                "name": "Honda",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89614,18 +92993,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Спортмастер": {
+            "shop/car/Hyundai": {
                 "tags": {
-                    "name": "Спортмастер",
-                    "shop": "sports"
+                    "name": "Hyundai",
+                    "shop": "car"
                 },
-                "name": "Спортмастер",
-                "icon": "shop",
+                "name": "Hyundai",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89633,18 +93011,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/McPaper": {
+            "shop/car/Subaru": {
                 "tags": {
-                    "name": "McPaper",
-                    "shop": "stationery"
+                    "name": "Subaru",
+                    "shop": "car"
                 },
-                "name": "McPaper",
-                "icon": "shop",
+                "name": "Subaru",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89652,18 +93029,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/Office Depot": {
+            "shop/car/Chevrolet": {
                 "tags": {
-                    "name": "Office Depot",
-                    "shop": "stationery"
+                    "name": "Chevrolet",
+                    "shop": "car"
                 },
-                "name": "Office Depot",
-                "icon": "shop",
+                "name": "Chevrolet",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89671,18 +93047,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/Staples": {
+            "shop/car/Автомагазин": {
                 "tags": {
-                    "name": "Staples",
-                    "shop": "stationery"
+                    "name": "Автомагазин",
+                    "shop": "car"
                 },
-                "name": "Staples",
-                "icon": "shop",
+                "name": "Автомагазин",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89690,18 +93065,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/Канцтовары": {
+            "shop/clothes/Matalan": {
                 "tags": {
-                    "name": "Канцтовары",
-                    "shop": "stationery"
+                    "name": "Matalan",
+                    "shop": "clothes"
                 },
-                "name": "Канцтовары",
-                "icon": "shop",
+                "name": "Matalan",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89714,3508 +93088,3508 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/AD Delhaize": {
+            "shop/clothes/KiK": {
                 "tags": {
-                    "name": "AD Delhaize",
-                    "shop": "supermarket"
+                    "name": "KiK",
+                    "shop": "clothes"
                 },
-                "name": "AD Delhaize",
-                "icon": "grocery",
+                "name": "KiK",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ADEG": {
+            "shop/clothes/H&M": {
                 "tags": {
-                    "name": "ADEG",
-                    "shop": "supermarket"
+                    "name": "H&M",
+                    "shop": "clothes"
                 },
-                "name": "ADEG",
-                "icon": "grocery",
+                "name": "H&M",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ALDI": {
+            "shop/clothes/Urban Outfitters": {
                 "tags": {
-                    "name": "ALDI",
-                    "shop": "supermarket"
+                    "name": "Urban Outfitters",
+                    "shop": "clothes"
                 },
-                "name": "ALDI",
-                "icon": "grocery",
+                "name": "Urban Outfitters",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Aldi Süd": {
+            "shop/clothes/Vögele": {
                 "tags": {
-                    "name": "Aldi Süd",
-                    "shop": "supermarket"
+                    "name": "Vögele",
+                    "shop": "clothes"
                 },
-                "name": "Aldi Süd",
-                "icon": "grocery",
+                "name": "Vögele",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ASDA": {
+            "shop/clothes/Zeeman": {
                 "tags": {
-                    "name": "ASDA",
-                    "shop": "supermarket"
+                    "name": "Zeeman",
+                    "shop": "clothes"
                 },
-                "name": "ASDA",
-                "icon": "grocery",
+                "name": "Zeeman",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Albert": {
+            "shop/clothes/Takko": {
                 "tags": {
-                    "name": "Albert",
-                    "shop": "supermarket"
+                    "name": "Takko",
+                    "shop": "clothes"
                 },
-                "name": "Albert",
-                "icon": "grocery",
+                "name": "Takko",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Albert Heijn": {
+            "shop/clothes/C&A": {
                 "tags": {
-                    "name": "Albert Heijn",
-                    "shop": "supermarket"
+                    "name": "C&A",
+                    "shop": "clothes"
                 },
-                "name": "Albert Heijn",
-                "icon": "grocery",
+                "name": "C&A",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Albertsons": {
+            "shop/clothes/Zara": {
                 "tags": {
-                    "name": "Albertsons",
-                    "shop": "supermarket"
+                    "name": "Zara",
+                    "shop": "clothes"
                 },
-                "name": "Albertsons",
-                "icon": "grocery",
+                "name": "Zara",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Aldi Nord": {
+            "shop/clothes/Vero Moda": {
                 "tags": {
-                    "name": "Aldi Nord",
-                    "shop": "supermarket"
+                    "name": "Vero Moda",
+                    "shop": "clothes"
                 },
-                "name": "Aldi Nord",
-                "icon": "grocery",
+                "name": "Vero Moda",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Alimerka": {
+            "shop/clothes/NKD": {
                 "tags": {
-                    "name": "Alimerka",
-                    "shop": "supermarket"
+                    "name": "NKD",
+                    "shop": "clothes"
                 },
-                "name": "Alimerka",
-                "icon": "grocery",
+                "name": "NKD",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Asda": {
+            "shop/clothes/Ernsting's family": {
                 "tags": {
-                    "name": "Asda",
-                    "shop": "supermarket"
+                    "name": "Ernsting's family",
+                    "shop": "clothes"
                 },
-                "name": "Asda",
-                "icon": "grocery",
+                "name": "Ernsting's family",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Billa": {
+            "shop/clothes/Winners": {
                 "tags": {
-                    "name": "Billa",
-                    "shop": "supermarket"
+                    "name": "Winners",
+                    "shop": "clothes"
                 },
-                "name": "Billa",
-                "icon": "grocery",
+                "name": "Winners",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Bodega Aurrera": {
+            "shop/clothes/River Island": {
                 "tags": {
-                    "name": "Bodega Aurrera",
-                    "shop": "supermarket"
+                    "name": "River Island",
+                    "shop": "clothes"
                 },
-                "name": "Bodega Aurrera",
-                "icon": "grocery",
+                "name": "River Island",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Budgens": {
+            "shop/clothes/Next": {
                 "tags": {
-                    "name": "Budgens",
-                    "shop": "supermarket"
+                    "name": "Next",
+                    "shop": "clothes"
                 },
-                "name": "Budgens",
-                "icon": "grocery",
+                "name": "Next",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/C1000": {
+            "shop/clothes/Gap": {
                 "tags": {
-                    "name": "C1000",
-                    "shop": "supermarket"
+                    "name": "Gap",
+                    "shop": "clothes"
                 },
-                "name": "C1000",
-                "icon": "grocery",
+                "name": "Gap",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Caprabo": {
+            "shop/clothes/Adidas": {
                 "tags": {
-                    "name": "Caprabo",
-                    "shop": "supermarket"
+                    "name": "Adidas",
+                    "shop": "clothes"
                 },
-                "name": "Caprabo",
-                "icon": "grocery",
+                "name": "Adidas",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Carrefour Contact": {
+            "shop/clothes/Mr Price": {
                 "tags": {
-                    "name": "Carrefour Contact",
-                    "shop": "supermarket"
+                    "name": "Mr Price",
+                    "shop": "clothes"
                 },
-                "name": "Carrefour Contact",
-                "icon": "grocery",
+                "name": "Mr Price",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Carrefour Market": {
+            "shop/clothes/Pep": {
                 "tags": {
-                    "name": "Carrefour Market",
-                    "shop": "supermarket"
+                    "name": "Pep",
+                    "shop": "clothes"
                 },
-                "name": "Carrefour Market",
-                "icon": "grocery",
+                "name": "Pep",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Champion": {
+            "shop/clothes/Edgars": {
                 "tags": {
-                    "name": "Champion",
-                    "shop": "supermarket"
+                    "name": "Edgars",
+                    "shop": "clothes"
                 },
-                "name": "Champion",
-                "icon": "grocery",
+                "name": "Edgars",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Checkers": {
+            "shop/clothes/Ackermans": {
                 "tags": {
-                    "name": "Checkers",
-                    "shop": "supermarket"
+                    "name": "Ackermans",
+                    "shop": "clothes"
                 },
-                "name": "Checkers",
-                "icon": "grocery",
+                "name": "Ackermans",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Coles": {
+            "shop/clothes/Truworths": {
                 "tags": {
-                    "name": "Coles",
-                    "shop": "supermarket"
+                    "name": "Truworths",
+                    "shop": "clothes"
                 },
-                "name": "Coles",
-                "icon": "grocery",
+                "name": "Truworths",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Colruyt": {
+            "shop/clothes/Ross": {
                 "tags": {
-                    "name": "Colruyt",
-                    "shop": "supermarket"
+                    "name": "Ross",
+                    "shop": "clothes"
                 },
-                "name": "Colruyt",
-                "icon": "grocery",
+                "name": "Ross",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Combi": {
+            "shop/clothes/Dorothy Perkins": {
                 "tags": {
-                    "name": "Combi",
-                    "shop": "supermarket"
+                    "name": "Dorothy Perkins",
+                    "shop": "clothes"
                 },
-                "name": "Combi",
-                "icon": "grocery",
+                "name": "Dorothy Perkins",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Conad": {
+            "shop/clothes/Deichmann": {
                 "tags": {
-                    "name": "Conad",
-                    "shop": "supermarket"
+                    "name": "Deichmann",
+                    "shop": "clothes"
                 },
-                "name": "Conad",
-                "icon": "grocery",
+                "name": "Deichmann",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Condis": {
+            "shop/clothes/Lindex": {
                 "tags": {
-                    "name": "Condis",
-                    "shop": "supermarket"
+                    "name": "Lindex",
+                    "shop": "clothes"
                 },
-                "name": "Condis",
-                "icon": "grocery",
+                "name": "Lindex",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Consum": {
+            "shop/clothes/s.Oliver": {
                 "tags": {
-                    "name": "Consum",
-                    "shop": "supermarket"
+                    "name": "s.Oliver",
+                    "shop": "clothes"
                 },
-                "name": "Consum",
-                "icon": "grocery",
+                "name": "s.Oliver",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Continente": {
+            "shop/clothes/Old Navy": {
                 "tags": {
-                    "name": "Continente",
-                    "shop": "supermarket"
+                    "name": "Old Navy",
+                    "shop": "clothes"
                 },
-                "name": "Continente",
-                "icon": "grocery",
+                "name": "Old Navy",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Coop Konsum": {
+            "shop/clothes/Jack & Jones": {
                 "tags": {
-                    "name": "Coop Konsum",
-                    "shop": "supermarket"
+                    "name": "Jack & Jones",
+                    "shop": "clothes"
                 },
-                "name": "Coop Konsum",
-                "icon": "grocery",
+                "name": "Jack & Jones",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Costco": {
+            "shop/clothes/Pimkie": {
                 "tags": {
-                    "name": "Costco",
-                    "shop": "supermarket"
+                    "name": "Pimkie",
+                    "shop": "clothes"
                 },
-                "name": "Costco",
-                "icon": "grocery",
+                "name": "Pimkie",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Countdown": {
+            "shop/clothes/Esprit": {
                 "tags": {
-                    "name": "Countdown",
-                    "shop": "supermarket"
+                    "name": "Esprit",
+                    "shop": "clothes"
                 },
-                "name": "Countdown",
-                "icon": "grocery",
+                "name": "Esprit",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Dia": {
+            "shop/clothes/Primark": {
                 "tags": {
-                    "name": "Dia",
-                    "shop": "supermarket"
+                    "name": "Primark",
+                    "shop": "clothes"
                 },
-                "name": "Dia",
-                "icon": "grocery",
+                "name": "Primark",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Delhaize": {
+            "shop/clothes/Bonita": {
                 "tags": {
-                    "name": "Delhaize",
-                    "shop": "supermarket"
+                    "name": "Bonita",
+                    "shop": "clothes"
                 },
-                "name": "Delhaize",
-                "icon": "grocery",
+                "name": "Bonita",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Delikatesy Centrum": {
+            "shop/clothes/Mexx": {
                 "tags": {
-                    "name": "Delikatesy Centrum",
-                    "shop": "supermarket"
+                    "name": "Mexx",
+                    "shop": "clothes"
                 },
-                "name": "Delikatesy Centrum",
-                "icon": "grocery",
+                "name": "Mexx",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Denner": {
+            "shop/clothes/Gerry Weber": {
                 "tags": {
-                    "name": "Denner",
-                    "shop": "supermarket"
+                    "name": "Gerry Weber",
+                    "shop": "clothes"
                 },
-                "name": "Denner",
-                "icon": "grocery",
+                "name": "Gerry Weber",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Despar": {
+            "shop/clothes/Tally Weijl": {
                 "tags": {
-                    "name": "Despar",
-                    "shop": "supermarket"
+                    "name": "Tally Weijl",
+                    "shop": "clothes"
                 },
-                "name": "Despar",
-                "icon": "grocery",
+                "name": "Tally Weijl",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Diska": {
+            "shop/clothes/Mango": {
                 "tags": {
-                    "name": "Diska",
-                    "shop": "supermarket"
+                    "name": "Mango",
+                    "shop": "clothes"
                 },
-                "name": "Diska",
-                "icon": "grocery",
+                "name": "Mango",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Dunnes Stores": {
+            "shop/clothes/TK Maxx": {
                 "tags": {
-                    "name": "Dunnes Stores",
-                    "shop": "supermarket"
+                    "name": "TK Maxx",
+                    "shop": "clothes"
                 },
-                "name": "Dunnes Stores",
-                "icon": "grocery",
+                "name": "TK Maxx",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/E-Center": {
+            "shop/clothes/Benetton": {
                 "tags": {
-                    "name": "E-Center",
-                    "shop": "supermarket"
+                    "name": "Benetton",
+                    "shop": "clothes"
                 },
-                "name": "E-Center",
-                "icon": "grocery",
+                "name": "Benetton",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/EDEKA": {
+            "shop/clothes/Ulla Popken": {
                 "tags": {
-                    "name": "EDEKA",
-                    "shop": "supermarket"
+                    "name": "Ulla Popken",
+                    "shop": "clothes"
                 },
-                "name": "EDEKA",
-                "icon": "grocery",
+                "name": "Ulla Popken",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Edeka": {
+            "shop/clothes/AWG": {
                 "tags": {
-                    "name": "Edeka",
-                    "shop": "supermarket"
+                    "name": "AWG",
+                    "shop": "clothes"
                 },
-                "name": "Edeka",
-                "icon": "grocery",
+                "name": "AWG",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/El Árbol": {
+            "shop/clothes/Tommy Hilfiger": {
                 "tags": {
-                    "name": "El Árbol",
-                    "shop": "supermarket"
+                    "name": "Tommy Hilfiger",
+                    "shop": "clothes"
                 },
-                "name": "El Árbol",
-                "icon": "grocery",
+                "name": "Tommy Hilfiger",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Eroski": {
+            "shop/clothes/New Yorker": {
                 "tags": {
-                    "name": "Eroski",
-                    "shop": "supermarket"
+                    "name": "New Yorker",
+                    "shop": "clothes"
                 },
-                "name": "Eroski",
-                "icon": "grocery",
+                "name": "New Yorker",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Esselunga": {
+            "shop/clothes/Orsay": {
                 "tags": {
-                    "name": "Esselunga",
-                    "shop": "supermarket"
+                    "name": "Orsay",
+                    "shop": "clothes"
                 },
-                "name": "Esselunga",
-                "icon": "grocery",
+                "name": "Orsay",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Eurospar": {
+            "shop/clothes/Charles Vögele": {
                 "tags": {
-                    "name": "Eurospar",
-                    "shop": "supermarket"
+                    "name": "Charles Vögele",
+                    "shop": "clothes"
                 },
-                "name": "Eurospar",
-                "icon": "grocery",
+                "name": "Charles Vögele",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Eurospin": {
+            "shop/clothes/New Look": {
                 "tags": {
-                    "name": "Eurospin",
-                    "shop": "supermarket"
+                    "name": "New Look",
+                    "shop": "clothes"
                 },
-                "name": "Eurospin",
-                "icon": "grocery",
+                "name": "New Look",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Extra": {
+            "shop/clothes/Lacoste": {
                 "tags": {
-                    "name": "Extra",
-                    "shop": "supermarket"
+                    "name": "Lacoste",
+                    "shop": "clothes"
                 },
-                "name": "Extra",
-                "icon": "grocery",
+                "name": "Lacoste",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Fakta": {
+            "shop/clothes/Etam": {
                 "tags": {
-                    "name": "Fakta",
-                    "shop": "supermarket"
+                    "name": "Etam",
+                    "shop": "clothes"
                 },
-                "name": "Fakta",
-                "icon": "grocery",
+                "name": "Etam",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Famiglia Cooperativa": {
+            "shop/clothes/Kiabi": {
                 "tags": {
-                    "name": "Famiglia Cooperativa",
-                    "shop": "supermarket"
+                    "name": "Kiabi",
+                    "shop": "clothes"
                 },
-                "name": "Famiglia Cooperativa",
-                "icon": "grocery",
+                "name": "Kiabi",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Famila": {
+            "shop/clothes/Jack Wolfskin": {
                 "tags": {
-                    "name": "Famila",
-                    "shop": "supermarket"
+                    "name": "Jack Wolfskin",
+                    "shop": "clothes"
                 },
-                "name": "Famila",
-                "icon": "grocery",
+                "name": "Jack Wolfskin",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Farmfoods": {
+            "shop/clothes/American Apparel": {
                 "tags": {
-                    "name": "Farmfoods",
-                    "shop": "supermarket"
+                    "name": "American Apparel",
+                    "shop": "clothes"
                 },
-                "name": "Farmfoods",
-                "icon": "grocery",
+                "name": "American Apparel",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Feneberg": {
+            "shop/clothes/Men's Wearhouse": {
                 "tags": {
-                    "name": "Feneberg",
-                    "shop": "supermarket"
+                    "name": "Men's Wearhouse",
+                    "shop": "clothes"
                 },
-                "name": "Feneberg",
-                "icon": "grocery",
+                "name": "Men's Wearhouse",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Food Basics": {
+            "shop/clothes/Intimissimi": {
                 "tags": {
-                    "name": "Food Basics",
-                    "shop": "supermarket"
+                    "name": "Intimissimi",
+                    "shop": "clothes"
                 },
-                "name": "Food Basics",
-                "icon": "grocery",
+                "name": "Intimissimi",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Food Lion": {
+            "shop/clothes/United Colors of Benetton": {
                 "tags": {
-                    "name": "Food Lion",
-                    "shop": "supermarket"
+                    "name": "United Colors of Benetton",
+                    "shop": "clothes"
                 },
-                "name": "Food Lion",
-                "icon": "grocery",
+                "name": "United Colors of Benetton",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Foodland": {
+            "shop/clothes/Jules": {
                 "tags": {
-                    "name": "Foodland",
-                    "shop": "supermarket"
+                    "name": "Jules",
+                    "shop": "clothes"
                 },
-                "name": "Foodland",
-                "icon": "grocery",
+                "name": "Jules",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Foodworks": {
+            "shop/clothes/AOKI": {
                 "tags": {
-                    "name": "Foodworks",
-                    "shop": "supermarket"
+                    "name": "AOKI",
+                    "shop": "clothes"
                 },
-                "name": "Foodworks",
-                "icon": "grocery",
+                "name": "AOKI",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Fred Meyer": {
+            "shop/clothes/Calzedonia": {
                 "tags": {
-                    "name": "Fred Meyer",
-                    "shop": "supermarket"
+                    "name": "Calzedonia",
+                    "shop": "clothes"
                 },
-                "name": "Fred Meyer",
-                "icon": "grocery",
+                "name": "Calzedonia",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Føtex": {
+            "shop/clothes/洋服の青山": {
                 "tags": {
-                    "name": "Føtex",
-                    "shop": "supermarket"
+                    "name": "洋服の青山",
+                    "shop": "clothes"
                 },
-                "name": "Føtex",
-                "icon": "grocery",
+                "name": "洋服の青山",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Game": {
+            "shop/clothes/Levi's": {
                 "tags": {
-                    "name": "Game",
-                    "shop": "supermarket"
+                    "name": "Levi's",
+                    "shop": "clothes"
                 },
-                "name": "Game",
-                "icon": "grocery",
+                "name": "Levi's",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Giant": {
+            "shop/clothes/Celio": {
                 "tags": {
-                    "name": "Giant",
-                    "shop": "supermarket"
+                    "name": "Celio",
+                    "shop": "clothes"
                 },
-                "name": "Giant",
-                "icon": "grocery",
+                "name": "Celio",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Giant Eagle": {
+            "shop/clothes/TJ Maxx": {
                 "tags": {
-                    "name": "Giant Eagle",
-                    "shop": "supermarket"
+                    "name": "TJ Maxx",
+                    "shop": "clothes"
                 },
-                "name": "Giant Eagle",
-                "icon": "grocery",
+                "name": "TJ Maxx",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Géant Casino": {
+            "shop/clothes/Promod": {
                 "tags": {
-                    "name": "Géant Casino",
-                    "shop": "supermarket"
+                    "name": "Promod",
+                    "shop": "clothes"
                 },
-                "name": "Géant Casino",
-                "icon": "grocery",
+                "name": "Promod",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/HEB": {
+            "shop/clothes/Street One": {
                 "tags": {
-                    "name": "HEB",
-                    "shop": "supermarket"
+                    "name": "Street One",
+                    "shop": "clothes"
                 },
-                "name": "HEB",
-                "icon": "grocery",
+                "name": "Street One",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/HIT": {
+            "shop/clothes/ユニクロ": {
                 "tags": {
-                    "name": "HIT",
-                    "shop": "supermarket"
+                    "name": "ユニクロ",
+                    "shop": "clothes"
                 },
-                "name": "HIT",
-                "icon": "grocery",
+                "name": "ユニクロ",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hannaford": {
+            "shop/clothes/Banana Republic": {
                 "tags": {
-                    "name": "Hannaford",
-                    "shop": "supermarket"
+                    "name": "Banana Republic",
+                    "shop": "clothes"
                 },
-                "name": "Hannaford",
-                "icon": "grocery",
+                "name": "Banana Republic",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Harris Teeter": {
+            "shop/clothes/Одежда": {
                 "tags": {
-                    "name": "Harris Teeter",
-                    "shop": "supermarket"
+                    "name": "Одежда",
+                    "shop": "clothes"
                 },
-                "name": "Harris Teeter",
-                "icon": "grocery",
+                "name": "Одежда",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hemköp": {
+            "shop/clothes/La Halle": {
                 "tags": {
-                    "name": "Hemköp",
-                    "shop": "supermarket"
+                    "name": "La Halle",
+                    "shop": "clothes"
                 },
-                "name": "Hemköp",
-                "icon": "grocery",
+                "name": "La Halle",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hofer": {
+            "shop/clothes/Peacocks": {
                 "tags": {
-                    "name": "Hofer",
-                    "shop": "supermarket"
+                    "name": "Peacocks",
+                    "shop": "clothes"
                 },
-                "name": "Hofer",
-                "icon": "grocery",
+                "name": "Peacocks",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hoogvliet": {
+            "shop/clothes/しまむら": {
                 "tags": {
-                    "name": "Hoogvliet",
-                    "shop": "supermarket"
+                    "name": "しまむら",
+                    "shop": "clothes"
                 },
-                "name": "Hoogvliet",
-                "icon": "grocery",
+                "name": "しまむら",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hy-Vee": {
+            "shop/books/Bruna": {
                 "tags": {
-                    "name": "Hy-Vee",
-                    "shop": "supermarket"
+                    "name": "Bruna",
+                    "shop": "books"
                 },
-                "name": "Hy-Vee",
-                "icon": "grocery",
+                "name": "Bruna",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ICA": {
+            "shop/books/Waterstones": {
                 "tags": {
-                    "name": "ICA",
-                    "shop": "supermarket"
+                    "name": "Waterstones",
+                    "shop": "books"
                 },
-                "name": "ICA",
-                "icon": "grocery",
+                "name": "Waterstones",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/IGA": {
+            "shop/books/Libro": {
                 "tags": {
-                    "name": "IGA",
-                    "shop": "supermarket"
+                    "name": "Libro",
+                    "shop": "books"
                 },
-                "name": "IGA",
-                "icon": "grocery",
+                "name": "Libro",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Iceland": {
+            "shop/books/Barnes & Noble": {
                 "tags": {
-                    "name": "Iceland",
-                    "shop": "supermarket"
+                    "name": "Barnes & Noble",
+                    "shop": "books"
                 },
-                "name": "Iceland",
-                "icon": "grocery",
+                "name": "Barnes & Noble",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Intermarche": {
+            "shop/books/Weltbild": {
                 "tags": {
-                    "name": "Intermarche",
-                    "shop": "supermarket"
+                    "name": "Weltbild",
+                    "shop": "books"
                 },
-                "name": "Intermarche",
-                "icon": "grocery",
+                "name": "Weltbild",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Interspar": {
+            "shop/books/Thalia": {
                 "tags": {
-                    "name": "Interspar",
-                    "shop": "supermarket"
+                    "name": "Thalia",
+                    "shop": "books"
                 },
-                "name": "Interspar",
-                "icon": "grocery",
+                "name": "Thalia",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Irma": {
+            "shop/books/Книги": {
                 "tags": {
-                    "name": "Irma",
-                    "shop": "supermarket"
+                    "name": "Книги",
+                    "shop": "books"
                 },
-                "name": "Irma",
-                "icon": "grocery",
+                "name": "Книги",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Jumbo": {
+            "shop/alcohol/Alko": {
                 "tags": {
-                    "name": "Jumbo",
-                    "shop": "supermarket"
+                    "name": "Alko",
+                    "shop": "alcohol"
                 },
-                "name": "Jumbo",
-                "icon": "grocery",
+                "name": "Alko",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/K+K": {
+            "shop/alcohol/The Beer Store": {
                 "tags": {
-                    "name": "K+K",
-                    "shop": "supermarket"
+                    "name": "The Beer Store",
+                    "shop": "alcohol"
                 },
-                "name": "K+K",
-                "icon": "grocery",
+                "name": "The Beer Store",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kaiser's": {
+            "shop/alcohol/Systembolaget": {
                 "tags": {
-                    "name": "Kaiser's",
-                    "shop": "supermarket"
+                    "name": "Systembolaget",
+                    "shop": "alcohol"
                 },
-                "name": "Kaiser's",
-                "icon": "grocery",
+                "name": "Systembolaget",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kaufland": {
+            "shop/alcohol/LCBO": {
                 "tags": {
-                    "name": "Kaufland",
-                    "shop": "supermarket"
+                    "name": "LCBO",
+                    "shop": "alcohol"
                 },
-                "name": "Kaufland",
-                "icon": "grocery",
+                "name": "LCBO",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kaufpark": {
+            "shop/alcohol/Ароматный мир": {
                 "tags": {
-                    "name": "Kaufpark",
-                    "shop": "supermarket"
+                    "name": "Ароматный мир",
+                    "shop": "alcohol"
                 },
-                "name": "Kaufpark",
-                "icon": "grocery",
+                "name": "Ароматный мир",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/King Soopers": {
+            "shop/alcohol/Bargain Booze": {
                 "tags": {
-                    "name": "King Soopers",
-                    "shop": "supermarket"
+                    "name": "Bargain Booze",
+                    "shop": "alcohol"
                 },
-                "name": "King Soopers",
-                "icon": "grocery",
+                "name": "Bargain Booze",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kiwi": {
+            "shop/alcohol/Nicolas": {
                 "tags": {
-                    "name": "Kiwi",
-                    "shop": "supermarket"
+                    "name": "Nicolas",
+                    "shop": "alcohol"
                 },
-                "name": "Kiwi",
-                "icon": "grocery",
+                "name": "Nicolas",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Konsum": {
+            "shop/alcohol/Botilleria": {
                 "tags": {
-                    "name": "Konsum",
-                    "shop": "supermarket"
+                    "name": "Botilleria",
+                    "shop": "alcohol"
                 },
-                "name": "Konsum",
-                "icon": "grocery",
+                "name": "Botilleria",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kroger": {
+            "shop/alcohol/SAQ": {
                 "tags": {
-                    "name": "Kroger",
-                    "shop": "supermarket"
+                    "name": "SAQ",
+                    "shop": "alcohol"
                 },
-                "name": "Kroger",
-                "icon": "grocery",
+                "name": "SAQ",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kvickly": {
+            "shop/alcohol/Gall & Gall": {
                 "tags": {
-                    "name": "Kvickly",
-                    "shop": "supermarket"
+                    "name": "Gall & Gall",
+                    "shop": "alcohol"
                 },
-                "name": "Kvickly",
-                "icon": "grocery",
+                "name": "Gall & Gall",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/LIDL": {
+            "shop/alcohol/BWS": {
                 "tags": {
-                    "name": "LIDL",
-                    "shop": "supermarket"
+                    "name": "BWS",
+                    "shop": "alcohol"
                 },
-                "name": "LIDL",
-                "icon": "grocery",
+                "name": "BWS",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Leader Price": {
+            "shop/alcohol/Живое пиво": {
                 "tags": {
-                    "name": "Leader Price",
-                    "shop": "supermarket"
+                    "name": "Живое пиво",
+                    "shop": "alcohol"
                 },
-                "name": "Leader Price",
-                "icon": "grocery",
+                "name": "Живое пиво",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Leclerc": {
+            "shop/bakery/Kamps": {
                 "tags": {
-                    "name": "Leclerc",
-                    "shop": "supermarket"
+                    "name": "Kamps",
+                    "shop": "bakery"
                 },
-                "name": "Leclerc",
-                "icon": "grocery",
+                "name": "Kamps",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Lider": {
+            "shop/bakery/Bäckerei Schmidt": {
                 "tags": {
-                    "name": "Lider",
-                    "shop": "supermarket"
+                    "name": "Bäckerei Schmidt",
+                    "shop": "bakery"
                 },
-                "name": "Lider",
-                "icon": "grocery",
+                "name": "Bäckerei Schmidt",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Lidl": {
+            "shop/bakery/Anker": {
                 "tags": {
-                    "name": "Lidl",
-                    "shop": "supermarket"
+                    "name": "Anker",
+                    "shop": "bakery"
                 },
-                "name": "Lidl",
-                "icon": "grocery",
+                "name": "Anker",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/M-Preis": {
+            "shop/bakery/Schäfer": {
                 "tags": {
-                    "name": "M-Preis",
-                    "shop": "supermarket"
+                    "name": "Schäfer",
+                    "shop": "bakery"
                 },
-                "name": "M-Preis",
-                "icon": "grocery",
+                "name": "Schäfer",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/MPreis": {
+            "shop/bakery/Hofpfisterei": {
                 "tags": {
-                    "name": "MPreis",
-                    "shop": "supermarket"
+                    "name": "Hofpfisterei",
+                    "shop": "bakery"
                 },
-                "name": "MPreis",
-                "icon": "grocery",
+                "name": "Hofpfisterei",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Makro": {
+            "shop/bakery/Greggs": {
                 "tags": {
-                    "name": "Makro",
-                    "shop": "supermarket"
+                    "name": "Greggs",
+                    "shop": "bakery"
                 },
-                "name": "Makro",
-                "icon": "grocery",
+                "name": "Greggs",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Markant": {
+            "shop/bakery/Oebel": {
                 "tags": {
-                    "name": "Markant",
-                    "shop": "supermarket"
+                    "name": "Oebel",
+                    "shop": "bakery"
                 },
-                "name": "Markant",
-                "icon": "grocery",
+                "name": "Oebel",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Marktkauf": {
+            "shop/bakery/Boulangerie": {
                 "tags": {
-                    "name": "Marktkauf",
-                    "shop": "supermarket"
+                    "name": "Boulangerie",
+                    "shop": "bakery"
                 },
-                "name": "Marktkauf",
-                "icon": "grocery",
+                "name": "Boulangerie",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Match": {
+            "shop/bakery/Stadtbäckerei": {
                 "tags": {
-                    "name": "Match",
-                    "shop": "supermarket"
+                    "name": "Stadtbäckerei",
+                    "shop": "bakery"
                 },
-                "name": "Match",
-                "icon": "grocery",
+                "name": "Stadtbäckerei",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Maxi": {
+            "shop/bakery/Steinecke": {
                 "tags": {
-                    "name": "Maxi",
-                    "shop": "supermarket"
+                    "name": "Steinecke",
+                    "shop": "bakery"
                 },
-                "name": "Maxi",
-                "icon": "grocery",
+                "name": "Steinecke",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Maxima": {
+            "shop/bakery/Ihle": {
                 "tags": {
-                    "name": "Maxima",
-                    "shop": "supermarket"
+                    "name": "Ihle",
+                    "shop": "bakery"
                 },
-                "name": "Maxima",
-                "icon": "grocery",
+                "name": "Ihle",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Maxima X": {
+            "shop/bakery/Goldilocks": {
                 "tags": {
-                    "name": "Maxima X",
-                    "shop": "supermarket"
+                    "name": "Goldilocks",
+                    "shop": "bakery"
                 },
-                "name": "Maxima X",
-                "icon": "grocery",
+                "name": "Goldilocks",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Meijer": {
+            "shop/bakery/Dat Backhus": {
                 "tags": {
-                    "name": "Meijer",
-                    "shop": "supermarket"
+                    "name": "Dat Backhus",
+                    "shop": "bakery"
                 },
-                "name": "Meijer",
-                "icon": "grocery",
+                "name": "Dat Backhus",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Mercadona": {
+            "shop/bakery/K&U": {
                 "tags": {
-                    "name": "Mercadona",
-                    "shop": "supermarket"
+                    "name": "K&U",
+                    "shop": "bakery"
                 },
-                "name": "Mercadona",
-                "icon": "grocery",
+                "name": "K&U",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Merkur": {
+            "shop/bakery/Der Beck": {
                 "tags": {
-                    "name": "Merkur",
-                    "shop": "supermarket"
+                    "name": "Der Beck",
+                    "shop": "bakery"
                 },
-                "name": "Merkur",
-                "icon": "grocery",
+                "name": "Der Beck",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Metro": {
+            "shop/bakery/Thürmann": {
                 "tags": {
-                    "name": "Metro",
-                    "shop": "supermarket"
+                    "name": "Thürmann",
+                    "shop": "bakery"
                 },
-                "name": "Metro",
-                "icon": "grocery",
+                "name": "Thürmann",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Migros": {
+            "shop/bakery/Backwerk": {
                 "tags": {
-                    "name": "Migros",
-                    "shop": "supermarket"
+                    "name": "Backwerk",
+                    "shop": "bakery"
                 },
-                "name": "Migros",
-                "icon": "grocery",
+                "name": "Backwerk",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Minipreço": {
+            "shop/bakery/Bäcker": {
                 "tags": {
-                    "name": "Minipreço",
-                    "shop": "supermarket"
+                    "name": "Bäcker",
+                    "shop": "bakery"
                 },
-                "name": "Minipreço",
-                "icon": "grocery",
+                "name": "Bäcker",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Monoprix": {
+            "shop/bakery/Schäfer's": {
                 "tags": {
-                    "name": "Monoprix",
-                    "shop": "supermarket"
+                    "name": "Schäfer's",
+                    "shop": "bakery"
                 },
-                "name": "Monoprix",
-                "icon": "grocery",
+                "name": "Schäfer's",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Netto": {
+            "shop/bakery/Panaderia": {
                 "tags": {
-                    "name": "Netto",
-                    "shop": "supermarket"
+                    "name": "Panaderia",
+                    "shop": "bakery"
                 },
-                "name": "Netto",
-                "icon": "grocery",
+                "name": "Panaderia",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/NORMA": {
+            "shop/bakery/Goeken backen": {
                 "tags": {
-                    "name": "NORMA",
-                    "shop": "supermarket"
+                    "name": "Goeken backen",
+                    "shop": "bakery"
                 },
-                "name": "NORMA",
-                "icon": "grocery",
+                "name": "Goeken backen",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/NP": {
+            "shop/bakery/Stadtbäckerei Junge": {
                 "tags": {
-                    "name": "NP",
-                    "shop": "supermarket"
+                    "name": "Stadtbäckerei Junge",
+                    "shop": "bakery"
                 },
-                "name": "NP",
-                "icon": "grocery",
+                "name": "Stadtbäckerei Junge",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Nah & Frisch": {
+            "shop/bakery/Boulangerie Patisserie": {
                 "tags": {
-                    "name": "Nah & Frisch",
-                    "shop": "supermarket"
+                    "name": "Boulangerie Patisserie",
+                    "shop": "bakery"
                 },
-                "name": "Nah & Frisch",
-                "icon": "grocery",
+                "name": "Boulangerie Patisserie",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Nahkauf": {
+            "shop/bakery/Paul": {
                 "tags": {
-                    "name": "Nahkauf",
-                    "shop": "supermarket"
+                    "name": "Paul",
+                    "shop": "bakery"
                 },
-                "name": "Nahkauf",
-                "icon": "grocery",
+                "name": "Paul",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Neukauf": {
+            "shop/bakery/Хлеб": {
                 "tags": {
-                    "name": "Neukauf",
-                    "shop": "supermarket"
+                    "name": "Хлеб",
+                    "shop": "bakery"
                 },
-                "name": "Neukauf",
-                "icon": "grocery",
+                "name": "Хлеб",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/New World": {
+            "shop/bakery/Piekarnia": {
                 "tags": {
-                    "name": "New World",
-                    "shop": "supermarket"
+                    "name": "Piekarnia",
+                    "shop": "bakery"
                 },
-                "name": "New World",
-                "icon": "grocery",
+                "name": "Piekarnia",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/No Frills": {
+            "shop/sports/Sports Direct": {
                 "tags": {
-                    "name": "No Frills",
-                    "shop": "supermarket"
+                    "name": "Sports Direct",
+                    "shop": "sports"
                 },
-                "name": "No Frills",
-                "icon": "grocery",
+                "name": "Sports Direct",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Norma": {
+            "shop/sports/Decathlon": {
                 "tags": {
-                    "name": "Norma",
-                    "shop": "supermarket"
+                    "name": "Decathlon",
+                    "shop": "sports"
                 },
-                "name": "Norma",
-                "icon": "grocery",
+                "name": "Decathlon",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/PENNY": {
+            "shop/sports/Intersport": {
                 "tags": {
-                    "name": "PENNY",
-                    "shop": "supermarket"
+                    "name": "Intersport",
+                    "shop": "sports"
                 },
-                "name": "PENNY",
-                "icon": "grocery",
+                "name": "Intersport",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Pam": {
+            "shop/sports/Sports Authority": {
                 "tags": {
-                    "name": "Pam",
-                    "shop": "supermarket"
+                    "name": "Sports Authority",
+                    "shop": "sports"
                 },
-                "name": "Pam",
-                "icon": "grocery",
+                "name": "Sports Authority",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Penny": {
+            "shop/sports/Спортмастер": {
                 "tags": {
-                    "name": "Penny",
-                    "shop": "supermarket"
+                    "name": "Спортмастер",
+                    "shop": "sports"
                 },
-                "name": "Penny",
-                "icon": "grocery",
+                "name": "Спортмастер",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Penny Market": {
+            "shop/sports/Sport 2000": {
                 "tags": {
-                    "name": "Penny Market",
-                    "shop": "supermarket"
+                    "name": "Sport 2000",
+                    "shop": "sports"
                 },
-                "name": "Penny Market",
-                "icon": "grocery",
+                "name": "Sport 2000",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Penny Markt": {
+            "shop/sports/Dick's Sporting Goods": {
                 "tags": {
-                    "name": "Penny Markt",
-                    "shop": "supermarket"
+                    "name": "Dick's Sporting Goods",
+                    "shop": "sports"
                 },
-                "name": "Penny Markt",
-                "icon": "grocery",
+                "name": "Dick's Sporting Goods",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Pick n Pay": {
+            "shop/variety_store/Tedi": {
                 "tags": {
-                    "name": "Pick n Pay",
-                    "shop": "supermarket"
+                    "name": "Tedi",
+                    "shop": "variety_store"
                 },
-                "name": "Pick n Pay",
-                "icon": "grocery",
+                "name": "Tedi",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Piggly Wiggly": {
+            "shop/variety_store/Dollarama": {
                 "tags": {
-                    "name": "Piggly Wiggly",
-                    "shop": "supermarket"
+                    "name": "Dollarama",
+                    "shop": "variety_store"
                 },
-                "name": "Piggly Wiggly",
-                "icon": "grocery",
+                "name": "Dollarama",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Pingo Doce": {
+            "shop/variety_store/Dollar Tree": {
                 "tags": {
-                    "name": "Pingo Doce",
-                    "shop": "supermarket"
+                    "name": "Dollar Tree",
+                    "shop": "variety_store"
                 },
-                "name": "Pingo Doce",
-                "icon": "grocery",
+                "name": "Dollar Tree",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Piotr i Paweł": {
+            "shop/pet/PetSmart": {
                 "tags": {
-                    "name": "Piotr i Paweł",
-                    "shop": "supermarket"
+                    "name": "PetSmart",
+                    "shop": "pet"
                 },
-                "name": "Piotr i Paweł",
-                "icon": "grocery",
+                "name": "PetSmart",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Plodine": {
+            "shop/pet/Das Futterhaus": {
                 "tags": {
-                    "name": "Plodine",
-                    "shop": "supermarket"
+                    "name": "Das Futterhaus",
+                    "shop": "pet"
                 },
-                "name": "Plodine",
-                "icon": "grocery",
+                "name": "Das Futterhaus",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Plus": {
+            "shop/pet/Pets at Home": {
                 "tags": {
-                    "name": "Plus",
-                    "shop": "supermarket"
+                    "name": "Pets at Home",
+                    "shop": "pet"
                 },
-                "name": "Plus",
-                "icon": "grocery",
+                "name": "Pets at Home",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Polo Market": {
+            "shop/pet/Petco": {
                 "tags": {
-                    "name": "Polo Market",
-                    "shop": "supermarket"
+                    "name": "Petco",
+                    "shop": "pet"
                 },
-                "name": "Polo Market",
-                "icon": "grocery",
+                "name": "Petco",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Price Chopper": {
+            "shop/pet/Зоомагазин": {
                 "tags": {
-                    "name": "Price Chopper",
-                    "shop": "supermarket"
+                    "name": "Зоомагазин",
+                    "shop": "pet"
                 },
-                "name": "Price Chopper",
-                "icon": "grocery",
+                "name": "Зоомагазин",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Profi": {
+            "shop/shoes/Reno": {
                 "tags": {
-                    "name": "Profi",
-                    "shop": "supermarket"
+                    "name": "Reno",
+                    "shop": "shoes"
                 },
-                "name": "Profi",
-                "icon": "grocery",
+                "name": "Reno",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Publix": {
+            "shop/shoes/Ecco": {
                 "tags": {
-                    "name": "Publix",
-                    "shop": "supermarket"
+                    "name": "Ecco",
+                    "shop": "shoes"
                 },
-                "name": "Publix",
-                "icon": "grocery",
+                "name": "Ecco",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/REWE": {
+            "shop/shoes/Clarks": {
                 "tags": {
-                    "name": "REWE",
-                    "shop": "supermarket"
+                    "name": "Clarks",
+                    "shop": "shoes"
                 },
-                "name": "REWE",
-                "icon": "grocery",
+                "name": "Clarks",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Real": {
+            "shop/shoes/La Halle aux Chaussures": {
                 "tags": {
-                    "name": "Real",
-                    "shop": "supermarket"
+                    "name": "La Halle aux Chaussures",
+                    "shop": "shoes"
                 },
-                "name": "Real",
-                "icon": "grocery",
+                "name": "La Halle aux Chaussures",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Reliance Fresh": {
+            "shop/shoes/Brantano": {
                 "tags": {
-                    "name": "Reliance Fresh",
-                    "shop": "supermarket"
+                    "name": "Brantano",
+                    "shop": "shoes"
                 },
-                "name": "Reliance Fresh",
-                "icon": "grocery",
+                "name": "Brantano",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Rema 1000": {
+            "shop/shoes/Salamander": {
                 "tags": {
-                    "name": "Rema 1000",
-                    "shop": "supermarket"
+                    "name": "Salamander",
+                    "shop": "shoes"
                 },
-                "name": "Rema 1000",
-                "icon": "grocery",
+                "name": "Salamander",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Rewe": {
+            "shop/shoes/Обувь": {
                 "tags": {
-                    "name": "Rewe",
-                    "shop": "supermarket"
+                    "name": "Обувь",
+                    "shop": "shoes"
                 },
-                "name": "Rewe",
-                "icon": "grocery",
+                "name": "Обувь",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Rimi": {
+            "shop/shoes/Payless Shoe Source": {
                 "tags": {
-                    "name": "Rimi",
-                    "shop": "supermarket"
+                    "name": "Payless Shoe Source",
+                    "shop": "shoes"
                 },
-                "name": "Rimi",
-                "icon": "grocery",
+                "name": "Payless Shoe Source",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/S-Market": {
+            "shop/shoes/Famous Footwear": {
                 "tags": {
-                    "name": "S-Market",
-                    "shop": "supermarket"
+                    "name": "Famous Footwear",
+                    "shop": "shoes"
                 },
-                "name": "S-Market",
-                "icon": "grocery",
+                "name": "Famous Footwear",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Safeway": {
+            "shop/shoes/Quick Schuh": {
                 "tags": {
-                    "name": "Safeway",
-                    "shop": "supermarket"
+                    "name": "Quick Schuh",
+                    "shop": "shoes"
                 },
-                "name": "Safeway",
-                "icon": "grocery",
+                "name": "Quick Schuh",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Sam's Club": {
+            "shop/shoes/Foot Locker": {
                 "tags": {
-                    "name": "Sam's Club",
-                    "shop": "supermarket"
+                    "name": "Foot Locker",
+                    "shop": "shoes"
                 },
-                "name": "Sam's Club",
-                "icon": "grocery",
+                "name": "Foot Locker",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Santa Isabel": {
+            "shop/shoes/Bata": {
                 "tags": {
-                    "name": "Santa Isabel",
-                    "shop": "supermarket"
+                    "name": "Bata",
+                    "shop": "shoes"
                 },
-                "name": "Santa Isabel",
-                "icon": "grocery",
+                "name": "Bata",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Shopi": {
+            "shop/toys/La Grande Récré": {
                 "tags": {
-                    "name": "Shopi",
-                    "shop": "supermarket"
+                    "name": "La Grande Récré",
+                    "shop": "toys"
                 },
-                "name": "Shopi",
-                "icon": "grocery",
+                "name": "La Grande Récré",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Shoprite": {
+            "shop/toys/Toys R Us": {
                 "tags": {
-                    "name": "Shoprite",
-                    "shop": "supermarket"
+                    "name": "Toys R Us",
+                    "shop": "toys"
                 },
-                "name": "Shoprite",
-                "icon": "grocery",
+                "name": "Toys R Us",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Simply Market": {
+            "shop/toys/Детский мир": {
                 "tags": {
-                    "name": "Simply Market",
-                    "shop": "supermarket"
+                    "name": "Детский мир",
+                    "shop": "toys"
                 },
-                "name": "Simply Market",
-                "icon": "grocery",
+                "name": "Детский мир",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Sobeys": {
+            "shop/toys/Intertoys": {
                 "tags": {
-                    "name": "Sobeys",
-                    "shop": "supermarket"
+                    "name": "Intertoys",
+                    "shop": "toys"
                 },
-                "name": "Sobeys",
-                "icon": "grocery",
+                "name": "Intertoys",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Soriana": {
+            "shop/toys/Игрушки": {
                 "tags": {
-                    "name": "Soriana",
-                    "shop": "supermarket"
+                    "name": "Игрушки",
+                    "shop": "toys"
                 },
-                "name": "Soriana",
-                "icon": "grocery",
+                "name": "Игрушки",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Stokrotka": {
+            "shop/travel_agency/Flight Centre": {
                 "tags": {
-                    "name": "Stokrotka",
-                    "shop": "supermarket"
+                    "name": "Flight Centre",
+                    "shop": "travel_agency"
                 },
-                "name": "Stokrotka",
-                "icon": "grocery",
+                "name": "Flight Centre",
+                "icon": "suitcase",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Stop & Shop": {
+            "shop/travel_agency/Thomas Cook": {
                 "tags": {
-                    "name": "Stop & Shop",
-                    "shop": "supermarket"
+                    "name": "Thomas Cook",
+                    "shop": "travel_agency"
                 },
-                "name": "Stop & Shop",
-                "icon": "grocery",
+                "name": "Thomas Cook",
+                "icon": "suitcase",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Super Brugsen": {
+            "shop/jewelry/Bijou Brigitte": {
                 "tags": {
-                    "name": "Super Brugsen",
-                    "shop": "supermarket"
+                    "name": "Bijou Brigitte",
+                    "shop": "jewelry"
                 },
-                "name": "Super Brugsen",
-                "icon": "grocery",
+                "name": "Bijou Brigitte",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/SuperBrugsen": {
+            "shop/jewelry/Christ": {
                 "tags": {
-                    "name": "SuperBrugsen",
-                    "shop": "supermarket"
+                    "name": "Christ",
+                    "shop": "jewelry"
                 },
-                "name": "SuperBrugsen",
-                "icon": "grocery",
+                "name": "Christ",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/tegut": {
+            "shop/jewelry/Swarovski": {
                 "tags": {
-                    "name": "tegut",
-                    "shop": "supermarket"
+                    "name": "Swarovski",
+                    "shop": "jewelry"
                 },
-                "name": "tegut",
-                "icon": "grocery",
+                "name": "Swarovski",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Tengelmann": {
+            "shop/optician/Fielmann": {
                 "tags": {
-                    "name": "Tengelmann",
-                    "shop": "supermarket"
+                    "name": "Fielmann",
+                    "shop": "optician"
                 },
-                "name": "Tengelmann",
-                "icon": "grocery",
+                "name": "Fielmann",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Tesco Extra": {
+            "shop/optician/Apollo Optik": {
                 "tags": {
-                    "name": "Tesco Extra",
-                    "shop": "supermarket"
+                    "name": "Apollo Optik",
+                    "shop": "optician"
                 },
-                "name": "Tesco Extra",
-                "icon": "grocery",
+                "name": "Apollo Optik",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Tesco Metro": {
+            "shop/optician/Vision Express": {
                 "tags": {
-                    "name": "Tesco Metro",
-                    "shop": "supermarket"
+                    "name": "Vision Express",
+                    "shop": "optician"
                 },
-                "name": "Tesco Metro",
-                "icon": "grocery",
+                "name": "Vision Express",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/The Co-operative": {
+            "shop/optician/Оптика": {
                 "tags": {
-                    "name": "The Co-operative",
-                    "shop": "supermarket"
+                    "name": "Оптика",
+                    "shop": "optician"
                 },
-                "name": "The Co-operative",
-                "icon": "grocery",
+                "name": "Оптика",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Trader Joe's": {
+            "shop/optician/Optic 2000": {
                 "tags": {
-                    "name": "Trader Joe's",
-                    "shop": "supermarket"
+                    "name": "Optic 2000",
+                    "shop": "optician"
                 },
-                "name": "Trader Joe's",
-                "icon": "grocery",
+                "name": "Optic 2000",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Treff 3000": {
+            "shop/optician/Alain Afflelou": {
                 "tags": {
-                    "name": "Treff 3000",
-                    "shop": "supermarket"
+                    "name": "Alain Afflelou",
+                    "shop": "optician"
                 },
-                "name": "Treff 3000",
-                "icon": "grocery",
+                "name": "Alain Afflelou",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Unimarc": {
+            "shop/optician/Specsavers": {
                 "tags": {
-                    "name": "Unimarc",
-                    "shop": "supermarket"
+                    "name": "Specsavers",
+                    "shop": "optician"
                 },
-                "name": "Unimarc",
-                "icon": "grocery",
+                "name": "Specsavers",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Unimarkt": {
+            "shop/optician/Krys": {
                 "tags": {
-                    "name": "Unimarkt",
-                    "shop": "supermarket"
+                    "name": "Krys",
+                    "shop": "optician"
                 },
-                "name": "Unimarkt",
-                "icon": "grocery",
+                "name": "Krys",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Waitrose": {
+            "shop/optician/Atol": {
                 "tags": {
-                    "name": "Waitrose",
-                    "shop": "supermarket"
+                    "name": "Atol",
+                    "shop": "optician"
                 },
-                "name": "Waitrose",
-                "icon": "grocery",
+                "name": "Atol",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Wasgau": {
+            "shop/video/Blockbuster": {
                 "tags": {
-                    "name": "Wasgau",
-                    "shop": "supermarket"
+                    "name": "Blockbuster",
+                    "shop": "video"
                 },
-                "name": "Wasgau",
-                "icon": "grocery",
+                "name": "Blockbuster",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Whole Foods": {
+            "shop/video/World of Video": {
                 "tags": {
-                    "name": "Whole Foods",
-                    "shop": "supermarket"
+                    "name": "World of Video",
+                    "shop": "video"
                 },
-                "name": "Whole Foods",
-                "icon": "grocery",
+                "name": "World of Video",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Willys": {
+            "shop/mobile_phone/Билайн": {
                 "tags": {
-                    "name": "Willys",
-                    "shop": "supermarket"
+                    "name": "Билайн",
+                    "shop": "mobile_phone"
                 },
-                "name": "Willys",
-                "icon": "grocery",
+                "name": "Билайн",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Zielpunkt": {
+            "shop/mobile_phone/ソフトバンクショップ (SoftBank shop)": {
                 "tags": {
-                    "name": "Zielpunkt",
-                    "shop": "supermarket"
+                    "name": "ソフトバンクショップ (SoftBank shop)",
+                    "shop": "mobile_phone"
                 },
-                "name": "Zielpunkt",
-                "icon": "grocery",
+                "name": "ソフトバンクショップ (SoftBank shop)",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/coop": {
+            "shop/mobile_phone/Vodafone": {
                 "tags": {
-                    "name": "coop",
-                    "shop": "supermarket"
+                    "name": "Vodafone",
+                    "shop": "mobile_phone"
                 },
-                "name": "coop",
-                "icon": "grocery",
+                "name": "Vodafone",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/nahkauf": {
+            "shop/mobile_phone/O2": {
                 "tags": {
-                    "name": "nahkauf",
-                    "shop": "supermarket"
+                    "name": "O2",
+                    "shop": "mobile_phone"
                 },
-                "name": "nahkauf",
-                "icon": "grocery",
+                "name": "O2",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/real,-": {
+            "shop/mobile_phone/Carphone Warehouse": {
                 "tags": {
-                    "name": "real,-",
-                    "shop": "supermarket"
+                    "name": "Carphone Warehouse",
+                    "shop": "mobile_phone"
                 },
-                "name": "real,-",
-                "icon": "grocery",
+                "name": "Carphone Warehouse",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/sky": {
+            "shop/mobile_phone/Orange": {
                 "tags": {
-                    "name": "sky",
-                    "shop": "supermarket"
+                    "name": "Orange",
+                    "shop": "mobile_phone"
                 },
-                "name": "sky",
-                "icon": "grocery",
+                "name": "Orange",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/АТБ": {
+            "shop/mobile_phone/Verizon Wireless": {
                 "tags": {
-                    "name": "АТБ",
-                    "shop": "supermarket"
+                    "name": "Verizon Wireless",
+                    "shop": "mobile_phone"
                 },
-                "name": "АТБ",
-                "icon": "grocery",
+                "name": "Verizon Wireless",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Десяточка": {
+            "shop/mobile_phone/Sprint": {
                 "tags": {
-                    "name": "Десяточка",
-                    "shop": "supermarket"
+                    "name": "Sprint",
+                    "shop": "mobile_phone"
                 },
-                "name": "Десяточка",
-                "icon": "grocery",
+                "name": "Sprint",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Евроопт": {
+            "shop/mobile_phone/T-Mobile": {
                 "tags": {
-                    "name": "Евроопт",
-                    "shop": "supermarket"
+                    "name": "T-Mobile",
+                    "shop": "mobile_phone"
                 },
-                "name": "Евроопт",
-                "icon": "grocery",
+                "name": "T-Mobile",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Карусель": {
+            "shop/mobile_phone/МТС": {
                 "tags": {
-                    "name": "Ð\9aаÑ\80Ñ\83Ñ\81елÑ\8c",
-                    "shop": "supermarket"
+                    "name": "Ð\9cТС",
+                    "shop": "mobile_phone"
                 },
-                "name": "Ð\9aаÑ\80Ñ\83Ñ\81елÑ\8c",
-                "icon": "grocery",
+                "name": "Ð\9cТС",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Квартал": {
+            "shop/mobile_phone/Евросеть": {
                 "tags": {
-                    "name": "Ð\9aваÑ\80Ñ\82ал",
-                    "shop": "supermarket"
+                    "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
+                    "shop": "mobile_phone"
                 },
-                "name": "Ð\9aваÑ\80Ñ\82ал",
-                "icon": "grocery",
+                "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Копейка": {
+            "shop/mobile_phone/Bell": {
                 "tags": {
-                    "name": "Копейка",
-                    "shop": "supermarket"
+                    "name": "Bell",
+                    "shop": "mobile_phone"
                 },
-                "name": "Копейка",
-                "icon": "grocery",
+                "name": "Bell",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Магнолия": {
+            "shop/mobile_phone/The Phone House": {
                 "tags": {
-                    "name": "Магнолия",
-                    "shop": "supermarket"
+                    "name": "The Phone House",
+                    "shop": "mobile_phone"
                 },
-                "name": "Магнолия",
-                "icon": "grocery",
+                "name": "The Phone House",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Народная 7Я семьЯ": {
+            "shop/mobile_phone/SFR": {
                 "tags": {
-                    "name": "Народная 7Я семьЯ",
-                    "shop": "supermarket"
+                    "name": "SFR",
+                    "shop": "mobile_phone"
                 },
-                "name": "Народная 7Я семьЯ",
-                "icon": "grocery",
+                "name": "SFR",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Полушка": {
+            "shop/mobile_phone/Связной": {
                 "tags": {
-                    "name": "Ð\9fолÑ\83Ñ\88ка",
-                    "shop": "supermarket"
+                    "name": "СвÑ\8fзной",
+                    "shop": "mobile_phone"
                 },
-                "name": "Ð\9fолÑ\83Ñ\88ка",
-                "icon": "grocery",
+                "name": "СвÑ\8fзной",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Седьмой континент": {
+            "shop/mobile_phone/Мегафон": {
                 "tags": {
-                    "name": "СедÑ\8cмой ÐºÐ¾Ð½Ñ\82иненÑ\82",
-                    "shop": "supermarket"
+                    "name": "Ð\9cегаÑ\84он",
+                    "shop": "mobile_phone"
                 },
-                "name": "СедÑ\8cмой ÐºÐ¾Ð½Ñ\82иненÑ\82",
-                "icon": "grocery",
+                "name": "Ð\9cегаÑ\84он",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Семья": {
+            "shop/mobile_phone/AT&T": {
                 "tags": {
-                    "name": "Семья",
-                    "shop": "supermarket"
+                    "name": "AT&T",
+                    "shop": "mobile_phone"
                 },
-                "name": "Семья",
-                "icon": "grocery",
+                "name": "AT&T",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Сільпо": {
+            "shop/mobile_phone/ドコモショップ (docomo shop)": {
                 "tags": {
-                    "name": "Сільпо",
-                    "shop": "supermarket"
+                    "name": "ドコモショップ (docomo shop)",
+                    "shop": "mobile_phone"
                 },
-                "name": "Сільпо",
-                "icon": "grocery",
+                "name": "ドコモショップ (docomo shop)",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Фора": {
+            "shop/mobile_phone/au": {
                 "tags": {
-                    "name": "Фора",
-                    "shop": "supermarket"
+                    "name": "au",
+                    "shop": "mobile_phone"
                 },
-                "name": "Фора",
-                "icon": "grocery",
+                "name": "au",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Фуршет": {
+            "shop/mobile_phone/Movistar": {
                 "tags": {
-                    "name": "Фуршет",
-                    "shop": "supermarket"
+                    "name": "Movistar",
+                    "shop": "mobile_phone"
                 },
-                "name": "Фуршет",
-                "icon": "grocery",
+                "name": "Movistar",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/マルエツ": {
+            "shop/mobile_phone/Bitė": {
                 "tags": {
-                    "name": "マルエツ",
-                    "shop": "supermarket"
+                    "name": "Bitė",
+                    "shop": "mobile_phone"
                 },
-                "name": "マルエツ",
-                "icon": "grocery",
+                "name": "Bitė",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ヨークマート (YorkMart)": {
+            "shop/computer/PC World": {
                 "tags": {
-                    "name": "ヨークマート (YorkMart)",
-                    "shop": "supermarket"
+                    "name": "PC World",
+                    "shop": "computer"
                 },
-                "name": "ヨークマート (YorkMart)",
-                "icon": "grocery",
+                "name": "PC World",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/西友 (SEIYU)": {
+            "shop/computer/DNS": {
                 "tags": {
-                    "name": "西友 (SEIYU)",
-                    "shop": "supermarket"
+                    "name": "DNS",
+                    "shop": "computer"
                 },
-                "name": "西友 (SEIYU)",
-                "icon": "grocery",
+                "name": "DNS",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/toys/La Grande Récré": {
+            "shop/hairdresser/Klier": {
                 "tags": {
-                    "name": "La Grande Récré",
-                    "shop": "toys"
+                    "name": "Klier",
+                    "shop": "hairdresser"
                 },
-                "name": "La Grande Récré",
+                "name": "Klier",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93229,12 +96603,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/toys/Toys R Us": {
+            "shop/hairdresser/Supercuts": {
                 "tags": {
-                    "name": "Toys R Us",
-                    "shop": "toys"
+                    "name": "Supercuts",
+                    "shop": "hairdresser"
                 },
-                "name": "Toys R Us",
+                "name": "Supercuts",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93248,12 +96622,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/toys/Детский мир": {
+            "shop/hairdresser/Hairkiller": {
                 "tags": {
-                    "name": "Детский мир",
-                    "shop": "toys"
+                    "name": "Hairkiller",
+                    "shop": "hairdresser"
                 },
-                "name": "Детский мир",
+                "name": "Hairkiller",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93267,13 +96641,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/travel_agency/Flight Centre": {
+            "shop/hairdresser/Great Clips": {
                 "tags": {
-                    "name": "Flight Centre",
-                    "shop": "travel_agency"
+                    "name": "Great Clips",
+                    "shop": "hairdresser"
                 },
-                "name": "Flight Centre",
-                "icon": "suitcase",
+                "name": "Great Clips",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93286,13 +96660,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/travel_agency/Thomas Cook": {
+            "shop/hairdresser/Парикмахерская": {
                 "tags": {
-                    "name": "Thomas Cook",
-                    "shop": "travel_agency"
+                    "name": "Парикмахерская",
+                    "shop": "hairdresser"
                 },
-                "name": "Thomas Cook",
-                "icon": "suitcase",
+                "name": "Парикмахерская",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93305,12 +96679,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/variety_store/Dollar Tree": {
+            "shop/hairdresser/Fryzjer": {
                 "tags": {
-                    "name": "Dollar Tree",
-                    "shop": "variety_store"
+                    "name": "Fryzjer",
+                    "shop": "hairdresser"
                 },
-                "name": "Dollar Tree",
+                "name": "Fryzjer",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93324,12 +96698,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/variety_store/Dollarama": {
+            "shop/hairdresser/Franck Provost": {
                 "tags": {
-                    "name": "Dollarama",
-                    "shop": "variety_store"
+                    "name": "Franck Provost",
+                    "shop": "hairdresser"
                 },
-                "name": "Dollarama",
+                "name": "Franck Provost",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93343,12 +96717,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/variety_store/Tedi": {
+            "shop/hairdresser/Салон красоты": {
                 "tags": {
-                    "name": "Tedi",
-                    "shop": "variety_store"
+                    "name": "Салон красоты",
+                    "shop": "hairdresser"
                 },
-                "name": "Tedi",
+                "name": "Салон красоты",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93362,12 +96736,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/video/Blockbuster": {
+            "shop/hardware/1000 мелочей": {
                 "tags": {
-                    "name": "Blockbuster",
-                    "shop": "video"
+                    "name": "1000 мелочей",
+                    "shop": "hardware"
                 },
-                "name": "Blockbuster",
+                "name": "1000 мелочей",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93381,12 +96755,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/video/World of Video": {
+            "shop/motorcycle/Yamaha": {
                 "tags": {
-                    "name": "World of Video",
-                    "shop": "video"
+                    "name": "Yamaha",
+                    "shop": "motorcycle"
                 },
-                "name": "World of Video",
+                "name": "Yamaha",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93579,7 +96953,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "waterway/river",
                     "waterway/stream",
                     "waterway/canal",
-                    "waterway/ditch"
+                    "waterway/ditch",
+                    "waterway/drain"
                 ]
             }
         },
@@ -93669,6 +97044,59 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "number",
                 "label": "Admin Level"
             },
+            "aerialway": {
+                "key": "aerialway",
+                "type": "typeCombo",
+                "label": "Type"
+            },
+            "aerialway/access": {
+                "key": "aerialway:access",
+                "type": "combo",
+                "options": [
+                    "entry",
+                    "exit",
+                    "both"
+                ],
+                "label": "Access"
+            },
+            "aerialway/bubble": {
+                "key": "aerialway:bubble",
+                "type": "check",
+                "label": "Bubble"
+            },
+            "aerialway/capacity": {
+                "key": "aerialway:capacity",
+                "type": "number",
+                "label": "Capacity (per hour)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "key": "aerialway:duration",
+                "type": "number",
+                "label": "Duration (minutes)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "key": "aerialway:heating",
+                "type": "check",
+                "label": "Heated"
+            },
+            "aerialway/occupancy": {
+                "key": "aerialway:occupancy",
+                "type": "number",
+                "label": "Occupancy",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "key": "aerialway:summer:access",
+                "type": "combo",
+                "options": [
+                    "entry",
+                    "exit",
+                    "both"
+                ],
+                "label": "Access (summer)"
+            },
             "aeroway": {
                 "key": "aeroway",
                 "type": "typeCombo",
@@ -93825,6 +97253,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "textarea",
                 "label": "Description"
             },
+            "electrified": {
+                "key": "electrified",
+                "type": "combo",
+                "label": "Electrification",
+                "options": [
+                    "contact_line",
+                    "rail",
+                    "yes",
+                    "no"
+                ]
+            },
             "elevation": {
                 "key": "ele",
                 "type": "number",
@@ -93869,6 +97308,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "textarea",
                 "label": "Fix Me"
             },
+            "gauge": {
+                "key": "gauge",
+                "type": "combo",
+                "label": "Gauge"
+            },
             "generator/method": {
                 "key": "generator:method",
                 "type": "combo",
@@ -94087,6 +97531,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "key": "piste:difficulty",
+                "type": "combo",
+                "label": "Difficulty"
+            },
+            "piste/grooming": {
+                "key": "piste:grooming",
+                "type": "combo",
+                "label": "Grooming"
+            },
+            "piste/type": {
+                "key": "piste:type",
+                "type": "typeCombo",
+                "label": "Type"
+            },
             "place": {
                 "key": "place",
                 "type": "typeCombo",
@@ -94224,6 +97683,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     }
                 }
             },
+            "studio_type": {
+                "key": "type",
+                "type": "combo",
+                "options": [
+                    "audio",
+                    "video"
+                ],
+                "label": "Type"
+            },
             "supervised": {
                 "key": "supervised",
                 "type": "check",
@@ -94269,6 +97737,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "label": "Type"
             },
+            "tunnel": {
+                "key": "tunnel",
+                "type": "combo",
+                "label": "Tunnel"
+            },
             "vending": {
                 "key": "vending",
                 "type": "combo",
@@ -106192,6 +109665,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "id",
         "it",
         "ja",
+        "kn",
         "ko",
         "lv",
         "lt",
@@ -106201,6 +109675,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "pl",
         "pt",
         "pt-BR",
+        "ro-RO",
         "ru",
         "sc",
         "sr",
@@ -106472,7 +109947,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "yes": "Yes",
                 "no": "No"
             },
-            "none": "None"
+            "none": "None",
+            "node": "Node",
+            "way": "Way",
+            "relation": "Relation",
+            "location": "Location"
         },
         "background": {
             "title": "Background",
@@ -106532,6 +110011,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "untagged_area": "Untagged area",
             "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
             "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
+            "untagged_tooltip": "Select a feature type that describes what this {geometry} is.",
             "deprecated_tags": "Deprecated tags: {tags}"
         },
         "zoom": {
@@ -106547,7 +110027,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         },
         "help": {
             "title": "Help",
-            "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/systemed/iD).\n",
+            "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
             "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n",
             "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
             "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
@@ -106690,6 +110170,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "admin_level": {
                     "label": "Admin Level"
                 },
+                "aerialway": {
+                    "label": "Type"
+                },
+                "aerialway/access": {
+                    "label": "Access"
+                },
+                "aerialway/bubble": {
+                    "label": "Bubble"
+                },
+                "aerialway/capacity": {
+                    "label": "Capacity (per hour)",
+                    "placeholder": "500, 2500, 5000..."
+                },
+                "aerialway/duration": {
+                    "label": "Duration (minutes)",
+                    "placeholder": "1, 2, 3..."
+                },
+                "aerialway/heating": {
+                    "label": "Heated"
+                },
+                "aerialway/occupancy": {
+                    "label": "Occupancy",
+                    "placeholder": "2, 4, 8..."
+                },
+                "aerialway/summer/access": {
+                    "label": "Access (summer)"
+                },
                 "aeroway": {
                     "label": "Type"
                 },
@@ -106770,6 +110277,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "description": {
                     "label": "Description"
                 },
+                "electrified": {
+                    "label": "Electrification"
+                },
                 "elevation": {
                     "label": "Elevation"
                 },
@@ -106792,6 +110302,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "gauge": {
+                    "label": "Gauge"
+                },
                 "generator/method": {
                     "label": "Method"
                 },
@@ -106915,6 +110428,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Phone",
                     "placeholder": "+31 42 123 4567"
                 },
+                "piste/difficulty": {
+                    "label": "Difficulty"
+                },
+                "piste/grooming": {
+                    "label": "Grooming"
+                },
+                "piste/type": {
+                    "label": "Type"
+                },
                 "place": {
                     "label": "Type"
                 },
@@ -106982,6 +110504,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "cutting": "Cutting"
                     }
                 },
+                "studio_type": {
+                    "label": "Type"
+                },
                 "supervised": {
                     "label": "Supervised"
                 },
@@ -107006,6 +110531,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tree_type": {
                     "label": "Type"
                 },
+                "tunnel": {
+                    "label": "Tunnel"
+                },
                 "vending": {
                     "label": "Type of Goods"
                 },
@@ -107037,6 +110565,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Address",
                     "terms": ""
                 },
+                "aerialway": {
+                    "name": "Aerialway",
+                    "terms": "ski lift,funifor,funitel"
+                },
+                "aerialway/cable_car": {
+                    "name": "Cable Car",
+                    "terms": "tramway,ropeway"
+                },
+                "aerialway/chair_lift": {
+                    "name": "Chair Lift",
+                    "terms": ""
+                },
+                "aerialway/gondola": {
+                    "name": "Gondola",
+                    "terms": ""
+                },
+                "aerialway/magic_carpet": {
+                    "name": "Magic Carpet Lift",
+                    "terms": ""
+                },
+                "aerialway/platter": {
+                    "name": "Platter Lift",
+                    "terms": "button lift,poma lift"
+                },
+                "aerialway/pylon": {
+                    "name": "Aerialway Pylon",
+                    "terms": ""
+                },
+                "aerialway/rope_tow": {
+                    "name": "Rope Tow Lift",
+                    "terms": "handle tow,bugel lift"
+                },
+                "aerialway/station": {
+                    "name": "Aerialway Station",
+                    "terms": ""
+                },
+                "aerialway/t-bar": {
+                    "name": "T-bar Lift",
+                    "terms": ""
+                },
                 "aeroway": {
                     "name": "Aeroway",
                     "terms": ""
@@ -107133,6 +110701,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Cinema",
                     "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
                 },
+                "amenity/clinic": {
+                    "name": "Clinic",
+                    "terms": "clinic,medical clinic"
+                },
+                "amenity/clock": {
+                    "name": "Clock",
+                    "terms": ""
+                },
                 "amenity/college": {
                     "name": "College",
                     "terms": ""
@@ -107141,6 +110717,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Courthouse",
                     "terms": ""
                 },
+                "amenity/dentist": {
+                    "name": "Dentist",
+                    "terms": "dentist,dentist's office"
+                },
+                "amenity/doctor": {
+                    "name": "Doctor",
+                    "terms": "doctor,doctor's office"
+                },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
                     "terms": "water fountain,potable water"
@@ -107249,6 +110833,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Shelter",
                     "terms": "lean-to"
                 },
+                "amenity/studio": {
+                    "name": "Studio",
+                    "terms": "recording studio,studio,radio,radio studio,television,television studio"
+                },
                 "amenity/swimming_pool": {
                     "name": "Swimming Pool",
                     "terms": ""
@@ -107281,6 +110869,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Vending Machine",
                     "terms": ""
                 },
+                "amenity/veterinary": {
+                    "name": "Veterinary",
+                    "terms": "pet clinic,veterinarian,animal hospital,pet doctor"
+                },
                 "amenity/waste_basket": {
                     "name": "Waste Basket",
                     "terms": "rubbish bin,litter bin,trash can,garbage can"
@@ -107397,6 +110989,186 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Residential Building",
                     "terms": ""
                 },
+                "craft/basket_maker": {
+                    "name": "Basket Maker",
+                    "terms": "basket,basketry,basket maker,basket weaver"
+                },
+                "craft/beekeeper": {
+                    "name": "Beekeeper",
+                    "terms": "bees,beekeeper,bee box"
+                },
+                "craft/blacksmith": {
+                    "name": "Blacksmith",
+                    "terms": "blacksmith"
+                },
+                "craft/boatbuilder": {
+                    "name": "Boat Builder",
+                    "terms": "boat builder"
+                },
+                "craft/bookbinder": {
+                    "name": "Bookbinder",
+                    "terms": "bookbinder,book repair"
+                },
+                "craft/brewery": {
+                    "name": "Brewery",
+                    "terms": "brewery"
+                },
+                "craft/carpenter": {
+                    "name": "Carpenter",
+                    "terms": "carpenter,woodworker"
+                },
+                "craft/carpet_layer": {
+                    "name": "Carpet Layer",
+                    "terms": "carpet layer"
+                },
+                "craft/caterer": {
+                    "name": "Caterer",
+                    "terms": "Caterer,Catering"
+                },
+                "craft/clockmaker": {
+                    "name": "Clockmaker",
+                    "terms": "clock,clockmaker,clock repair"
+                },
+                "craft/confectionary": {
+                    "name": "Confectionary",
+                    "terms": "confectionary,sweets,candy"
+                },
+                "craft/dressmaker": {
+                    "name": "Dressmaker",
+                    "terms": "dress,dressmaker"
+                },
+                "craft/electrician": {
+                    "name": "Electrician",
+                    "terms": "electrician"
+                },
+                "craft/gardener": {
+                    "name": "Gardener",
+                    "terms": "gardener,landscaper,grounds keeper"
+                },
+                "craft/glaziery": {
+                    "name": "Glaziery",
+                    "terms": "glass,glass foundry,stained-glass,window"
+                },
+                "craft/handicraft": {
+                    "name": "Handicraft",
+                    "terms": "handicraft"
+                },
+                "craft/hvac": {
+                    "name": "HVAC",
+                    "terms": "heating,ventilating,air-conditioning,air conditioning"
+                },
+                "craft/insulator": {
+                    "name": "Insulator",
+                    "terms": "insulation,insulator"
+                },
+                "craft/jeweler": {
+                    "name": "Jeweler",
+                    "terms": "jeweler,gem,diamond"
+                },
+                "craft/key_cutter": {
+                    "name": "Key Cutter",
+                    "terms": "key,key cutter"
+                },
+                "craft/locksmith": {
+                    "name": "Locksmith",
+                    "terms": "locksmith,lock"
+                },
+                "craft/metal_construction": {
+                    "name": "Metal Construction",
+                    "terms": "metal construction"
+                },
+                "craft/optician": {
+                    "name": "Optician",
+                    "terms": "glasses,optician"
+                },
+                "craft/painter": {
+                    "name": "painter",
+                    "terms": "painter"
+                },
+                "craft/photographer": {
+                    "name": "Photographer",
+                    "terms": "photographer"
+                },
+                "craft/photographic_labratory": {
+                    "name": "Photographic Labratory",
+                    "terms": "photographic labratory,film developer"
+                },
+                "craft/plasterer": {
+                    "name": "Plasterer",
+                    "terms": "plasterer"
+                },
+                "craft/plumber": {
+                    "name": "Plumber",
+                    "terms": "pumber"
+                },
+                "craft/pottery": {
+                    "name": "Pottery",
+                    "terms": "pottery,potter"
+                },
+                "craft/rigger": {
+                    "name": "Rigger",
+                    "terms": "rigger"
+                },
+                "craft/roofer": {
+                    "name": "Roofer",
+                    "terms": "roofer"
+                },
+                "craft/saddler": {
+                    "name": "Saddler",
+                    "terms": "saddler"
+                },
+                "craft/sailmaker": {
+                    "name": "Sailmaker",
+                    "terms": "sailmaker"
+                },
+                "craft/sawmill": {
+                    "name": "Sawmill",
+                    "terms": "sawmill,lumber"
+                },
+                "craft/scaffolder": {
+                    "name": "Scaffolder",
+                    "terms": "scaffolder"
+                },
+                "craft/sculpter": {
+                    "name": "Sculpter",
+                    "terms": "sculpter"
+                },
+                "craft/shoemaker": {
+                    "name": "Shoemaker",
+                    "terms": "shoe repair,shoemaker"
+                },
+                "craft/stonemason": {
+                    "name": "Stonemason",
+                    "terms": "stonemason,masonry"
+                },
+                "craft/sweep": {
+                    "name": "Chimney Sweep",
+                    "terms": "sweep,chimney sweep"
+                },
+                "craft/tailor": {
+                    "name": "Tailor",
+                    "terms": "tailor,clothes"
+                },
+                "craft/tiler": {
+                    "name": "Tiler",
+                    "terms": "tiler"
+                },
+                "craft/tinsmith": {
+                    "name": "Tinsmith",
+                    "terms": "tinsmith"
+                },
+                "craft/upholsterer": {
+                    "name": "Upholsterer",
+                    "terms": "upholsterer"
+                },
+                "craft/watchmaker": {
+                    "name": "Watchmaker",
+                    "terms": "watch,watchmaker,watch repair"
+                },
+                "craft/window_construction": {
+                    "name": "Window Construction",
+                    "terms": "window,window maker,window construction"
+                },
                 "embankment": {
                     "name": "Embankment",
                     "terms": ""
@@ -107521,6 +111293,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Residential Road",
                     "terms": ""
                 },
+                "highway/rest_area": {
+                    "name": "Rest Area",
+                    "terms": "rest stop,turnout,lay-by"
+                },
                 "highway/road": {
                     "name": "Unknown Road",
                     "terms": ""
@@ -107557,6 +111333,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Parking Aisle",
                     "terms": ""
                 },
+                "highway/services": {
+                    "name": "Service Area",
+                    "terms": "services,travel plaza,service station"
+                },
                 "highway/steps": {
                     "name": "Steps",
                     "terms": "stairs,staircase"
@@ -108033,6 +111813,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Travel Agency",
                     "terms": ""
                 },
+                "piste": {
+                    "name": "Piste/Ski Trail",
+                    "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+                },
                 "place": {
                     "name": "Place",
                     "terms": ""
@@ -108121,6 +111905,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Disused Railway",
                     "terms": ""
                 },
+                "railway/funicular": {
+                    "name": "Funicular",
+                    "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
+                },
                 "railway/halt": {
                     "name": "Railway Halt",
                     "terms": "break,interrupt,rest,wait,interruption"
@@ -108133,6 +111921,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Monorail",
                     "terms": ""
                 },
+                "railway/narrow_gauge": {
+                    "name": "Narrow Gauge Rail",
+                    "terms": "narrow gauge railway,narrow gauge railroad"
+                },
                 "railway/platform": {
                     "name": "Railway Platform",
                     "terms": ""
@@ -108510,4612 +112302,4733 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "type/route/train": {
-                    "name": "Train Route",
-                    "terms": ""
-                },
-                "type/route/tram": {
-                    "name": "Tram Route",
-                    "terms": ""
-                },
-                "type/route_master": {
-                    "name": "Route Master",
-                    "terms": ""
-                },
-                "vertex": {
-                    "name": "Other",
-                    "terms": ""
-                },
-                "waterway": {
-                    "name": "Waterway",
-                    "terms": ""
-                },
-                "waterway/canal": {
-                    "name": "Canal",
-                    "terms": ""
-                },
-                "waterway/dam": {
-                    "name": "Dam",
-                    "terms": ""
-                },
-                "waterway/ditch": {
-                    "name": "Ditch",
-                    "terms": ""
-                },
-                "waterway/drain": {
-                    "name": "Drain",
-                    "terms": ""
-                },
-                "waterway/river": {
-                    "name": "River",
-                    "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
-                },
-                "waterway/riverbank": {
-                    "name": "Riverbank",
-                    "terms": ""
-                },
-                "waterway/stream": {
-                    "name": "Stream",
-                    "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"
-                },
-                "waterway/weir": {
-                    "name": "Weir",
-                    "terms": ""
-                }
-            }
-        }
-    },
-    "suggestions": {
-        "amenity": {
-            "bank": {
-                "ABN AMRO": {
-                    "count": 129
-                },
-                "ABSA": {
-                    "count": 88
-                },
-                "AIB": {
-                    "count": 71
-                },
-                "ANZ": {
-                    "count": 199
-                },
-                "AXA": {
-                    "count": 66
-                },
-                "Alior Bank": {
-                    "count": 71
-                },
-                "Allied Bank": {
-                    "count": 115
-                },
-                "Alpha Bank": {
-                    "count": 94
-                },
-                "Argenta": {
-                    "count": 84
-                },
-                "Axis Bank": {
-                    "count": 52
-                },
-                "BAWAG PSK": {
-                    "count": 105
-                },
-                "BB&T": {
-                    "count": 126
-                },
-                "BBK": {
-                    "count": 69
-                },
-                "BBVA": {
-                    "count": 574
-                },
-                "BCI": {
-                    "count": 57
-                },
-                "BCR": {
-                    "count": 137
-                },
-                "BDO": {
-                    "count": 275
-                },
-                "BES": {
-                    "count": 68
-                },
-                "BMO": {
-                    "count": 160
-                },
-                "BNL": {
-                    "count": 78
-                },
-                "BNP": {
-                    "count": 109
-                },
-                "BNP Paribas": {
-                    "count": 574
+                    "name": "Train Route",
+                    "terms": ""
                 },
-                "BNP Paribas Fortis": {
-                    "count": 204
+                "type/route/tram": {
+                    "name": "Tram Route",
+                    "terms": ""
                 },
-                "BPI": {
-                    "count": 393
+                "type/route_master": {
+                    "name": "Route Master",
+                    "terms": ""
                 },
-                "BRD": {
-                    "count": 179
+                "vertex": {
+                    "name": "Other",
+                    "terms": ""
                 },
-                "BW-Bank": {
-                    "count": 97
+                "waterway": {
+                    "name": "Waterway",
+                    "terms": ""
                 },
-                "BZ WBK": {
-                    "count": 65
+                "waterway/canal": {
+                    "name": "Canal",
+                    "terms": ""
                 },
-                "Banamex": {
-                    "count": 130
+                "waterway/dam": {
+                    "name": "Dam",
+                    "terms": ""
                 },
-                "Banca Intesa": {
-                    "count": 58
+                "waterway/ditch": {
+                    "name": "Ditch",
+                    "terms": ""
                 },
-                "Banca Popolare di Novara": {
-                    "count": 51
+                "waterway/drain": {
+                    "name": "Drain",
+                    "terms": ""
                 },
-                "Banca Popolare di Vicenza": {
-                    "count": 67
+                "waterway/river": {
+                    "name": "River",
+                    "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
                 },
-                "Banca Transilvania": {
-                    "count": 131
+                "waterway/riverbank": {
+                    "name": "Riverbank",
+                    "terms": ""
                 },
-                "Bancaja": {
-                    "count": 58
+                "waterway/stream": {
+                    "name": "Stream",
+                    "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"
                 },
-                "Banco BCI": {
+                "waterway/weir": {
+                    "name": "Weir",
+                    "terms": ""
+                }
+            }
+        }
+    },
+    "suggestions": {
+        "amenity": {
+            "pub": {
+                "The Green Man": {
                     "count": 51
                 },
-                "Banco Estado": {
+                "Kings Arms": {
                     "count": 67
                 },
-                "Banco G&T Continental": {
-                    "count": 62
+                "Red Lion": {
+                    "count": 203
                 },
-                "Banco Itaú": {
-                    "count": 82
+                "The Ship": {
+                    "count": 87
                 },
-                "Banco Nación": {
-                    "count": 59
+                "The White Horse": {
+                    "count": 201
                 },
-                "Banco Pastor": {
-                    "count": 62
+                "The White Hart": {
+                    "count": 228
                 },
-                "Banco Popular": {
-                    "count": 262
+                "Royal Oak": {
+                    "count": 147
                 },
-                "Banco Provincia": {
-                    "count": 62
+                "The Red Lion": {
+                    "count": 231
                 },
-                "Banco Santander": {
-                    "count": 91
+                "The Kings Arms": {
+                    "count": 58
                 },
-                "Banco de Chile": {
-                    "count": 95
+                "The Star": {
+                    "count": 73
                 },
-                "Banco de Costa Rica": {
+                "The Anchor": {
                     "count": 64
                 },
-                "Banco de Desarrollo Banrural": {
-                    "count": 74
-                },
-                "Banco de la Nación": {
-                    "count": 93
-                },
-                "Banco do Brasil": {
-                    "count": 440
-                },
-                "BancoEstado": {
-                    "count": 79
+                "The Cross Keys": {
+                    "count": 55
                 },
-                "Bancolombia": {
-                    "count": 85
+                "The Wheatsheaf": {
+                    "count": 117
                 },
-                "Bancomer": {
-                    "count": 96
+                "The Crown Inn": {
+                    "count": 68
                 },
-                "Bancpost": {
-                    "count": 51
+                "The Kings Head": {
+                    "count": 53
                 },
-                "Banesco": {
-                    "count": 86
+                "The Castle": {
+                    "count": 58
                 },
-                "Banesto": {
-                    "count": 198
+                "The Railway": {
+                    "count": 100
                 },
-                "Bank Austria": {
-                    "count": 174
+                "The White Lion": {
+                    "count": 118
                 },
-                "Bank Mandiri": {
-                    "count": 56
+                "The Bell": {
+                    "count": 121
                 },
-                "Bank Spółdzielczy": {
-                    "count": 142
+                "The Bull": {
+                    "count": 67
                 },
-                "Bank of America": {
-                    "count": 836
+                "The Plough": {
+                    "count": 177
                 },
-                "Bank of Ireland": {
+                "The George": {
                     "count": 109
                 },
-                "Bank of Montreal": {
-                    "count": 111
+                "The Royal Oak": {
+                    "count": 210
                 },
-                "Bank of Scotland": {
-                    "count": 85
+                "The Fox": {
+                    "count": 76
                 },
-                "Bank of the West": {
-                    "count": 86
+                "Prince of Wales": {
+                    "count": 76
                 },
-                "Bankia": {
-                    "count": 108
+                "The Rising Sun": {
+                    "count": 69
                 },
-                "Bankinter": {
-                    "count": 54
+                "The Prince of Wales": {
+                    "count": 51
                 },
-                "Banorte": {
-                    "count": 65
+                "The Crown": {
+                    "count": 241
                 },
-                "Banque Nationale": {
-                    "count": 56
+                "The Chequers": {
+                    "count": 64
                 },
-                "Banque Populaire": {
-                    "count": 399
+                "The Swan": {
+                    "count": 150
                 },
-                "Barclays": {
-                    "count": 925
+                "Rose and Crown": {
+                    "count": 79
                 },
-                "Belfius": {
-                    "count": 219
+                "The Victoria": {
+                    "count": 68
                 },
-                "Bendigo Bank": {
-                    "count": 88
+                "New Inn": {
+                    "count": 89
                 },
-                "Berliner Sparkasse": {
-                    "count": 61
+                "Royal Hotel": {
+                    "count": 55
                 },
-                "Berliner Volksbank": {
-                    "count": 79
+                "Cross Keys": {
+                    "count": 59
                 },
-                "Bicentenario": {
-                    "count": 183
+                "The Greyhound": {
+                    "count": 96
                 },
-                "Bradesco": {
-                    "count": 236
+                "The Black Horse": {
+                    "count": 94
                 },
-                "CIBC": {
-                    "count": 306
+                "The New Inn": {
+                    "count": 104
                 },
-                "CIC": {
-                    "count": 393
+                "Kings Head": {
+                    "count": 57
                 },
-                "Caisse d'Épargne": {
-                    "count": 801
+                "The Angel": {
+                    "count": 53
                 },
-                "Caixa": {
-                    "count": 99
+                "The Queens Head": {
+                    "count": 51
                 },
-                "Caixa Econômica Federal": {
-                    "count": 131
+                "The Ship Inn": {
+                    "count": 83
                 },
-                "Caixa Geral de Depósitos": {
-                    "count": 119
+                "Rose & Crown": {
+                    "count": 51
                 },
-                "Caja Círculo": {
-                    "count": 65
+                "Queens Head": {
+                    "count": 51
                 },
-                "Caja Duero": {
-                    "count": 58
+                "Irish Pub": {
+                    "count": 79
+                }
+            },
+            "fuel": {
+                "76": {
+                    "count": 295
                 },
-                "Caja Madrid": {
-                    "count": 115
+                "Neste": {
+                    "count": 192
                 },
-                "Caja Rural": {
-                    "count": 87
+                "BP": {
+                    "count": 2444
                 },
-                "Caja de Burgos": {
-                    "count": 58
+                "Shell": {
+                    "count": 8191
                 },
-                "Cajamar": {
-                    "count": 61
+                "Agip": {
+                    "count": 2652
                 },
-                "Cajero Automatico Bancared": {
-                    "count": 147
+                "Migrol": {
+                    "count": 65
                 },
-                "Canara Bank": {
-                    "count": 82
+                "Avia": {
+                    "count": 883
                 },
-                "Cassa di Risparmio del Veneto": {
-                    "count": 58
+                "Texaco": {
+                    "count": 667
                 },
-                "Chase": {
-                    "count": 623
+                "Total": {
+                    "count": 2545
                 },
-                "China Bank": {
-                    "count": 59
+                "Statoil": {
+                    "count": 589
                 },
-                "Chinabank": {
-                    "count": 54
+                "Esso": {
+                    "count": 3595
                 },
-                "Citibank": {
-                    "count": 249
+                "Jet": {
+                    "count": 438
                 },
-                "Citizens Bank": {
-                    "count": 107
+                "Avanti": {
+                    "count": 89
                 },
-                "CityCommerce Bank": {
-                    "count": 53
+                "Sainsbury's": {
+                    "count": 57
                 },
-                "Commercial Bank of Ceylon PLC": {
-                    "count": 80
+                "OMV": {
+                    "count": 706
                 },
-                "Commerzbank": {
-                    "count": 799
+                "Aral": {
+                    "count": 1334
                 },
-                "Commonwealth Bank": {
-                    "count": 218
+                "Tesco": {
+                    "count": 193
                 },
-                "Credit Agricole": {
-                    "count": 143
+                "JET": {
+                    "count": 178
                 },
-                "Credit Suisse": {
-                    "count": 69
+                "Morrisons": {
+                    "count": 108
                 },
-                "Crédit Agricole": {
-                    "count": 1160
+                "United": {
+                    "count": 89
                 },
-                "Crédit Mutuel": {
-                    "count": 648
+                "Canadian Tire": {
+                    "count": 65
                 },
-                "Crédit Mutuel de Bretagne": {
-                    "count": 335
+                "Mobil": {
+                    "count": 586
                 },
-                "Crédit du Nord": {
-                    "count": 88
+                "Caltex": {
+                    "count": 973
                 },
-                "Danske Bank": {
-                    "count": 130
+                "Sunoco": {
+                    "count": 336
                 },
-                "Davivienda": {
-                    "count": 83
+                "Q8": {
+                    "count": 1160
                 },
-                "De Venezuela": {
-                    "count": 127
+                "ABC": {
+                    "count": 80
                 },
-                "Del Tesoro": {
-                    "count": 94
+                "Tankstelle": {
+                    "count": 115
                 },
-                "Deutsche Bank": {
-                    "count": 836
+                "ARAL": {
+                    "count": 366
                 },
-                "Dresdner Bank": {
-                    "count": 77
+                "CEPSA": {
+                    "count": 1017
                 },
-                "Ecobank": {
-                    "count": 54
+                "BFT": {
+                    "count": 88
                 },
-                "Erste Bank": {
-                    "count": 178
+                "Petron": {
+                    "count": 862
                 },
-                "Eurobank": {
-                    "count": 89
+                "Intermarché": {
+                    "count": 428
                 },
-                "FNB": {
-                    "count": 90
+                "Super U": {
+                    "count": 122
                 },
-                "Fifth Third Bank": {
-                    "count": 66
+                "Auchan": {
+                    "count": 52
                 },
-                "First National Bank": {
-                    "count": 76
+                "Elf": {
+                    "count": 131
                 },
-                "GE Money Bank": {
-                    "count": 72
+                "Carrefour": {
+                    "count": 199
                 },
-                "HDFC Bank": {
-                    "count": 85
+                "Station Service E. Leclerc": {
+                    "count": 534
                 },
-                "HSBC": {
-                    "count": 1039
+                "Shell Express": {
+                    "count": 129
                 },
-                "Halifax": {
-                    "count": 214
+                "Hess": {
+                    "count": 114
                 },
-                "Hamburger Sparkasse": {
-                    "count": 157
+                "Flying V": {
+                    "count": 132
                 },
-                "Handelsbanken": {
-                    "count": 178
+                "bft": {
+                    "count": 169
                 },
-                "HypoVereinsbank": {
-                    "count": 570
+                "Gulf": {
+                    "count": 192
                 },
-                "ICICI Bank": {
-                    "count": 78
+                "PTT": {
+                    "count": 176
                 },
-                "ING": {
-                    "count": 468
+                "St1": {
+                    "count": 102
                 },
-                "ING Bank Śląski": {
-                    "count": 64
+                "Teboil": {
+                    "count": 120
                 },
-                "Ibercaja": {
-                    "count": 58
+                "HEM": {
+                    "count": 218
                 },
-                "Intesa San Paolo": {
-                    "count": 60
+                "GALP": {
+                    "count": 593
                 },
-                "Itaú": {
-                    "count": 278
+                "OK": {
+                    "count": 160
                 },
-                "KBC": {
-                    "count": 194
+                "ÖMV": {
+                    "count": 100
                 },
-                "Key Bank": {
-                    "count": 139
+                "Tinq": {
+                    "count": 215
                 },
-                "Komerční banka": {
-                    "count": 136
+                "OKQ8": {
+                    "count": 187
                 },
-                "Kreissparkasse": {
-                    "count": 579
+                "Freie Tankstelle": {
+                    "count": 217
                 },
-                "Kreissparkasse Köln": {
-                    "count": 67
+                "Repsol": {
+                    "count": 408
                 },
-                "LCL": {
-                    "count": 508
+                "Westfalen": {
+                    "count": 96
                 },
-                "La Banque Postale": {
-                    "count": 61
+                "Esso Express": {
+                    "count": 87
                 },
-                "La Caixa": {
-                    "count": 513
+                "Raiffeisenbank": {
+                    "count": 115
                 },
-                "Landbank": {
-                    "count": 79
+                "Tamoil": {
+                    "count": 865
                 },
-                "Lloyds Bank": {
-                    "count": 541
+                "Engen": {
+                    "count": 230
                 },
-                "M&T Bank": {
-                    "count": 80
+                "Sasol": {
+                    "count": 58
                 },
-                "Maybank": {
-                    "count": 81
+                "Topaz": {
+                    "count": 78
                 },
-                "Mercantil": {
-                    "count": 220
+                "LPG": {
+                    "count": 170
                 },
-                "Metrobank": {
-                    "count": 253
+                "Coop": {
+                    "count": 55
                 },
-                "Millenium Bank": {
-                    "count": 60
+                "Orlen": {
+                    "count": 577
                 },
-                "Millennium Bank": {
-                    "count": 415
+                "Oilibya": {
+                    "count": 66
                 },
-                "Monte dei Paschi di Siena": {
-                    "count": 126
+                "Tango": {
+                    "count": 122
                 },
-                "NAB": {
-                    "count": 123
+                "Star": {
+                    "count": 315
                 },
-                "NatWest": {
-                    "count": 606
+                "Петрол": {
+                    "count": 81
                 },
-                "National Bank": {
-                    "count": 87
+                "Cepsa": {
+                    "count": 82
                 },
-                "Nationwide": {
-                    "count": 193
+                "OIL!": {
+                    "count": 59
                 },
-                "Nedbank": {
-                    "count": 74
+                "Ultramar": {
+                    "count": 124
                 },
-                "Nordea": {
-                    "count": 312
+                "Irving": {
+                    "count": 86
                 },
-                "OLB": {
-                    "count": 52
+                "Lukoil": {
+                    "count": 689
                 },
-                "OTP": {
-                    "count": 184
+                "Petro-Canada": {
+                    "count": 477
                 },
-                "Oberbank": {
-                    "count": 87
+                "7-Eleven": {
+                    "count": 447
                 },
-                "Oldenburgische Landesbank": {
-                    "count": 56
+                "Agrola": {
+                    "count": 70
                 },
-                "Osuuspankki": {
-                    "count": 74
+                "Husky": {
+                    "count": 119
                 },
-                "PKO BP": {
-                    "count": 239
+                "Slovnaft": {
+                    "count": 218
+                },
+                "Sheetz": {
+                    "count": 113
                 },
-                "PNB": {
-                    "count": 106
+                "Mol": {
+                    "count": 56
                 },
-                "PNC Bank": {
-                    "count": 215
+                "Petronas": {
+                    "count": 151
                 },
-                "PSBank": {
-                    "count": 57
+                "Газпромнефть": {
+                    "count": 742
                 },
-                "Pekao SA": {
-                    "count": 53
+                "Лукойл": {
+                    "count": 1451
                 },
-                "Peoples Bank": {
-                    "count": 55
+                "Elan": {
+                    "count": 113
                 },
-                "Postbank": {
-                    "count": 433
+                "Роснефть": {
+                    "count": 621
                 },
-                "RBC": {
-                    "count": 220
+                "Turmöl": {
+                    "count": 57
                 },
-                "RBS": {
-                    "count": 136
+                "Neste A24": {
+                    "count": 57
                 },
-                "RCBC": {
-                    "count": 117
+                "Marathon": {
+                    "count": 170
                 },
-                "Rabobank": {
-                    "count": 619
+                "Valero": {
+                    "count": 348
                 },
-                "Raiffeisenbank": {
-                    "count": 2028
+                "Eni": {
+                    "count": 219
                 },
-                "Regions Bank": {
-                    "count": 59
+                "Chevron": {
+                    "count": 918
                 },
-                "Royal Bank": {
-                    "count": 65
+                "ТНК": {
+                    "count": 512
                 },
-                "Royal Bank of Scotland": {
-                    "count": 108
+                "REPSOL": {
+                    "count": 1609
                 },
-                "SEB": {
-                    "count": 129
+                "MOL": {
+                    "count": 226
                 },
-                "Santander": {
-                    "count": 1181
+                "Bliska": {
+                    "count": 150
                 },
-                "Santander Consumer Bank": {
-                    "count": 81
+                "Api": {
+                    "count": 307
                 },
-                "Santander Totta": {
-                    "count": 63
+                "Arco": {
+                    "count": 174
                 },
-                "Sberbank": {
-                    "count": 61
+                "Pemex": {
+                    "count": 385
                 },
-                "Scotiabank": {
-                    "count": 379
+                "Exxon": {
+                    "count": 474
                 },
-                "Security Bank": {
-                    "count": 71
+                "Coles Express": {
+                    "count": 108
                 },
-                "Slovenská sporiteľňa": {
-                    "count": 127
+                "Petrom": {
+                    "count": 256
                 },
-                "Société Générale": {
-                    "count": 592
+                "PETRONOR": {
+                    "count": 208
                 },
-                "Sparda-Bank": {
-                    "count": 313
+                "Rompetrol": {
+                    "count": 165
                 },
-                "Sparkasse": {
-                    "count": 4521
+                "Lotos": {
+                    "count": 171
                 },
-                "Sparkasse Aachen": {
-                    "count": 58
+                "ОМВ": {
+                    "count": 60
                 },
-                "Sparkasse KölnBonn": {
-                    "count": 55
+                "BR": {
+                    "count": 102
                 },
-                "Stadtsparkasse": {
-                    "count": 86
+                "Copec": {
+                    "count": 500
                 },
-                "Standard Bank": {
-                    "count": 100
+                "Petrobras": {
+                    "count": 260
                 },
-                "State Bank of India": {
-                    "count": 132
+                "Liberty": {
+                    "count": 53
                 },
-                "SunTrust": {
-                    "count": 63
+                "IP": {
+                    "count": 855
                 },
-                "SunTrust Bank": {
-                    "count": 66
+                "YPF": {
+                    "count": 158
                 },
-                "Swedbank": {
-                    "count": 219
+                "Erg": {
+                    "count": 594
                 },
-                "TD Bank": {
-                    "count": 178
+                "Eneos": {
+                    "count": 96
                 },
-                "TD Canada Trust": {
-                    "count": 421
+                "Citgo": {
+                    "count": 268
                 },
-                "TSB": {
-                    "count": 51
+                "Metano": {
+                    "count": 206
                 },
-                "Targobank": {
-                    "count": 167
+                "Сургутнефтегаз": {
+                    "count": 62
                 },
-                "Tatra banka": {
-                    "count": 65
+                "EKO": {
+                    "count": 58
                 },
-                "UBS": {
-                    "count": 129
+                "Eko": {
+                    "count": 58
                 },
-                "UCPB": {
-                    "count": 87
+                "Indipend.": {
+                    "count": 175
                 },
-                "US Bank": {
-                    "count": 214
+                "IES": {
+                    "count": 63
                 },
-                "Ulster Bank": {
+                "TotalErg": {
                     "count": 85
                 },
-                "UniCredit Bank": {
-                    "count": 376
+                "Cenex": {
+                    "count": 114
                 },
-                "Unicredit Banca": {
-                    "count": 224
+                "ПТК": {
+                    "count": 81
                 },
-                "Unicaja": {
-                    "count": 74
+                "HP": {
+                    "count": 76
                 },
-                "Union Bank": {
-                    "count": 110
+                "Phillips 66": {
+                    "count": 202
                 },
-                "VR-Bank": {
-                    "count": 421
+                "CARREFOUR": {
+                    "count": 73
                 },
-                "Volksbank": {
-                    "count": 2573
+                "ERG": {
+                    "count": 75
                 },
-                "VÚB": {
-                    "count": 108
+                "Speedway": {
+                    "count": 131
                 },
-                "Wachovia": {
-                    "count": 61
+                "Benzina": {
+                    "count": 70
                 },
-                "Wells Fargo": {
-                    "count": 781
+                "Татнефть": {
+                    "count": 258
                 },
-                "Western Union": {
-                    "count": 84
+                "Terpel": {
+                    "count": 258
                 },
-                "Westpac": {
-                    "count": 194
+                "WOG": {
+                    "count": 169
                 },
-                "Yorkshire Bank": {
-                    "count": 60
+                "Seaoil": {
+                    "count": 53
                 },
-                "ČSOB": {
-                    "count": 157
+                "АЗС": {
+                    "count": 1048
                 },
-                "Česká spořitelna": {
-                    "count": 207
+                "Kwik Trip": {
+                    "count": 104
                 },
-                "Альфа-Банк": {
-                    "count": 183
+                "Wawa": {
+                    "count": 81
                 },
-                "Банк Москвы": {
-                    "count": 116
+                "Pertamina": {
+                    "count": 182
                 },
-                "Белагропромбанк": {
-                    "count": 66
+                "COSMO": {
+                    "count": 65
                 },
-                "Беларусбанк": {
-                    "count": 223
+                "Z": {
+                    "count": 75
                 },
-                "ВТБ": {
-                    "count": 54
+                "Indian Oil": {
+                    "count": 167
                 },
-                "Ð\92ТÐ\9124": {
-                    "count": 298
+                "Ð\90Ð\93Ð\97С": {
+                    "count": 486
                 },
-                "Возрождение": {
-                    "count": 56
+                "INA": {
+                    "count": 119
                 },
-                "Газпромбанк": {
-                    "count": 93
+                "JOMO": {
+                    "count": 63
                 },
-                "Ощадбанк": {
-                    "count": 292
+                "Holiday": {
+                    "count": 96
                 },
-                "ПриватБанк": {
-                    "count": 480
+                "IDEMITSU": {
+                    "count": 88
                 },
-                "Промсвязьбанк": {
-                    "count": 86
+                "ENEOS": {
+                    "count": 702
                 },
-                "Райффайзен Банк Аваль": {
-                    "count": 57
+                "Stacja paliw": {
+                    "count": 84
                 },
-                "Росбанк": {
-                    "count": 172
+                "Bharat Petroleum": {
+                    "count": 51
                 },
-                "Россельхозбанк": {
-                    "count": 181
+                "CAMPSA": {
+                    "count": 622
                 },
-                "Сбербанк": {
-                    "count": 4579
+                "Casey's General Store": {
+                    "count": 179
                 },
-                "Совкомбанк": {
+                "Kangaroo": {
+                    "count": 57
+                },
+                "Белоруснефть": {
                     "count": 51
                 },
-                "УкрСиббанк": {
-                    "count": 125
+                "コスモ石油 (COSMO)": {
+                    "count": 132
                 },
-                "Уралсиб": {
-                    "count": 83
+                "MEROIL": {
+                    "count": 78
                 },
-                "ლიბერთი ბანკი": {
-                    "count": 55,
-                    "tags": {
-                        "name:en": "Liberty Bank"
-                    }
+                "1-2-3": {
+                    "count": 71
                 },
-                "みずほ銀行": {
-                    "count": 68
+                "Conoco": {
+                    "count": 171
                 },
-                "りそな銀行": {
-                    "count": 227,
+                "出光": {
+                    "count": 214,
                     "tags": {
-                        "name:en": "Mizuho Bank"
+                        "name:en": "IDEMITSU"
                     }
                 },
-                "三井住友銀行": {
-                    "count": 122
+                "НК Альянс": {
+                    "count": 87
                 },
-                "三菱東京UFJ銀行": {
-                    "count": 149
+                "Sinclair": {
+                    "count": 86
                 },
-                "中国银行": {
-                    "count": 65
+                "SPBU": {
+                    "count": 51
                 },
-                "광주은행": {
-                    "count": 55,
-                    "tags": {
-                        "name:en": "Gwangju Bank"
-                    }
+                "Макпетрол": {
+                    "count": 109
                 },
-                "국민은행": {
-                    "count": 167,
-                    "tags": {
-                        "name:en": "Gungmin Bank"
-                    }
+                "Circle K": {
+                    "count": 156
                 },
-                "농협": {
-                    "count": 51
+                "Posto Ipiranga": {
+                    "count": 57
                 },
-                "신한은행": {
-                    "count": 218,
-                    "tags": {
-                        "name:en": "Sinhan Bank"
-                    }
+                "Phoenix": {
+                    "count": 143
                 },
-                "우리은행": {
-                    "count": 293,
-                    "tags": {
-                        "name:en": "Uri Bank"
-                    }
+                "Ipiranga": {
+                    "count": 83
                 },
-                "중소기업은행": {
-                    "count": 53,
-                    "tags": {
-                        "name:en": "Industrial Bank of Korea"
-                    }
+                "OKKO": {
+                    "count": 83
                 },
-                "하나은행": {
-                    "count": 78
-                }
-            },
-            "cafe": {
-                "Cafe Amazon": {
-                    "count": 51
+                "ОККО": {
+                    "count": 116
                 },
-                "Cafe Coffee Day": {
-                    "count": 103
+                "บางจาก": {
+                    "count": 59
                 },
-                "Cafeteria": {
-                    "count": 69
+                "QuikTrip": {
+                    "count": 92
                 },
-                "Caffè Nero": {
-                    "count": 159
+                "Stewart's": {
+                    "count": 62
                 },
-                "Café Central": {
+                "Posto BR": {
                     "count": 58
                 },
-                "Caribou Coffee": {
-                    "count": 92
+                "ป ต ท": {
+                    "count": 153
                 },
-                "Coffee Time": {
-                    "count": 94
+                "ปตท": {
+                    "count": 88
                 },
-                "Costa": {
-                    "count": 548
+                "ANP": {
+                    "count": 77
                 },
-                "Dunkin Donuts": {
-                    "count": 365,
-                    "tags": {
-                        "cuisine": "donut"
-                    }
+                "Kum & Go": {
+                    "count": 84
+                },
+                "Sokimex": {
+                    "count": 61
                 },
-                "Eiscafe": {
+                "Tela": {
                     "count": 115
                 },
-                "Eiscafe Venezia": {
-                    "count": 176
+                "Укрнафта": {
+                    "count": 57
                 },
-                "Eisdiele": {
-                    "count": 64
+                "Татнефтепродукт": {
+                    "count": 54
                 },
-                "Pret A Manger": {
-                    "count": 115
+                "Afriquia": {
+                    "count": 88
                 },
-                "Second Cup": {
-                    "count": 170
+                "Murphy USA": {
+                    "count": 62
                 },
-                "Segafredo": {
-                    "count": 67
+                "昭和シェル (Showa-shell)": {
+                    "count": 94
                 },
-                "Starbucks": {
-                    "count": 3837,
+                "CNG": {
+                    "count": 79
+                }
+            },
+            "fast_food": {
+                "Quick": {
+                    "count": 482
+                },
+                "McDonald's": {
+                    "count": 12049,
                     "tags": {
-                        "cuisine": "coffee_shop"
+                        "cuisine": "burger"
                     }
                 },
-                "Tchibo": {
-                    "count": 91
+                "Subway": {
+                    "count": 5378,
+                    "tags": {
+                        "cuisine": "sandwich"
+                    }
                 },
-                "Traveler's Coffee": {
+                "Burger King": {
+                    "count": 3594,
+                    "tags": {
+                        "cuisine": "burger"
+                    }
+                },
+                "Ali Baba": {
                     "count": 59
                 },
-                "Кафе": {
-                    "count": 244
+                "Hungry Jacks": {
+                    "count": 170,
+                    "tags": {
+                        "cuisine": "burger"
+                    }
                 },
-                "Кофе Хауз": {
-                    "count": 99
+                "Red Rooster": {
+                    "count": 147
                 },
-                "Столовая": {
-                    "count": 320
+                "KFC": {
+                    "count": 3093,
+                    "tags": {
+                        "cuisine": "chicken"
+                    }
                 },
-                "Шашлычная": {
-                    "count": 51
+                "Domino's Pizza": {
+                    "count": 935,
+                    "tags": {
+                        "cuisine": "pizza"
+                    }
                 },
-                "Шоколадница": {
-                    "count": 124
+                "Chowking": {
+                    "count": 141
                 },
-                "คาเฟ่ อเมซอน": {
-                    "count": 63
+                "Jollibee": {
+                    "count": 390
                 },
-                "カフェ・ド・クリエ": {
-                    "count": 68,
-                    "tags": {
-                        "name:en": "Cafe de CRIE"
-                    }
+                "Hesburger": {
+                    "count": 99
                 },
-                "スターバックス": {
-                    "count": 245,
+                "肯德基": {
+                    "count": 84
+                },
+                "Wendy's": {
+                    "count": 1554,
                     "tags": {
-                        "name:en": "Starbucks"
+                        "cuisine": "burger"
                     }
                 },
-                "ドトール": {
-                    "count": 163,
+                "Tim Hortons": {
+                    "count": 304
+                },
+                "Steers": {
+                    "count": 143
+                },
+                "Hardee's": {
+                    "count": 253,
                     "tags": {
-                        "name:en": "DOUTOR"
+                        "cuisine": "burger"
                     }
-                }
-            },
-            "car_rental": {
-                "Avis": {
-                    "count": 263
                 },
-                "Budget": {
-                    "count": 81
+                "Arby's": {
+                    "count": 747
                 },
-                "Enterprise": {
-                    "count": 173
+                "A&W": {
+                    "count": 268
                 },
-                "Europcar": {
-                    "count": 271
+                "Dairy Queen": {
+                    "count": 752
                 },
-                "Hertz": {
-                    "count": 276
+                "Hallo Pizza": {
+                    "count": 76
                 },
-                "Sixt": {
-                    "count": 150
+                "Fish & Chips": {
+                    "count": 85
                 },
-                "stadtmobil CarSharing-Station": {
-                    "count": 162
-                }
-            },
-            "fast_food": {
-                "A&W": {
-                    "count": 255
+                "Harvey's": {
+                    "count": 88
                 },
-                "Ali Baba": {
-                    "count": 57
+                "麥當勞": {
+                    "count": 55
                 },
-                "Arby's": {
-                    "count": 714
+                "Pizza Pizza": {
+                    "count": 203
                 },
-                "Asia Imbiss": {
-                    "count": 103
+                "Kotipizza": {
+                    "count": 75
                 },
-                "Baskin Robbins": {
-                    "count": 69
+                "Jack in the Box": {
+                    "count": 530,
+                    "tags": {
+                        "cuisine": "burger"
+                    }
                 },
-                "Boston Market": {
-                    "count": 57
+                "Istanbul": {
+                    "count": 56
+                },
+                "Kochlöffel": {
+                    "count": 68
+                },
+                "Döner": {
+                    "count": 227
+                },
+                "Telepizza": {
+                    "count": 190
                 },
-                "Burger King": {
-                    "count": 3449,
-                    "tags": {
-                        "cuisine": "burger"
-                    }
+                "Sibylla": {
+                    "count": 60
                 },
                 "Carl's Jr.": {
-                    "count": 272,
+                    "count": 287,
                     "tags": {
                         "cuisine": "burger"
                     }
                 },
-                "Chick-fil-A": {
-                    "count": 214,
+                "Quiznos": {
+                    "count": 261,
                     "tags": {
-                        "cuisine": "chicken"
+                        "cuisine": "sandwich"
                     }
                 },
-                "Chipotle": {
-                    "count": 260,
+                "Wimpy": {
+                    "count": 136
+                },
+                "Sonic": {
+                    "count": 538,
                     "tags": {
-                        "cuisine": "mexican"
+                        "cuisine": "burger"
                     }
                 },
-                "Chowking": {
-                    "count": 138
-                },
-                "Church's Chicken": {
-                    "count": 86
-                },
-                "Culver's": {
-                    "count": 427
-                },
-                "Dairy Queen": {
-                    "count": 722
+                "Taco Bell": {
+                    "count": 1367
                 },
-                "Del Taco": {
-                    "count": 137
+                "Pizza Nova": {
+                    "count": 58
                 },
-                "Domino's Pizza": {
-                    "count": 896,
+                "Papa John's": {
+                    "count": 289,
                     "tags": {
                         "cuisine": "pizza"
                     }
                 },
-                "Döner": {
-                    "count": 221
-                },
-                "El Pollo Loco": {
-                    "count": 61
-                },
-                "Fish & Chips": {
-                    "count": 82
+                "Nordsee": {
+                    "count": 158
                 },
-                "Five Guys": {
-                    "count": 124
+                "Mr. Sub": {
+                    "count": 104
                 },
-                "Hallo Pizza": {
-                    "count": 76
+                "Kebab": {
+                    "count": 176
                 },
-                "Hardee's": {
-                    "count": 242,
+                "Макдоналдс": {
+                    "count": 316,
                     "tags": {
-                        "cuisine": "burger"
+                        "name:en": "McDonald's"
                     }
                 },
-                "Harvey's": {
-                    "count": 83
+                "Asia Imbiss": {
+                    "count": 107
                 },
-                "Hesburger": {
-                    "count": 97
+                "Imbiss": {
+                    "count": 183
                 },
-                "Hungry Jacks": {
-                    "count": 163,
+                "Chipotle": {
+                    "count": 275,
                     "tags": {
-                        "cuisine": "burger"
+                        "cuisine": "mexican"
                     }
                 },
-                "Imbiss": {
-                    "count": 181
+                "マクドナルド": {
+                    "count": 668,
+                    "tags": {
+                        "name:en": "McDonald's",
+                        "cuisine": "burger"
+                    }
                 },
                 "In-N-Out Burger": {
                     "count": 58
                 },
-                "Istanbul": {
-                    "count": 52
-                },
-                "Jack in the Box": {
-                    "count": 517,
-                    "tags": {
-                        "cuisine": "burger"
-                    }
+                "Jimmy John's": {
+                    "count": 126
                 },
                 "Jamba Juice": {
-                    "count": 60
+                    "count": 63
                 },
-                "Jimmy John's": {
-                    "count": 119
+                "Робин Сдобин": {
+                    "count": 81
                 },
-                "Jollibee": {
-                    "count": 384
+                "Baskin Robbins": {
+                    "count": 69
                 },
-                "KFC": {
-                    "count": 2975,
+                "ケンタッキーフライドチキン": {
+                    "count": 162,
                     "tags": {
+                        "name:en": "KFC",
                         "cuisine": "chicken"
                     }
                 },
-                "Kebab": {
-                    "count": 167
+                "吉野家": {
+                    "count": 183
                 },
-                "Kochlöffel": {
-                    "count": 69
+                "Taco Time": {
+                    "count": 85
                 },
-                "Kotipizza": {
-                    "count": 75
+                "松屋": {
+                    "count": 262,
+                    "tags": {
+                        "name:en": "Matsuya"
+                    }
                 },
                 "Little Caesars": {
-                    "count": 61
+                    "count": 65
                 },
-                "Long John Silver's": {
-                    "count": 76
+                "El Pollo Loco": {
+                    "count": 62
                 },
-                "McDonald's": {
-                    "count": 11760,
+                "Del Taco": {
+                    "count": 139
+                },
+                "White Castle": {
+                    "count": 77
+                },
+                "Boston Market": {
+                    "count": 63
+                },
+                "Chick-fil-A": {
+                    "count": 236,
                     "tags": {
-                        "cuisine": "burger"
+                        "cuisine": "chicken"
                     }
                 },
-                "Mr. Sub": {
-                    "count": 108
+                "Panda Express": {
+                    "count": 225
                 },
-                "Nordsee": {
-                    "count": 159
+                "Whataburger": {
+                    "count": 152
                 },
-                "Panda Express": {
-                    "count": 212
+                "Taco John's": {
+                    "count": 72
                 },
-                "Papa John's": {
-                    "count": 274,
-                    "tags": {
-                        "cuisine": "pizza"
-                    }
+                "Теремок": {
+                    "count": 65
                 },
-                "Pizza Nova": {
-                    "count": 57
+                "Culver's": {
+                    "count": 426
                 },
-                "Pizza Pizza": {
-                    "count": 202
+                "Five Guys": {
+                    "count": 130
                 },
-                "Pollo Campero": {
-                    "count": 63
+                "Church's Chicken": {
+                    "count": 93
                 },
                 "Popeye's": {
-                    "count": 147,
+                    "count": 151,
                     "tags": {
                         "cuisine": "chicken"
                     }
                 },
-                "Quick": {
-                    "count": 484
-                },
-                "Quiznos": {
-                    "count": 262,
-                    "tags": {
-                        "cuisine": "sandwich"
-                    }
-                },
-                "Red Rooster": {
-                    "count": 145
+                "Long John Silver's": {
+                    "count": 80
                 },
-                "Sibylla": {
+                "Pollo Campero": {
                     "count": 61
                 },
-                "Sonic": {
-                    "count": 506,
+                "すき家": {
+                    "count": 264,
                     "tags": {
-                        "cuisine": "burger"
+                        "name:en": "SUKIYA"
                     }
                 },
-                "Steers": {
-                    "count": 139
-                },
-                "Subway": {
-                    "count": 5113,
+                "モスバーガー": {
+                    "count": 252,
                     "tags": {
-                        "cuisine": "sandwich"
+                        "name:en": "MOS BURGER"
                     }
                 },
-                "Taco Bell": {
-                    "count": 1257
+                "Русский Аппетит": {
+                    "count": 67
                 },
-                "Taco John's": {
+                "なか卯": {
+                    "count": 56
+                }
+            },
+            "restaurant": {
+                "Pizza Hut": {
+                    "count": 1099
+                },
+                "Little Chef": {
                     "count": 64
                 },
-                "Taco Time": {
-                    "count": 82
+                "Adler": {
+                    "count": 158
                 },
-                "Telepizza": {
-                    "count": 188
+                "Zur Krone": {
+                    "count": 91
                 },
-                "Tim Hortons": {
-                    "count": 292
+                "Deutsches Haus": {
+                    "count": 91
                 },
-                "Wendy's": {
-                    "count": 1487,
-                    "tags": {
-                        "cuisine": "burger"
-                    }
+                "Krone": {
+                    "count": 173
                 },
-                "Whataburger": {
-                    "count": 147
+                "Akropolis": {
+                    "count": 150
                 },
-                "White Castle": {
-                    "count": 74
+                "Schützenhaus": {
+                    "count": 126
                 },
-                "Wimpy": {
-                    "count": 136
+                "TGI Friday's": {
+                    "count": 198
                 },
-                "Макдоналдс": {
-                    "count": 309,
-                    "tags": {
-                        "name:en": "McDonald's"
-                    }
+                "Kreuz": {
+                    "count": 73
                 },
-                "Робин Сдобин": {
-                    "count": 72
+                "Waldschänke": {
+                    "count": 56
                 },
-                "Русский Аппетит": {
-                    "count": 65
+                "La Piazza": {
+                    "count": 69
                 },
-                "Теремок": {
-                    "count": 63
+                "Lamm": {
+                    "count": 68
                 },
-                "すき家": {
-                    "count": 245,
-                    "tags": {
-                        "name:en": "SUKIYA"
-                    }
+                "Zur Sonne": {
+                    "count": 73
                 },
-                "なか卯": {
-                    "count": 52
+                "Zur Linde": {
+                    "count": 204
                 },
-                "ケンタッキーフライドチキン": {
-                    "count": 158,
-                    "tags": {
-                        "name:en": "KFC",
-                        "cuisine": "chicken"
-                    }
+                "Poseidon": {
+                    "count": 111
                 },
-                "マクドナルド": {
-                    "count": 632,
-                    "tags": {
-                        "name:en": "McDonald's",
-                        "cuisine": "burger"
-                    }
+                "Shanghai": {
+                    "count": 81
                 },
-                "モスバーガー": {
-                    "count": 237,
-                    "tags": {
-                        "name:en": "MOS BURGER"
-                    }
+                "Red Lobster": {
+                    "count": 224
                 },
-                "吉野家": {
-                    "count": 172
+                "Zum Löwen": {
+                    "count": 81
                 },
-                "松屋": {
-                    "count": 224,
+                "Swiss Chalet": {
+                    "count": 105
+                },
+                "Olympia": {
+                    "count": 77
+                },
+                "Wagamama": {
+                    "count": 59
+                },
+                "Frankie & Benny's": {
+                    "count": 62
+                },
+                "Hooters": {
+                    "count": 101
+                },
+                "Sternen": {
+                    "count": 76
+                },
+                "Hirschen": {
+                    "count": 82
+                },
+                "Papa John's": {
+                    "count": 58,
                     "tags": {
-                        "name:en": "Matsuya"
+                        "cuisine": "pizza"
                     }
                 },
-                "肯德基": {
-                    "count": 81
+                "Denny's": {
+                    "count": 422
                 },
-                "麥當勞": {
-                    "count": 51
-                }
-            },
-            "fuel": {
-                "76": {
-                    "count": 282
+                "Athen": {
+                    "count": 67
                 },
-                "1-2-3": {
-                    "count": 71
+                "Sonne": {
+                    "count": 124
                 },
-                "7-Eleven": {
-                    "count": 422
+                "Hirsch": {
+                    "count": 78
                 },
-                "ABC": {
-                    "count": 80
+                "Ratskeller": {
+                    "count": 149
                 },
-                "Agip": {
-                    "count": 2654
+                "La Cantina": {
+                    "count": 54
                 },
-                "ANP": {
-                    "count": 65
+                "Gasthaus Krone": {
+                    "count": 55
                 },
-                "ARAL": {
-                    "count": 371
+                "El Greco": {
+                    "count": 80
                 },
-                "Avia": {
-                    "count": 871
+                "Gasthof zur Post": {
+                    "count": 74
                 },
-                "Afriquia": {
-                    "count": 90
+                "Nando's": {
+                    "count": 234
                 },
-                "Agrola": {
-                    "count": 72
+                "Löwen": {
+                    "count": 114
                 },
-                "Api": {
-                    "count": 313
+                "Pizza Express": {
+                    "count": 250
                 },
-                "Aral": {
-                    "count": 1334
+                "Mandarin": {
+                    "count": 64
                 },
-                "Arco": {
-                    "count": 153
+                "Hong Kong": {
+                    "count": 83
                 },
-                "Auchan": {
-                    "count": 52
+                "Zizzi": {
+                    "count": 65
                 },
-                "Avanti": {
-                    "count": 92
+                "Cracker Barrel": {
+                    "count": 170
                 },
-                "BFT": {
-                    "count": 88
+                "Rhodos": {
+                    "count": 78
                 },
-                "BP": {
-                    "count": 2330
+                "Lindenhof": {
+                    "count": 80
                 },
-                "BR": {
+                "Milano": {
+                    "count": 53
+                },
+                "Dolce Vita": {
+                    "count": 75
+                },
+                "Kirchenwirt": {
                     "count": 81
                 },
-                "Benzina": {
-                    "count": 70
+                "Kantine": {
+                    "count": 56
                 },
-                "Bliska": {
-                    "count": 149
+                "Ochsen": {
+                    "count": 93
                 },
-                "C. C. E. Leclerc": {
-                    "count": 84
+                "Spur": {
+                    "count": 59
                 },
-                "CAMPSA": {
-                    "count": 630
+                "Mykonos": {
+                    "count": 59
                 },
-                "CARREFOUR": {
-                    "count": 75
+                "Lotus": {
+                    "count": 66
                 },
-                "CEPSA": {
-                    "count": 1020
+                "Applebee's": {
+                    "count": 501
                 },
-                "COSMO": {
-                    "count": 65
+                "Flunch": {
+                    "count": 71
                 },
-                "Caltex": {
-                    "count": 948
+                "Zur Post": {
+                    "count": 116
                 },
-                "Canadian Tire": {
-                    "count": 63
+                "China Town": {
+                    "count": 71
                 },
-                "Carrefour": {
-                    "count": 196
+                "La Dolce Vita": {
+                    "count": 68
                 },
-                "Casey's General Store": {
-                    "count": 162
+                "Waffle House": {
+                    "count": 195
                 },
-                "Cenex": {
-                    "count": 106
+                "Delphi": {
+                    "count": 88
                 },
-                "Cepsa": {
-                    "count": 75
+                "Linde": {
+                    "count": 102
                 },
-                "Chevron": {
-                    "count": 825
+                "Dionysos": {
+                    "count": 69
                 },
-                "Circle K": {
-                    "count": 149
+                "Outback Steakhouse": {
+                    "count": 199
                 },
-                "Citgo": {
-                    "count": 246
+                "Kelsey's": {
+                    "count": 55
                 },
-                "Coles Express": {
-                    "count": 99
+                "Boston Pizza": {
+                    "count": 153
                 },
-                "Conoco": {
-                    "count": 169
+                "Bella Italia": {
+                    "count": 129
                 },
-                "Coop": {
-                    "count": 55
+                "Sizzler": {
+                    "count": 52
                 },
-                "Copec": {
-                    "count": 496
+                "Grüner Baum": {
+                    "count": 115
                 },
-                "E.Leclerc": {
-                    "count": 250
+                "Taj Mahal": {
+                    "count": 102
                 },
-                "EKO": {
+                "Rössli": {
+                    "count": 67
+                },
+                "Traube": {
+                    "count": 64
+                },
+                "Red Robin": {
+                    "count": 177
+                },
+                "Roma": {
                     "count": 61
                 },
-                "ENEOS": {
-                    "count": 644
+                "San Marco": {
+                    "count": 66
                 },
-                "ERG": {
-                    "count": 74
+                "Hellas": {
+                    "count": 54
                 },
-                "Esso": {
-                    "count": 3566
+                "La Perla": {
+                    "count": 66
                 },
-                "Eko": {
-                    "count": 58
+                "Vips": {
+                    "count": 52
                 },
-                "Elan": {
-                    "count": 114
+                "Panera Bread": {
+                    "count": 192
                 },
-                "Elf": {
-                    "count": 138
+                "Da Vinci": {
+                    "count": 54
                 },
-                "Eneos": {
-                    "count": 97
+                "Hippopotamus": {
+                    "count": 92
                 },
-                "Engen": {
-                    "count": 224
+                "Prezzo": {
+                    "count": 71
                 },
-                "Eni": {
-                    "count": 199
+                "Courtepaille": {
+                    "count": 99
+                },
+                "Hard Rock Cafe": {
+                    "count": 67
+                },
+                "Panorama": {
+                    "count": 61
                 },
-                "Erg": {
-                    "count": 609
+                "デニーズ": {
+                    "count": 77
                 },
-                "Esso Express": {
-                    "count": 81
+                "Sportheim": {
+                    "count": 62
                 },
-                "Exxon": {
-                    "count": 435
+                "餃子の王将": {
+                    "count": 54
                 },
-                "Flying V": {
-                    "count": 130
+                "Bären": {
+                    "count": 55
                 },
-                "Freie Tankstelle": {
-                    "count": 210
+                "Alte Post": {
+                    "count": 61
                 },
-                "GALP": {
-                    "count": 582
+                "China Garden": {
+                    "count": 64
                 },
-                "Gulf": {
-                    "count": 184
+                "Vapiano": {
+                    "count": 82
                 },
-                "HEM": {
-                    "count": 216
+                "Mamma Mia": {
+                    "count": 60
                 },
-                "HP": {
-                    "count": 59
+                "Schwarzer Adler": {
+                    "count": 56
                 },
-                "Hess": {
-                    "count": 110
+                "IHOP": {
+                    "count": 304
                 },
-                "Holiday": {
-                    "count": 96
+                "Chili's": {
+                    "count": 308
                 },
-                "Husky": {
-                    "count": 115
+                "Olive Garden": {
+                    "count": 264
                 },
-                "IDEMITSU": {
-                    "count": 79
+                "Friendly's": {
+                    "count": 75
                 },
-                "IES": {
-                    "count": 62
+                "Buffalo Grill": {
+                    "count": 196
                 },
-                "INA": {
-                    "count": 118
+                "Texas Roadhouse": {
+                    "count": 103
                 },
-                "IP": {
-                    "count": 830
+                "ガスト": {
+                    "count": 221,
+                    "tags": {
+                        "name:en": "Gusto"
+                    }
                 },
-                "Indian Oil": {
-                    "count": 134
+                "Sakura": {
+                    "count": 70
                 },
-                "Indipend.": {
-                    "count": 178
+                "Mensa": {
+                    "count": 92
                 },
-                "Intermarché": {
-                    "count": 417
+                "The Keg": {
+                    "count": 52
                 },
-                "Ipiranga": {
-                    "count": 79
+                "サイゼリヤ": {
+                    "count": 88
                 },
-                "Irving": {
-                    "count": 79
+                "La Strada": {
+                    "count": 51
                 },
-                "JET": {
-                    "count": 177
+                "Village Inn": {
+                    "count": 89
                 },
-                "JOMO": {
-                    "count": 65
+                "Buffalo Wild Wings": {
+                    "count": 161
                 },
-                "Jet": {
-                    "count": 439
+                "Peking": {
+                    "count": 56
                 },
-                "Kum & Go": {
-                    "count": 76
+                "Boston Market": {
+                    "count": 60
                 },
-                "Kwik Trip": {
-                    "count": 100
+                "Jimmy John's": {
+                    "count": 53
                 },
-                "LPG": {
-                    "count": 151
+                "California Pizza Kitchen": {
+                    "count": 56
                 },
-                "Lotos": {
-                    "count": 168
+                "Якитория": {
+                    "count": 77
                 },
-                "Lukoil": {
-                    "count": 667
+                "Golden Corral": {
+                    "count": 97
                 },
-                "MEROIL": {
-                    "count": 80
+                "Perkins": {
+                    "count": 101
                 },
-                "MOL": {
-                    "count": 216
+                "Ruby Tuesday": {
+                    "count": 146
                 },
-                "Marathon": {
-                    "count": 154
+                "Shari's": {
+                    "count": 63
                 },
-                "Metano": {
-                    "count": 205
+                "Bob Evans": {
+                    "count": 112
                 },
-                "Migrol": {
-                    "count": 66
+                "바다횟집 (Bada Fish Restaurant)": {
+                    "count": 54
                 },
-                "Mobil": {
-                    "count": 564
+                "Mang Inasal": {
+                    "count": 82
                 },
-                "Mol": {
-                    "count": 58
+                "Евразия": {
+                    "count": 99
                 },
-                "Morrisons": {
-                    "count": 104
+                "ジョナサン": {
+                    "count": 57
                 },
-                "Neste": {
-                    "count": 197
+                "Longhorn Steakhouse": {
+                    "count": 63
+                }
+            },
+            "bank": {
+                "Chase": {
+                    "count": 667
                 },
-                "Neste A24": {
-                    "count": 58
+                "Commonwealth Bank": {
+                    "count": 224
                 },
-                "OIL!": {
-                    "count": 57
+                "Citibank": {
+                    "count": 261
                 },
-                "OK": {
-                    "count": 159
+                "HSBC": {
+                    "count": 1072
                 },
-                "OKKO": {
-                    "count": 56
+                "Barclays": {
+                    "count": 947
                 },
-                "OKQ8": {
-                    "count": 186
+                "Westpac": {
+                    "count": 200
                 },
-                "OMV": {
-                    "count": 718
+                "NAB": {
+                    "count": 126
                 },
-                "Oilibya": {
-                    "count": 65
+                "ANZ": {
+                    "count": 207
                 },
-                "Orlen": {
-                    "count": 541
+                "Lloyds Bank": {
+                    "count": 543
                 },
-                "Pemex": {
-                    "count": 357
+                "Landbank": {
+                    "count": 80
                 },
-                "PETRONOR": {
-                    "count": 209
+                "Sparkasse": {
+                    "count": 4526
                 },
-                "PTT": {
-                    "count": 175
+                "UCPB": {
+                    "count": 90
                 },
-                "Pertamina": {
-                    "count": 176
+                "PNB": {
+                    "count": 243
                 },
-                "Petro-Canada": {
-                    "count": 466
+                "Metrobank": {
+                    "count": 264
                 },
-                "Petrobras": {
-                    "count": 256
+                "BDO": {
+                    "count": 288
                 },
-                "Petrom": {
-                    "count": 253
+                "Volksbank": {
+                    "count": 2584
                 },
-                "Petron": {
-                    "count": 824
+                "BPI": {
+                    "count": 402
                 },
-                "Petronas": {
-                    "count": 143
+                "Postbank": {
+                    "count": 440
                 },
-                "Phillips 66": {
-                    "count": 193
+                "NatWest": {
+                    "count": 620
                 },
-                "Phoenix": {
-                    "count": 138
+                "Raiffeisenbank": {
+                    "count": 2072
                 },
-                "Q8": {
-                    "count": 1137
+                "Yorkshire Bank": {
+                    "count": 63
                 },
-                "QuikTrip": {
-                    "count": 84
+                "ABSA": {
+                    "count": 90
                 },
-                "REPSOL": {
-                    "count": 1610
+                "Standard Bank": {
+                    "count": 101
                 },
-                "Raiffeisenbank": {
-                    "count": 118
+                "FNB": {
+                    "count": 92
                 },
-                "Repsol": {
-                    "count": 390
+                "Deutsche Bank": {
+                    "count": 846
                 },
-                "Rompetrol": {
-                    "count": 161
+                "SEB": {
+                    "count": 131
                 },
-                "Shell": {
-                    "count": 7936
+                "Commerzbank": {
+                    "count": 802
                 },
-                "Sainsbury's": {
-                    "count": 55
+                "Targobank": {
+                    "count": 166
                 },
-                "Sasol": {
-                    "count": 55
+                "ABN AMRO": {
+                    "count": 129
                 },
-                "Sheetz": {
-                    "count": 95
+                "Handelsbanken": {
+                    "count": 181
                 },
-                "Shell Express": {
-                    "count": 133
+                "Swedbank": {
+                    "count": 221
                 },
-                "Sinclair": {
-                    "count": 78
+                "Kreissparkasse": {
+                    "count": 587
                 },
-                "Slovnaft": {
-                    "count": 217
+                "UniCredit Bank": {
+                    "count": 400
                 },
-                "Sokimex": {
-                    "count": 59
+                "Monte dei Paschi di Siena": {
+                    "count": 131
                 },
-                "Speedway": {
-                    "count": 124
+                "Caja Rural": {
+                    "count": 94
                 },
-                "St1": {
-                    "count": 100
+                "Dresdner Bank": {
+                    "count": 72
                 },
-                "Stacja paliw": {
-                    "count": 84
+                "Sparda-Bank": {
+                    "count": 315
                 },
-                "Star": {
-                    "count": 316
+                "VÚB": {
+                    "count": 106
                 },
-                "Total": {
-                    "count": 2498
+                "Slovenská sporiteľňa": {
+                    "count": 130
                 },
-                "Statoil": {
-                    "count": 588
+                "Bank of Montreal": {
+                    "count": 115
                 },
-                "Stewart's": {
-                    "count": 62
+                "KBC": {
+                    "count": 198
                 },
-                "Sunoco": {
-                    "count": 307
+                "Royal Bank of Scotland": {
+                    "count": 109
                 },
-                "Super U": {
-                    "count": 122
+                "TSB": {
+                    "count": 71
                 },
-                "Tamoil": {
-                    "count": 864
+                "US Bank": {
+                    "count": 234
                 },
-                "Tango": {
-                    "count": 119
+                "HypoVereinsbank": {
+                    "count": 565
                 },
-                "Tankstelle": {
-                    "count": 114
+                "Bank Austria": {
+                    "count": 172
                 },
-                "Teboil": {
-                    "count": 119
+                "ING": {
+                    "count": 482
                 },
-                "Tela": {
-                    "count": 113
+                "Erste Bank": {
+                    "count": 180
                 },
-                "Terpel": {
-                    "count": 255
+                "CIBC": {
+                    "count": 321
                 },
-                "Tesco": {
-                    "count": 192
+                "Scotiabank": {
+                    "count": 392
                 },
-                "Texaco": {
-                    "count": 645
+                "Caisse d'Épargne": {
+                    "count": 849
                 },
-                "Tinq": {
-                    "count": 218
+                "Santander": {
+                    "count": 1254
                 },
-                "Topaz": {
-                    "count": 78
+                "Bank of Scotland": {
+                    "count": 87
                 },
-                "TotalErg": {
-                    "count": 71
+                "TD Canada Trust": {
+                    "count": 437
                 },
-                "Turmöl": {
-                    "count": 57
+                "BMO": {
+                    "count": 166
                 },
-                "Ultramar": {
-                    "count": 119
+                "Danske Bank": {
+                    "count": 130
                 },
-                "United": {
-                    "count": 83
+                "OTP": {
+                    "count": 189
                 },
-                "Valero": {
-                    "count": 328
+                "Crédit Agricole": {
+                    "count": 1200
                 },
-                "WOG": {
-                    "count": 139
+                "LCL": {
+                    "count": 528
                 },
-                "Wawa": {
-                    "count": 78
+                "VR-Bank": {
+                    "count": 427
                 },
-                "Westfalen": {
-                    "count": 97
+                "ČSOB": {
+                    "count": 160
                 },
-                "YPF": {
-                    "count": 141
+                "Česká spořitelna": {
+                    "count": 211
                 },
-                "Z": {
-                    "count": 76
+                "BNP": {
+                    "count": 109
                 },
-                "bft": {
-                    "count": 168
+                "Royal Bank": {
+                    "count": 65
                 },
-                "ÖMV": {
-                    "count": 100
+                "Nationwide": {
+                    "count": 200
                 },
-                "АГЗС": {
-                    "count": 471
+                "Halifax": {
+                    "count": 219
                 },
-                "АЗС": {
-                    "count": 1012
+                "BAWAG PSK": {
+                    "count": 101
                 },
-                "Башнефть": {
-                    "count": 52
+                "National Bank": {
+                    "count": 84
                 },
-                "Белоруснефть": {
-                    "count": 55
+                "Nedbank": {
+                    "count": 78
                 },
-                "Газпромнефть": {
-                    "count": 727
+                "First National Bank": {
+                    "count": 76
                 },
-                "Лукойл": {
-                    "count": 1472
+                "Nordea": {
+                    "count": 313
                 },
-                "Макпетрол": {
-                    "count": 110
+                "Rabobank": {
+                    "count": 613
                 },
-                "НК Альянс": {
-                    "count": 89
+                "Sparkasse KölnBonn": {
+                    "count": 53
                 },
-                "ОККО": {
-                    "count": 112
+                "Tatra banka": {
+                    "count": 67
                 },
-                "ОМВ": {
-                    "count": 57
+                "Berliner Sparkasse": {
+                    "count": 61
                 },
-                "ПТК": {
-                    "count": 82
+                "Berliner Volksbank": {
+                    "count": 77
                 },
-                "Петрол": {
-                    "count": 82
+                "Wells Fargo": {
+                    "count": 822
                 },
-                "Роснефть": {
-                    "count": 594
+                "Credit Suisse": {
+                    "count": 70
                 },
-                "Славнефть": {
-                    "count": 53
+                "Société Générale": {
+                    "count": 615
                 },
-                "Сургутнефтегаз": {
-                    "count": 60
+                "Osuuspankki": {
+                    "count": 73
                 },
-                "ТНК": {
-                    "count": 503
+                "Sparkasse Aachen": {
+                    "count": 56
                 },
-                "Татнефтепродукт": {
-                    "count": 55
+                "Hamburger Sparkasse": {
+                    "count": 155
                 },
-                "Татнефть": {
-                    "count": 250
+                "Cassa di Risparmio del Veneto": {
+                    "count": 66
                 },
-                "บางจาก": {
-                    "count": 60
+                "BNP Paribas": {
+                    "count": 598
                 },
-                "ป ต ท": {
-                    "count": 154
+                "Banque Populaire": {
+                    "count": 411
                 },
-                "ปตท": {
-                    "count": 89
+                "BNP Paribas Fortis": {
+                    "count": 208
                 },
-                "コスモ石油 (COSMO)": {
-                    "count": 132
+                "Banco Popular": {
+                    "count": 272
                 },
-                "出光": {
-                    "count": 205,
-                    "tags": {
-                        "name:en": "IDEMITSU"
-                    }
+                "Bancaja": {
+                    "count": 55
                 },
-                "昭和シェル (Showa-shell)": {
-                    "count": 93
-                }
-            },
-            "pharmacy": {
-                "Аптека 36,6": {
-                    "count": 220
+                "Banesto": {
+                    "count": 207
                 },
-                "Adler Apotheke": {
-                    "count": 302
+                "La Caixa": {
+                    "count": 553
                 },
-                "Alte Apotheke": {
-                    "count": 85
+                "Santander Consumer Bank": {
+                    "count": 83
                 },
-                "Apotheke": {
-                    "count": 167
+                "BRD": {
+                    "count": 188
                 },
-                "Apotheke am Markt": {
-                    "count": 62
+                "BCR": {
+                    "count": 140
                 },
-                "Apteka": {
-                    "count": 335
+                "Banca Transilvania": {
+                    "count": 139
                 },
-                "Bahnhof-Apotheke": {
-                    "count": 64
+                "BW-Bank": {
+                    "count": 97
                 },
-                "Boots": {
-                    "count": 809
+                "Komerční banka": {
+                    "count": 133
                 },
-                "Brunnen-Apotheke": {
-                    "count": 52
+                "Banco Pastor": {
+                    "count": 64
                 },
-                "Burg-Apotheke": {
-                    "count": 56
+                "Stadtsparkasse": {
+                    "count": 86
                 },
-                "Bären-Apotheke": {
-                    "count": 72
+                "Ulster Bank": {
+                    "count": 88
                 },
-                "CVS": {
-                    "count": 1400
+                "Sberbank": {
+                    "count": 59
                 },
-                "Clicks": {
-                    "count": 110
+                "CIC": {
+                    "count": 411
                 },
-                "Cruz Verde": {
-                    "count": 96
+                "Bancpost": {
+                    "count": 53
                 },
-                "Engel-Apotheke": {
-                    "count": 126
+                "Caja Madrid": {
+                    "count": 114
                 },
-                "Eurovaistinė": {
-                    "count": 60
+                "Maybank": {
+                    "count": 88
                 },
-                "Farmacia Comunale": {
-                    "count": 103
+                "中国银行": {
+                    "count": 70
                 },
-                "Farmacias Ahumada": {
-                    "count": 101
+                "Unicredit Banca": {
+                    "count": 233
                 },
-                "Farmacias Cruz Verde": {
-                    "count": 84
+                "Crédit Mutuel": {
+                    "count": 666
                 },
-                "Farmacias SalcoBrand": {
-                    "count": 133
+                "BBVA": {
+                    "count": 614
                 },
-                "Farmacity": {
+                "Intesa San Paolo": {
                     "count": 62
                 },
-                "Farmahorro": {
-                    "count": 61
+                "TD Bank": {
+                    "count": 184
                 },
-                "Farmatodo": {
-                    "count": 133
+                "Belfius": {
+                    "count": 227
                 },
-                "Gintarinė vaistinė": {
-                    "count": 100
+                "Bank of America": {
+                    "count": 877
                 },
-                "Hirsch-Apotheke": {
-                    "count": 80
+                "RBC": {
+                    "count": 224
                 },
-                "Hubertus Apotheke": {
+                "Alpha Bank": {
                     "count": 103
                 },
-                "Jean Coutu": {
-                    "count": 56
+                "Сбербанк": {
+                    "count": 4703
                 },
-                "Kinney Drugs": {
-                    "count": 67
+                "Россельхозбанк": {
+                    "count": 192
                 },
-                "Linden-Apotheke": {
-                    "count": 210
+                "Crédit du Nord": {
+                    "count": 91
                 },
-                "Ljekarna": {
-                    "count": 55
+                "BancoEstado": {
+                    "count": 79
                 },
-                "Lloyds Pharmacy": {
-                    "count": 286
+                "Millennium Bank": {
+                    "count": 415
                 },
-                "Löwen-Apotheke": {
-                    "count": 354
+                "State Bank of India": {
+                    "count": 141
                 },
-                "Marien-Apotheke": {
-                    "count": 315
+                "Беларусбанк": {
+                    "count": 233
                 },
-                "Markt-Apotheke": {
-                    "count": 161
+                "ING Bank Śląski": {
+                    "count": 65
                 },
-                "Mercury Drug": {
-                    "count": 401
+                "Caixa Geral de Depósitos": {
+                    "count": 124
                 },
-                "Neue Apotheke": {
-                    "count": 111
+                "Kreissparkasse Köln": {
+                    "count": 67
                 },
-                "Pharmacie Centrale": {
-                    "count": 60
+                "Banco BCI": {
+                    "count": 51
                 },
-                "Pharmaprix": {
-                    "count": 57
+                "Banco de Chile": {
+                    "count": 96
                 },
-                "Pharmasave": {
-                    "count": 63
+                "ВТБ24": {
+                    "count": 316
                 },
-                "Rathaus-Apotheke": {
-                    "count": 130
+                "UBS": {
+                    "count": 131
                 },
-                "Rats-Apotheke": {
-                    "count": 85
+                "PKO BP": {
+                    "count": 249
                 },
-                "Rite Aid": {
-                    "count": 659
+                "Chinabank": {
+                    "count": 54
                 },
-                "Rosen-Apotheke": {
-                    "count": 208
+                "PSBank": {
+                    "count": 57
                 },
-                "Rowlands Pharmacy": {
-                    "count": 68
+                "Union Bank": {
+                    "count": 118
                 },
-                "SalcoBrand": {
-                    "count": 88
+                "China Bank": {
+                    "count": 63
                 },
-                "Shoppers Drug Mart": {
-                    "count": 396
+                "RCBC": {
+                    "count": 122
                 },
-                "Sonnen-Apotheke": {
-                    "count": 306
+                "Unicaja": {
+                    "count": 78
                 },
-                "Stadt-Apotheke": {
-                    "count": 300
+                "BBK": {
+                    "count": 77
                 },
-                "Stern-Apotheke": {
-                    "count": 67
+                "Ibercaja": {
+                    "count": 66
                 },
-                "Superdrug": {
+                "RBS": {
+                    "count": 140
+                },
+                "Commercial Bank of Ceylon PLC": {
+                    "count": 79
+                },
+                "Bank of Ireland": {
                     "count": 108
                 },
-                "The Generics Pharmacy": {
-                    "count": 82
+                "BNL": {
+                    "count": 80
                 },
-                "Walgreens": {
-                    "count": 1447
+                "Banco Santander": {
+                    "count": 106
                 },
-                "Айболит": {
-                    "count": 51
+                "Banco Itaú": {
+                    "count": 94
                 },
-                "Аптека": {
-                    "count": 1879
+                "AIB": {
+                    "count": 70
                 },
-                "Аптечный пункт": {
-                    "count": 136
+                "BZ WBK": {
+                    "count": 72
                 },
-                "Вита": {
-                    "count": 107
+                "Banco do Brasil": {
+                    "count": 494
                 },
-                "Имплозия": {
-                    "count": 59
+                "Caixa Econômica Federal": {
+                    "count": 155
                 },
-                "Классика": {
-                    "count": 66
+                "Fifth Third Bank": {
+                    "count": 71
                 },
-                "Невис": {
-                    "count": 58
+                "Banca Popolare di Vicenza": {
+                    "count": 77
                 },
-                "Первая помощь": {
+                "Wachovia": {
+                    "count": 60
+                },
+                "OLB": {
+                    "count": 51
+                },
+                "みずほ銀行": {
                     "count": 73
                 },
-                "Радуга": {
+                "BES": {
                     "count": 69
                 },
-                "Ригла": {
-                    "count": 109
+                "ICICI Bank": {
+                    "count": 88
                 },
-                "Фармакор": {
-                    "count": 71
+                "HDFC Bank": {
+                    "count": 89
                 },
-                "Фармация": {
-                    "count": 118
+                "La Banque Postale": {
+                    "count": 63
                 },
-                "Фармленд": {
-                    "count": 80
+                "Pekao SA": {
+                    "count": 53
                 },
-                "аптека": {
-                    "count": 100
+                "Oberbank": {
+                    "count": 88
                 },
-                "ავერსი (Aversi)": {
-                    "count": 63
+                "Bradesco": {
+                    "count": 272
                 },
-                "サンドラッグ": {
+                "Oldenburgische Landesbank": {
+                    "count": 55
+                },
+                "Scotia Bank": {
                     "count": 52
                 },
-                "スギ薬局": {
-                    "count": 76
+                "Bendigo Bank": {
+                    "count": 89
                 },
-                "トモズ (Tomod's)": {
-                    "count": 82
+                "Argenta": {
+                    "count": 85
                 },
-                "ドラッグてらしま (Drug Terashima)": {
-                    "count": 96
+                "AXA": {
+                    "count": 68
                 },
-                "マツモトキヨシ": {
-                    "count": 107
-                }
-            },
-            "pub": {
-                "Cross Keys": {
-                    "count": 59
+                "Axis Bank": {
+                    "count": 58
                 },
-                "Irish Pub": {
-                    "count": 82
+                "Banco Nación": {
+                    "count": 61
                 },
-                "Kings Arms": {
-                    "count": 68
+                "GE Money Bank": {
+                    "count": 71
                 },
-                "Kings Head": {
-                    "count": 56
+                "Альфа-Банк": {
+                    "count": 182
                 },
-                "New Inn": {
-                    "count": 89
+                "Белагропромбанк": {
+                    "count": 67
                 },
-                "Prince of Wales": {
-                    "count": 76
+                "Caja Círculo": {
+                    "count": 64
                 },
-                "Red Lion": {
-                    "count": 201
+                "Eurobank": {
+                    "count": 91
                 },
-                "Rose & Crown": {
-                    "count": 51
+                "Banca Intesa": {
+                    "count": 55
                 },
-                "Rose and Crown": {
-                    "count": 77
+                "Canara Bank": {
+                    "count": 86
                 },
-                "Royal Hotel": {
-                    "count": 52
+                "Cajamar": {
+                    "count": 68
                 },
-                "Royal Oak": {
-                    "count": 149
+                "Banamex": {
+                    "count": 138
                 },
-                "The Anchor": {
-                    "count": 64
+                "Crédit Mutuel de Bretagne": {
+                    "count": 335
                 },
-                "The Angel": {
+                "Davivienda": {
+                    "count": 81
+                },
+                "Bank Spółdzielczy": {
+                    "count": 148
+                },
+                "Credit Agricole": {
+                    "count": 151
+                },
+                "Bankinter": {
                     "count": 55
                 },
-                "The Bell": {
-                    "count": 121
+                "Banque Nationale": {
+                    "count": 62
                 },
-                "The Black Horse": {
-                    "count": 94
+                "Bank of the West": {
+                    "count": 91
                 },
-                "The Bull": {
-                    "count": 67
+                "Key Bank": {
+                    "count": 144
                 },
-                "The Castle": {
-                    "count": 56
+                "Western Union": {
+                    "count": 86
                 },
-                "The Chequers": {
-                    "count": 65
+                "Citizens Bank": {
+                    "count": 110
                 },
-                "The Cross Keys": {
-                    "count": 55
+                "ПриватБанк": {
+                    "count": 492
                 },
-                "The Crown": {
-                    "count": 239
+                "Security Bank": {
+                    "count": 72
                 },
-                "The Crown Inn": {
-                    "count": 69
+                "Ecobank": {
+                    "count": 63
                 },
-                "The Fox": {
-                    "count": 78
+                "Millenium Bank": {
+                    "count": 61
                 },
-                "The George": {
+                "Bankia": {
+                    "count": 127
+                },
+                "三菱東京UFJ銀行": {
+                    "count": 159
+                },
+                "Caixa": {
                     "count": 109
                 },
-                "The Green Man": {
+                "Banco de Costa Rica": {
+                    "count": 62
+                },
+                "SunTrust Bank": {
+                    "count": 69
+                },
+                "Itaú": {
+                    "count": 313
+                },
+                "PBZ": {
                     "count": 52
                 },
-                "The Greyhound": {
-                    "count": 97
+                "Bancolombia": {
+                    "count": 87
                 },
-                "The Kings Arms": {
-                    "count": 59
+                "Райффайзен Банк Аваль": {
+                    "count": 62
                 },
-                "The Kings Head": {
-                    "count": 54
+                "Bancomer": {
+                    "count": 102
                 },
-                "The New Inn": {
-                    "count": 105
+                "Banorte": {
+                    "count": 74
                 },
-                "The Plough": {
-                    "count": 173
+                "Alior Bank": {
+                    "count": 76
                 },
-                "The Prince of Wales": {
+                "BOC": {
                     "count": 51
                 },
-                "The Queens Head": {
-                    "count": 51
+                "Банк Москвы": {
+                    "count": 116
                 },
-                "The Railway": {
-                    "count": 100
+                "ВТБ": {
+                    "count": 57
                 },
-                "The Red Lion": {
-                    "count": 230
+                "Caja Duero": {
+                    "count": 58
                 },
-                "The Rising Sun": {
+                "Regions Bank": {
+                    "count": 61
+                },
+                "Росбанк": {
+                    "count": 177
+                },
+                "Banco Estado": {
                     "count": 70
                 },
-                "The Royal Oak": {
-                    "count": 207
+                "BCI": {
+                    "count": 63
                 },
-                "The Ship": {
-                    "count": 89
+                "SunTrust": {
+                    "count": 64
                 },
-                "The Ship Inn": {
-                    "count": 80
+                "PNC Bank": {
+                    "count": 232
                 },
-                "The Star": {
-                    "count": 74
+                "신한은행": {
+                    "count": 218,
+                    "tags": {
+                        "name:en": "Sinhan Bank"
+                    }
                 },
-                "The Swan": {
-                    "count": 148
+                "우리은행": {
+                    "count": 292,
+                    "tags": {
+                        "name:en": "Uri Bank"
+                    }
                 },
-                "The Victoria": {
-                    "count": 68
+                "국민은행": {
+                    "count": 166,
+                    "tags": {
+                        "name:en": "Gungmin Bank"
+                    }
                 },
-                "The Wheatsheaf": {
-                    "count": 120
+                "중소기업은행": {
+                    "count": 52,
+                    "tags": {
+                        "name:en": "Industrial Bank of Korea"
+                    }
                 },
-                "The White Hart": {
-                    "count": 223
+                "광주은행": {
+                    "count": 53,
+                    "tags": {
+                        "name:en": "Gwangju Bank"
+                    }
                 },
-                "The White Horse": {
-                    "count": 201
+                "Газпромбанк": {
+                    "count": 99
                 },
-                "The White Lion": {
-                    "count": 117
-                }
-            },
-            "recycling": {
-                "Altglas": {
-                    "count": 98
+                "M&T Bank": {
+                    "count": 85
                 },
-                "Déchèterie": {
-                    "count": 244
+                "Caja de Burgos": {
+                    "count": 52
                 },
-                "Glas": {
-                    "count": 106
+                "Santander Totta": {
+                    "count": 63
                 },
-                "Glascontainer": {
-                    "count": 144
+                "УкрСиббанк": {
+                    "count": 128
                 },
-                "Recyclinghof": {
-                    "count": 131
+                "Ощадбанк": {
+                    "count": 313
                 },
-                "Wertstoffhof": {
-                    "count": 262
-                }
-            },
-            "restaurant": {
-                "Adler": {
-                    "count": 154
+                "Уралсиб": {
+                    "count": 84
                 },
-                "Akropolis": {
-                    "count": 149
+                "りそな銀行": {
+                    "count": 227,
+                    "tags": {
+                        "name:en": "Mizuho Bank"
+                    }
                 },
-                "Alte Post": {
-                    "count": 62
+                "Cajero Automatico Bancared": {
+                    "count": 145
                 },
-                "Applebee's": {
-                    "count": 467
+                "Промсвязьбанк": {
+                    "count": 89
                 },
-                "Athen": {
-                    "count": 65
+                "三井住友銀行": {
+                    "count": 126
                 },
-                "Bella Italia": {
-                    "count": 125
+                "Banco Provincia": {
+                    "count": 65
                 },
-                "Bob Evans": {
-                    "count": 99
+                "BB&T": {
+                    "count": 136
                 },
-                "Boston Market": {
+                "Возрождение": {
                     "count": 57
                 },
-                "Boston Pizza": {
-                    "count": 148
+                "Capital One": {
+                    "count": 52
                 },
-                "Buffalo Grill": {
-                    "count": 192
+                "Bank Mandiri": {
+                    "count": 59
                 },
-                "Buffalo Wild Wings": {
-                    "count": 147
+                "Banco de la Nación": {
+                    "count": 93
                 },
-                "Bären": {
+                "Banco G&T Continental": {
+                    "count": 62
+                },
+                "Peoples Bank": {
                     "count": 58
                 },
-                "California Pizza Kitchen": {
+                "Совкомбанк": {
+                    "count": 52
+                },
+                "Provincial": {
+                    "count": 53
+                },
+                "Banco de Desarrollo Banrural": {
+                    "count": 73
+                },
+                "Banco Bradesco": {
                     "count": 56
                 },
-                "Chili's": {
-                    "count": 294
+                "Bicentenario": {
+                    "count": 182
                 },
-                "China Garden": {
-                    "count": 64
+                "ლიბერთი ბანკი": {
+                    "count": 54,
+                    "tags": {
+                        "name:en": "Liberty Bank"
+                    }
                 },
-                "China Town": {
-                    "count": 70
+                "Banesco": {
+                    "count": 106
                 },
-                "Courtepaille": {
-                    "count": 95
+                "Mercantil": {
+                    "count": 76
                 },
-                "Cracker Barrel": {
-                    "count": 162
+                "Del Tesoro": {
+                    "count": 91
+                },
+                "하나은행": {
+                    "count": 77
+                },
+                "CityCommerce Bank": {
+                    "count": 53
+                },
+                "De Venezuela": {
+                    "count": 118
+                }
+            },
+            "car_rental": {
+                "Europcar": {
+                    "count": 287
                 },
-                "Da Vinci": {
-                    "count": 53
+                "Budget": {
+                    "count": 85
                 },
-                "Delphi": {
-                    "count": 86
+                "Sixt": {
+                    "count": 151
                 },
-                "Denny's": {
-                    "count": 395
+                "Avis": {
+                    "count": 276
                 },
-                "Deutsches Haus": {
-                    "count": 88
+                "Hertz": {
+                    "count": 286
                 },
-                "Dionysos": {
-                    "count": 68
+                "Enterprise": {
+                    "count": 184
                 },
-                "Dolce Vita": {
-                    "count": 74
+                "stadtmobil CarSharing-Station": {
+                    "count": 149
+                }
+            },
+            "pharmacy": {
+                "Rowlands Pharmacy": {
+                    "count": 69
                 },
-                "El Greco": {
-                    "count": 80
+                "Boots": {
+                    "count": 819
                 },
-                "Flunch": {
-                    "count": 71
+                "Marien-Apotheke": {
+                    "count": 314
                 },
-                "Frankie & Benny's": {
-                    "count": 58
+                "Mercury Drug": {
+                    "count": 412
                 },
-                "Friendly's": {
-                    "count": 72
+                "Löwen-Apotheke": {
+                    "count": 354
                 },
-                "Gasthaus Adler": {
-                    "count": 51
+                "Superdrug": {
+                    "count": 109
                 },
-                "Gasthaus Krone": {
-                    "count": 54
+                "Sonnen-Apotheke": {
+                    "count": 306
                 },
-                "Gasthof zur Post": {
-                    "count": 72
+                "Rathaus-Apotheke": {
+                    "count": 131
                 },
-                "Golden Corral": {
-                    "count": 91
+                "Engel-Apotheke": {
+                    "count": 123
                 },
-                "Grüner Baum": {
-                    "count": 116
+                "Hirsch-Apotheke": {
+                    "count": 82
                 },
-                "Hard Rock Cafe": {
+                "Stern-Apotheke": {
                     "count": 66
                 },
-                "Hellas": {
-                    "count": 54
+                "Lloyds Pharmacy": {
+                    "count": 292
                 },
-                "Hippopotamus": {
-                    "count": 91
+                "Rosen-Apotheke": {
+                    "count": 207
                 },
-                "Hirsch": {
-                    "count": 77
+                "Stadt-Apotheke": {
+                    "count": 299
                 },
-                "Hirschen": {
-                    "count": 83
+                "Markt-Apotheke": {
+                    "count": 162
                 },
-                "Hong Kong": {
-                    "count": 81
+                "Аптека": {
+                    "count": 1938
                 },
-                "Hooters": {
-                    "count": 94
+                "Pharmasave": {
+                    "count": 63
                 },
-                "IHOP": {
-                    "count": 286
+                "Brunnen-Apotheke": {
+                    "count": 53
                 },
-                "Kantine": {
-                    "count": 52
+                "Shoppers Drug Mart": {
+                    "count": 417
                 },
-                "Kelsey's": {
-                    "count": 56
+                "Apotheke am Markt": {
+                    "count": 61
                 },
-                "Kirchenwirt": {
-                    "count": 79
+                "Alte Apotheke": {
+                    "count": 87
                 },
-                "Kreuz": {
-                    "count": 75
+                "Neue Apotheke": {
+                    "count": 110
                 },
-                "Krone": {
-                    "count": 173
+                "Gintarinė vaistinė": {
+                    "count": 101
                 },
-                "La Cantina": {
-                    "count": 54
+                "Rats-Apotheke": {
+                    "count": 83
                 },
-                "La Dolce Vita": {
-                    "count": 68
+                "Adler Apotheke": {
+                    "count": 307
                 },
-                "La Perla": {
-                    "count": 66
+                "Pharmacie Centrale": {
+                    "count": 63
                 },
-                "La Piazza": {
-                    "count": 67
+                "Walgreens": {
+                    "count": 1521
                 },
-                "Lamm": {
-                    "count": 67
+                "Rite Aid": {
+                    "count": 700
                 },
-                "Linde": {
-                    "count": 102
+                "Apotheke": {
+                    "count": 163
                 },
-                "Lindenhof": {
-                    "count": 82
+                "Linden-Apotheke": {
+                    "count": 209
                 },
-                "Little Chef": {
-                    "count": 68
+                "Bahnhof-Apotheke": {
+                    "count": 65
                 },
-                "Longhorn Steakhouse": {
+                "Burg-Apotheke": {
                     "count": 56
                 },
-                "Lotus": {
-                    "count": 64
+                "Jean Coutu": {
+                    "count": 59
                 },
-                "Löwen": {
-                    "count": 114
+                "Pharmaprix": {
+                    "count": 58
                 },
-                "Mamma Mia": {
-                    "count": 61
+                "Farmacias Ahumada": {
+                    "count": 102
                 },
-                "Mandarin": {
-                    "count": 64
+                "Farmacia Comunale": {
+                    "count": 108
                 },
-                "Mang Inasal": {
-                    "count": 81
+                "Farmacias Cruz Verde": {
+                    "count": 84
                 },
-                "Mensa": {
-                    "count": 87
+                "Cruz Verde": {
+                    "count": 97
                 },
-                "Milano": {
+                "Hubertus Apotheke": {
                     "count": 52
                 },
-                "Mykonos": {
-                    "count": 59
+                "CVS": {
+                    "count": 1448
                 },
-                "Nando's": {
-                    "count": 219
+                "Farmacias SalcoBrand": {
+                    "count": 132
                 },
-                "Ochsen": {
-                    "count": 93
+                "Фармация": {
+                    "count": 118
                 },
-                "Olive Garden": {
-                    "count": 241
+                "Bären-Apotheke": {
+                    "count": 72
                 },
-                "Olympia": {
-                    "count": 78
+                "Clicks": {
+                    "count": 109
                 },
-                "Outback Steakhouse": {
-                    "count": 189
+                "セイジョー": {
+                    "count": 51
                 },
-                "Panera Bread": {
-                    "count": 171
+                "マツモトキヨシ": {
+                    "count": 111
                 },
-                "Panorama": {
-                    "count": 60
+                "Вита": {
+                    "count": 107
                 },
-                "Peking": {
-                    "count": 54
+                "Радуга": {
+                    "count": 70
                 },
-                "Perkins": {
-                    "count": 96
+                "サンドラッグ": {
+                    "count": 57
                 },
-                "Pizza Express": {
-                    "count": 241
+                "Apteka": {
+                    "count": 352
                 },
-                "Pizza Hut": {
-                    "count": 1038
+                "Первая помощь": {
+                    "count": 74
                 },
-                "Poseidon": {
+                "Ригла": {
                     "count": 111
                 },
-                "Prezzo": {
+                "Имплозия": {
+                    "count": 63
+                },
+                "Kinney Drugs": {
                     "count": 68
                 },
-                "Ratskeller": {
-                    "count": 148
+                "Классика": {
+                    "count": 66
                 },
-                "Red Lobster": {
-                    "count": 205
+                "Ljekarna": {
+                    "count": 54
                 },
-                "Red Robin": {
-                    "count": 169
+                "SalcoBrand": {
+                    "count": 90
                 },
-                "Rhodos": {
-                    "count": 80
+                "Аптека 36,6": {
+                    "count": 220
                 },
-                "Roma": {
-                    "count": 60
+                "Фармакор": {
+                    "count": 74
                 },
-                "Ruby Tuesday": {
-                    "count": 137
+                "スギ薬局": {
+                    "count": 82
                 },
-                "Rössli": {
-                    "count": 68
+                "Аптечный пункт": {
+                    "count": 140
                 },
-                "Sakura": {
-                    "count": 69
+                "Невис": {
+                    "count": 58
                 },
-                "San Marco": {
-                    "count": 66
+                "トモズ (Tomod's)": {
+                    "count": 83
                 },
-                "Schwarzer Adler": {
-                    "count": 58
+                "Eurovaistinė": {
+                    "count": 62
                 },
-                "Schützenhaus": {
-                    "count": 129
+                "Farmacity": {
+                    "count": 65
                 },
-                "Seeblick": {
-                    "count": 51
+                "аптека": {
+                    "count": 100
                 },
-                "Shanghai": {
-                    "count": 79
+                "The Generics Pharmacy": {
+                    "count": 86
                 },
-                "Shari's": {
-                    "count": 63
+                "Farmatodo": {
+                    "count": 124
                 },
-                "Sonne": {
-                    "count": 123
+                "Фармленд": {
+                    "count": 80
                 },
-                "Sportheim": {
-                    "count": 57
+                "ドラッグてらしま (Drug Terashima)": {
+                    "count": 96
                 },
-                "Spur": {
-                    "count": 60
+                "ავერსი (Aversi)": {
+                    "count": 62
                 },
-                "Sternen": {
-                    "count": 78
+                "Farmahorro": {
+                    "count": 58
+                }
+            },
+            "cafe": {
+                "Starbucks": {
+                    "count": 4032,
+                    "tags": {
+                        "cuisine": "coffee_shop"
+                    }
                 },
-                "Swiss Chalet": {
-                    "count": 101
+                "Cafeteria": {
+                    "count": 77
                 },
-                "TGI Friday's": {
-                    "count": 138
+                "Costa": {
+                    "count": 579
                 },
-                "Taj Mahal": {
-                    "count": 101
+                "Caffè Nero": {
+                    "count": 165
                 },
-                "Texas Roadhouse": {
-                    "count": 96
+                "Кафе": {
+                    "count": 214
                 },
-                "The Keg": {
-                    "count": 52
+                "Café Central": {
+                    "count": 60
                 },
-                "Traube": {
+                "Second Cup": {
+                    "count": 190
+                },
+                "Eisdiele": {
                     "count": 65
                 },
-                "Vapiano": {
-                    "count": 81
+                "Dunkin Donuts": {
+                    "count": 393,
+                    "tags": {
+                        "cuisine": "donut"
+                    }
                 },
-                "Village Inn": {
-                    "count": 88
+                "Segafredo": {
+                    "count": 66
                 },
-                "Vips": {
-                    "count": 51
+                "Coffee Time": {
+                    "count": 95
                 },
-                "Waffle House": {
-                    "count": 182
+                "Cafe Coffee Day": {
+                    "count": 104
                 },
-                "Wagamama": {
-                    "count": 58
+                "Eiscafe Venezia": {
+                    "count": 173
                 },
-                "Waldschänke": {
-                    "count": 55
+                "スターバックス": {
+                    "count": 248,
+                    "tags": {
+                        "name:en": "Starbucks"
+                    }
                 },
-                "Zizzi": {
-                    "count": 62
+                "Шоколадница": {
+                    "count": 138
                 },
-                "Zum Löwen": {
-                    "count": 82
+                "Pret A Manger": {
+                    "count": 115
                 },
-                "Zur Krone": {
-                    "count": 92
+                "Столовая": {
+                    "count": 351
                 },
-                "Zur Linde": {
-                    "count": 200
+                "ドトール": {
+                    "count": 163,
+                    "tags": {
+                        "name:en": "DOUTOR"
+                    }
                 },
-                "Zur Post": {
-                    "count": 117
+                "Tchibo": {
+                    "count": 97
                 },
-                "Zur Sonne": {
-                    "count": 73
+                "Кофе Хауз": {
+                    "count": 102
                 },
-                "Евразия": {
+                "Caribou Coffee": {
                     "count": 98
                 },
-                "ЯкиÑ\82оÑ\80иÑ\8f": {
-                    "count": 74
+                "УÑ\8eÑ\82": {
+                    "count": 51
                 },
-                "ガスト": {
-                    "count": 204,
-                    "tags": {
-                        "name:en": "Gusto"
-                    }
+                "Шашлычная": {
+                    "count": 57
                 },
-                "サイゼリヤ": {
-                    "count": 81
+                "คาเฟ่ อเมซอน": {
+                    "count": 62
                 },
-                "ジョナサン": {
-                    "count": 56
+                "Traveler's Coffee": {
+                    "count": 60
                 },
-                "デニーズ": {
-                    "count": 73
+                "カフェ・ド・クリエ": {
+                    "count": 67,
+                    "tags": {
+                        "name:en": "Cafe de CRIE"
+                    }
                 },
-                "바다횟집 (Bada Fish Restaurant)": {
-                    "count": 55
+                "Cafe Amazon": {
+                    "count": 54
                 }
             }
         },
         "shop": {
-            "alcohol": {
-                "Alko": {
+            "supermarket": {
+                "Budgens": {
+                    "count": 86
+                },
+                "Morrisons": {
+                    "count": 408
+                },
+                "Interspar": {
                     "count": 141
                 },
-                "BWS": {
-                    "count": 58
+                "Merkur": {
+                    "count": 107
                 },
-                "Bargain Booze": {
-                    "count": 59
+                "Sainsbury's": {
+                    "count": 540
                 },
-                "Botilleria": {
-                    "count": 75
+                "Lidl": {
+                    "count": 6128
                 },
-                "Gall & Gall": {
-                    "count": 514
+                "EDEKA": {
+                    "count": 494
                 },
-                "LCBO": {
-                    "count": 214
+                "Coles": {
+                    "count": 392
                 },
-                "Nicolas": {
-                    "count": 109
+                "Iceland": {
+                    "count": 301
                 },
-                "SAQ": {
-                    "count": 66
+                "Coop": {
+                    "count": 1883
                 },
-                "Systembolaget": {
-                    "count": 199
+                "Tesco": {
+                    "count": 1292
                 },
-                "The Beer Store": {
-                    "count": 141
+                "Woolworths": {
+                    "count": 530
                 },
-                "Ароматный мир": {
-                    "count": 56
+                "Zielpunkt": {
+                    "count": 236
                 },
-                "Живое пиво": {
-                    "count": 62
-                }
-            },
-            "bakery": {
-                "Anker": {
-                    "count": 65
+                "Nahkauf": {
+                    "count": 167
                 },
-                "Backwerk": {
-                    "count": 94
+                "Billa": {
+                    "count": 1415
                 },
-                "Boulangerie": {
-                    "count": 232
+                "Kaufland": {
+                    "count": 989
                 },
-                "Boulangerie Patisserie": {
-                    "count": 76
+                "Plus": {
+                    "count": 125
                 },
-                "Bäcker": {
-                    "count": 65
+                "ALDI": {
+                    "count": 5132
                 },
-                "Bäckerei": {
-                    "count": 163
+                "Checkers": {
+                    "count": 126
                 },
-                "Bäckerei Schmidt": {
-                    "count": 56
+                "Tesco Metro": {
+                    "count": 124
                 },
-                "Dat Backhus": {
-                    "count": 62
+                "NP": {
+                    "count": 149
                 },
-                "Der Beck": {
-                    "count": 97
+                "Penny": {
+                    "count": 1758
                 },
-                "Goeken backen": {
-                    "count": 52
+                "Norma": {
+                    "count": 1062
                 },
-                "Goldilocks": {
-                    "count": 55
+                "Asda": {
+                    "count": 226
                 },
-                "Greggs": {
-                    "count": 255
+                "Netto": {
+                    "count": 4331
                 },
-                "Hofpfisterei": {
-                    "count": 108
+                "REWE": {
+                    "count": 1467
                 },
-                "Ihle": {
-                    "count": 76
+                "Rewe": {
+                    "count": 1169
                 },
-                "K&U": {
-                    "count": 54
+                "Aldi Süd": {
+                    "count": 590
                 },
-                "Kamps": {
-                    "count": 252
+                "Real": {
+                    "count": 248
                 },
-                "Oebel": {
-                    "count": 57
+                "Tesco Express": {
+                    "count": 388
+                },
+                "King Soopers": {
+                    "count": 70
+                },
+                "Kiwi": {
+                    "count": 164
                 },
-                "Panaderia": {
-                    "count": 154
+                "Edeka": {
+                    "count": 1799
                 },
-                "Panificio": {
-                    "count": 63
+                "Pick n Pay": {
+                    "count": 238
                 },
-                "Paul": {
-                    "count": 74
+                "ICA": {
+                    "count": 192
                 },
-                "Piekarnia": {
-                    "count": 52
+                "Tengelmann": {
+                    "count": 190
                 },
-                "Stadtbäckerei": {
-                    "count": 58
+                "Carrefour": {
+                    "count": 1614
                 },
-                "Stadtbäckerei Junge": {
-                    "count": 53
+                "Waitrose": {
+                    "count": 258
                 },
-                "Steinecke": {
-                    "count": 135
+                "Spar": {
+                    "count": 2063
                 },
-                "Thürmann": {
-                    "count": 57
+                "Hofer": {
+                    "count": 439
                 },
-                "Хлеб": {
-                    "count": 81
-                }
-            },
-            "books": {
-                "Barnes & Noble": {
-                    "count": 239
+                "M-Preis": {
+                    "count": 79
                 },
-                "Bruna": {
-                    "count": 55
+                "LIDL": {
+                    "count": 915
                 },
-                "Libro": {
-                    "count": 59
+                "tegut": {
+                    "count": 209
                 },
-                "Thalia": {
-                    "count": 122
+                "Sainsbury's Local": {
+                    "count": 109
                 },
-                "Waterstones": {
-                    "count": 85
+                "E-Center": {
+                    "count": 66
                 },
-                "Weltbild": {
-                    "count": 72
+                "Aldi Nord": {
+                    "count": 197
                 },
-                "Книги": {
-                    "count": 110
-                }
-            },
-            "car_repair": {
-                "ATU": {
-                    "count": 257
+                "nahkauf": {
+                    "count": 81
                 },
-                "AutoZone": {
-                    "count": 51
+                "Meijer": {
+                    "count": 73
                 },
-                "Carglass": {
-                    "count": 99
+                "Safeway": {
+                    "count": 398
                 },
-                "Euromaster": {
-                    "count": 80
+                "Costco": {
+                    "count": 145
                 },
-                "Feu Vert": {
-                    "count": 104
+                "Albert": {
+                    "count": 183
                 },
-                "Firestone": {
-                    "count": 77
+                "Jumbo": {
+                    "count": 190
                 },
-                "Jiffy Lube": {
-                    "count": 178
+                "Shoprite": {
+                    "count": 239
                 },
-                "Kwik Fit": {
-                    "count": 73
+                "MPreis": {
+                    "count": 52
                 },
-                "Midas": {
-                    "count": 171
+                "Penny Market": {
+                    "count": 409
                 },
-                "Norauto": {
-                    "count": 141
+                "Tesco Extra": {
+                    "count": 119
                 },
-                "O'Reilly Auto Parts": {
-                    "count": 62
+                "Albert Heijn": {
+                    "count": 464
                 },
-                "Peugeot": {
-                    "count": 80
+                "IGA": {
+                    "count": 347
                 },
-                "Pit Stop": {
-                    "count": 55
+                "Super U": {
+                    "count": 476
                 },
-                "Renault": {
-                    "count": 158
+                "Metro": {
+                    "count": 256
                 },
-                "Roady": {
-                    "count": 52
+                "Neukauf": {
+                    "count": 77
                 },
-                "Speedy": {
-                    "count": 104
+                "Migros": {
+                    "count": 442
                 },
-                "ÖAMTC": {
-                    "count": 51
+                "Marktkauf": {
+                    "count": 126
                 },
-                "Автозапчасти": {
-                    "count": 172
+                "Delikatesy Centrum": {
+                    "count": 57
                 },
-                "Автосервис": {
+                "C1000": {
                     "count": 314
                 },
-                "СТО": {
-                    "count": 338
-                },
-                "Шиномонтаж": {
-                    "count": 995
-                }
-            },
-            "car": {
-                "Audi": {
-                    "count": 101
+                "Hoogvliet": {
+                    "count": 52
                 },
-                "BMW": {
-                    "count": 139
+                "COOP": {
+                    "count": 192
                 },
-                "Chevrolet": {
-                    "count": 75
+                "Food Basics": {
+                    "count": 74
                 },
-                "Citroen": {
+                "Casino": {
                     "count": 259
                 },
-                "Fiat": {
-                    "count": 83
+                "Penny Markt": {
+                    "count": 462
                 },
-                "Ford": {
-                    "count": 216
+                "Giant": {
+                    "count": 194
                 },
-                "Honda": {
-                    "count": 134
+                "COOP Jednota": {
+                    "count": 69
                 },
-                "Hyundai": {
-                    "count": 146
+                "Rema 1000": {
+                    "count": 364
                 },
-                "Mazda": {
+                "Kaufpark": {
                     "count": 96
                 },
-                "Mercedes-Benz": {
-                    "count": 218
-                },
-                "Mitsubishi": {
-                    "count": 66
-                },
-                "Nissan": {
-                    "count": 173
+                "ALDI SÜD": {
+                    "count": 114
                 },
-                "Opel": {
-                    "count": 161
+                "Simply Market": {
+                    "count": 320
                 },
-                "Peugeot": {
-                    "count": 291
+                "Konzum": {
+                    "count": 228
                 },
-                "Renault": {
-                    "count": 356
+                "Carrefour Express": {
+                    "count": 330
                 },
-                "Skoda": {
-                    "count": 92
+                "Eurospar": {
+                    "count": 265
                 },
-                "Suzuki": {
-                    "count": 73
+                "Mercator": {
+                    "count": 123
                 },
-                "Toyota": {
-                    "count": 238
+                "Mercadona": {
+                    "count": 734
                 },
-                "Volkswagen": {
-                    "count": 200
+                "Famila": {
+                    "count": 129
                 },
-                "Volvo": {
-                    "count": 82
+                "Hemköp": {
+                    "count": 83
                 },
-                "Автозапчасти": {
-                    "count": 290
+                "real,-": {
+                    "count": 80
                 },
-                "Автомагазин": {
-                    "count": 64
+                "Markant": {
+                    "count": 87
                 },
-                "Шиномонтаж": {
-                    "count": 263
-                }
-            },
-            "chemist": {
-                "Bipa": {
-                    "count": 276
+                "Volg": {
+                    "count": 128
                 },
-                "dm": {
-                    "count": 873
+                "Leader Price": {
+                    "count": 257
                 },
-                "Douglas": {
-                    "count": 62
+                "Treff 3000": {
+                    "count": 95
                 },
-                "Etos": {
-                    "count": 465
+                "SuperBrugsen": {
+                    "count": 67
                 },
-                "Ihr Platz": {
-                    "count": 76
+                "Kaiser's": {
+                    "count": 253
                 },
-                "Kruidvat": {
-                    "count": 114
+                "K+K": {
+                    "count": 104
                 },
-                "Müller": {
-                    "count": 195
+                "Unimarkt": {
+                    "count": 81
                 },
-                "Rossmann": {
-                    "count": 1623
+                "Sobeys": {
+                    "count": 120
                 },
-                "Schlecker": {
-                    "count": 201
-                }
-            },
-            "clothes": {
-                "AWG": {
-                    "count": 62
+                "S-Market": {
+                    "count": 107
                 },
-                "Ackermans": {
-                    "count": 91
+                "Combi": {
+                    "count": 55
                 },
-                "Adidas": {
-                    "count": 81
+                "Denner": {
+                    "count": 267
                 },
-                "Adler": {
-                    "count": 53
+                "Konsum": {
+                    "count": 134
                 },
-                "American Apparel": {
-                    "count": 53
+                "Franprix": {
+                    "count": 308
                 },
-                "Benetton": {
-                    "count": 96
+                "Monoprix": {
+                    "count": 195
                 },
-                "Bonita": {
-                    "count": 143
+                "Diska": {
+                    "count": 68
                 },
-                "C&A": {
-                    "count": 484
+                "PENNY": {
+                    "count": 79
                 },
-                "Calzedonia": {
-                    "count": 56
+                "Dia": {
+                    "count": 798
                 },
-                "Cecil": {
-                    "count": 51
+                "Giant Eagle": {
+                    "count": 82
                 },
-                "Celio": {
-                    "count": 71
+                "NORMA": {
+                    "count": 115
                 },
-                "Charles Vögele": {
-                    "count": 63
+                "AD Delhaize": {
+                    "count": 62
                 },
-                "Deichmann": {
-                    "count": 61
+                "Auchan": {
+                    "count": 147
                 },
-                "Dorothy Perkins": {
-                    "count": 51
+                "Consum": {
+                    "count": 125
                 },
-                "Edgars": {
-                    "count": 111
+                "Carrefour Market": {
+                    "count": 80
                 },
-                "Ernsting's family": {
-                    "count": 286
+                "Carrefour City": {
+                    "count": 117
                 },
-                "Esprit": {
-                    "count": 209
+                "Pam": {
+                    "count": 54
                 },
-                "Etam": {
-                    "count": 51
+                "Despar": {
+                    "count": 147
                 },
-                "Gap": {
-                    "count": 74
+                "Eroski": {
+                    "count": 204
                 },
-                "Gerry Weber": {
-                    "count": 68
+                "Costcutter": {
+                    "count": 61
                 },
-                "H&M": {
-                    "count": 607
+                "Maxi": {
+                    "count": 103
                 },
-                "Jack & Jones": {
-                    "count": 51
+                "Colruyt": {
+                    "count": 181
                 },
-                "Jack Wolfskin": {
-                    "count": 55
+                "The Co-operative": {
+                    "count": 64
                 },
-                "Jet": {
-                    "count": 62
+                "sky": {
+                    "count": 101
                 },
-                "Jules": {
-                    "count": 61
+                "Intermarché": {
+                    "count": 1183
                 },
-                "KiK": {
-                    "count": 1148
+                "Delhaize": {
+                    "count": 207
                 },
-                "Kiabi": {
-                    "count": 139
+                "CBA": {
+                    "count": 165
                 },
-                "Lacoste": {
-                    "count": 66
+                "Shopi": {
+                    "count": 57
                 },
-                "Levi's": {
-                    "count": 58
+                "Walmart": {
+                    "count": 611
                 },
-                "Lindex": {
-                    "count": 70
+                "Kroger": {
+                    "count": 298
                 },
-                "Mango": {
-                    "count": 115
+                "Albertsons": {
+                    "count": 236
                 },
-                "Matalan": {
-                    "count": 83
+                "Trader Joe's": {
+                    "count": 190
                 },
-                "Mexx": {
-                    "count": 65
+                "Feneberg": {
+                    "count": 58
                 },
-                "Mr Price": {
-                    "count": 86
+                "dm": {
+                    "count": 108
                 },
-                "NKD": {
-                    "count": 444
+                "Kvickly": {
+                    "count": 54
                 },
-                "New Look": {
-                    "count": 115
+                "Makro": {
+                    "count": 137
                 },
-                "New Yorker": {
-                    "count": 173
+                "Nah & Frisch": {
+                    "count": 72
                 },
-                "Next": {
-                    "count": 163
+                "Champion": {
+                    "count": 59
                 },
-                "Old Navy": {
-                    "count": 154
+                "Fakta": {
+                    "count": 227
                 },
-                "Orsay": {
-                    "count": 71
+                "Магнит": {
+                    "count": 1697
                 },
-                "Peacocks": {
-                    "count": 86
+                "Caprabo": {
+                    "count": 101
                 },
-                "Pep": {
-                    "count": 136
+                "Famiglia Cooperativa": {
+                    "count": 64
                 },
-                "Pimkie": {
-                    "count": 72
+                "Народная 7Я семьЯ": {
+                    "count": 150
                 },
-                "Primark": {
+                "Esselunga": {
                     "count": 87
                 },
-                "Promod": {
-                    "count": 71
+                "Maxima": {
+                    "count": 103
                 },
-                "River Island": {
-                    "count": 56
+                "Petit Casino": {
+                    "count": 104
                 },
-                "Ross": {
-                    "count": 77
+                "Wasgau": {
+                    "count": 60
                 },
-                "Street One": {
-                    "count": 74
+                "Pingo Doce": {
+                    "count": 250
                 },
-                "TK Maxx": {
-                    "count": 73
+                "Match": {
+                    "count": 142
                 },
-                "Takko": {
-                    "count": 476
+                "Profi": {
+                    "count": 58
                 },
-                "Tally Weijl": {
-                    "count": 67
+                "Lider": {
+                    "count": 64
                 },
-                "Tommy Hilfiger": {
-                    "count": 65
+                "Unimarc": {
+                    "count": 174
                 },
-                "Truworths": {
-                    "count": 64
+                "Co-operative Food": {
+                    "count": 51
                 },
-                "Ulla Popken": {
-                    "count": 59
+                "Santa Isabel": {
+                    "count": 128
                 },
-                "United Colors of Benetton": {
-                    "count": 90
+                "Седьмой континент": {
+                    "count": 79
                 },
-                "Urban Outfitters": {
+                "HIT": {
                     "count": 61
                 },
-                "Vero Moda": {
-                    "count": 89
-                },
-                "Vögele": {
-                    "count": 129
+                "Rimi": {
+                    "count": 104
                 },
-                "Winners": {
-                    "count": 59
+                "Conad": {
+                    "count": 302
                 },
-                "Woolworths": {
-                    "count": 116
+                "Фуршет": {
+                    "count": 74
                 },
-                "Zara": {
-                    "count": 199
+                "Willys": {
+                    "count": 55
                 },
-                "Zeeman": {
-                    "count": 108
+                "Farmfoods": {
+                    "count": 62
                 },
-                "s.Oliver": {
-                    "count": 53
+                "Фора": {
+                    "count": 52
                 },
-                "Одежда": {
-                    "count": 68
+                "Dunnes Stores": {
+                    "count": 72
                 },
-                "洋服の青山": {
-                    "count": 86
-                }
-            },
-            "computer": {
-                "DNS": {
+                "Сільпо": {
                     "count": 119
                 },
-                "PC World": {
-                    "count": 58
-                }
-            },
-            "convenience": {
-                "24 часа": {
-                    "count": 56
+                "マルエツ": {
+                    "count": 59
                 },
-                "7-Eleven": {
-                    "count": 3898
+                "Piggly Wiggly": {
+                    "count": 52
                 },
-                "8 à Huit": {
-                    "count": 57
+                "Crai": {
+                    "count": 52
                 },
-                "ABC": {
-                    "count": 138
+                "Biedronka": {
+                    "count": 1290
                 },
-                "Alepa": {
-                    "count": 63
+                "El Árbol": {
+                    "count": 72
                 },
-                "Alfamart": {
-                    "count": 74
+                "Centre Commercial E. Leclerc": {
+                    "count": 553
                 },
-                "Almacen": {
-                    "count": 201
+                "Foodland": {
+                    "count": 98
                 },
-                "BP": {
-                    "count": 157
+                "Super Brugsen": {
+                    "count": 64
                 },
-                "Biedronka": {
-                    "count": 67
+                "Дикси": {
+                    "count": 610
                 },
-                "Boutique": {
-                    "count": 59
+                "Пятёрочка": {
+                    "count": 1293
                 },
-                "CBA": {
-                    "count": 122
+                "Publix": {
+                    "count": 321
                 },
-                "COOP": {
-                    "count": 122
+                "Whole Foods": {
+                    "count": 196
                 },
-                "COOP Jednota": {
-                    "count": 160
+                "Føtex": {
+                    "count": 66
                 },
-                "Carrefour City": {
-                    "count": 54
+                "coop": {
+                    "count": 74
                 },
-                "Carrefour Express": {
-                    "count": 73
+                "Fressnapf": {
+                    "count": 64
                 },
-                "Casey's General Store": {
-                    "count": 80
+                "Coop Konsum": {
+                    "count": 79
                 },
-                "Casino": {
-                    "count": 85
+                "Carrefour Contact": {
+                    "count": 77
                 },
-                "Centra": {
-                    "count": 112
+                "SPAR": {
+                    "count": 280
                 },
-                "Central Convenience Store": {
-                    "count": 52
+                "No Frills": {
+                    "count": 102
                 },
-                "Chevron": {
-                    "count": 57
+                "The Co-operative Food": {
+                    "count": 120
                 },
-                "Circle K": {
-                    "count": 269
+                "Plodine": {
+                    "count": 51
                 },
-                "Citgo": {
+                "ADEG": {
                     "count": 63
                 },
-                "Coop": {
-                    "count": 505
+                "Minipreço": {
+                    "count": 103
                 },
-                "Coop Jednota": {
+                "Eurospin": {
+                    "count": 153
+                },
+                "Семья": {
+                    "count": 62
+                },
+                "Евроопт": {
                     "count": 58
                 },
-                "Costcutter": {
-                    "count": 272
+                "Centra": {
+                    "count": 51
                 },
-                "Cumberland Farms": {
-                    "count": 62
+                "Квартал": {
+                    "count": 88
                 },
-                "Delikatesy": {
-                    "count": 77
+                "New World": {
+                    "count": 65
                 },
-                "Dollar General": {
-                    "count": 101
+                "Countdown": {
+                    "count": 92
                 },
-                "Dorfladen": {
-                    "count": 76
+                "Reliance Fresh": {
+                    "count": 62
                 },
-                "Epicerie": {
-                    "count": 64
+                "Stokrotka": {
+                    "count": 98
                 },
-                "Esso": {
-                    "count": 64
+                "Coop Jednota": {
+                    "count": 73
                 },
-                "FamilyMart": {
-                    "count": 489
+                "Fred Meyer": {
+                    "count": 62
                 },
-                "Food Mart": {
-                    "count": 88
+                "Irma": {
+                    "count": 59
                 },
-                "Four Square": {
-                    "count": 51
+                "Continente": {
+                    "count": 73
                 },
-                "Franprix": {
-                    "count": 64
+                "Price Chopper": {
+                    "count": 98
                 },
-                "Groszek": {
-                    "count": 57
+                "Wegmans": {
+                    "count": 53
                 },
-                "Hasty Market": {
+                "Game": {
                     "count": 53
                 },
-                "Indomaret": {
-                    "count": 126
+                "Soriana": {
+                    "count": 92
                 },
-                "Jednota": {
-                    "count": 56
+                "Alimerka": {
+                    "count": 61
                 },
-                "K-Market": {
-                    "count": 57
+                "Piotr i Paweł": {
+                    "count": 52
                 },
-                "Kiosk": {
-                    "count": 57
+                "Перекресток": {
+                    "count": 309
                 },
-                "Konzum": {
-                    "count": 164
+                "Maxima X": {
+                    "count": 113
                 },
-                "Kum & Go": {
+                "Карусель": {
                     "count": 55
                 },
-                "Kwik Trip": {
+                "Tesco Lotus": {
                     "count": 69
                 },
-                "LAWSON": {
-                    "count": 397
+                "Condis": {
+                    "count": 64
                 },
-                "Lewiatan": {
-                    "count": 111
+                "Sam's Club": {
+                    "count": 131
                 },
-                "Londis": {
-                    "count": 341
+                "Копейка": {
+                    "count": 91
                 },
-                "Mac's": {
-                    "count": 147
+                "Géant Casino": {
+                    "count": 54
                 },
-                "Mace": {
+                "ASDA": {
+                    "count": 177
+                },
+                "Intermarche": {
                     "count": 111
                 },
-                "McColl's": {
-                    "count": 97
+                "Stop & Shop": {
+                    "count": 56
                 },
-                "Mercator": {
-                    "count": 59
+                "Food Lion": {
+                    "count": 192
                 },
-                "Mini Market": {
-                    "count": 190
+                "Harris Teeter": {
+                    "count": 88
                 },
-                "Mini Stop": {
-                    "count": 210
+                "H-E-B": {
+                    "count": 122
                 },
-                "Mobil": {
-                    "count": 63
+                "Foodworks": {
+                    "count": 59
                 },
-                "Nisa": {
-                    "count": 52
+                "Polo Market": {
+                    "count": 84
                 },
-                "Nisa Local": {
-                    "count": 71
+                "西友 (SEIYU)": {
+                    "count": 58
                 },
-                "Oxxo": {
-                    "count": 614
+                "Полушка": {
+                    "count": 135
                 },
-                "One Stop": {
-                    "count": 142
+                "Extra": {
+                    "count": 76
                 },
-                "Petit Casino": {
-                    "count": 227
+                "Lewiatan": {
+                    "count": 91
                 },
-                "Picard": {
-                    "count": 53
+                "АТБ": {
+                    "count": 305
                 },
-                "Potraviny": {
-                    "count": 243
+                "Społem": {
+                    "count": 55
                 },
-                "Premier": {
-                    "count": 123
+                "Bodega Aurrera": {
+                    "count": 78
                 },
-                "Proxi": {
-                    "count": 114
+                "Мария-Ра": {
+                    "count": 95
                 },
-                "QuikTrip": {
-                    "count": 59
+                "Магнолия": {
+                    "count": 71
                 },
-                "SPAR": {
-                    "count": 185
+                "Магазин": {
+                    "count": 113
                 },
-                "Sainsbury's Local": {
-                    "count": 96
+                "Монетка": {
+                    "count": 170
                 },
-                "Sale": {
-                    "count": 80
+                "Hy-Vee": {
+                    "count": 72
                 },
-                "Select": {
-                    "count": 58
+                "Walmart Supercenter": {
+                    "count": 112
                 },
-                "Shell": {
-                    "count": 241
+                "Hannaford": {
+                    "count": 55
                 },
-                "Siwa": {
-                    "count": 212
+                "業務スーパー": {
+                    "count": 55
                 },
-                "Sklep spożywczy": {
-                    "count": 235
+                "Norfa XL": {
+                    "count": 53
                 },
-                "Spar": {
-                    "count": 888
+                "ヨークマート (YorkMart)": {
+                    "count": 64
                 },
-                "Społem": {
-                    "count": 84
+                "Leclerc Drive": {
+                    "count": 75
+                }
+            },
+            "electronics": {
+                "Media Markt": {
+                    "count": 277
                 },
-                "Spożywczy": {
-                    "count": 67
+                "Maplin": {
+                    "count": 63
                 },
-                "Statoil": {
+                "Best Buy": {
+                    "count": 325
+                },
+                "Future Shop": {
                     "count": 69
                 },
-                "Stewart's": {
-                    "count": 254
+                "Saturn": {
+                    "count": 130
                 },
-                "Stores": {
-                    "count": 61
+                "Currys": {
+                    "count": 81
                 },
-                "Studenac": {
-                    "count": 74
+                "Radio Shack": {
+                    "count": 249
                 },
-                "Sunkus": {
-                    "count": 63
+                "Comet": {
+                    "count": 52
                 },
-                "Tchibo": {
-                    "count": 54
+                "Euronics": {
+                    "count": 112
                 },
-                "Tesco": {
-                    "count": 55
+                "Expert": {
+                    "count": 119
+                },
+                "Эльдорадо": {
+                    "count": 180
+                },
+                "Darty": {
+                    "count": 72
+                },
+                "М.Видео": {
+                    "count": 75
+                }
+            },
+            "convenience": {
+                "Shell": {
+                    "count": 251
+                },
+                "Spar": {
+                    "count": 913
+                },
+                "McColl's": {
+                    "count": 96
                 },
                 "Tesco Express": {
-                    "count": 415
+                    "count": 417
+                },
+                "Sainsbury's Local": {
+                    "count": 98
+                },
+                "One Stop": {
+                    "count": 143
                 },
                 "The Co-operative Food": {
                     "count": 109
                 },
-                "Valintatalo": {
-                    "count": 62
+                "Londis": {
+                    "count": 349
                 },
-                "Vival": {
-                    "count": 182
+                "7-Eleven": {
+                    "count": 4138
                 },
-                "Volg": {
-                    "count": 110
+                "CBA": {
+                    "count": 128
                 },
-                "Wawa": {
-                    "count": 129
+                "Sale": {
+                    "count": 79
                 },
-                "abc": {
-                    "count": 61
+                "Statoil": {
+                    "count": 69
                 },
-                "Żabka": {
-                    "count": 497
+                "Konzum": {
+                    "count": 171
                 },
-                "Авоська": {
-                    "count": 53
+                "Siwa": {
+                    "count": 211
                 },
-                "Березка": {
-                    "count": 71
+                "Mercator": {
+                    "count": 58
                 },
-                "Весна": {
-                    "count": 56
+                "Esso": {
+                    "count": 66
                 },
-                "Визит": {
+                "COOP Jednota": {
+                    "count": 172
+                },
+                "Mac's": {
+                    "count": 151
+                },
+                "Alepa": {
+                    "count": 62
+                },
+                "Hasty Market": {
+                    "count": 54
+                },
+                "K-Market": {
                     "count": 55
                 },
-                "Виктория": {
-                    "count": 67
+                "Coop": {
+                    "count": 520
                 },
-                "Гастроном": {
-                    "count": 136
+                "Costcutter": {
+                    "count": 285
                 },
-                "Дикси": {
-                    "count": 118
+                "Valintatalo": {
+                    "count": 61
                 },
-                "Кировский": {
-                    "count": 69
+                "SPAR": {
+                    "count": 188
                 },
-                "Копеечка": {
-                    "count": 56
+                "COOP": {
+                    "count": 134
                 },
-                "Кулинария": {
-                    "count": 53
+                "Casino": {
+                    "count": 87
                 },
-                "Магазин": {
-                    "count": 760
+                "Franprix": {
+                    "count": 62
                 },
-                "Магнит": {
-                    "count": 645
+                "Circle K": {
+                    "count": 277
                 },
-                "Мария-Ра": {
-                    "count": 76
+                "セブンイレブン": {
+                    "count": 2893,
+                    "tags": {
+                        "name:en": "7-Eleven"
+                    }
                 },
-                "Мечта": {
-                    "count": 53
+                "ローソン": {
+                    "count": 1514,
+                    "tags": {
+                        "name:en": "LAWSON"
+                    }
                 },
-                "Минимаркет": {
-                    "count": 97
+                "BP": {
+                    "count": 160
                 },
-                "Монетка": {
-                    "count": 59
+                "Tesco": {
+                    "count": 55
                 },
-                "Надежда": {
-                    "count": 54
+                "Petit Casino": {
+                    "count": 231
                 },
-                "Перекресток": {
-                    "count": 51
+                "Volg": {
+                    "count": 113
                 },
-                "Продукти": {
-                    "count": 153
+                "Mace": {
+                    "count": 112
                 },
-                "Продуктовый": {
-                    "count": 65
+                "Mini Market": {
+                    "count": 223
                 },
-                "Продуктовый магазин": {
-                    "count": 87
+                "Nisa Local": {
+                    "count": 74
+                },
+                "Dorfladen": {
+                    "count": 74
                 },
                 "Продукты": {
-                    "count": 3813
+                    "count": 4085
                 },
-                "Пятёрочка": {
-                    "count": 377
+                "Mini Stop": {
+                    "count": 222
                 },
-                "Радуга": {
-                    "count": 80
+                "LAWSON": {
+                    "count": 414
                 },
-                "Смак": {
-                    "count": 70
+                "デイリーヤマザキ": {
+                    "count": 134
                 },
-                "ТеÑ\80емок": {
-                    "count": 53
+                "Ð\9dадежда": {
+                    "count": 56
                 },
-                "Универсам": {
-                    "count": 75
+                "Mobil": {
+                    "count": 64
                 },
-                "магазин": {
-                    "count": 102
+                "Nisa": {
+                    "count": 51
                 },
-                "продукты": {
-                    "count": 113
+                "Premier": {
+                    "count": 126
                 },
-                "เซเว่นอีเลฟเว่น": {
-                    "count": 193
+                "ABC": {
+                    "count": 147
                 },
-                "მარკეტი (Market)": {
-                    "count": 145
+                "Edeka": {
+                    "count": 51
                 },
-                "ã\82µã\83³ã\82¯ã\82¹": {
-                    "count": 517,
+                "ã\83\9fã\83\8bã\82¹ã\83\88ã\83\83ã\83\97": {
+                    "count": 299,
                     "tags": {
-                        "name:en": "sunkus"
+                        "name:en": "MINISTOP"
                     }
                 },
-                "ã\82µã\83¼ã\82¯ã\83«K": {
-                    "count": 450,
+                "ã\82µã\83³ã\82¯ã\82¹": {
+                    "count": 537,
                     "tags": {
-                        "name:en": "Circle K"
+                        "name:en": "sunkus"
                     }
                 },
                 "スリーエフ": {
-                    "count": 84
+                    "count": 87
                 },
-                "セイコーマート (Seicomart)": {
-                    "count": 52
+                "8 à Huit": {
+                    "count": 59
                 },
-                "セブンイレブン": {
-                    "count": 2742,
-                    "tags": {
-                        "name:en": "7-Eleven"
-                    }
+                "Tchibo": {
+                    "count": 55
                 },
-                "デイリーヤマザキ": {
-                    "count": 124
+                "Żabka": {
+                    "count": 520
+                },
+                "Almacen": {
+                    "count": 211
+                },
+                "Vival": {
+                    "count": 191
+                },
+                "FamilyMart": {
+                    "count": 518
                 },
                 "ファミリーマート": {
-                    "count": 1352,
+                    "count": 1512,
                     "tags": {
                         "name:en": "FamilyMart"
                     }
                 },
-                "ミニストップ": {
-                    "count": 282,
-                    "tags": {
-                        "name:en": "MINISTOP"
-                    }
+                "Carrefour City": {
+                    "count": 54
                 },
-                "ローソン": {
-                    "count": 1399,
-                    "tags": {
-                        "name:en": "LAWSON"
-                    }
+                "Sunkus": {
+                    "count": 61
                 },
-                "ローソンストア100": {
-                    "count": 65
+                "Casey's General Store": {
+                    "count": 88
                 },
-                "ã\83­ã\83¼ã\82½ã\83³ã\82¹ã\83\88ã\82¢100 (LAWSON STORE 100)": {
-                    "count": 84
+                "ã\82»ã\83\96ã\83³ã\82¤ã\83¬ã\83\96ã\83³(Seven-Eleven)": {
+                    "count": 58
                 },
-                "全家": {
-                    "count": 60
+                "Jednota": {
+                    "count": 55
+                },
+                "Гастроном": {
+                    "count": 148
                 },
-                "全家便利商店": {
-                    "count": 104
-                }
-            },
-            "department_store": {
-                "Big W": {
-                    "count": 51
+                "Sklep spożywczy": {
+                    "count": 276
                 },
-                "Canadian Tire": {
-                    "count": 69
+                "Centra": {
+                    "count": 110
                 },
-                "Debenhams": {
-                    "count": 65
+                "Магнит": {
+                    "count": 684
                 },
-                "Galeria Kaufhof": {
-                    "count": 57
+                "サークルK": {
+                    "count": 495,
+                    "tags": {
+                        "name:en": "Circle K"
+                    }
                 },
-                "Karstadt": {
-                    "count": 62
+                "Wawa": {
+                    "count": 130
                 },
-                "Kmart": {
+                "Proxi": {
                     "count": 120
                 },
-                "Kohl's": {
-                    "count": 123
-                },
-                "Macy's": {
-                    "count": 119
+                "Универсам": {
+                    "count": 79
                 },
-                "Marks & Spencer": {
+                "Groszek": {
                     "count": 59
                 },
-                "Sears": {
-                    "count": 208
+                "Select": {
+                    "count": 58
                 },
-                "Target": {
-                    "count": 468
+                "Potraviny": {
+                    "count": 246
                 },
-                "Walmart": {
-                    "count": 456
+                "Смак": {
+                    "count": 72
                 },
-                "Walmart Supercenter": {
-                    "count": 67
+                "Эконом": {
+                    "count": 53
                 },
-                "Woolworth": {
-                    "count": 74
+                "Магазин": {
+                    "count": 875
                 },
-                "Универмаг": {
-                    "count": 57
-                }
-            },
-            "doityourself": {
-                "Ace Hardware": {
-                    "count": 130
+                "Березка": {
+                    "count": 75
                 },
-                "B&Q": {
-                    "count": 222
+                "Społem": {
+                    "count": 89
                 },
-                "Bauhaus": {
-                    "count": 178
+                "Carrefour Express": {
+                    "count": 81
                 },
-                "Baumax": {
-                    "count": 94
+                "Biedronka": {
+                    "count": 77
                 },
-                "Brico": {
-                    "count": 99
+                "Cumberland Farms": {
+                    "count": 63
                 },
-                "Bricomarché": {
-                    "count": 213
+                "Chevron": {
+                    "count": 56
                 },
-                "Bricorama": {
-                    "count": 59
+                "Coop Jednota": {
+                    "count": 63
                 },
-                "Bunnings Warehouse": {
-                    "count": 87
+                "Tesco Lotus Express": {
+                    "count": 64
                 },
-                "Canadian Tire": {
-                    "count": 92
+                "Kiosk": {
+                    "count": 55
                 },
-                "Castorama": {
-                    "count": 160
+                "24 часа": {
+                    "count": 58
                 },
-                "Gamma": {
-                    "count": 105
+                "Минимаркет": {
+                    "count": 97
                 },
-                "Hagebau": {
-                    "count": 61
+                "Oxxo": {
+                    "count": 632
                 },
-                "Hagebaumarkt": {
-                    "count": 109
+                "Пятёрочка": {
+                    "count": 383
                 },
-                "Hellweg": {
-                    "count": 62
+                "abc": {
+                    "count": 64
                 },
-                "Home Depot": {
-                    "count": 789
+                "Stewart's": {
+                    "count": 255
                 },
-                "Home Hardware": {
-                    "count": 66
+                "Продукти": {
+                    "count": 162
                 },
-                "Homebase": {
-                    "count": 224
+                "ローソンストア100 (LAWSON STORE 100)": {
+                    "count": 84
                 },
-                "Hornbach": {
-                    "count": 124
+                "Дикси": {
+                    "count": 121
                 },
-                "Hubo": {
-                    "count": 72
+                "Радуга": {
+                    "count": 85
                 },
-                "Lagerhaus": {
+                "ローソンストア100": {
                     "count": 71
                 },
-                "Leroy Merlin": {
-                    "count": 197
+                "เซเว่นอีเลฟเว่น": {
+                    "count": 191
                 },
-                "Lowes": {
-                    "count": 1131
+                "Spożywczy": {
+                    "count": 75
                 },
-                "Max Bahr": {
-                    "count": 86
+                "Delikatesy Centrum": {
+                    "count": 51
                 },
-                "Menards": {
-                    "count": 62
+                "Citgo": {
+                    "count": 63
                 },
-                "Mr Bricolage": {
-                    "count": 87
+                "Фортуна": {
+                    "count": 52
                 },
-                "OBI": {
-                    "count": 418
+                "Kum & Go": {
+                    "count": 59
                 },
-                "Praktiker": {
-                    "count": 187
+                "Мария-Ра": {
+                    "count": 75
                 },
-                "Rona": {
+                "Picard": {
+                    "count": 55
+                },
+                "Four Square": {
+                    "count": 51
+                },
+                "Визит": {
                     "count": 57
                 },
-                "Toom": {
-                    "count": 69
+                "Авоська": {
+                    "count": 52
                 },
-                "Toom Baumarkt": {
-                    "count": 65
+                "Dollar General": {
+                    "count": 109
                 },
-                "Weldom": {
-                    "count": 70
+                "Studenac": {
+                    "count": 75
                 },
-                "Wickes": {
-                    "count": 120
+                "Central Convenience Store": {
+                    "count": 54
                 },
-                "СÑ\82Ñ\80оймаÑ\82еÑ\80иалÑ\8b": {
-                    "count": 165
+                "Ð\9cонеÑ\82ка": {
+                    "count": 61
                 },
-                "Хозтовары": {
-                    "count": 68
-                }
-            },
-            "electronics": {
-                "Best Buy": {
-                    "count": 297
+                "продукты": {
+                    "count": 118
                 },
-                "Comet": {
-                    "count": 62
+                "Теремок": {
+                    "count": 54
                 },
-                "Currys": {
-                    "count": 80
+                "Kwik Trip": {
+                    "count": 68
                 },
-                "Darty": {
-                    "count": 71
+                "Кулинария": {
+                    "count": 53
                 },
-                "Euronics": {
-                    "count": 109
+                "全家": {
+                    "count": 71
                 },
-                "Expert": {
-                    "count": 117
+                "Мечта": {
+                    "count": 54
                 },
-                "Future Shop": {
-                    "count": 69
+                "Epicerie": {
+                    "count": 70
                 },
-                "Maplin": {
-                    "count": 63
+                "Кировский": {
+                    "count": 67
                 },
-                "Media Markt": {
-                    "count": 273
+                "Food Mart": {
+                    "count": 101
                 },
-                "Radio Shack": {
-                    "count": 226
+                "Delikatesy": {
+                    "count": 79
                 },
-                "Saturn": {
-                    "count": 147
+                "ポプラ": {
+                    "count": 52
                 },
-                "М.Видео": {
-                    "count": 74
+                "Lewiatan": {
+                    "count": 123
                 },
-                "Эльдорадо": {
-                    "count": 171
-                }
-            },
-            "furniture": {
-                "But": {
-                    "count": 58
+                "Продуктовый магазин": {
+                    "count": 94
                 },
-                "Conforama": {
-                    "count": 90
+                "Продуктовый": {
+                    "count": 67
                 },
-                "Dänisches Bettenlager": {
-                    "count": 290
+                "セイコーマート (Seicomart)": {
+                    "count": 55
                 },
-                "IKEA": {
-                    "count": 162
+                "Виктория": {
+                    "count": 67
                 },
-                "Jysk": {
-                    "count": 92
+                "Весна": {
+                    "count": 56
                 },
-                "Matratzen Concord": {
-                    "count": 51
+                "Mini Market Non-Stop": {
+                    "count": 58
                 },
-                "Roller": {
-                    "count": 77
+                "QuikTrip": {
+                    "count": 70
                 },
-                "Мебель": {
-                    "count": 190
-                }
-            },
-            "hairdresser": {
-                "Coiffeur": {
-                    "count": 60
+                "Копеечка": {
+                    "count": 53
                 },
-                "Franck Provost": {
-                    "count": 64
+                "Royal Farms": {
+                    "count": 51
                 },
-                "Friseur": {
-                    "count": 127
+                "Alfamart": {
+                    "count": 76
                 },
-                "Great Clips": {
-                    "count": 155
+                "Indomaret": {
+                    "count": 130
                 },
-                "Klier": {
-                    "count": 105
+                "магазин": {
+                    "count": 118
                 },
-                "Peluqueria": {
-                    "count": 56
+                "全家便利商店": {
+                    "count": 111
                 },
-                "Supercuts": {
-                    "count": 89
+                "Boutique": {
+                    "count": 58
                 },
-                "Парикмахерская": {
-                    "count": 485
+                "მარკეტი (Market)": {
+                    "count": 144
                 },
-                "Салон красоты": {
-                    "count": 65
+                "Stores": {
+                    "count": 60
                 }
             },
-            "hardware": {
-                "1000 мелочей": {
-                    "count": 53
+            "chemist": {
+                "dm": {
+                    "count": 904
                 },
-                "Хозтовары": {
-                    "count": 143
-                }
-            },
-            "hifi": {},
-            "jewelry": {
-                "Bijou Brigitte": {
-                    "count": 53
+                "Müller": {
+                    "count": 206
                 },
-                "Christ": {
-                    "count": 55
+                "Schlecker": {
+                    "count": 194
                 },
-                "Swarovski": {
-                    "count": 70
+                "Etos": {
+                    "count": 465
+                },
+                "Bipa": {
+                    "count": 282
+                },
+                "Rossmann": {
+                    "count": 1652
+                },
+                "Ihr Platz": {
+                    "count": 74
+                },
+                "Douglas": {
+                    "count": 61
+                },
+                "Kruidvat": {
+                    "count": 122
                 }
             },
-            "mobile_phone": {
-                "AT&T": {
-                    "count": 95
-                },
-                "Bell": {
-                    "count": 191
+            "car_repair": {
+                "Peugeot": {
+                    "count": 82
                 },
-                "Bitė": {
+                "Kwik Fit": {
                     "count": 73
                 },
-                "Carphone Warehouse": {
-                    "count": 109
+                "ATU": {
+                    "count": 259
                 },
-                "Movistar": {
-                    "count": 55
+                "Kwik-Fit": {
+                    "count": 51
                 },
-                "O2": {
-                    "count": 180
+                "Midas": {
+                    "count": 190
                 },
-                "Orange": {
-                    "count": 220
+                "Feu Vert": {
+                    "count": 105
                 },
-                "SFR": {
-                    "count": 70
+                "Norauto": {
+                    "count": 141
                 },
-                "Sprint": {
-                    "count": 91
+                "Speedy": {
+                    "count": 112
                 },
-                "T-Mobile": {
-                    "count": 158
+                "Автозапчасти": {
+                    "count": 186
                 },
-                "The Phone House": {
-                    "count": 81
+                "Renault": {
+                    "count": 165
                 },
-                "Verizon Wireless": {
-                    "count": 97
+                "Pit Stop": {
+                    "count": 57
                 },
-                "Vodafone": {
-                    "count": 311
+                "Jiffy Lube": {
+                    "count": 187
                 },
-                "au": {
-                    "count": 56
+                "Шиномонтаж": {
+                    "count": 1097
                 },
-                "Ð\91илайн": {
-                    "count": 113
+                "СТÐ\9e": {
+                    "count": 366
                 },
-                "Евросеть": {
-                    "count": 466
+                "O'Reilly Auto Parts": {
+                    "count": 69
                 },
-                "МТС": {
-                    "count": 311
+                "Carglass": {
+                    "count": 103
                 },
-                "Мегафон": {
-                    "count": 227
+                "шиномонтаж": {
+                    "count": 56
                 },
-                "Связной": {
-                    "count": 396
+                "Euromaster": {
+                    "count": 84
                 },
-                "ソフトバンクショップ (SoftBank shop)": {
-                    "count": 256
+                "Firestone": {
+                    "count": 84
                 },
-                "ドコモショップ (docomo shop)": {
-                    "count": 113
-                }
-            },
-            "motorcycle": {
-                "Honda": {
-                    "count": 56
+                "AutoZone": {
+                    "count": 63
                 },
-                "Yamaha": {
-                    "count": 58
+                "Автосервис": {
+                    "count": 344
+                },
+                "Roady": {
+                    "count": 55
                 }
             },
-            "optician": {
-                "Alain Afflelou": {
-                    "count": 68
+            "furniture": {
+                "IKEA": {
+                    "count": 165
                 },
-                "Apollo Optik": {
-                    "count": 142
+                "Jysk": {
+                    "count": 98
                 },
-                "Fielmann": {
-                    "count": 219
+                "Roller": {
+                    "count": 76
                 },
-                "Krys": {
-                    "count": 65
+                "Dänisches Bettenlager": {
+                    "count": 298
                 },
-                "Optic 2000": {
-                    "count": 87
+                "Conforama": {
+                    "count": 93
                 },
-                "Specsavers": {
-                    "count": 109
+                "Matratzen Concord": {
+                    "count": 51
                 },
-                "Vision Express": {
-                    "count": 54
+                "Мебель": {
+                    "count": 201
                 },
-                "Оптика": {
-                    "count": 165
+                "But": {
+                    "count": 58
                 }
             },
-            "pet": {
-                "Das Futterhaus": {
-                    "count": 61
+            "doityourself": {
+                "Hornbach": {
+                    "count": 123
                 },
-                "Fressnapf": {
-                    "count": 300
+                "B&Q": {
+                    "count": 223
                 },
-                "PetSmart": {
-                    "count": 150
+                "Hubo": {
+                    "count": 74
                 },
-                "Petco": {
-                    "count": 79
+                "Mr Bricolage": {
+                    "count": 88
                 },
-                "Pets at Home": {
-                    "count": 53
+                "Gamma": {
+                    "count": 108
                 },
-                "Зоомагазин": {
-                    "count": 95
-                }
-            },
-            "shoes": {
-                "Bata": {
-                    "count": 88
+                "OBI": {
+                    "count": 409
                 },
-                "Brantano": {
-                    "count": 67
+                "Lowes": {
+                    "count": 1135
                 },
-                "Clarks": {
-                    "count": 97
+                "Wickes": {
+                    "count": 122
                 },
-                "Deichmann": {
-                    "count": 574
+                "Hagebau": {
+                    "count": 59
                 },
-                "Ecco": {
-                    "count": 53
+                "Max Bahr": {
+                    "count": 87
                 },
-                "Foot Locker": {
-                    "count": 74
+                "Castorama": {
+                    "count": 153
                 },
-                "La Halle aux Chaussures": {
-                    "count": 63
+                "Rona": {
+                    "count": 58
+                },
+                "Home Depot": {
+                    "count": 823
+                },
+                "Toom Baumarkt": {
+                    "count": 66
                 },
-                "Payless Shoe Source": {
-                    "count": 52
+                "Homebase": {
+                    "count": 223
                 },
-                "Quick Schuh": {
-                    "count": 69
+                "Baumax": {
+                    "count": 94
                 },
-                "Reno": {
-                    "count": 170
+                "Lagerhaus": {
+                    "count": 73
                 },
-                "Salamander": {
-                    "count": 52
+                "Bauhaus": {
+                    "count": 181
                 },
-                "Обувь": {
+                "Canadian Tire": {
                     "count": 93
-                }
-            },
-            "sports": {
-                "Decathlon": {
-                    "count": 286
                 },
-                "Dick's Sporting Goods": {
-                    "count": 58
+                "Leroy Merlin": {
+                    "count": 203
                 },
-                "Intersport": {
-                    "count": 265
+                "Hellweg": {
+                    "count": 58
                 },
-                "Sport 2000": {
-                    "count": 83
+                "Brico": {
+                    "count": 97
                 },
-                "Sports Authority": {
-                    "count": 63
+                "Bricomarché": {
+                    "count": 217
                 },
-                "Спортмастер": {
-                    "count": 80
-                }
-            },
-            "stationery": {
-                "McPaper": {
-                    "count": 79
+                "Toom": {
+                    "count": 67
                 },
-                "Office Depot": {
-                    "count": 83
+                "Praktiker": {
+                    "count": 143
                 },
-                "Staples": {
-                    "count": 262
+                "Hagebaumarkt": {
+                    "count": 105
                 },
-                "Канцтовары": {
-                    "count": 57
-                }
-            },
-            "supermarket": {
-                "AD Delhaize": {
+                "Menards": {
                     "count": 66
                 },
-                "ADEG": {
-                    "count": 64
-                },
-                "ALDI": {
-                    "count": 5182
-                },
-                "Aldi Süd": {
-                    "count": 589
+                "Weldom": {
+                    "count": 70
                 },
-                "ASDA": {
-                    "count": 178
+                "Bunnings Warehouse": {
+                    "count": 90
                 },
-                "Albert": {
-                    "count": 185
+                "Ace Hardware": {
+                    "count": 133
                 },
-                "Albert Heijn": {
-                    "count": 445
+                "Home Hardware": {
+                    "count": 69
                 },
-                "Albertsons": {
-                    "count": 229
+                "Хозтовары": {
+                    "count": 70
                 },
-                "Aldi Nord": {
-                    "count": 194
+                "Стройматериалы": {
+                    "count": 180
                 },
-                "Alimerka": {
+                "Bricorama": {
                     "count": 58
                 },
-                "Asda": {
-                    "count": 221
+                "Point P": {
+                    "count": 56
+                }
+            },
+            "department_store": {
+                "Target": {
+                    "count": 530
                 },
-                "Auchan": {
-                    "count": 144
+                "Debenhams": {
+                    "count": 66
                 },
-                "Billa": {
-                    "count": 1417
+                "Canadian Tire": {
+                    "count": 71
                 },
-                "Biedronka": {
-                    "count": 1227
+                "Karstadt": {
+                    "count": 64
                 },
-                "Bodega Aurrera": {
-                    "count": 70
+                "Walmart": {
+                    "count": 496
                 },
-                "Budgens": {
-                    "count": 86
+                "Kmart": {
+                    "count": 133
                 },
-                "C1000": {
-                    "count": 332
+                "Galeria Kaufhof": {
+                    "count": 58
                 },
-                "CBA": {
-                    "count": 160
+                "Marks & Spencer": {
+                    "count": 62
                 },
-                "COOP": {
-                    "count": 187
+                "Big W": {
+                    "count": 56
                 },
-                "COOP Jednota": {
-                    "count": 67
+                "Woolworth": {
+                    "count": 76
                 },
-                "Caprabo": {
-                    "count": 96
+                "Универмаг": {
+                    "count": 63
                 },
-                "Carrefour": {
-                    "count": 1575
+                "Sears": {
+                    "count": 218
                 },
-                "Carrefour City": {
-                    "count": 109
+                "Walmart Supercenter": {
+                    "count": 90
                 },
-                "Carrefour Contact": {
-                    "count": 73
+                "Sam's Club": {
+                    "count": 51
                 },
-                "Carrefour Express": {
-                    "count": 314
+                "Kohl's": {
+                    "count": 139
                 },
-                "Carrefour Market": {
-                    "count": 79
+                "Macy's": {
+                    "count": 129
                 },
-                "Casino": {
-                    "count": 254
+                "JCPenney": {
+                    "count": 58
+                }
+            },
+            "stationery": {
+                "Staples": {
+                    "count": 276
                 },
-                "Centra": {
-                    "count": 51
+                "McPaper": {
+                    "count": 80
                 },
-                "Champion": {
-                    "count": 63
+                "Office Depot": {
+                    "count": 88
                 },
-                "Checkers": {
-                    "count": 124
+                "Канцтовары": {
+                    "count": 56
+                }
+            },
+            "car": {
+                "Skoda": {
+                    "count": 95
                 },
-                "Coop": {
-                    "count": 1860
+                "BMW": {
+                    "count": 146
                 },
-                "Coles": {
-                    "count": 381
+                "Citroen": {
+                    "count": 271
                 },
-                "Colruyt": {
-                    "count": 186
+                "Renault": {
+                    "count": 365
                 },
-                "Combi": {
-                    "count": 56
+                "Mercedes-Benz": {
+                    "count": 226
                 },
-                "Conad": {
-                    "count": 294
+                "Volvo": {
+                    "count": 91
                 },
-                "Condis": {
-                    "count": 65
+                "Ford": {
+                    "count": 230
                 },
-                "Consum": {
-                    "count": 123
+                "Volkswagen": {
+                    "count": 203
                 },
-                "Continente": {
-                    "count": 66
+                "Mazda": {
+                    "count": 99
                 },
-                "Coop Jednota": {
-                    "count": 68
+                "Mitsubishi": {
+                    "count": 72
                 },
-                "Coop Konsum": {
-                    "count": 78
+                "Fiat": {
+                    "count": 87
                 },
-                "Costco": {
-                    "count": 133
+                "Автозапчасти": {
+                    "count": 278
                 },
-                "Costcutter": {
-                    "count": 62
+                "Opel": {
+                    "count": 162
                 },
-                "Countdown": {
-                    "count": 90
+                "Audi": {
+                    "count": 109
                 },
-                "Dia": {
-                    "count": 749
+                "Toyota": {
+                    "count": 256
                 },
-                "dm": {
-                    "count": 108
+                "Nissan": {
+                    "count": 180
                 },
-                "Delhaize": {
-                    "count": 219
+                "Suzuki": {
+                    "count": 75
                 },
-                "Delikatesy Centrum": {
-                    "count": 56
+                "Honda": {
+                    "count": 148
                 },
-                "Denner": {
+                "Peugeot": {
+                    "count": 296
+                },
+                "Шиномонтаж": {
                     "count": 256
                 },
-                "Despar": {
-                    "count": 143
+                "Hyundai": {
+                    "count": 155
                 },
-                "Diska": {
-                    "count": 69
+                "Subaru": {
+                    "count": 53
                 },
-                "Dunnes Stores": {
-                    "count": 70
+                "Chevrolet": {
+                    "count": 81
                 },
-                "E-Center": {
-                    "count": 67
+                "Автомагазин": {
+                    "count": 62
+                }
+            },
+            "clothes": {
+                "Matalan": {
+                    "count": 84
                 },
-                "E.Leclerc": {
-                    "count": 341
+                "KiK": {
+                    "count": 1180
                 },
-                "EDEKA": {
-                    "count": 498
+                "H&M": {
+                    "count": 641
                 },
-                "Edeka": {
-                    "count": 1811
+                "Urban Outfitters": {
+                    "count": 62
                 },
-                "El Árbol": {
-                    "count": 71
+                "Vögele": {
+                    "count": 131
                 },
-                "Eroski": {
-                    "count": 203
+                "Zeeman": {
+                    "count": 120
                 },
-                "Esselunga": {
-                    "count": 82
+                "Takko": {
+                    "count": 508
                 },
-                "Eurospar": {
-                    "count": 260
+                "Adler": {
+                    "count": 53
                 },
-                "Eurospin": {
-                    "count": 153
+                "C&A": {
+                    "count": 498
                 },
-                "Extra": {
-                    "count": 74
+                "Zara": {
+                    "count": 211
                 },
-                "Fakta": {
-                    "count": 215
+                "Vero Moda": {
+                    "count": 93
                 },
-                "Famiglia Cooperativa": {
-                    "count": 62
+                "NKD": {
+                    "count": 476
                 },
-                "Famila": {
-                    "count": 127
+                "Ernsting's family": {
+                    "count": 298
                 },
-                "Farmfoods": {
-                    "count": 63
+                "Winners": {
+                    "count": 62
                 },
-                "Feneberg": {
-                    "count": 61
+                "River Island": {
+                    "count": 56
                 },
-                "Food Basics": {
-                    "count": 73
+                "Next": {
+                    "count": 170
                 },
-                "Food Lion": {
-                    "count": 175
+                "Gap": {
+                    "count": 77
                 },
-                "Foodland": {
-                    "count": 92
+                "Adidas": {
+                    "count": 86
                 },
-                "Foodworks": {
-                    "count": 55
+                "Woolworths": {
+                    "count": 116
                 },
-                "Franprix": {
-                    "count": 298
+                "Mr Price": {
+                    "count": 87
                 },
-                "Fred Meyer": {
-                    "count": 63
+                "Jet": {
+                    "count": 61
                 },
-                "Fressnapf": {
-                    "count": 66
+                "Pep": {
+                    "count": 134
                 },
-                "Føtex": {
-                    "count": 67
+                "Edgars": {
+                    "count": 110
                 },
-                "Game": {
-                    "count": 53
+                "Ackermans": {
+                    "count": 90
                 },
-                "Giant": {
-                    "count": 187
+                "Truworths": {
+                    "count": 65
                 },
-                "Giant Eagle": {
-                    "count": 69
+                "Ross": {
+                    "count": 85
                 },
-                "Géant Casino": {
+                "Dorothy Perkins": {
                     "count": 53
                 },
-                "HEB": {
-                    "count": 75
+                "Deichmann": {
+                    "count": 58
                 },
-                "HIT": {
-                    "count": 62
+                "Lindex": {
+                    "count": 72
                 },
-                "Hannaford": {
-                    "count": 55
+                "s.Oliver": {
+                    "count": 54
                 },
-                "Harris Teeter": {
-                    "count": 84
+                "Old Navy": {
+                    "count": 163
                 },
-                "Hemköp": {
-                    "count": 83
+                "Jack & Jones": {
+                    "count": 52
                 },
-                "Hofer": {
-                    "count": 451
+                "Pimkie": {
+                    "count": 72
                 },
-                "Hoogvliet": {
-                    "count": 52
+                "Esprit": {
+                    "count": 221
                 },
-                "Hy-Vee": {
-                    "count": 67
+                "Primark": {
+                    "count": 87
                 },
-                "ICA": {
-                    "count": 195
+                "Bonita": {
+                    "count": 150
                 },
-                "IGA": {
-                    "count": 333
+                "Mexx": {
+                    "count": 65
                 },
-                "Iceland": {
-                    "count": 297
+                "Gerry Weber": {
+                    "count": 70
                 },
-                "Intermarche": {
-                    "count": 107
+                "Tally Weijl": {
+                    "count": 68
                 },
-                "Intermarché": {
-                    "count": 1155
+                "Mango": {
+                    "count": 128
                 },
-                "Interspar": {
-                    "count": 142
+                "TK Maxx": {
+                    "count": 77
                 },
-                "Irma": {
-                    "count": 61
+                "Benetton": {
+                    "count": 99
                 },
-                "Jumbo": {
-                    "count": 175
+                "Ulla Popken": {
+                    "count": 59
                 },
-                "K+K": {
-                    "count": 104
+                "AWG": {
+                    "count": 66
                 },
-                "Kaiser's": {
-                    "count": 255
+                "Tommy Hilfiger": {
+                    "count": 69
                 },
-                "Kaufland": {
-                    "count": 996
+                "New Yorker": {
+                    "count": 176
                 },
-                "Kaufpark": {
-                    "count": 100
+                "Orsay": {
+                    "count": 72
                 },
-                "King Soopers": {
-                    "count": 69
+                "Charles Vögele": {
+                    "count": 68
                 },
-                "Kiwi": {
-                    "count": 164
+                "New Look": {
+                    "count": 122
                 },
-                "Konsum": {
-                    "count": 139
+                "Lacoste": {
+                    "count": 73
                 },
-                "Konzum": {
-                    "count": 225
+                "Etam": {
+                    "count": 52
                 },
-                "Kroger": {
-                    "count": 280
+                "Kiabi": {
+                    "count": 145
                 },
-                "Kvickly": {
-                    "count": 54
+                "Jack Wolfskin": {
+                    "count": 60
                 },
-                "LIDL": {
-                    "count": 901
+                "American Apparel": {
+                    "count": 55
                 },
-                "Leader Price": {
-                    "count": 242
+                "Men's Wearhouse": {
+                    "count": 51
                 },
-                "Leclerc": {
-                    "count": 132
+                "Intimissimi": {
+                    "count": 51
                 },
-                "Lewiatan": {
-                    "count": 88
+                "United Colors of Benetton": {
+                    "count": 93
                 },
-                "Lider": {
-                    "count": 65
+                "Jules": {
+                    "count": 61
                 },
-                "Lidl": {
-                    "count": 6116
+                "AOKI": {
+                    "count": 55
                 },
-                "M-Preis": {
-                    "count": 81
+                "Calzedonia": {
+                    "count": 66
                 },
-                "MPreis": {
-                    "count": 54
+                "洋服の青山": {
+                    "count": 96
                 },
-                "Makro": {
-                    "count": 130
+                "Levi's": {
+                    "count": 59
                 },
-                "Markant": {
-                    "count": 91
+                "Celio": {
+                    "count": 73
                 },
-                "Marktkauf": {
-                    "count": 133
+                "TJ Maxx": {
+                    "count": 52
                 },
-                "Match": {
-                    "count": 146
+                "Promod": {
+                    "count": 77
                 },
-                "Maxi": {
-                    "count": 100
+                "Street One": {
+                    "count": 72
                 },
-                "Maxima": {
-                    "count": 107
+                "ユニクロ": {
+                    "count": 56
                 },
-                "Maxima X": {
-                    "count": 111
+                "Banana Republic": {
+                    "count": 51
+                },
+                "Одежда": {
+                    "count": 68
                 },
-                "Meijer": {
-                    "count": 74
+                "La Halle": {
+                    "count": 61
                 },
-                "Mercadona": {
-                    "count": 707
+                "Peacocks": {
+                    "count": 87
                 },
-                "Mercator": {
-                    "count": 119
+                "しまむら": {
+                    "count": 53
+                }
+            },
+            "books": {
+                "Bruna": {
+                    "count": 57
                 },
-                "Merkur": {
-                    "count": 113
+                "Waterstones": {
+                    "count": 86
                 },
-                "Metro": {
-                    "count": 250
+                "Libro": {
+                    "count": 55
                 },
-                "Migros": {
-                    "count": 433
+                "Barnes & Noble": {
+                    "count": 249
                 },
-                "Minipreço": {
-                    "count": 99
+                "Weltbild": {
+                    "count": 73
                 },
-                "Monoprix": {
-                    "count": 194
+                "Thalia": {
+                    "count": 120
                 },
-                "Morrisons": {
-                    "count": 405
+                "Книги": {
+                    "count": 111
+                }
+            },
+            "alcohol": {
+                "Alko": {
+                    "count": 142
                 },
-                "Netto": {
-                    "count": 4309
+                "The Beer Store": {
+                    "count": 144
                 },
-                "NORMA": {
-                    "count": 113
+                "Systembolaget": {
+                    "count": 207
                 },
-                "NP": {
-                    "count": 153
+                "LCBO": {
+                    "count": 226
                 },
-                "Nah & Frisch": {
-                    "count": 76
+                "Ароматный мир": {
+                    "count": 61
                 },
-                "Nahkauf": {
-                    "count": 166
+                "Bargain Booze": {
+                    "count": 61
                 },
-                "Neukauf": {
-                    "count": 81
+                "Nicolas": {
+                    "count": 114
                 },
-                "New World": {
-                    "count": 67
+                "Botilleria": {
+                    "count": 76
                 },
-                "No Frills": {
-                    "count": 101
+                "SAQ": {
+                    "count": 70
                 },
-                "Norma": {
-                    "count": 1054
+                "Gall & Gall": {
+                    "count": 513
                 },
-                "PENNY": {
-                    "count": 78
+                "BWS": {
+                    "count": 66
                 },
-                "Pam": {
-                    "count": 53
+                "Живое пиво": {
+                    "count": 61
+                }
+            },
+            "bakery": {
+                "Kamps": {
+                    "count": 250
                 },
-                "Penny": {
-                    "count": 1766
+                "Bäckerei Schmidt": {
+                    "count": 56
                 },
-                "Penny Market": {
-                    "count": 397
+                "Anker": {
+                    "count": 70
                 },
-                "Penny Markt": {
-                    "count": 464
+                "Schäfer": {
+                    "count": 51
                 },
-                "Petit Casino": {
-                    "count": 106
+                "Hofpfisterei": {
+                    "count": 110
                 },
-                "Pick n Pay": {
-                    "count": 237
+                "Greggs": {
+                    "count": 265
                 },
-                "Piggly Wiggly": {
-                    "count": 53
+                "Oebel": {
+                    "count": 58
                 },
-                "Pingo Doce": {
-                    "count": 238
+                "Boulangerie": {
+                    "count": 248
                 },
-                "Piotr i Paweł": {
-                    "count": 52
+                "Stadtbäckerei": {
+                    "count": 57
                 },
-                "Plodine": {
-                    "count": 52
+                "Steinecke": {
+                    "count": 139
                 },
-                "Plus": {
-                    "count": 138
+                "Ihle": {
+                    "count": 75
                 },
-                "Polo Market": {
-                    "count": 81
+                "Goldilocks": {
+                    "count": 56
                 },
-                "Price Chopper": {
-                    "count": 96
+                "Dat Backhus": {
+                    "count": 66
                 },
-                "Profi": {
+                "K&U": {
                     "count": 55
                 },
-                "Publix": {
-                    "count": 312
+                "Der Beck": {
+                    "count": 97
                 },
-                "REWE": {
-                    "count": 1440
+                "Thürmann": {
+                    "count": 54
                 },
-                "Real": {
-                    "count": 257
+                "Backwerk": {
+                    "count": 94
                 },
-                "Reliance Fresh": {
-                    "count": 63
+                "Bäcker": {
+                    "count": 66
                 },
-                "Rema 1000": {
-                    "count": 360
+                "Schäfer's": {
+                    "count": 51
                 },
-                "Rewe": {
-                    "count": 1194
+                "Panaderia": {
+                    "count": 162
                 },
-                "Rimi": {
-                    "count": 103
+                "Goeken backen": {
+                    "count": 51
                 },
-                "S-Market": {
-                    "count": 107
+                "Stadtbäckerei Junge": {
+                    "count": 53
                 },
-                "SPAR": {
-                    "count": 275
+                "Boulangerie Patisserie": {
+                    "count": 93
                 },
-                "Safeway": {
-                    "count": 436
+                "Paul": {
+                    "count": 78
                 },
-                "Sainsbury's": {
-                    "count": 538
+                "Хлеб": {
+                    "count": 84
                 },
-                "Sainsbury's Local": {
-                    "count": 101
+                "Piekarnia": {
+                    "count": 55
+                }
+            },
+            "sports": {
+                "Sports Direct": {
+                    "count": 53
                 },
-                "Sam's Club": {
-                    "count": 125
+                "Decathlon": {
+                    "count": 298
                 },
-                "Santa Isabel": {
-                    "count": 123
+                "Intersport": {
+                    "count": 272
                 },
-                "Shopi": {
-                    "count": 57
+                "Sports Authority": {
+                    "count": 68
                 },
-                "Shoprite": {
-                    "count": 235
+                "Спортмастер": {
+                    "count": 81
                 },
-                "Simply Market": {
-                    "count": 310
+                "Sport 2000": {
+                    "count": 83
                 },
-                "Sobeys": {
-                    "count": 117
+                "Dick's Sporting Goods": {
+                    "count": 69
+                }
+            },
+            "variety_store": {
+                "Tedi": {
+                    "count": 148
                 },
-                "Soriana": {
+                "Dollarama": {
+                    "count": 99
+                },
+                "Dollar Tree": {
                     "count": 91
                 },
-                "Spar": {
-                    "count": 2028
+                "Dollar General": {
+                    "count": 68
+                }
+            },
+            "pet": {
+                "Fressnapf": {
+                    "count": 309
                 },
-                "Społem": {
-                    "count": 54
+                "PetSmart": {
+                    "count": 163
                 },
-                "Stokrotka": {
-                    "count": 84
+                "Das Futterhaus": {
+                    "count": 67
                 },
-                "Stop & Shop": {
-                    "count": 55
+                "Pets at Home": {
+                    "count": 56
                 },
-                "Super Brugsen": {
-                    "count": 63
+                "Petco": {
+                    "count": 89
                 },
-                "Super U": {
-                    "count": 462
+                "Зоомагазин": {
+                    "count": 95
+                }
+            },
+            "shoes": {
+                "Deichmann": {
+                    "count": 607
                 },
-                "SuperBrugsen": {
-                    "count": 68
+                "Reno": {
+                    "count": 178
                 },
-                "Tesco": {
-                    "count": 1285
+                "Ecco": {
+                    "count": 54
                 },
-                "tegut": {
-                    "count": 220
+                "Clarks": {
+                    "count": 100
                 },
-                "Tengelmann": {
-                    "count": 191
+                "La Halle aux Chaussures": {
+                    "count": 65
                 },
-                "Tesco Express": {
-                    "count": 373
+                "Brantano": {
+                    "count": 68
                 },
-                "Tesco Extra": {
-                    "count": 118
+                "Salamander": {
+                    "count": 52
                 },
-                "Tesco Metro": {
-                    "count": 125
+                "Обувь": {
+                    "count": 97
                 },
-                "The Co-operative": {
-                    "count": 60
+                "Payless Shoe Source": {
+                    "count": 57
                 },
-                "The Co-operative Food": {
-                    "count": 113
+                "Famous Footwear": {
+                    "count": 54
                 },
-                "Trader Joe's": {
-                    "count": 182
+                "Quick Schuh": {
+                    "count": 72
                 },
-                "Treff 3000": {
-                    "count": 95
+                "Foot Locker": {
+                    "count": 79
                 },
-                "Unimarc": {
-                    "count": 169
+                "Bata": {
+                    "count": 97
+                }
+            },
+            "toys": {
+                "La Grande Récré": {
+                    "count": 55
                 },
-                "Unimarkt": {
-                    "count": 80
+                "Toys R Us": {
+                    "count": 141,
+                    "tags": {
+                        "shop": "toys"
+                    }
                 },
-                "Volg": {
-                    "count": 127
+                "Детский мир": {
+                    "count": 82
                 },
-                "Waitrose": {
-                    "count": 252
+                "Intertoys": {
+                    "count": 53
                 },
-                "Walmart": {
-                    "count": 600
+                "Игрушки": {
+                    "count": 57
+                }
+            },
+            "travel_agency": {
+                "Flight Centre": {
+                    "count": 91
                 },
-                "Walmart Supercenter": {
-                    "count": 103
+                "Thomas Cook": {
+                    "count": 111
+                }
+            },
+            "jewelry": {
+                "Bijou Brigitte": {
+                    "count": 54
                 },
-                "Wasgau": {
-                    "count": 60
+                "Christ": {
+                    "count": 56
                 },
-                "Whole Foods": {
-                    "count": 191
+                "Swarovski": {
+                    "count": 73
+                }
+            },
+            "optician": {
+                "Fielmann": {
+                    "count": 222
                 },
-                "Willys": {
+                "Apollo Optik": {
+                    "count": 147
+                },
+                "Vision Express": {
                     "count": 54
                 },
-                "Woolworths": {
-                    "count": 519
+                "Оптика": {
+                    "count": 175
                 },
-                "Zielpunkt": {
-                    "count": 240
+                "Optic 2000": {
+                    "count": 90
                 },
-                "coop": {
+                "Alain Afflelou": {
                     "count": 71
                 },
-                "nahkauf": {
-                    "count": 79
+                "Specsavers": {
+                    "count": 116
                 },
-                "real,-": {
-                    "count": 80
+                "Krys": {
+                    "count": 70
                 },
-                "sky": {
-                    "count": 100
+                "Atol": {
+                    "count": 52
+                }
+            },
+            "video": {
+                "Blockbuster": {
+                    "count": 190
                 },
-                "АТБ": {
-                    "count": 289
+                "World of Video": {
+                    "count": 65
+                }
+            },
+            "mobile_phone": {
+                "Билайн": {
+                    "count": 120
                 },
-                "Десяточка": {
-                    "count": 51
+                "ソフトバンクショップ (SoftBank shop)": {
+                    "count": 256
                 },
-                "Дикси": {
-                    "count": 562
+                "Vodafone": {
+                    "count": 335
                 },
-                "Евроопт": {
-                    "count": 57
+                "O2": {
+                    "count": 190
                 },
-                "Карусель": {
-                    "count": 55
+                "Carphone Warehouse": {
+                    "count": 116
                 },
-                "Квартал": {
-                    "count": 93
+                "Orange": {
+                    "count": 236
                 },
-                "Копейка": {
-                    "count": 96
+                "Verizon Wireless": {
+                    "count": 104
                 },
-                "Магазин": {
-                    "count": 113
+                "Sprint": {
+                    "count": 97
                 },
-                "Магнит": {
-                    "count": 1635
+                "T-Mobile": {
+                    "count": 169
                 },
-                "Ð\9cагнолиÑ\8f": {
-                    "count": 70
+                "Ð\9cТС": {
+                    "count": 334
                 },
-                "Ð\9cаÑ\80иÑ\8f-Ра": {
-                    "count": 94
+                "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c": {
+                    "count": 489
                 },
-                "Монетка": {
-                    "count": 163
+                "Bell": {
+                    "count": 188
                 },
-                "Народная 7Я семьЯ": {
-                    "count": 147
+                "The Phone House": {
+                    "count": 83
                 },
-                "Перекресток": {
-                    "count": 310
+                "SFR": {
+                    "count": 69
                 },
-                "Ð\9fолÑ\83Ñ\88ка": {
-                    "count": 133
+                "СвÑ\8fзной": {
+                    "count": 419
                 },
-                "Ð\9fÑ\8fÑ\82Ñ\91Ñ\80оÑ\87ка": {
-                    "count": 1232
+                "Ð\9cегаÑ\84он": {
+                    "count": 238
                 },
-                "Седьмой континент": {
-                    "count": 81
+                "AT&T": {
+                    "count": 111
                 },
-                "Семья": {
+                "ドコモショップ (docomo shop)": {
+                    "count": 115
+                },
+                "au": {
                     "count": 61
                 },
-                "Сільпо": {
-                    "count": 118
+                "Movistar": {
+                    "count": 69
                 },
-                "Фора": {
-                    "count": 52
+                "Bitė": {
+                    "count": 72
+                }
+            },
+            "hifi": {},
+            "computer": {
+                "PC World": {
+                    "count": 55
                 },
-                "Фуршет": {
-                    "count": 76
+                "DNS": {
+                    "count": 124
+                }
+            },
+            "hairdresser": {
+                "Klier": {
+                    "count": 112
                 },
-                "マルエツ": {
+                "Supercuts": {
+                    "count": 96
+                },
+                "Hairkiller": {
                     "count": 52
                 },
-                "ヨークマート (YorkMart)": {
-                    "count": 62
+                "Great Clips": {
+                    "count": 169
                 },
-                "西友 (SEIYU)": {
-                    "count": 55
-                }
-            },
-            "toys": {
-                "La Grande Récré": {
-                    "count": 55
+                "Парикмахерская": {
+                    "count": 502
                 },
-                "Toys R Us": {
-                    "count": 135
+                "Fryzjer": {
+                    "count": 53
                 },
-                "Детский мир": {
-                    "count": 81
-                }
-            },
-            "travel_agency": {
-                "Flight Centre": {
-                    "count": 85
+                "Franck Provost": {
+                    "count": 67
                 },
-                "Thomas Cook": {
-                    "count": 100
+                "Салон красоты": {
+                    "count": 67
                 }
             },
-            "variety_store": {
-                "Dollar General": {
-                    "count": 53
-                },
-                "Dollar Tree": {
-                    "count": 76
+            "hardware": {
+                "1000 мелочей": {
+                    "count": 57
                 },
-                "Dollarama": {
-                    "count": 90
+                "Хозтовары": {
+                    "count": 149
                 },
-                "Tedi": {
-                    "count": 138
+                "Стройматериалы": {
+                    "count": 52
                 }
             },
-            "video": {
-                "Blockbuster": {
-                    "count": 197
+            "motorcycle": {
+                "Yamaha": {
+                    "count": 63
                 },
-                "World of Video": {
-                    "count": 66
+                "Honda": {
+                    "count": 57
                 }
             }
         }
index 9392feda6fda3b765627ad1b55b37a8222ebcb14..7b34892552d2ceef60b58b86968491e01df9eace 100644 (file)
             "category-building": {
                 "name": "Građevina"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Upotreba zemljišta"
             },
             "admin_level": {
                 "label": "Administrativni nivo"
             },
+            "aerialway": {
+                "label": "Vrsta"
+            },
+            "aerialway/access": {
+                "label": "Pristup"
+            },
+            "aerialway/bubble": {
+                "label": "Balon"
+            },
+            "aerialway/capacity": {
+                "label": "Kapacitet (po satu)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Trajanje (u minutama)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Zagrijano"
+            },
+            "aerialway/occupancy": {
+                "label": "Zauzeće",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Pristup (ljeto)"
+            },
             "aeroway": {
                 "label": "Vrsta"
             },
             "building_area": {
                 "label": "Građevina"
             },
+            "cans": {
+                "label": "Prihvata konzerve"
+            },
             "capacity": {
                 "label": "Kapacitet",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "U smjeru suprotnom od kazaljke na satu"
                 }
             },
+            "clothes": {
+                "label": "Prihvata odjeću"
+            },
             "collection_times": {
                 "label": "Vremena skupljanja"
             },
             "country": {
                 "label": "Zemlja"
             },
+            "covered": {
+                "label": "Pokriveno"
+            },
             "crossing": {
                 "label": "Vrsta"
             },
             "generator/type": {
                 "label": "Vrsta"
             },
+            "glass": {
+                "label": "Prihvata staklo"
+            },
+            "golf_hole": {
+                "label": "Referenca",
+                "placeholder": "Rupa broj (1-18)"
+            },
+            "handicap": {
+                "label": "Hendikep",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Vrsta"
             },
             "incline": {
                 "label": "Nagib"
             },
+            "information": {
+                "label": "Vrsta"
+            },
             "internet_access": {
                 "label": "Internet pristup",
                 "options": {
             "operator": {
                 "label": "Operator"
             },
+            "paper": {
+                "label": "Prihvata papir"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Podsticaj parkiranja"
             },
                 "label": "Telefon",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Težina"
+            },
+            "piste/grooming": {
+                "label": "Održavanje"
+            },
+            "piste/type": {
+                "label": "Vrsta"
+            },
             "place": {
                 "label": "Vrsta"
             },
                     "cutting": "Usjek"
                 }
             },
+            "studio_type": {
+                "label": "Vrsta"
+            },
             "supervised": {
                 "label": "Pod nadzorom"
             },
             "tree_type": {
                 "label": "Vrsta"
             },
+            "tunnel": {
+                "label": "Tunel"
+            },
             "vending": {
                 "label": "Vrsta dobara"
             },
                 "name": "Adresa",
                 "terms": "adresa,prebivalište"
             },
+            "aerialway/gondola": {
+                "name": "Gondola"
+            },
             "aeroway": {
                 "name": "Avio-put",
                 "terms": "fizička infrastruktura aerodroma,zračni transport,avio-put"
                 "name": "Kino",
                 "terms": "kino,kino dvorana,multipleks"
             },
+            "amenity/clinic": {
+                "name": "Klinika"
+            },
             "amenity/college": {
                 "name": "Koledž",
                 "terms": "koledž,fakultet,faks"
                 "name": "Sudnica",
                 "terms": "sudnica,zgrada suda"
             },
+            "amenity/dentist": {
+                "name": "Zubar",
+                "terms": "zubar,stomatolog"
+            },
+            "amenity/doctor": {
+                "name": "Doktor",
+                "terms": "doktor,ljekar"
+            },
             "amenity/drinking_water": {
                 "name": "Voda za piće",
                 "terms": "voda za piće,pitka voda"
                 "name": "Stanica rendžerske službe",
                 "terms": "rendžerska služba,stanica rendžerske službe,rendžerska stanica"
             },
+            "amenity/recycling": {
+                "name": "Recikliranje",
+                "terms": "recikliranje,ponovna obrada,reciklaža"
+            },
             "amenity/restaurant": {
                 "name": "Restoran",
                 "terms": "restoran,gostionica"
                 "name": "Sklonište",
                 "terms": "sklonište,zaklon"
             },
+            "amenity/studio": {
+                "name": "Studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Bazen",
                 "terms": "bazen,bazen za plivanje,plivački bazen"
                 "name": "Stambena zgrada",
                 "terms": "stambena zgrada,zgrada za stanovanje"
             },
+            "craft/beekeeper": {
+                "name": "Pčelar"
+            },
+            "craft/blacksmith": {
+                "name": "Kovač"
+            },
+            "craft/boatbuilder": {
+                "name": "Brodograditelj"
+            },
+            "craft/bookbinder": {
+                "name": "Knjigovezac"
+            },
+            "craft/brewery": {
+                "name": "Pivara"
+            },
+            "craft/carpenter": {
+                "name": "Stolar"
+            },
+            "craft/caterer": {
+                "name": "Ugostitelj"
+            },
+            "craft/clockmaker": {
+                "name": "Proizvođač satova"
+            },
+            "craft/dressmaker": {
+                "name": "Izrada haljina"
+            },
+            "craft/electrician": {
+                "name": "Električar"
+            },
+            "craft/gardener": {
+                "name": "Vrtlar"
+            },
+            "craft/hvac": {
+                "name": "HVAC"
+            },
+            "craft/insulator": {
+                "name": "Izolator"
+            },
+            "craft/jeweler": {
+                "name": "Zlatar",
+                "terms": "zlatar,draguljar"
+            },
+            "craft/key_cutter": {
+                "name": "Izrada ključeva"
+            },
+            "craft/locksmith": {
+                "name": "Bravar"
+            },
+            "craft/metal_construction": {
+                "name": "Metalne konstrukcije"
+            },
+            "craft/optician": {
+                "name": "Optičar"
+            },
+            "craft/painter": {
+                "name": "Slikar"
+            },
+            "craft/photographer": {
+                "name": "Fotograf"
+            },
+            "craft/photographic_labratory": {
+                "name": "Fotografska laboratorija"
+            },
+            "craft/plumber": {
+                "name": "Vodoinstalater"
+            },
+            "craft/pottery": {
+                "name": "Grnčarija"
+            },
+            "craft/roofer": {
+                "name": "Krovopokrivač"
+            },
+            "craft/saddler": {
+                "name": "Sedlar"
+            },
+            "craft/sculpter": {
+                "name": "Skulptor"
+            },
+            "craft/stonemason": {
+                "name": "Klesar"
+            },
+            "craft/sweep": {
+                "name": "Čišćenje dimnjaka"
+            },
+            "craft/tailor": {
+                "name": "Krojač"
+            },
+            "craft/window_construction": {
+                "name": "Izrada prozora"
+            },
             "embankment": {
                 "name": "Nasip",
                 "terms": "nasip"
                 "name": "Trotoar",
                 "terms": "trotoar"
             },
+            "golf/bunker": {
+                "name": "Pješčana zamka",
+                "terms": "pješčana zamka,pješčana klopka,bunker"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "osnovni dio golf terena, glavni teren za golf"
+            },
+            "golf/green": {
+                "name": "Putting Green",
+                "terms": "područje golf terena najbliže rupi"
+            },
+            "golf/hole": {
+                "name": "Rupa za golf",
+                "terms": "golf rupa,rupa za golf loptice"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Vodena opasnost sa strane",
+                "terms": "opasnost of vode sa strane,voda sa strane"
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": "područje \"divlje\" trave van igre,trava van golf terena"
+            },
+            "golf/tee": {
+                "name": "Tee Box",
+                "terms": "\"Tee\" kutija,kutija područja na početku rupe"
+            },
+            "golf/water_hazard": {
+                "name": "Vodena opasnost",
+                "terms": "opasnost od vode,vodena opasnost"
+            },
             "highway": {
                 "name": "Put",
                 "terms": "cesta,put"
index 22ef95237f8af66dad3094494187b0f4e636b79c..e8278fb58816bfca64195ab1b78278ff32555ead 100644 (file)
         "incomplete": "<no baixat>",
         "feature_list": "Cerca característiques",
         "edit": "Editar la característica",
-        "none": "Cap"
+        "none": "Cap",
+        "node": "Node",
+        "way": "Via",
+        "relation": "Relació",
+        "location": "Ubicació"
     },
     "background": {
         "title": "Fons",
         "untagged_area": "Àrea sense etiquetar",
         "many_deletions": "Esteu eliminant {n} objectes. Esteu segurs que voleu fer-ho? Això els eliminarà dels mapa que tothom veu a openstreetmap.org",
         "tag_suggests_area": "L'etiqueta {tag} suggereix que la línia hauria de ser una àrea, però no és una àrea",
+        "untagged_tooltip": "Seleccioneu un tipus de característica que descrigui el que és aquesta {geometry}.",
         "deprecated_tags": "Etiquetes obsoletes : {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "Edifici"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Aprofitament del terreny"
             },
             "address": {
                 "label": "Adreça",
                 "placeholders": {
-                    "housename": "Número de carrer",
+                    "housename": "Nom de l'edifici",
                     "number": "123",
                     "street": "Carrer",
                     "city": "Ciutat ",
             "admin_level": {
                 "label": "Nivell administratiu"
             },
+            "aerialway": {
+                "label": "Tipus"
+            },
+            "aerialway/access": {
+                "label": "Accés"
+            },
+            "aerialway/bubble": {
+                "label": "Bombolla"
+            },
+            "aerialway/capacity": {
+                "label": "Capacitat (per hora)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Duració (minuts)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Climatitzat"
+            },
+            "aerialway/occupancy": {
+                "label": "Ocupació",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Accés (estival)"
+            },
             "aeroway": {
                 "label": "Tipus"
             },
             "building_area": {
                 "label": "Edifici"
             },
+            "cans": {
+                "label": "Accepta llaunes"
+            },
             "capacity": {
                 "label": "Capacitat",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "en sentit contrari al de les agulles del rellotge"
                 }
             },
+            "clothes": {
+                "label": "Accepta roba"
+            },
             "collection_times": {
                 "label": "Horari de recollida"
             },
             "country": {
                 "label": "País"
             },
+            "covered": {
+                "label": "Cobert"
+            },
             "crossing": {
                 "label": "Tipus"
             },
             "description": {
                 "label": "Descripció"
             },
+            "electrified": {
+                "label": "Electrificació"
+            },
             "elevation": {
                 "label": "Elevació"
             },
             "fixme": {
                 "label": "Arregla'm"
             },
+            "gauge": {
+                "label": "Ample"
+            },
             "generator/method": {
                 "label": "Mètode"
             },
             "generator/type": {
                 "label": "Tipus"
             },
+            "glass": {
+                "label": "Accepta vidre"
+            },
+            "golf_hole": {
+                "label": "Referència",
+                "placeholder": "Número de forat (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tipus"
             },
             "incline": {
                 "label": "Pendent"
             },
+            "information": {
+                "label": "Tipus"
+            },
             "internet_access": {
                 "label": "Accés a Internet",
                 "options": {
             "operator": {
                 "label": "Operador"
             },
+            "paper": {
+                "label": "Accepta paper"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Aparca i viatja "
             },
                 "label": "Telèfon",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Dificultat"
+            },
+            "piste/grooming": {
+                "label": "Adequació"
+            },
+            "piste/type": {
+                "label": "Tipus"
+            },
             "place": {
                 "label": "Tipus"
             },
                     "cutting": "Trinxera"
                 }
             },
+            "studio_type": {
+                "label": "Tipus"
+            },
             "supervised": {
                 "label": "Supervisat"
             },
             "tree_type": {
                 "label": "Tipus"
             },
+            "tunnel": {
+                "label": "Túnel"
+            },
             "vending": {
                 "label": "Tipus de mercaderies"
             },
                 "name": "Adreça",
                 "terms": "Adreça, Direcció, Domicili"
             },
+            "aerialway": {
+                "name": "Transport per cable"
+            },
+            "aerialway/cable_car": {
+                "name": "Telefèric"
+            },
+            "aerialway/chair_lift": {
+                "name": "Telecadira"
+            },
+            "aerialway/gondola": {
+                "name": "Telecabina"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Cinta remuntadora"
+            },
+            "aerialway/platter": {
+                "name": "Teleesquí individual"
+            },
+            "aerialway/pylon": {
+                "name": "Piló d'estructura de transport per cable"
+            },
+            "aerialway/rope_tow": {
+                "name": "Corda remuntadora"
+            },
+            "aerialway/station": {
+                "name": "Estació de transport per cable"
+            },
+            "aerialway/t-bar": {
+                "name": "Teleesquí doble"
+            },
             "aeroway": {
                 "name": "Infraestructura aeroportuària",
                 "terms": "Infraestructura aeroportuària, Instal·lacions aeroportuàries, Àrea aeroportuària"
                 "name": "Cinema",
                 "terms": "Cinema, Cine, Local de projeccions cinematogràfiques, Local d'esbarjo"
             },
+            "amenity/clinic": {
+                "name": "Clínica"
+            },
             "amenity/college": {
                 "name": "Campus universitari",
                 "terms": "Col·legi, Campus universitàri, universitat, facultat"
                 "name": "Jutjat",
                 "terms": "Jutjats, Palau de justícia"
             },
+            "amenity/dentist": {
+                "name": "Dentista"
+            },
+            "amenity/doctor": {
+                "name": "Doctor"
+            },
             "amenity/drinking_water": {
                 "name": "Aigua apte per al consum",
                 "terms": "Aigua potable, Aigua apte per al consum humà, Aigua per beure"
             "amenity/ranger_station": {
                 "name": "Base d'Agents Rurals"
             },
+            "amenity/recycling": {
+                "name": "Reciclatge"
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "Restaurant, Lloc per menjar, Bistro, Wok, Trattoria, Pizzeria"
             "amenity/shelter": {
                 "name": "Refugi"
             },
+            "amenity/studio": {
+                "name": "Estudi"
+            },
             "amenity/swimming_pool": {
                 "name": "Piscina",
                 "terms": "Piscina, Instal·lació aquàtica"
             "amenity/vending_machine": {
                 "name": "Màquina de vending"
             },
+            "amenity/veterinary": {
+                "name": "Veterinari"
+            },
             "amenity/waste_basket": {
                 "name": "Paperera",
                 "terms": "Paperera, Basura, Paperera pública, Contenidor, deixalles, brossa"
             "building/residential": {
                 "name": "Edifici residencial"
             },
+            "craft/basket_maker": {
+                "name": "Cistellaire"
+            },
+            "craft/beekeeper": {
+                "name": "Apicultor"
+            },
+            "craft/blacksmith": {
+                "name": "Ferrer"
+            },
+            "craft/boatbuilder": {
+                "name": "Constructor d'embarcacions"
+            },
+            "craft/bookbinder": {
+                "name": "Enquadernador"
+            },
+            "craft/brewery": {
+                "name": "Cerveseria"
+            },
+            "craft/carpenter": {
+                "name": "Fuster"
+            },
+            "craft/carpet_layer": {
+                "name": "Moquetista"
+            },
+            "craft/caterer": {
+                "name": "Servei de càtering"
+            },
+            "craft/clockmaker": {
+                "name": "Rellotger"
+            },
+            "craft/dressmaker": {
+                "name": "Sastreria"
+            },
+            "craft/electrician": {
+                "name": "Electricista"
+            },
+            "craft/gardener": {
+                "name": "Jardiner"
+            },
+            "craft/hvac": {
+                "name": "Empresa d'instal·lacions climàtiques"
+            },
+            "craft/jeweler": {
+                "name": "Joieria"
+            },
+            "craft/metal_construction": {
+                "name": "Construccions metàliques"
+            },
+            "craft/optician": {
+                "name": "Òptica"
+            },
+            "craft/painter": {
+                "name": "pintor"
+            },
+            "craft/photographer": {
+                "name": "Fotògraf"
+            },
+            "craft/photographic_labratory": {
+                "name": "Laboratori fotogràfic"
+            },
+            "craft/plumber": {
+                "name": "Llauner"
+            },
+            "craft/sculpter": {
+                "name": "Escultor"
+            },
+            "craft/watchmaker": {
+                "name": "Fabricant de rellotges"
+            },
+            "craft/window_construction": {
+                "name": "Fabricant de finestres"
+            },
+            "embankment": {
+                "name": "Terraplè "
+            },
             "emergency/ambulance_station": {
                 "name": "Parada d'ambulàncies"
             },
             "footway/sidewalk": {
                 "name": "Vorera"
             },
+            "golf/bunker": {
+                "name": "Bunker"
+            },
+            "golf/fairway": {
+                "name": "Fairway"
+            },
+            "golf/green": {
+                "name": "Green"
+            },
+            "golf/hole": {
+                "name": "Forat"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Obstacle d'aigua lateral"
+            },
+            "golf/rough": {
+                "name": "Rough"
+            },
+            "golf/tee": {
+                "name": "Àrea inicial"
+            },
+            "golf/water_hazard": {
+                "name": "Obstacle d'aigua"
+            },
             "highway": {
                 "name": "Via"
             },
             "highway/residential": {
                 "name": "Carrer"
             },
+            "highway/rest_area": {
+                "name": "Àrea de descans"
+            },
             "highway/road": {
                 "name": "Carretera sense classificació"
             },
                 "name": "Carrer d'aparcament",
                 "terms": "Passadís de pàrquing, pàrquing, parking, aparcament, carrer interior d'aparcament, carrer per aparcar, carrer de pàrqquing, carrer de parking"
             },
+            "highway/services": {
+                "name": "Àrea de servei"
+            },
             "highway/steps": {
                 "name": "Escales"
             },
             "man_made/cutline": {
                 "name": "Línia de tall"
             },
+            "man_made/embankment": {
+                "name": "Terraplè "
+            },
+            "man_made/flagpole": {
+                "name": "Màstil"
+            },
             "man_made/lighthouse": {
                 "name": "Far"
             },
             "man_made/water_works": {
                 "name": "Planta potabilitzadora"
             },
+            "military/airfield": {
+                "name": "Aeròdrom militar"
+            },
+            "military/barracks": {
+                "name": "Caserna militar"
+            },
+            "military/bunker": {
+                "name": "Búnquer"
+            },
+            "military/range": {
+                "name": "Terreny per a usos militars"
+            },
             "natural": {
                 "name": "Natural"
             },
             "office/travel_agent": {
                 "name": "Agència de viatges"
             },
+            "piste": {
+                "name": "Pista d'esquí"
+            },
             "place": {
                 "name": "Lloc"
             },
             "power/transformer": {
                 "name": "Transformador"
             },
+            "public_transport/platform": {
+                "name": "Plataforma"
+            },
+            "public_transport/stop_position": {
+                "name": "Posició d'aturada"
+            },
             "railway": {
                 "name": "Ferrocarril"
             },
             "railway/disused": {
                 "name": "Vià de tren fora d'ús"
             },
+            "railway/funicular": {
+                "name": "Funicular"
+            },
             "railway/halt": {
                 "name": "Parada de Ferrocarril"
             },
             "railway/monorail": {
                 "name": "Monocarril"
             },
+            "railway/narrow_gauge": {
+                "name": "Ferrocarril de via estreta"
+            },
             "railway/platform": {
                 "name": "Andana "
             },
index 50e8dec0ecc659a048bf405788cdf2881032cdcb..0815f84c9adc40f01ef11399f98927803c022a8c 100644 (file)
         "incomplete": "<nebylo staženo>",
         "feature_list": "Hledat objekty",
         "edit": "Editovat objekt",
-        "none": "Žádné"
+        "none": "Žádné",
+        "node": "Uzel",
+        "way": "Cesta",
+        "relation": "Relace",
+        "location": "Poloha"
     },
     "background": {
         "title": "Pozadí",
         "untagged_area": "Neoznačená plocha",
         "many_deletions": "Pokoušíte se smazat {n} objektů. Opravdu to chcete provést? Odstranilo by je z globální mapy na openstreetmap.org.",
         "tag_suggests_area": "Vlastnost {tag} obvykle označuje plochu - ale zvolený objekt není plocha",
+        "untagged_tooltip": "Zvolte typ objektu - co je tato {geometry} zač.",
         "deprecated_tags": "Zastaralé vlastnosti: {tag}"
     },
     "zoom": {
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Budova"
+            },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Využití krajiny"
             },
             },
             "category-route": {
                 "name": "Trasa"
+            },
+            "category-water-area": {
+                "name": "Voda"
+            },
+            "category-water-line": {
+                "name": "Voda"
             }
         },
         "fields": {
                     }
                 }
             },
+            "access_simple": {
+                "label": "Přístup"
+            },
             "address": {
                 "label": "Adresa",
                 "placeholders": {
             "admin_level": {
                 "label": "Administrativní úroveň"
             },
+            "aerialway": {
+                "label": "Typ"
+            },
+            "aerialway/access": {
+                "label": "Přístup"
+            },
+            "aerialway/bubble": {
+                "label": "Stříška"
+            },
+            "aerialway/capacity": {
+                "label": "Odbaví lidí (za hodinu)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Délka cesty (v minutách)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Vytápěno"
+            },
+            "aerialway/occupancy": {
+                "label": "Kapacita (počet cestujících)",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Přístup v létě"
+            },
             "aeroway": {
                 "label": "Typ"
             },
             "building_area": {
                 "label": "Budova"
             },
+            "cans": {
+                "label": "Pro plechovky"
+            },
             "capacity": {
                 "label": "Kapacita",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Proti směru hod. ručiček"
                 }
             },
+            "clothes": {
+                "label": "Pro textil"
+            },
             "collection_times": {
                 "label": "Čas výběru"
             },
             "country": {
                 "label": "Stát"
             },
+            "covered": {
+                "label": "Zastřešeno"
+            },
             "crossing": {
                 "label": "Typ"
             },
             "description": {
                 "label": "Popis"
             },
+            "electrified": {
+                "label": "Elektrifikace"
+            },
             "elevation": {
                 "label": "Nadmořská výška"
             },
             "fixme": {
                 "label": "Opravit"
             },
+            "gauge": {
+                "label": "Rozchod"
+            },
             "generator/method": {
                 "label": "Princip"
             },
             "generator/type": {
                 "label": "Typ"
             },
+            "glass": {
+                "label": "Pro sklo"
+            },
+            "golf_hole": {
+                "label": "Číslo",
+                "placeholder": "Číslo jamky (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Typ"
             },
             "incline": {
                 "label": "Sklon"
             },
+            "information": {
+                "label": "Typ"
+            },
             "internet_access": {
                 "label": "Přístup k internetu",
                 "options": {
             "operator": {
                 "label": "Provozovatel"
             },
+            "paper": {
+                "label": "Pro papír"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Parkoviště P+R"
             },
                 "label": "Telefon",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Obtížnost"
+            },
+            "piste/grooming": {
+                "label": "Úprava"
+            },
+            "piste/type": {
+                "label": "Typ"
+            },
             "place": {
                 "label": "Typ"
             },
             "shelter": {
                 "label": "Přístřešek"
             },
+            "shelter_type": {
+                "label": "Typ"
+            },
             "shop": {
                 "label": "Typ"
             },
                 "options": {
                     "bridge": "Most",
                     "tunnel": "Tunel",
-                    "embankment": "Násep",
+                    "embankment": "Násyp",
                     "cutting": "Zářez"
                 }
             },
+            "studio_type": {
+                "label": "Typ"
+            },
             "supervised": {
                 "label": "Hlídané"
             },
             "trail_visibility": {
                 "label": "Viditelnost stezky"
             },
+            "tree_type": {
+                "label": "Typ"
+            },
+            "tunnel": {
+                "label": "Tunel"
+            },
             "vending": {
                 "label": "Druh zboží"
             },
                 "name": "Adresa",
                 "terms": "adresa,PSČ,ulice"
             },
+            "aerialway": {
+                "name": "Lanovka/vlek",
+                "terms": "lanovka,vlek,lanová dráha,sedačková lanovka,kabinková lanovka,kabinová lanovka,pozemní lanovka,lyžařský vlek,výtah,ozubnicová dráha"
+            },
+            "aerialway/cable_car": {
+                "name": "Kabinová lanovka",
+                "terms": "kabinková lanovka,kabinová lanovka,kabinková lanová dráha,kabinová lanová dráha"
+            },
+            "aerialway/chair_lift": {
+                "name": "Sedačková lanovka",
+                "terms": "sedačková lanovka,sedačková lanová dráha,lyžařská lanovka,visutý vlek"
+            },
+            "aerialway/gondola": {
+                "name": "Kabinková lanovka",
+                "terms": "gondola,gondolová lanovka,kabinková lanovka,kabinová lanovka,kabinová lanová dráha,kabinková lanová dráha"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Pásový dopravník",
+                "terms": "pásový dopravník,lyžařský vlek,vlek,lanovka na pásu,pohybivý pás,eskalátor"
+            },
+            "aerialway/platter": {
+                "name": "Vlek - talíř (poma)",
+                "terms": "talířový vlek,talířový teleskopický vlek,poma,lyžařský vlek"
+            },
+            "aerialway/pylon": {
+                "name": "Sloup",
+                "terms": "sloup lanovky,stožár lanovky"
+            },
+            "aerialway/rope_tow": {
+                "name": "Vlek - kotvičkový",
+                "terms": "lyžařský vlek,vlek,kotvička,lanový vlek"
+            },
+            "aerialway/station": {
+                "name": "Stanice lanovky",
+                "terms": "stanice lanovky,stanice lanové dráhy,zastávka lanovky,zastávka lanové dráhy"
+            },
+            "aerialway/t-bar": {
+                "name": "Vlek - dvojmístná kotva",
+                "terms": "vlek,lyžařský vlek,kotva,dvojmístná kotva,dvoumístná kotva"
+            },
             "aeroway": {
                 "name": "Přistávací dráha",
                 "terms": "letitiště,přistávací dráha,letadlo,terminál"
                 "terms": "letadlo,letiště,přistávací dráha"
             },
             "aeroway/apron": {
-                "name": "Parkovací plocha",
+                "name": "Odbavovací plocha",
                 "terms": "apron"
             },
             "aeroway/gate": {
                 "name": "Kino",
                 "terms": "kino,film,cinema,multikino,bio,biograf,kinematograf"
             },
+            "amenity/clinic": {
+                "name": "Poliklinika",
+                "terms": "poliklinika,klinika,nemocnice,ambulance,špitál"
+            },
+            "amenity/clock": {
+                "name": "Hodiny",
+                "terms": "hodiny,orloj,hodinky,chronometr,ciferník,čas,ukazatel času"
+            },
             "amenity/college": {
                 "name": "College",
                 "terms": "Vysoká škola,univerzita,akademie"
                 "name": "Soud",
                 "terms": "soud,soudní budova,soudní dvůr"
             },
+            "amenity/dentist": {
+                "name": "Zubař",
+                "terms": "zubař,dentista,zubařská ordinace,ordinace"
+            },
+            "amenity/doctor": {
+                "name": "Lékař",
+                "terms": "lékař,doktor,praktický lékař,ordinace,medik"
+            },
             "amenity/drinking_water": {
                 "name": "Pitná voda",
                 "terms": "pítko,fontána,fontánka"
                 "name": "Trhoviště",
                 "terms": "tržiště,trh"
             },
+            "amenity/parking": {
+                "name": "Parkoviště",
+                "terms": "parkoviště,parking,parkování,stání,garáž,garáže"
+            },
             "amenity/pharmacy": {
                 "name": "Lékárna",
                 "terms": "lékárna,apatyka"
                 "name": "Návštěvnické centrum",
                 "terms": "návštěvnické centrum, návštěvní centrum"
             },
+            "amenity/recycling": {
+                "name": "Recyklace",
+                "terms": "recyklace,kontejner,recyklační centrum,sběr,sběrna,sběrné suroviny,sběr odpadu,odpad,odpadky,popelnice"
+            },
             "amenity/restaurant": {
                 "name": "Restaurace",
                 "terms": "bar,jídelna,kantýna,bistro,bufet,rychlé občerstvení,fast food,hamburger,restaurace,restaurant,hostinec,pohostinství,krčma,gastronomie,občerstvení,stánek,jídlo,obědy,gril,pizzeria,čína,kebab"
                 "name": "Škola",
                 "terms": "univerzita,universita,fakulta,vysoká škola,univerzitní,universitní,katedra,ústav,college"
             },
+            "amenity/shelter": {
+                "name": "Přístřešek",
+                "terms": "přístřešek,střecha,budka,bouda,čekárna"
+            },
+            "amenity/studio": {
+                "name": "Studio",
+                "terms": "studio,nahrávací studio,rozhlasové studio,rádiové studio,radiové studio,televizní studio,filmové studio,trikové studio,dabingové studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Plavecký bazén",
                 "terms": "koupaliště,bazén,plovárna"
                 "name": "Prodejní automat",
                 "terms": "automat,prodejní automat"
             },
+            "amenity/veterinary": {
+                "name": "Veterina",
+                "terms": "veterina,veterinář,zvíře"
+            },
             "amenity/waste_basket": {
                 "name": "Odpadkový koš",
                 "terms": "popelnice,kontejner,odpadkový koš,odpadky"
                 "name": "Obytná budova",
                 "terms": "obytná budova,ubytování,bývání,byt"
             },
+            "craft/basket_maker": {
+                "name": "Košíkář",
+                "terms": "košíkář,košíkářství,proutěný,pletení"
+            },
+            "craft/beekeeper": {
+                "name": "Včelař",
+                "terms": "včelař,včely,úl,med,prodej medu,včelařství"
+            },
+            "craft/blacksmith": {
+                "name": "Kovář",
+                "terms": "kovář,kovářství"
+            },
+            "craft/boatbuilder": {
+                "name": "Loďař",
+                "terms": "loďařství,loďař,stavba lodí,stavba člunů"
+            },
+            "craft/bookbinder": {
+                "name": "Knihař",
+                "terms": "knihařství,knihař,vazba knih,vazač,vazačství"
+            },
+            "craft/brewery": {
+                "name": "Pivovar",
+                "terms": "pivovar,pivo,minipivovar"
+            },
+            "craft/carpenter": {
+                "name": "Tesař",
+                "terms": "tesařství,tesař,dřevo"
+            },
+            "craft/carpet_layer": {
+                "name": "Pokladač koberců",
+                "terms": "pokladač koberců,pokladačství koberců,koberce"
+            },
+            "craft/caterer": {
+                "name": "Catering",
+                "terms": "catering,dodavatel občerstvení,dodavatelství občerstvení"
+            },
+            "craft/clockmaker": {
+                "name": "Hodinář (ne hodinky)",
+                "terms": "hodinářství,hodinář,hodiny"
+            },
+            "craft/confectionary": {
+                "name": "Cukrář",
+                "terms": "cukrářství,cukrář,cukrovinky,sladkost"
+            },
+            "craft/dressmaker": {
+                "name": "Švadlena",
+                "terms": "švadlena,krejčí,krejčová,šaty,dámská krejčová"
+            },
+            "craft/electrician": {
+                "name": "Elektrikář",
+                "terms": "elektrikář,elektrikářství"
+            },
+            "craft/gardener": {
+                "name": "Zahradník",
+                "terms": "zahradník,zahradnictví,zahradní architekt"
+            },
+            "craft/glaziery": {
+                "name": "Práce se sklem",
+                "terms": "sklenář,sklenářství,sklo,práce se sklem"
+            },
+            "craft/handicraft": {
+                "name": "Řemeslník",
+                "terms": "řemeslník,řemeslo,řemeslná výroba,ruční výroba,rukodělný,rukodělná"
+            },
+            "craft/hvac": {
+                "name": "Topenář, vzduchotechnik",
+                "terms": "topenář,topení,klimatizace,vzduchotechnika"
+            },
+            "craft/insulator": {
+                "name": "Firma na izolace",
+                "terms": "zateplovlování,zateplení,izolace"
+            },
+            "craft/jeweler": {
+                "name": "Klenotník",
+                "terms": "klenotnictví,klenotník,zlatnictví,zlatník"
+            },
+            "craft/key_cutter": {
+                "name": "Výroba klíčů",
+                "terms": "klíče,klíčník,výroba klíčů,zámečník,zámečnictví"
+            },
+            "craft/locksmith": {
+                "name": "Zámečník",
+                "terms": "zámečník,zámečnictví"
+            },
+            "craft/metal_construction": {
+                "name": "Kovovýroba",
+                "terms": "kovovýroba,výroba z kovu,práce s kovem"
+            },
+            "craft/optician": {
+                "name": "Optika",
+                "terms": "optik,optika,brýle,zrak"
+            },
+            "craft/painter": {
+                "name": "Malíř",
+                "terms": "malíř,malířství"
+            },
+            "craft/photographer": {
+                "name": "Fotograf",
+                "terms": "fotograf,fotografie,ateliér"
+            },
+            "craft/photographic_labratory": {
+                "name": "Fotolaboratoř",
+                "terms": "fotolaboratoř,fotografická laboratoř,vyvolání,film"
+            },
+            "craft/plasterer": {
+                "name": "Štukatér",
+                "terms": "štukatér,škukatérství,štuky"
+            },
+            "craft/plumber": {
+                "name": "Instalatér",
+                "terms": "instalatér,instalatérství,vodoinstalatér"
+            },
+            "craft/pottery": {
+                "name": "Hrnčíř",
+                "terms": "hrnčíř,hrnčířství,keramika"
+            },
+            "craft/rigger": {
+                "name": "Výroba takeláže",
+                "terms": "výroba takeláže,takeláž,plachtoví,ráhnoví,lanoví,stěžně"
+            },
+            "craft/roofer": {
+                "name": "Pokrývač",
+                "terms": "pokrývač,pokrývačství"
+            },
+            "craft/saddler": {
+                "name": "Sedlář",
+                "terms": "sedlář,sedlářství"
+            },
+            "craft/sailmaker": {
+                "name": "Výroba plachet",
+                "terms": "plachty,plachetář,výroba plachet"
+            },
+            "craft/sawmill": {
+                "name": "Pila",
+                "terms": "pila,pilař,dřevař,dřevařský,pilařský"
+            },
+            "craft/scaffolder": {
+                "name": "Lešenář",
+                "terms": "lešenář,lešenářství,lešení"
+            },
+            "craft/sculpter": {
+                "name": "Sochař",
+                "terms": "sochař,sochařství,socha"
+            },
+            "craft/shoemaker": {
+                "name": "Švec",
+                "terms": "švec,ševcovství,obuvník,obuvnictví"
+            },
+            "craft/stonemason": {
+                "name": "Kameník",
+                "terms": "kameník,kamenictví"
+            },
+            "craft/sweep": {
+                "name": "Kominík",
+                "terms": "kominík,kominictví"
+            },
+            "craft/tailor": {
+                "name": "Krejčí",
+                "terms": "krejčí,krejčovství,švadlena,dámská krejčová,krejčová"
+            },
+            "craft/tiler": {
+                "name": "Obkladač",
+                "terms": "obkladač,obkladačství,pokladač,pokladačství,dlaždič,dlaždičství"
+            },
+            "craft/tinsmith": {
+                "name": "Klempíř",
+                "terms": "klempíř,klempířství,plech"
+            },
+            "craft/upholsterer": {
+                "name": "Čalouník",
+                "terms": "čalouník,čalounictví"
+            },
+            "craft/watchmaker": {
+                "name": "Hodinář",
+                "terms": "hodinářství,hodinky"
+            },
+            "craft/window_construction": {
+                "name": "Výroba oken",
+                "terms": "sklenář,sklenářství,výroba oken,okenářství"
+            },
+            "embankment": {
+                "name": "Násyp",
+                "terms": "násyp,násep,hráz,bariéra"
+            },
             "emergency/ambulance_station": {
                 "name": "Stanice záchranné služby",
                 "terms": "ambulance,pohotovost,zdravotní pohotovost,pohotovostní stanice,záchranná služba,služba"
                 "name": "Vchod",
                 "terms": "vchod,východ,únikový východ,brána,dveře,vrata"
             },
+            "footway/crossing": {
+                "name": "Přechod pro chodce",
+                "terms": "přechod pro chodce,zebra,přechod,přechod pro pěší"
+            },
+            "footway/sidewalk": {
+                "name": "Chodník po straně silnice",
+                "terms": "chodník,obrubník"
+            },
+            "golf/bunker": {
+                "name": "Pískový bunker",
+                "terms": "pískový bunker,písková překážka,písečná překážka,bunker,hazard"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "fairway,nízká tráva"
+            },
+            "golf/green": {
+                "name": "Jamkoviště",
+                "terms": "jamkoviště,green"
+            },
+            "golf/hole": {
+                "name": "Dráha do jamky",
+                "terms": "jamka,dráha od odpaliště,dráha do jamkoviště,dráha"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Vodní překážka po straně",
+                "terms": "vodní překážka,hazard,jezírko"
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": "rough,vysoká tráva"
+            },
+            "golf/tee": {
+                "name": "Odpaliště",
+                "terms": "odpaliště,tee,týčko,tee box"
+            },
+            "golf/water_hazard": {
+                "name": "Vodní překážka",
+                "terms": "vodní překážka,jezírko,hazard"
+            },
             "highway": {
                 "name": "Pozemní komunikace",
                 "terms": "komunikace"
                 "name": "Ulice",
                 "terms": "obytná zóna"
             },
+            "highway/rest_area": {
+                "name": "Odpočívadlo",
+                "terms": "odpočívadlo,místo k zastavení,dálniční odpočívadlo"
+            },
             "highway/road": {
                 "name": "Silnice neznámého typu",
                 "terms": "neznámá komunikace"
                 "name": "Parkovací ulička",
                 "terms": "jízdní pruh na parkovišti"
             },
+            "highway/services": {
+                "name": "Odpočívadlo se službami",
+                "terms": "odpočívadlo,odpočívadlo se službami,čerpací stanice,dálniční odpočívadlo"
+            },
             "highway/steps": {
                 "name": "Schody",
                 "terms": "schody,schodiště"
                 "name": "Zemědělská půda",
                 "terms": "pole,farma,dobytek,zahrady,pěstitelská plocha"
             },
-            "landuse/farmyard": {
-                "name": "Farma",
+            "landuse/farmland": {
+                "name": "Zemědělská půda",
                 "terms": "pole,farma,dobytek,zahrady,pěstitelská plocha"
             },
+            "landuse/farmyard": {
+                "name": "Statek",
+                "terms": "statek,farma,zemědělství,usedlost,JZD,družstvo"
+            },
             "landuse/forest": {
                 "name": "Les",
                 "terms": "les,hospodářský les"
                 "name": "Průsek",
                 "terms": "lesní průsek,holina"
             },
+            "man_made/embankment": {
+                "name": "Násyp",
+                "terms": "násyp,násep,hráz,bariéra"
+            },
+            "man_made/flagpole": {
+                "name": "Vlajka",
+                "terms": "prapor,vlajka,stožár,vlajkový stožár"
+            },
             "man_made/lighthouse": {
                 "name": "Maják",
                 "terms": "maják,světlo"
                 "name": "Vodárna",
                 "terms": "vodárna,úpravna vody"
             },
+            "military/airfield": {
+                "name": "Vojenské letiště",
+                "terms": "vojenské letiště,letiště,letecká základna"
+            },
+            "military/barracks": {
+                "name": "Kasárny",
+                "terms": "kasárny,kasárna,armáda"
+            },
+            "military/bunker": {
+                "name": "Opevnění",
+                "terms": "bunkr,opevnění,fortifikace,šance,řopík"
+            },
+            "military/range": {
+                "name": "Vojenská střelnice",
+                "terms": "střelnice,vojenská střelnice"
+            },
             "natural": {
                 "name": "Přírodní objekt",
                 "terms": "příroda,přírodní,naturální,přirozený"
                 "name": "Kanceláře",
                 "terms": "kancelář,kancelářský,úřad,úřadovna,administrativa,office,sídlo"
             },
+            "office/accountant": {
+                "name": "Finanční poradce",
+                "terms": "finanční poradce,účetní,daňový poradce"
+            },
+            "office/administrative": {
+                "name": "Místní úřad",
+                "terms": "místní úřad,městský úřad,krajský úřad,kancelář,administrativa,samospráva"
+            },
+            "office/architect": {
+                "name": "Architekt",
+                "terms": "architekt,stavební,architektonické studio"
+            },
+            "office/company": {
+                "name": "Kancelář",
+                "terms": "kancelář,firma,společnost,soukromá firma,soukromá společnost,sídlo,s.r.o."
+            },
+            "office/educational_institution": {
+                "name": "Vzdělávací instituce",
+                "terms": "škola,kancelář,vzdělání,výuka,univerzita"
+            },
+            "office/employment_agency": {
+                "name": "Úřad práce",
+                "terms": "úřad práce,pracovní úřad,zaměstnání,nezaměstnaní,nabídka práce"
+            },
+            "office/estate_agent": {
+                "name": "Realitní kancelář",
+                "terms": "realitní kancelář,realitka,nemovitost"
+            },
+            "office/financial": {
+                "name": "Finanční úřad",
+                "terms": "finanční úřad,daňový úřad,berní úřad,celní správa"
+            },
+            "office/government": {
+                "name": "Státní úřad",
+                "terms": "státní úřad,státní instituce,ministerstvo"
+            },
+            "office/insurance": {
+                "name": "Pojišťovna",
+                "terms": "pojišťovna,pojištění,zajišťovna"
+            },
+            "office/it": {
+                "name": "IT specialista",
+                "terms": "IT specialista,počítačový specialista"
+            },
+            "office/lawyer": {
+                "name": "Právní kancelář",
+                "terms": "právní kancelář,právník,právní zástupce,advokátní kancelář,advokát"
+            },
+            "office/newspaper": {
+                "name": "Noviny",
+                "terms": "noviny,deník,časopis,vydavatelství"
+            },
+            "office/ngo": {
+                "name": "Nezisková organizace",
+                "terms": "nezisková organizace,neziskovka,nevládní organizace"
+            },
+            "office/physician": {
+                "name": "Praktický lékař",
+                "terms": "lékař,praktický lékař,medik,ordinace,doktor,praktický doktor"
+            },
+            "office/political_party": {
+                "name": "Politická strana",
+                "terms": "politická strana,strana,politická organizace"
+            },
+            "office/research": {
+                "name": "Výzkumný ústav",
+                "terms": "výzkumný ústav,akademie věd,akademie,ústav,vědecký ústav,vědecká instituce,věda,výzkum,vývoj,vědecké pracoviště,výzkumné pracoviště"
+            },
+            "office/telecommunication": {
+                "name": "Telekomunikační společnost",
+                "terms": "telekomunikační společnost,telekomunikace,spoje,mobilní operátor,mobil,radiotelekomunikace"
+            },
+            "office/therapist": {
+                "name": "Fyzioterapeut",
+                "terms": "fyzioterapeut,terapeut,rekonvalescence,masér"
+            },
+            "office/travel_agent": {
+                "name": "Cestovní kancelář",
+                "terms": "cestovní kancelář,cestovka,cestovní agentura,zájezd,dovolená"
+            },
+            "piste": {
+                "name": "Lyžařská stopa",
+                "terms": "stopa,lyžařská stopa,běžkařská stopa,běžky"
+            },
             "place": {
                 "name": "Místo",
                 "terms": "obec,místo,lokace,město,vesnice"
                 "name": "Transformátor",
                 "terms": "transformátor,transformátorová stanice,elektrická stanice,adaptér"
             },
+            "public_transport/platform": {
+                "name": "Nástupiště",
+                "terms": "nástupiště,nástupní plocha,platforma,nástupní ostrůvek,zastávkový mys,molo"
+            },
+            "public_transport/stop_position": {
+                "name": "Místo zastavení",
+                "terms": "stání,zastávka,stanice,pozice,pozice stání,poloha,poloha stání"
+            },
             "railway": {
                 "name": "Železnice",
                 "terms": "železnice, železniční dráha"
                 "name": "Nepoužívaná železnice",
                 "terms": "nepoužívaná železnice, nepoužívaná železniční dráha"
             },
+            "railway/funicular": {
+                "name": "Lanová dráha",
+                "terms": "lanovka"
+            },
             "railway/halt": {
                 "name": "Železniční zastávka",
                 "terms": "železniční zastávka, železniční stanice, vlaková zastávka, vlaková stanice, nádraží, železniční nástupiště, vlakové nástupiště"
                 "name": "Jednokolejka",
                 "terms": "jednokolejka,monorail,jednokolejná trať"
             },
+            "railway/narrow_gauge": {
+                "name": "Úzkorozchodná dráha",
+                "terms": "úzkorozchodná dráha,úzkokolejná dráha,úzkokolejka"
+            },
             "railway/platform": {
-                "name": "Nástupiště",
+                "name": "Železniční nástupiště",
                 "terms": "železniční nástupiště, nástupiště"
             },
             "railway/rail": {
index be9f8e58e8bc3f764f2e0b241657b49e2fbd5bde..ae61650687eafbf6ca41e0bd87601c4ed4315986 100644 (file)
         "incomplete": "<ikke downloadet>",
         "feature_list": "Søgefunktioner",
         "edit": "Ret objekt",
-        "none": "Ingen"
+        "none": "Ingen",
+        "node": "Punkt",
+        "way": "Vej",
+        "relation": "Relation",
+        "location": "Lokalitet"
     },
     "background": {
         "title": "Baggrund",
         "untagged_area": "Område uden tags",
         "many_deletions": "Du er ved at slette {n} objekter. Er du sikker på du ønsker at gøre dette? Det vil slette dem fra det kort som alle andre ser på openstreetmap.org.",
         "tag_suggests_area": "Tagget {tag} antyder at linjen er et område,  selvom det ikke er et område",
+        "untagged_tooltip": "Vælg en objekttype der beskriver hvad det {geometritype} er.",
         "deprecated_tags": "Forældede tags: {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "Bygning"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Brug af land"
             },
             "admin_level": {
                 "label": "Administrativt niveau"
             },
+            "aerialway": {
+                "label": "Type"
+            },
+            "aerialway/access": {
+                "label": "Adgang"
+            },
+            "aerialway/bubble": {
+                "label": "Skikabine"
+            },
+            "aerialway/capacity": {
+                "label": "Kapacitet (per time)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Varighed (minutter)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Opvarmet"
+            },
+            "aerialway/occupancy": {
+                "label": "Belægning",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Adgang (sommer)"
+            },
             "aeroway": {
                 "label": "Type"
             },
             "building_area": {
                 "label": "Bygning"
             },
+            "cans": {
+                "label": "Accepterer dåser"
+            },
             "capacity": {
                 "label": "Kapacitet",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Mod uret"
                 }
             },
+            "clothes": {
+                "label": "Acceptere tøj"
+            },
             "collection_times": {
                 "label": "Indsamlingstidspunkt"
             },
             "country": {
                 "label": "Land"
             },
+            "covered": {
+                "label": "Overdækket"
+            },
             "crossing": {
                 "label": "Type"
             },
             "description": {
                 "label": "Beskrivelse"
             },
+            "electrified": {
+                "label": "Elektrificering"
+            },
             "elevation": {
                 "label": "Højde over havet"
             },
             "fixme": {
                 "label": "Ret mig"
             },
+            "gauge": {
+                "label": "Sporvidde"
+            },
             "generator/method": {
                 "label": "Metode"
             },
             "generator/type": {
                 "label": "Type"
             },
+            "glass": {
+                "label": "Acceptere glas"
+            },
+            "golf_hole": {
+                "label": "Reference",
+                "placeholder": "Hul nummer (1-18)"
+            },
+            "handicap": {
+                "label": "Handikap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Type"
             },
             "incline": {
                 "label": "Stigning"
             },
+            "information": {
+                "label": "Type"
+            },
             "internet_access": {
                 "label": "Internetadgang",
                 "options": {
             "operator": {
                 "label": "Operatør"
             },
+            "paper": {
+                "label": "Accepterer papir"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Park and ride-anlæg"
             },
                 "label": "Telefon",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Vanskelighedsniveau"
+            },
+            "piste/grooming": {
+                "label": "Sikkerhed"
+            },
+            "piste/type": {
+                "label": "Type"
+            },
             "place": {
                 "label": "Type"
             },
                     "cutting": "Forsænkning"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "supervised": {
                 "label": "Supervision"
             },
             "tree_type": {
                 "label": "Type"
             },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Gods type"
             },
                 "name": "Adresse",
                 "terms": "adresse, adresser"
             },
+            "aerialway": {
+                "name": "Skiliftbane",
+                "terms": "Skiliftbane, Skilift"
+            },
+            "aerialway/cable_car": {
+                "name": "Svævebane",
+                "terms": "Svævebane, Gongolbane"
+            },
+            "aerialway/chair_lift": {
+                "name": "Skilift",
+                "terms": "Skilift, Stolelift"
+            },
+            "aerialway/gondola": {
+                "name": "Gondol",
+                "terms": "Gondol"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Rullebane",
+                "terms": "Rullebane, Skirullebane"
+            },
+            "aerialway/platter": {
+                "name": "Knaplift",
+                "terms": "Knaplift"
+            },
+            "aerialway/pylon": {
+                "name": "Skilifttårn",
+                "terms": "Skilifttårn"
+            },
+            "aerialway/rope_tow": {
+                "name": "Tovlift",
+                "terms": "Tovlift"
+            },
+            "aerialway/station": {
+                "name": "Skiliftstation",
+                "terms": "Skiliftstation"
+            },
+            "aerialway/t-bar": {
+                "name": "Træklift",
+                "terms": "Træklift"
+            },
             "aeroway": {
                 "name": "Lufthavnsvej",
                 "terms": "Lufthavnsveje"
                 "name": "Biograf",
                 "terms": "Biograf, Bio"
             },
+            "amenity/clinic": {
+                "name": "Klinik",
+                "terms": "Klinik"
+            },
+            "amenity/clock": {
+                "name": "Ur",
+                "terms": "Ur"
+            },
             "amenity/college": {
                 "name": "Gymnasie",
                 "terms": "Gymnasie, Handelsgymnasie"
                 "name": "Domstolsbygning",
                 "terms": "Domstolsbygning, Domstol"
             },
+            "amenity/dentist": {
+                "name": "Tandlæge",
+                "terms": "Tandlæge"
+            },
+            "amenity/doctor": {
+                "name": "Læge",
+                "terms": "Læge, Doktor"
+            },
             "amenity/drinking_water": {
                 "name": "Drikkevand",
                 "terms": "<oversæt med synonymer eller beslægtet termer for 'Drikkevand', adskilt med kommaer>"
                 "name": "Rangerstation",
                 "terms": "Rangerstation"
             },
+            "amenity/recycling": {
+                "name": "Genbrug",
+                "terms": "Genbrug"
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "Restaurant, Spisested, Spisehus"
                 "name": "Shelter",
                 "terms": "Shelter, læskur"
             },
+            "amenity/studio": {
+                "name": "Studie",
+                "terms": "Studie"
+            },
             "amenity/swimming_pool": {
                 "name": "Svømmebassin",
                 "terms": "Svømmebassin, Swimming Pool, Pool"
                 "name": "Automat",
                 "terms": "Automat"
             },
+            "amenity/veterinary": {
+                "name": "Dyrelæge",
+                "terms": "Dyrelæge, Veterinærdyrelæge"
+            },
             "amenity/waste_basket": {
                 "name": "Skraldespand",
                 "terms": "<oversæt med synonymer eller beslægtet termer for 'Skraldespand', adskilt med kommaer>"
                 "name": "Beboelsesbygning",
                 "terms": "Beboelsesbygning, Parcelhus"
             },
+            "craft/basket_maker": {
+                "name": "Kurvemager",
+                "terms": "Kurvemager"
+            },
+            "craft/beekeeper": {
+                "name": "Biavler",
+                "terms": "Biavler"
+            },
+            "craft/blacksmith": {
+                "name": "Smed",
+                "terms": "Smed, Grovsmed"
+            },
+            "craft/boatbuilder": {
+                "name": "Bådbygger",
+                "terms": "Bådbygger, Skibsbygger"
+            },
+            "craft/bookbinder": {
+                "name": "Bogbinder",
+                "terms": "Bogbinder"
+            },
+            "craft/brewery": {
+                "name": "Bryggeri",
+                "terms": "Bryggeri,  Minibryggeri"
+            },
+            "craft/carpenter": {
+                "name": "Tæppelægger",
+                "terms": "Tæppelægger"
+            },
+            "craft/carpet_layer": {
+                "name": "Tæppelægger",
+                "terms": "Tæppelægger"
+            },
+            "craft/caterer": {
+                "name": "Catering",
+                "terms": "Catering"
+            },
+            "craft/clockmaker": {
+                "name": "Urmager",
+                "terms": "Urmager"
+            },
+            "craft/confectionary": {
+                "name": "Slikbutik",
+                "terms": "Slikbutik, Konfekturebutik"
+            },
+            "craft/dressmaker": {
+                "name": "Skrædder",
+                "terms": "Skrædder"
+            },
+            "craft/electrician": {
+                "name": "Elektriker",
+                "terms": "Elektriker, Elektrikerfirma"
+            },
+            "craft/gardener": {
+                "name": "Gartner",
+                "terms": "Gartner"
+            },
+            "craft/glaziery": {
+                "name": "Vinduemager",
+                "terms": "Vinduemager"
+            },
+            "craft/handicraft": {
+                "name": "Håndværker",
+                "terms": "Håndværker"
+            },
+            "craft/hvac": {
+                "name": "Ventilationsfirma",
+                "terms": "Ventilationsfirma"
+            },
+            "craft/insulator": {
+                "name": "Isolationsfirma",
+                "terms": "Isolationsfirma, isolatør"
+            },
+            "craft/jeweler": {
+                "name": "Juvelér",
+                "terms": "Juvelér, Guldsmed"
+            },
+            "craft/key_cutter": {
+                "name": "Hælebar",
+                "terms": "Hælebar"
+            },
+            "craft/locksmith": {
+                "name": "Låsesmed",
+                "terms": "Låsesmed"
+            },
+            "craft/metal_construction": {
+                "name": "Metalskærer",
+                "terms": "Metalskærer"
+            },
+            "craft/optician": {
+                "name": "Optiker",
+                "terms": "Optiker, Brillebutik"
+            },
+            "craft/painter": {
+                "name": "maler",
+                "terms": "Maler"
+            },
+            "craft/photographer": {
+                "name": "Fotograf",
+                "terms": "Fotograf"
+            },
+            "craft/photographic_labratory": {
+                "name": "Fotolaboratorie",
+                "terms": "Fotolaboratorie"
+            },
+            "craft/plasterer": {
+                "name": "Oppudser",
+                "terms": "Oppudser"
+            },
+            "craft/plumber": {
+                "name": "Blikkenslager",
+                "terms": "Blikkenslager"
+            },
+            "craft/pottery": {
+                "name": "Pottemager",
+                "terms": "Pottemager"
+            },
+            "craft/rigger": {
+                "name": "Rebslager",
+                "terms": "Rebslager"
+            },
+            "craft/roofer": {
+                "name": "Tagdækker",
+                "terms": "Tagdækker, Tagdækningsfirma"
+            },
+            "craft/saddler": {
+                "name": "Sadelmager",
+                "terms": "Sadelmager"
+            },
+            "craft/sailmaker": {
+                "name": "sejlmager",
+                "terms": "Sejlmager"
+            },
+            "craft/sawmill": {
+                "name": "Savmølle",
+                "terms": "Savmølle, Savværk"
+            },
+            "craft/scaffolder": {
+                "name": "Stilladsfirma",
+                "terms": "Stilladsfirma"
+            },
+            "craft/sculpter": {
+                "name": "Skulpturmager",
+                "terms": "Skulpturmager"
+            },
+            "craft/shoemaker": {
+                "name": "Skomager",
+                "terms": "Skomager"
+            },
+            "craft/stonemason": {
+                "name": "Stenhugger",
+                "terms": "Stenhugger"
+            },
+            "craft/sweep": {
+                "name": "Skorstensfejer",
+                "terms": "Skorstensfejer"
+            },
+            "craft/tailor": {
+                "name": "Skrædder",
+                "terms": "Skrædder"
+            },
+            "craft/tiler": {
+                "name": "Brolægger",
+                "terms": "Brolægger"
+            },
+            "craft/tinsmith": {
+                "name": "Sølvsmed",
+                "terms": "Sølvsmed"
+            },
+            "craft/upholsterer": {
+                "name": "Møbelpolstrer",
+                "terms": "Møbelpolstrer"
+            },
+            "craft/watchmaker": {
+                "name": "Urmager",
+                "terms": "Urmager"
+            },
+            "craft/window_construction": {
+                "name": "Vinduebygger",
+                "terms": "Vinduebygger"
+            },
             "embankment": {
                 "name": "Forhøjning til tog, vej",
                 "terms": "Forhøjning"
                 "name": "Fortov",
                 "terms": "Fortov"
             },
+            "golf/bunker": {
+                "name": "Sandbunker",
+                "terms": "Sandbunker"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "Fairway"
+            },
+            "golf/green": {
+                "name": "Putting Green",
+                "terms": "Putting Green"
+            },
+            "golf/hole": {
+                "name": "Golfhul",
+                "terms": "Golfhul"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Vandgrav",
+                "terms": "Vandgrav"
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": "Rough, Højt gras"
+            },
+            "golf/tee": {
+                "name": "Tee Box",
+                "terms": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "name": "Vandgrav",
+                "terms": "Vandgrav"
+            },
             "highway": {
                 "name": "Vej",
                 "terms": "Veje, Gader"
                 "name": "Villavej",
                 "terms": "Villavej"
             },
+            "highway/rest_area": {
+                "name": "Rasteplads",
+                "terms": "Rasteplads"
+            },
             "highway/road": {
                 "name": "Ukendt vejtype",
                 "terms": "Ukendt vejtype"
                 "name": "Vej mellem parkeringspladser",
                 "terms": "Parkeringsvej"
             },
+            "highway/services": {
+                "name": "Serviceområde",
+                "terms": "Serviceområde"
+            },
             "highway/steps": {
                 "name": "Trappe",
                 "terms": "Trapper"
                 "name": "Rejsebureau",
                 "terms": "Rejseselskab, Rejsebureau"
             },
+            "piste": {
+                "name": "Skiløjper/Skispor",
+                "terms": "Skiløjper/Skispor"
+            },
             "place": {
                 "name": "Lokalitet",
                 "terms": "Lokalitet, Sted"
                 "name": "Ej brugt jernbanespor",
                 "terms": "Ej brugt jernbanespor"
             },
+            "railway/funicular": {
+                "name": "Kabelsporvej",
+                "terms": "Kabelsporvej"
+            },
             "railway/halt": {
                 "name": "Togstation lille ubemandet",
                 "terms": "Togstation lille ubemandet"
                 "name": "Monorail",
                 "terms": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Smalspor",
+                "terms": "Smalspor, Smalsporbane, Smalsportogbane"
+            },
             "railway/platform": {
                 "name": "Jernbaneperron",
                 "terms": "Jernbaneperron, Perron "
index 52c8476436981efba31cb3e93c5220829480e185..4644c9d4b3670e29550f02e28888353c1cb25263 100644 (file)
         },
         "move": {
             "title": "Verschieben",
-            "description": "Verschiebe dieses Objekt an einen anderen Ort.",
+            "description": "Verschiebe dieses Objekt an einen anderen Standort.",
             "key": "M",
             "annotation": {
                 "point": "Punkt verschoben.",
         "no_results_worldwide": "Keine Ergebnisse gefunden"
     },
     "geolocate": {
-        "title": "Zeige meine Position"
+        "title": "Zeige meinen Standort"
     },
     "inspector": {
         "no_documentation_combination": "Für dieses Attribut-Kombination ist keine Dokumentation verfügbar.",
         "incomplete": "<nicht heruntergeladen>",
         "feature_list": "Objekte suchen",
         "edit": "Eigenschaft bearbeiten",
-        "none": "Nichts"
+        "none": "Nichts",
+        "node": "Punkt",
+        "way": "Weg",
+        "relation": "Relation",
+        "location": "Standort"
     },
     "background": {
         "title": "Hintergrund",
         "untagged_area": "Fläche ohne Attribute",
         "many_deletions": "Du löscht gerade {n} Elemente. Willst Du das wirklich? Damit werden diese Elemente von der Karte gelöscht die alle auf openstreetmap.org sehen können.",
         "tag_suggests_area": "Das Attribut {tag} legt nahe, dass die Linie eine Fläche sein sollte, es ist aber keine Fläche",
+        "untagged_tooltip": "Wähle einen Eigenschaftentyp der das {geometry} beschreibt.",
         "deprecated_tags": "Veraltete Attribute: {tags}"
     },
     "zoom": {
         },
         "points": {
             "title": "Punkte",
-            "add": "Punkte können verwendet werden, um Objekte wie Läden, Restaurants oder Denkmäler darzustellen. Sie markieren eine bestimmte Stelle und beschreiben, was sich dort befindet. **Klicke den Punkt-Knopf an, um einen neuen Punkt hinzuzufügen**",
+            "add": "Punkte können verwendet werden, um Objekte wie Läden, Restaurants oder Denkmäler darzustellen. Sie markieren einen bestimmten Standort und beschreiben, was sich dort befindet. **Klicke den Punkt-Knopf an, um einen neuen Punkt hinzuzufügen**",
             "place": "Punkte können durch Klicken auf die Karte platziert werden. **Platziere einen Punkt auf dem Gebäude**",
             "search": "Es gibt viele verschiedene Objekte, die ein Punkt repräsentieren kann. Der Punkt, den du gerade hinzugefügt hast, ist ein Café. **Suche nach '{name}'**",
             "choose": "**Wähle \"Café\" aus der Liste aus.**",
             "category-building": {
                 "name": "Gebäude"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Landnutzung"
             },
             "admin_level": {
                 "label": "Verwaltungsebene"
             },
+            "aerialway": {
+                "label": "Typ"
+            },
+            "aerialway/access": {
+                "label": "Zugang"
+            },
+            "aerialway/bubble": {
+                "label": "Blase"
+            },
+            "aerialway/capacity": {
+                "label": "Kapazität (pro Stunde)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Dauer (Minuten)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "beheizt"
+            },
+            "aerialway/occupancy": {
+                "label": "Belegung",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Zugang (Sommer)"
+            },
             "aeroway": {
                 "label": "Typ"
             },
             "building_area": {
                 "label": "Gebäude"
             },
+            "cans": {
+                "label": "Dosen"
+            },
             "capacity": {
                 "label": "Kapazität",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "gegen den Uhrzeigersinn"
                 }
             },
+            "clothes": {
+                "label": "Kleidung"
+            },
             "collection_times": {
                 "label": "Leerungszeiten"
             },
             "country": {
                 "label": "Land"
             },
+            "covered": {
+                "label": "Überdacht / Verdeckt"
+            },
             "crossing": {
                 "label": "Typ"
             },
             "description": {
                 "label": "Beschreibung"
             },
+            "electrified": {
+                "label": "Elektrifizierung"
+            },
             "elevation": {
                 "label": "Höhe ü. d. Meeresspiegel"
             },
             "fixme": {
                 "label": "Korrigiere mich"
             },
+            "gauge": {
+                "label": "Spurbreite"
+            },
             "generator/method": {
                 "label": "Methode"
             },
             "generator/type": {
                 "label": "Typ"
             },
+            "glass": {
+                "label": "Glas"
+            },
+            "golf_hole": {
+                "label": "Loch-Nummer",
+                "placeholder": "1-18"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Art"
             },
             "incline": {
                 "label": "Steigung"
             },
+            "information": {
+                "label": "Typ"
+            },
             "internet_access": {
                 "label": "Internetzugang",
                 "options": {
             "operator": {
                 "label": "Betreiber"
             },
+            "paper": {
+                "label": "Papier"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5…"
+            },
             "park_ride": {
                 "label": "Park and Ride"
             },
                 "label": "Telefon",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Schwierigkeit"
+            },
+            "piste/grooming": {
+                "label": "Grooming"
+            },
+            "piste/type": {
+                "label": "Typ"
+            },
             "place": {
                 "label": "Art"
             },
                     "cutting": "Senke"
                 }
             },
+            "studio_type": {
+                "label": "Typ"
+            },
             "supervised": {
                 "label": "überwacht"
             },
             "tree_type": {
                 "label": "Typ"
             },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Dienstleistung"
             },
                 "name": "Adresse",
                 "terms": "Adresse"
             },
+            "aerialway": {
+                "name": "Seilbahn",
+                "terms": "Seilbahn, Gondelbahn, Sessellift, Schlepplift, Materialseilbahn"
+            },
+            "aerialway/cable_car": {
+                "name": "Seilbahn",
+                "terms": "Seilbahn, Gondelbahn, Straßenbahn, Kabelbahn, Drahtseilbahn"
+            },
+            "aerialway/chair_lift": {
+                "name": "Sessellift",
+                "terms": "Sessellift, Sesselbahn"
+            },
+            "aerialway/gondola": {
+                "name": "Gondel",
+                "terms": "Gondel, Seilbahngondel"
+            },
+            "aerialway/magic_carpet": {
+                "name": "KInderskilift",
+                "terms": "Kinderschilift, Zauberteppichlift, Babylift"
+            },
+            "aerialway/platter": {
+                "name": "Tellerlift",
+                "terms": "Tellerlift, Teller-Skilift"
+            },
+            "aerialway/pylon": {
+                "name": "Seilbahnmast",
+                "terms": "Seilbahnmast, Liftmast, Liftstütze"
+            },
+            "aerialway/rope_tow": {
+                "name": "Schlepplift",
+                "terms": "Schlepplift, Seilschlepplift, Übungslift"
+            },
+            "aerialway/station": {
+                "name": "Seilbahnstation",
+                "terms": "Seilbahnstation, Liftstation"
+            },
+            "aerialway/t-bar": {
+                "name": "Bügelschlepplift",
+                "terms": "Schlepplift, Seilschlepplift, Bügellift, Bügelschlepplift"
+            },
             "aeroway": {
                 "name": "Luftfahrt",
                 "terms": "Flugplatz, Flughafen"
                 "name": "Kino",
                 "terms": "Großbildleinwand,Kino,Autokino,Filmtheater,Filmpalast"
             },
+            "amenity/clinic": {
+                "name": "Klinik",
+                "terms": "Klinik, Krankenhaus"
+            },
+            "amenity/clock": {
+                "name": "Uhr",
+                "terms": "Uhr, Turmuhr, Kirchenuhr"
+            },
             "amenity/college": {
                 "name": "Hochschule",
                 "terms": "Hochschule, Kolleg"
                 "name": "Gericht",
                 "terms": "Gericht, Amtsgericht"
             },
+            "amenity/dentist": {
+                "name": "Zahnarzt",
+                "terms": "Zahnarzt, Dentist"
+            },
+            "amenity/doctor": {
+                "name": "Arzt",
+                "terms": "Arzt, Mediziner"
+            },
             "amenity/drinking_water": {
                 "name": "Trinkwasserstelle",
-                "terms": "Brunnen,Trinkwasser,Trinkwasserbrunnen,Wasserhahn"
+                "terms": "Brunnen,Trinkwasser,Trinkwasserbrunnen,Wasserhahn,Trinkbrunnen"
             },
             "amenity/embassy": {
                 "name": "Botschaft",
             },
             "amenity/hospital": {
                 "name": "Krankenhaus",
-                "terms": "Klinik,Notaufnahme,Gesundheitswesen,Hospiz,Krankenhaus,Pflegeheim,Altersheim,Nervenheilanstalt,Sanatorium,Lazarett,Chirurgie,Krankenstation"
+                "terms": "Klinik,Notaufnahme,Gesundheitswesen,Hospiz,Krankenhaus,Pflegeheim,Altersheim,Nervenheilanstalt,Sanatorium,Lazarett,Chirurgie,Krankenstation,Spital"
             },
             "amenity/kindergarten": {
                 "name": "Kindergarten",
                 "name": "Ranger-Station",
                 "terms": "Ranger-Station"
             },
+            "amenity/recycling": {
+                "name": "Recycling",
+                "terms": "Recyclingcontainer, Abfallwiederverwertung, Container, Abfall, Müll"
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "Bar,Cafeteria,Café,Kantine,Speisehaus,Coffee-Shop,Kaffeehaus,Imbiss,Speisesaal,Kneipe,Donut Shop,Drive-In,Restaurant,Speiserestaurant,Wirtschaft,Fast-Food-Restaurant,Grill,Hamburgerstand,Hotdogstand,Gasthaus,Gasthof,Wirtshaus,Imbissstube,Imbiss,Pizzeria,Lokal"
                 "name": "Unterstand",
                 "terms": "Unterstand, Schutzdach, Schutzraum, Schuppen"
             },
+            "amenity/studio": {
+                "name": "Atelier",
+                "terms": "Atelier, Werkstatt, Studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Schwimmbecken",
                 "terms": "Pool,Schwimmbecken"
                 "name": "Automat",
                 "terms": "Warenautomat,Münzautomat,Verkaufsautomat, Selbstbedienungsautomat,Getränkeautomat,Süßigkeitenautomat,Fahrkartenautomat,Parkscheinautomat,"
             },
+            "amenity/veterinary": {
+                "name": "Tierarzt",
+                "terms": "Tierarzt, Tierärztin, Verterinär"
+            },
             "amenity/waste_basket": {
                 "name": "Abfalleimer",
                 "terms": "Abfalleimer,Abfallkübel,Abfallbehälter,Mistkübel,Mülleimer"
                 "name": "Wohngebäude",
                 "terms": "Wohnhaus,Einfamilienhaus,Mehrfamilienhaus"
             },
+            "craft/basket_maker": {
+                "name": "Korbflechter",
+                "terms": "Korbflecher, Korbmacher, Korbhersteller"
+            },
+            "craft/beekeeper": {
+                "name": "Imker",
+                "terms": "Imker, Bienenzüchter"
+            },
+            "craft/blacksmith": {
+                "name": "Schmied",
+                "terms": "Schmied, Hufschmied, Schmiedewerkstatt"
+            },
+            "craft/boatbuilder": {
+                "name": "Schiffsbauer",
+                "terms": "Schiffsbauer"
+            },
+            "craft/bookbinder": {
+                "name": "Buchbinder",
+                "terms": "Buchbinder"
+            },
+            "craft/brewery": {
+                "name": "Brauerei",
+                "terms": "Brauerei, Bierbrauerei, Bierhersteller"
+            },
+            "craft/carpenter": {
+                "name": "Tischler",
+                "terms": "Tischler, Schreiner, Zimmerer"
+            },
+            "craft/carpet_layer": {
+                "name": "Teppichleger",
+                "terms": "Teppichleger, Teppichbodenleger"
+            },
+            "craft/caterer": {
+                "name": "Partyservice",
+                "terms": "Partyservice, Speiselieferant, Lebensmittellieferant, Brötchenservice, Gastronom"
+            },
+            "craft/clockmaker": {
+                "name": "Uhrmacher",
+                "terms": "Uhrmacher"
+            },
+            "craft/confectionary": {
+                "name": "Süßwarengeschäft",
+                "terms": "Süßwarengeschäfts, Konditorei, Konfektladen"
+            },
+            "craft/dressmaker": {
+                "name": "Schneiderei",
+                "terms": "Schneiderei, Damenschneiderei"
+            },
+            "craft/electrician": {
+                "name": "Elektriker",
+                "terms": "Elektriker"
+            },
+            "craft/gardener": {
+                "name": "Gärtner",
+                "terms": "Gärtner, Landschaftsgärtner"
+            },
+            "craft/glaziery": {
+                "name": "Glaserei",
+                "terms": "Glaserei, Fensterglaserei, Autoglaserei"
+            },
+            "craft/handicraft": {
+                "name": "Kunsthandwerk",
+                "terms": "Kunsthandwerk, Handwerkskunst, Handwerk, Handarbeit, Bastelarbeit"
+            },
+            "craft/hvac": {
+                "name": "Heizung-Lüftung-Klimatechnik",
+                "terms": "Heizung, Lüftung, Klimatechnik"
+            },
+            "craft/insulator": {
+                "name": "Dämmstoff",
+                "terms": "Dämmstoff, Isolierung, Isolierstoff"
+            },
+            "craft/jeweler": {
+                "name": "Juwelier",
+                "terms": "Juwelier, Schmuckladen, Schmuckgeschäft, Edelsteinverkäufer"
+            },
+            "craft/key_cutter": {
+                "name": "Schlüsselschneider",
+                "terms": "Schlüsselschneider, Schlüsselgeschäft"
+            },
+            "craft/locksmith": {
+                "name": "Schlüsseldienst",
+                "terms": "Schlüsseldienst, Schlossermeister, Schlosser"
+            },
+            "craft/metal_construction": {
+                "name": "Metallbau",
+                "terms": "Metallbau, Anlagenbau"
+            },
+            "craft/optician": {
+                "name": "Optiker",
+                "terms": "Optiker, Brillengeschäft, Kontaktlinsengeschäft"
+            },
+            "craft/painter": {
+                "name": "Maler",
+                "terms": "Maler, Anstreicher, Lackierer"
+            },
+            "craft/photographer": {
+                "name": "Fotograf",
+                "terms": "Fotograf, Fotostudio, Fotoatelier"
+            },
+            "craft/photographic_labratory": {
+                "name": "Fotolabor",
+                "terms": "Fotolabor"
+            },
+            "craft/plasterer": {
+                "name": "Stuckateur",
+                "terms": "Stuckateur, Kaschierer, Gipser, Verputzer"
+            },
+            "craft/plumber": {
+                "name": "Installateur",
+                "terms": "Installateur"
+            },
+            "craft/pottery": {
+                "name": "Töpferei",
+                "terms": "Töpferei"
+            },
+            "craft/rigger": {
+                "name": "Bühnenarbeiter",
+                "terms": "Bühnenarbeiter, Höhenarbeiter"
+            },
+            "craft/roofer": {
+                "name": "Dachdecker",
+                "terms": "Dachdecker"
+            },
+            "craft/saddler": {
+                "name": "Sattler",
+                "terms": "Sattler"
+            },
+            "craft/sailmaker": {
+                "name": "Segelmacher",
+                "terms": "Segelmacher"
+            },
+            "craft/sawmill": {
+                "name": "Sägewerk",
+                "terms": "Sägewerk, Sägerei, Sägemühle"
+            },
+            "craft/scaffolder": {
+                "name": "Gerüstbauer",
+                "terms": "Gerüstbauer"
+            },
+            "craft/sculpter": {
+                "name": "Bildhauer",
+                "terms": "Bildhauer"
+            },
+            "craft/shoemaker": {
+                "name": "Schuster",
+                "terms": "Schuster, Schuhmacher"
+            },
+            "craft/stonemason": {
+                "name": "Steinmetz",
+                "terms": "Steinmetz"
+            },
+            "craft/sweep": {
+                "name": "Kaminkehrer",
+                "terms": "Kaminkehrer, Schornsteinfeger"
+            },
+            "craft/tailor": {
+                "name": "Herrenschneider",
+                "terms": "Herrenschneider, Schneider"
+            },
+            "craft/tiler": {
+                "name": "Fliesenleger",
+                "terms": "Fliesenleger, Dachdecker"
+            },
+            "craft/tinsmith": {
+                "name": "Klempner",
+                "terms": "Klempner, Spengler, Blechschmied"
+            },
+            "craft/upholsterer": {
+                "name": "Polsterer",
+                "terms": "Polsterer, Möbeltapezierer"
+            },
+            "craft/watchmaker": {
+                "name": "Uhrmacher",
+                "terms": "Uhrmacher"
+            },
+            "craft/window_construction": {
+                "name": "Fensterbauer",
+                "terms": "Fensterbauer, Fensterhersteller, Fenstererzeuger"
+            },
             "embankment": {
                 "name": "Fahrdamm",
                 "terms": "Damm"
                 "name": "Bürgersteig",
                 "terms": "Gehsteig, Fußgängerweg, Gehweg, Fußweg, Gangsteig, Trottoir"
             },
+            "golf/bunker": {
+                "name": "Bunker (Golf)",
+                "terms": "Bunker, Sandbunker, Sand-Hindernis, Golfbunker"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "Golf-Fairway"
+            },
+            "golf/green": {
+                "name": "Grün",
+                "terms": "Grün, Green, Putting-Grün, Putting-Green"
+            },
+            "golf/hole": {
+                "name": "Loch",
+                "terms": "Loch"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Seitliches Wasserhindernis",
+                "terms": "Seitliches Wasserhindernis, Wasserhindernis"
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": "Rough"
+            },
+            "golf/tee": {
+                "name": "Abschlag",
+                "terms": "Abschlag"
+            },
+            "golf/water_hazard": {
+                "name": "Wasserhindernis",
+                "terms": "Wasserhindernis"
+            },
             "highway": {
                 "name": "Straße/Weg",
                 "terms": "Autobahn"
                 "name": "Wohngebietsstraße",
                 "terms": "Siedlungsstraße"
             },
+            "highway/rest_area": {
+                "name": "Rastplatz",
+                "terms": "Rastplatz, Autobahnrastplatz, Pausenplatz, Autobahnpauseplatz, Raststelle, Autobahnraststelle, Rastanlage, Autobahnrastanlage"
+            },
             "highway/road": {
                 "name": "Unbekannter Straßentyp",
                 "terms": "Unbekannte Straße"
                 "name": "Parkplatzweg",
                 "terms": "Fahrweg auf Parkplatz"
             },
+            "highway/services": {
+                "name": "Raststätte",
+                "terms": "Raststätte, Autobahnraststätte, Rasthof, Autobahnrasthof, Raststation, Autobahnraststation"
+            },
             "highway/steps": {
                 "name": "Treppen",
                 "terms": "Treppe,Stufen"
             },
             "leisure/golf_course": {
                 "name": "Golfplatz",
-                "terms": "Golfplatz"
+                "terms": "Golfplatz, Golfkurs, Golfclub"
             },
             "leisure/marina": {
                 "name": "Yachthafen",
                 "name": "Reisebüro",
                 "terms": "Reiseagentur"
             },
+            "piste": {
+                "name": "Piste/Skipiste",
+                "terms": "Piste, Skipiste, Skiwanderweg"
+            },
             "place": {
                 "name": "Ort",
                 "terms": "Platz, Ort, Stelle, Gegend"
                 "name": "Ungenutzte Eisenbahnstrecke",
                 "terms": "Ungenutzte Eisenbahn, Eingestellte Eisenbahnstrecke"
             },
+            "railway/funicular": {
+                "name": "Standseilbahn",
+                "terms": "Standseilbahn, Seilbahn, Drahtseilbahn, Kettenbahn"
+            },
             "railway/halt": {
                 "name": "Bahn-Haltestelle",
                 "terms": "Bahn-Haltestelle, Zug-Haltestelle, Haltestelle"
                 "name": "Einschienenbahn",
                 "terms": "Einschienenbahn"
             },
+            "railway/narrow_gauge": {
+                "name": "Schmalspureisenbahn",
+                "terms": "Schmalspureisenbahn, Schmalspurbahn, schmalspurige Eisenbahn"
+            },
             "railway/platform": {
                 "name": "Bahnsteig",
                 "terms": "Bahnsteig"
             },
             "tourism/alpine_hut": {
                 "name": "Berghütte",
-                "terms": "Berghütte, Almhütte"
+                "terms": "Berghütte,Almhütte,Alm,Schutzhütte,Schutzhaus,Hospiz,Winterraum"
             },
             "tourism/artwork": {
                 "name": "Kunst",
index bed61ddd497fe56a6b0d4ef5bcec72d56e641823..ea9c6545db8a1fb3b5a7c0d1572a580b55e74eea 100644 (file)
@@ -52,7 +52,7 @@
             "annotation": "Αλλάχτηκε ο ρόλος ενός μέλους σχέσης."
         },
         "change_tags": {
-            "annotation": "Î\91λάÏ\87Ï\84ικαν ÎµÏ\84ικέÏ\84εÏ\82."
+            "annotation": "Î\91λλάÏ\87Ï\84ηκαν Ï\87αÏ\81ακÏ\84ηÏ\81ιÏ\83Ï\84ικά."
         },
         "circularize": {
             "title": "Σχηματισμός κύκλου",
         "title": "Εμφάνισε την Τοποθεσία μου"
     },
     "inspector": {
-        "no_documentation_combination": "Δεν υπάρχει διαθέσιμη τεκμηρίωση για αυτό το συνδυασμό ετικετών",
+        "no_documentation_combination": "Δεν υπάρχει διαθέσιμη τεκμηρίωση για αυτόν τον συνδυασμό χαρακτηριστικών",
         "no_documentation_key": "Δεν υπάρχει διαθέσιμη τεκμηρίωση για αυτό το κλειδί",
         "show_more": "Εμφάνιση Περισσότερων",
         "view_on_osm": "Προβολή στο openstreetmap.org",
-        "all_tags": "Î\8cλεÏ\82 Î¿Î¹ ÎµÏ\84ικέÏ\84εÏ\82",
+        "all_tags": "Î\8cλα Ï\84α Ï\87αÏ\81ακÏ\84ηÏ\81ιÏ\83Ï\84ικά",
         "all_members": "Όλα τα μέλη",
         "all_relations": "Όλες οι σχέσεις",
         "new_relation": "Νέα σχέση",
         "used_with": "χρησιμοποιείται με {type}"
     },
     "validations": {
-        "untagged_point": "Σημείο χωρίς ετικέτα",
-        "untagged_line": "Γραμμή χωρίς ετικέτα",
-        "untagged_area": "Περιοχή χωρίς ετικέτα",
+        "untagged_point": "Σημείο χωρίς χαρακτηριστικά",
+        "untagged_line": "Γραμμή χωρίς χαρακτηριστικά",
+        "untagged_area": "Περιοχή χωρίς χαρακτηριστικά",
         "many_deletions": "Διαγράφετε {n} αντικείμενα. Είστε σίγουρος ότι θέλετε να το κάνετε αυτό; Αυτό θα τα διαγράψει από το χάρτη πού όλοι οι άλλοι βλέπουν στο openstreetmap.org.",
-        "tag_suggests_area": "Î\97 ÎµÏ\84ικέÏ\84α {tag} προτείνει η γραμμή πρέπει να είναι περιοχή, αλλά δεν είναι περιοχή",
-        "deprecated_tags": "ΠαÏ\81Ï\89Ï\87ημένεÏ\82 ÎµÏ\84ικέÏ\84εÏ\82: {tags}"
+        "tag_suggests_area": "Το Ï\87αÏ\81ακÏ\84ηÏ\81ιÏ\83Ï\84ικÏ\8c {tag} προτείνει η γραμμή πρέπει να είναι περιοχή, αλλά δεν είναι περιοχή",
+        "deprecated_tags": "ΠαÏ\81Ï\89Ï\87ημένα Ï\87αÏ\81ακÏ\84ηÏ\81ιÏ\83Ï\84ικά: {tags}"
     },
     "zoom": {
         "in": "Μεγέθυνση",
                 "label": "Είδος"
             },
             "wheelchair": {
-                "label": "ΠÏ\81Ï\8cÏ\83βαÏ\83η Î£ε Αναπηρικό Καροτσάκι"
+                "label": "ΠÏ\81Ï\8cÏ\83βαÏ\83η Î\9cε Αναπηρικό Καροτσάκι"
             },
             "wikipedia": {
                 "label": "Wikipedia"
index 554f01c8ee9813bfc8e5eeef8b9e6c426eb6a17c..5cb257b77ea35c957d2991e56399f140d47f0904 100644 (file)
             "yes": "Yes",
             "no": "No"
         },
-        "none": "None"
+        "none": "None",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Location"
     },
     "background": {
         "title": "Background",
         "untagged_area": "Untagged area",
         "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
         "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
-        "deprecated_tags": "Deprecated tags: {tags}",
-        "untagged_tooltip": "Select a feature type that describes what this {geometry} is."
+        "untagged_tooltip": "Select a feature type that describes what this {geometry} is.",
+        "deprecated_tags": "Deprecated tags: {tags}"
     },
     "zoom": {
         "in": "Zoom In",
             "admin_level": {
                 "label": "Admin Level"
             },
+            "aerialway": {
+                "label": "Type"
+            },
+            "aerialway/access": {
+                "label": "Access"
+            },
+            "aerialway/bubble": {
+                "label": "Bubble"
+            },
+            "aerialway/capacity": {
+                "label": "Capacity (per hour)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Duration (minutes)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Heated"
+            },
+            "aerialway/occupancy": {
+                "label": "Occupancy",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Access (summer)"
+            },
             "aeroway": {
                 "label": "Type"
             },
             "description": {
                 "label": "Description"
             },
+            "electrified": {
+                "label": "Electrification"
+            },
             "elevation": {
                 "label": "Elevation"
             },
             "fixme": {
                 "label": "Fix Me"
             },
+            "gauge": {
+                "label": "Gauge"
+            },
             "generator/method": {
                 "label": "Method"
             },
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Difficulty"
+            },
+            "piste/grooming": {
+                "label": "Grooming"
+            },
+            "piste/type": {
+                "label": "Type"
+            },
             "place": {
                 "label": "Type"
             },
                     "cutting": "Cutting"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "supervised": {
                 "label": "Supervised"
             },
             "tree_type": {
                 "label": "Type"
             },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Type of Goods"
             },
                 "name": "Address",
                 "terms": ""
             },
+            "aerialway": {
+                "name": "Aerialway",
+                "terms": "ski lift,funifor,funitel"
+            },
+            "aerialway/cable_car": {
+                "name": "Cable Car",
+                "terms": "tramway,ropeway"
+            },
+            "aerialway/chair_lift": {
+                "name": "Chair Lift",
+                "terms": ""
+            },
+            "aerialway/gondola": {
+                "name": "Gondola",
+                "terms": ""
+            },
+            "aerialway/magic_carpet": {
+                "name": "Magic Carpet Lift",
+                "terms": ""
+            },
+            "aerialway/platter": {
+                "name": "Platter Lift",
+                "terms": "button lift,poma lift"
+            },
+            "aerialway/pylon": {
+                "name": "Aerialway Pylon",
+                "terms": ""
+            },
+            "aerialway/rope_tow": {
+                "name": "Rope Tow Lift",
+                "terms": "handle tow,bugel lift"
+            },
+            "aerialway/station": {
+                "name": "Aerialway Station",
+                "terms": ""
+            },
+            "aerialway/t-bar": {
+                "name": "T-bar Lift",
+                "terms": ""
+            },
             "aeroway": {
                 "name": "Aeroway",
                 "terms": ""
                 "name": "Cinema",
                 "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
             },
+            "amenity/clinic": {
+                "name": "Clinic",
+                "terms": "clinic,medical clinic"
+            },
+            "amenity/clock": {
+                "name": "Clock",
+                "terms": ""
+            },
             "amenity/college": {
                 "name": "College",
                 "terms": ""
                 "name": "Courthouse",
                 "terms": ""
             },
+            "amenity/dentist": {
+                "name": "Dentist",
+                "terms": "dentist,dentist's office"
+            },
+            "amenity/doctor": {
+                "name": "Doctor",
+                "terms": "doctor,doctor's office"
+            },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
                 "terms": "water fountain,potable water"
                 "name": "Shelter",
                 "terms": "lean-to"
             },
+            "amenity/studio": {
+                "name": "Studio",
+                "terms": "recording studio,studio,radio,radio studio,television,television studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Swimming Pool",
                 "terms": ""
                 "name": "Vending Machine",
                 "terms": ""
             },
+            "amenity/veterinary": {
+                "name": "Veterinary",
+                "terms": "pet clinic,veterinarian,animal hospital,pet doctor"
+            },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
                 "terms": "rubbish bin,litter bin,trash can,garbage can"
                 "name": "Residential Building",
                 "terms": ""
             },
+            "craft/basket_maker": {
+                "name": "Basket Maker",
+                "terms": "basket,basketry,basket maker,basket weaver"
+            },
+            "craft/beekeeper": {
+                "name": "Beekeeper",
+                "terms": "bees,beekeeper,bee box"
+            },
+            "craft/blacksmith": {
+                "name": "Blacksmith",
+                "terms": "blacksmith"
+            },
+            "craft/boatbuilder": {
+                "name": "Boat Builder",
+                "terms": "boat builder"
+            },
+            "craft/bookbinder": {
+                "name": "Bookbinder",
+                "terms": "bookbinder,book repair"
+            },
+            "craft/brewery": {
+                "name": "Brewery",
+                "terms": "brewery"
+            },
+            "craft/carpenter": {
+                "name": "Carpenter",
+                "terms": "carpenter,woodworker"
+            },
+            "craft/carpet_layer": {
+                "name": "Carpet Layer",
+                "terms": "carpet layer"
+            },
+            "craft/caterer": {
+                "name": "Caterer",
+                "terms": "Caterer,Catering"
+            },
+            "craft/clockmaker": {
+                "name": "Clockmaker",
+                "terms": "clock,clockmaker,clock repair"
+            },
+            "craft/confectionary": {
+                "name": "Confectionary",
+                "terms": "confectionary,sweets,candy"
+            },
+            "craft/dressmaker": {
+                "name": "Dressmaker",
+                "terms": "dress,dressmaker"
+            },
+            "craft/electrician": {
+                "name": "Electrician",
+                "terms": "electrician"
+            },
+            "craft/gardener": {
+                "name": "Gardener",
+                "terms": "gardener,landscaper,grounds keeper"
+            },
+            "craft/glaziery": {
+                "name": "Glaziery",
+                "terms": "glass,glass foundry,stained-glass,window"
+            },
+            "craft/handicraft": {
+                "name": "Handicraft",
+                "terms": "handicraft"
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "terms": "heating,ventilating,air-conditioning,air conditioning"
+            },
+            "craft/insulator": {
+                "name": "Insulator",
+                "terms": "insulation,insulator"
+            },
+            "craft/jeweler": {
+                "name": "Jeweler",
+                "terms": "jeweler,gem,diamond"
+            },
+            "craft/key_cutter": {
+                "name": "Key Cutter",
+                "terms": "key,key cutter"
+            },
+            "craft/locksmith": {
+                "name": "Locksmith",
+                "terms": "locksmith,lock"
+            },
+            "craft/metal_construction": {
+                "name": "Metal Construction",
+                "terms": "metal construction"
+            },
+            "craft/optician": {
+                "name": "Optician",
+                "terms": "glasses,optician"
+            },
+            "craft/painter": {
+                "name": "painter",
+                "terms": "painter"
+            },
+            "craft/photographer": {
+                "name": "Photographer",
+                "terms": "photographer"
+            },
+            "craft/photographic_labratory": {
+                "name": "Photographic Labratory",
+                "terms": "photographic labratory,film developer"
+            },
+            "craft/plasterer": {
+                "name": "Plasterer",
+                "terms": "plasterer"
+            },
+            "craft/plumber": {
+                "name": "Plumber",
+                "terms": "pumber"
+            },
+            "craft/pottery": {
+                "name": "Pottery",
+                "terms": "pottery,potter"
+            },
+            "craft/rigger": {
+                "name": "Rigger",
+                "terms": "rigger"
+            },
+            "craft/roofer": {
+                "name": "Roofer",
+                "terms": "roofer"
+            },
+            "craft/saddler": {
+                "name": "Saddler",
+                "terms": "saddler"
+            },
+            "craft/sailmaker": {
+                "name": "Sailmaker",
+                "terms": "sailmaker"
+            },
+            "craft/sawmill": {
+                "name": "Sawmill",
+                "terms": "sawmill,lumber"
+            },
+            "craft/scaffolder": {
+                "name": "Scaffolder",
+                "terms": "scaffolder"
+            },
+            "craft/sculpter": {
+                "name": "Sculpter",
+                "terms": "sculpter"
+            },
+            "craft/shoemaker": {
+                "name": "Shoemaker",
+                "terms": "shoe repair,shoemaker"
+            },
+            "craft/stonemason": {
+                "name": "Stonemason",
+                "terms": "stonemason,masonry"
+            },
+            "craft/sweep": {
+                "name": "Chimney Sweep",
+                "terms": "sweep,chimney sweep"
+            },
+            "craft/tailor": {
+                "name": "Tailor",
+                "terms": "tailor,clothes"
+            },
+            "craft/tiler": {
+                "name": "Tiler",
+                "terms": "tiler"
+            },
+            "craft/tinsmith": {
+                "name": "Tinsmith",
+                "terms": "tinsmith"
+            },
+            "craft/upholsterer": {
+                "name": "Upholsterer",
+                "terms": "upholsterer"
+            },
+            "craft/watchmaker": {
+                "name": "Watchmaker",
+                "terms": "watch,watchmaker,watch repair"
+            },
+            "craft/window_construction": {
+                "name": "Window Construction",
+                "terms": "window,window maker,window construction"
+            },
             "embankment": {
                 "name": "Embankment",
                 "terms": ""
                 "name": "Residential Road",
                 "terms": ""
             },
+            "highway/rest_area": {
+                "name": "Rest Area",
+                "terms": "rest stop,turnout,lay-by"
+            },
             "highway/road": {
                 "name": "Unknown Road",
                 "terms": ""
                 "name": "Parking Aisle",
                 "terms": ""
             },
+            "highway/services": {
+                "name": "Service Area",
+                "terms": "services,travel plaza,service station"
+            },
             "highway/steps": {
                 "name": "Steps",
                 "terms": "stairs,staircase"
                 "name": "Travel Agency",
                 "terms": ""
             },
+            "piste": {
+                "name": "Piste/Ski Trail",
+                "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+            },
             "place": {
                 "name": "Place",
                 "terms": ""
                 "name": "Disused Railway",
                 "terms": ""
             },
+            "railway/funicular": {
+                "name": "Funicular",
+                "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
+            },
             "railway/halt": {
                 "name": "Railway Halt",
                 "terms": "break,interrupt,rest,wait,interruption"
                 "name": "Monorail",
                 "terms": ""
             },
+            "railway/narrow_gauge": {
+                "name": "Narrow Gauge Rail",
+                "terms": "narrow gauge railway,narrow gauge railroad"
+            },
             "railway/platform": {
                 "name": "Railway Platform",
                 "terms": ""
index 53ec82134ef57d14b5bb75ca44d13445c8da6934..398d2c1ef391643d27a2a026d9012bfdae89dff1 100644 (file)
         "incomplete": "<no descargado>",
         "feature_list": "Buscar elementos",
         "edit": "Editar elemento",
-        "none": "Ninguno"
+        "none": "Ninguno",
+        "node": "Nodo",
+        "way": "Vía",
+        "relation": "Relación",
+        "location": "Localización"
     },
     "background": {
         "title": "Fondo",
         "untagged_area": "Área sin etiquetar",
         "many_deletions": "Está eliminando {n} objetos ¿Está seguro de que quieres hacer esto? Esta acción los eliminará del mapa que todos ven en openstreetmap.org.",
         "tag_suggests_area": "La etiqueta {tag} sugiere que esta línea debería ser una área, pero no lo es.",
+        "untagged_tooltip": "Seleccione un tipo de característica que describa lo que es esta {geometry}.",
         "deprecated_tags": "Etiquetas obsoletas: {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "Edificio"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Uso del suelo"
             },
             "admin_level": {
                 "label": "Nivel administrativo"
             },
+            "aerialway/access": {
+                "label": "Acceso"
+            },
+            "aerialway/capacity": {
+                "label": "Capacidad (por hora)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Duración (minutos)",
+                "placeholder": "1, 2, 3..."
+            },
             "aeroway": {
                 "label": "Tipo"
             },
             "country": {
                 "label": "País"
             },
+            "covered": {
+                "label": "Cubierto"
+            },
             "crossing": {
                 "label": "Tipo"
             },
             "generator/type": {
                 "label": "Tipo"
             },
+            "golf_hole": {
+                "label": "Referencia",
+                "placeholder": "Número de hoyo (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tipo"
             },
             "incline": {
                 "label": "Pendiente"
             },
+            "information": {
+                "label": "Tipo"
+            },
             "internet_access": {
                 "label": "Acceso a Internet",
                 "options": {
             "operator": {
                 "label": "Operador"
             },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Aparcamiento disuasorio"
             },
             "tree_type": {
                 "label": "Tipo"
             },
+            "tunnel": {
+                "label": "Túnel"
+            },
             "vending": {
                 "label": "Tipo de producto"
             },
             "amenity/ranger_station": {
                 "name": "Puesto de guardaparques"
             },
+            "amenity/recycling": {
+                "name": "Reciclaje"
+            },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "restaurante,restorán, comedor, ambigú, bufé, mesón, taberna"
                 "name": "Edificio residencial",
                 "terms": "bloque"
             },
+            "craft/upholsterer": {
+                "name": "Tapicero"
+            },
             "embankment": {
                 "name": "Terraplén"
             },
             },
             "highway/pedestrian": {
                 "name": "Vía peatonal",
-                "terms": "Peatonal"
+                "terms": "Peatonal, plaza, calle"
             },
             "highway/primary": {
                 "name": "Carretera primaria",
                 "terms": "Depósito de agua"
             },
             "military/airfield": {
-                "name": "Aeródromo"
+                "name": "Aeródromo",
+                "terms": "Aerodromo, Aeropuerto, Pista"
             },
             "military/barracks": {
                 "name": "Cuartel"
                 "terms": "Relación, Vínculo, Asociación"
             },
             "route/ferry": {
-                "name": "Ruta de Ferry"
+                "name": "Ruta de Ferry",
+                "terms": "ruta, ferry, transbordador, lancha, embarcación"
             },
             "shop": {
                 "name": "Tienda",
                 "terms": "carnicería, tablajería, casquería, tocinería, fiambrería, pollería, chacinería, charcutería, alimentación, carne, vacuno, caballo, vaca, pollo, embutido, jamón"
             },
             "shop/car": {
-                "name": "Concesionario de automóviles"
+                "name": "Concesionario de automóviles",
+                "terms": "concesionario, coches, automóviles, carros, vehículos, venta"
             },
             "shop/car_parts": {
-                "name": "Tienda de componente de vehículos"
+                "name": "Tienda de componente de vehículos",
+                "terms": "repuestos, tienda, automóvil, vehículo, carro, coche, piezas, almacén"
             },
             "shop/car_repair": {
                 "name": "Taller de reparación de vehículos",
                 "terms": "tienda, almacén, colmado, abarrote, alimentación"
             },
             "shop/deli": {
-                "name": "Delicatessen"
+                "name": "Delicatessen",
+                "terms": "delicatessen, tienda, comestibles, gourmet, exquisiteces, comida"
             },
             "shop/department_store": {
-                "name": "Almacén"
+                "name": "Almacén",
+                "terms": "grandes almacenes, comercio, negocio, tienda, gran superficie"
             },
             "shop/doityourself": {
                 "name": "Tienda de bricolaje",
                 "terms": "bricolaje, ferretería, tienda"
             },
             "shop/dry_cleaning": {
-                "name": "Tintorería"
+                "name": "Tintorería",
+                "terms": "tintorería"
             },
             "shop/electronics": {
                 "name": "Tienda de electrodomésticos",
                 "terms": "peluquería barbería, peluquero, barbero, pelo, corte, salón, belleza, manicura, estética, esteticién, depilación"
             },
             "shop/hardware": {
-                "name": "Ferretería"
+                "name": "Ferretería",
+                "terms": "Ferreteria"
             },
             "shop/hifi": {
                 "name": "Tienda de sonido"
                 "terms": "música, melodía, tienda, disco, dvd, vinilo, lp, sonido, discografía, cantante, banda, grupo, rock, soul, pop, reggea, heavy, metal, rap, blues, clásica, cumbia, salsa"
             },
             "shop/newsagent": {
-                "name": "Quiosco de prensa"
+                "name": "Quiosco de prensa",
+                "terms": "vendedor, periódicos, revistas, kiosco, quiosco, puesto, prensa, publicación, diario"
             },
             "shop/optician": {
                 "name": "Óptica",
                 "terms": "tienda, deportes, aventura, aire, libre, excursionismo"
             },
             "shop/pet": {
-                "name": "Tienda de mascotas"
+                "name": "Tienda de mascotas",
+                "terms": "tienda, mascotas, perros, canina, felina, perruquería, gatos"
             },
             "shop/photo": {
                 "name": "Tienda de fotografía",
                 "terms": "fotografía, tienda , establecimiento, fotógrafo, cámara, retratista, revelado"
             },
             "shop/shoes": {
-                "name": "Zapatería"
+                "name": "Zapatería",
+                "terms": "zapatería, calzado, tienda, zapato, zapatilla, escarpín, bota, sandalia, alpargata, pantufla, babucha, borceguí, almadreña, zueco, chancla, chanclo, madreña, chinela, coturno, alborga"
             },
             "shop/sports": {
                 "name": "Tienda de artículos deportivos"
                 "terms": "juguetería,juguetes"
             },
             "shop/travel_agency": {
-                "name": "Agencia de viajes"
+                "name": "Agencia de viajes",
+                "terms": "agencia de viajes, agencia de turismo"
             },
             "shop/tyres": {
                 "name": "Tienda de neumáticos"
                 "name": "Local vacío"
             },
             "shop/variety_store": {
-                "name": "Tienda de variedades"
+                "name": "Tienda de variedades",
+                "terms": "tienda, variedades, bazar, cadena 100, conveniencia"
             },
             "shop/video": {
-                "name": "Videoclub"
+                "name": "Videoclub",
+                "terms": "tienda, alquiler, renta, tienda de vídeos, videoclub, alquiler de vídeos, renta de vídeos"
             },
             "tourism": {
-                "name": "Turismo"
+                "name": "Turismo",
+                "terms": "turismo"
             },
             "tourism/alpine_hut": {
                 "name": "Cabaña alpina"
index 2e6400530ebdb4d1b0e7b452d34e532e2be38bd5..cf6da165962341d2a321621b64587bbc478b618a 100644 (file)
 {
     "modes": {
         "add_area": {
-            "title": "مساحت"
+            "title": "فضاها",
+            "description": "افزودن پارک ها، ساختمان ها، دریاچه ها و سایر فضاها به نقشه.",
+            "tail": "برای شروع کشیدن فضا هایی مثل پارک، دریاچه، یا ساختمان روی نقشه کلیک کنید."
+        },
+        "add_line": {
+            "title": "خط",
+            "description": "افزودن بزرگ راه ها، خیابان ها، مسیر های پیاده روی، کانال ها یا سایر خطوط به نقشه.",
+            "tail": "برای شروع کشیدن راه، مسیر پیاده یا مسیر روی نقشه کلیک کنید."
         },
         "add_point": {
-            "title": "نقطه"
+            "title": "نقطه",
+            "description": "افزودن رستوران ها، کوه ها، صندوق های پستی یا سایر نقاط به نقشه.",
+            "tail": "برای افزودن نقطه روی نقشه کلیک کنید."
         },
         "browse": {
-            "title": "جستجو"
+            "title": "مرور",
+            "description": "مرور و زوم نقشه."
+        },
+        "draw_area": {
+            "tail": "برای افزودن گره به منطقه تان کلیک کنید. برای پایان دادن به منطقه روی اولین گره کلیک کنید."
+        },
+        "draw_line": {
+            "tail": "برای افزودن گره های بیشتر به خط کلیک کنید. برای اتصال به سایر خطوط روی آنها کلیک کنید، و برای پایان دادن به خط دو بار کلیک کنید."
         }
     },
     "operations": {
         "add": {
             "annotation": {
-                "point": "افزودن یک نقطه."
+                "point": "انقطه ای اضافه شد.",
+                "vertex": "گره ای به راه اضافه شد.",
+                "relation": "ارتباط اضافه شد."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "خطی شروع شد.",
+                "area": "فضایی آغاز شد."
             }
         },
         "continue": {
             "key": "A",
             "title": "ادامه",
-            "description": "ادامه این خط."
+            "description": "ادامه این خط.",
+            "not_eligible": "خط قابل ادامه دادنی اینجا نیست.",
+            "multiple": "اینجا چندین خط قابل ادامه دادن است. برای انتخاب یک خط، کلید Shift را فشار دهید و روی آن کلیک کنید تا انتخاب شود.",
+            "annotation": {
+                "line": "نقطه ای ادامه داده شد.",
+                "area": "فضایی ادامه داده شد."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "کشیدن لغو شد."
+        },
+        "change_role": {
+            "annotation": "نقش عضو مرتبط تغییر یافت."
+        },
+        "change_tags": {
+            "annotation": "برچسب ها تغییر یافت."
+        },
+        "circularize": {
+            "title": "حلقه",
+            "description": {
+                "line": "این خط را حلقوی کن.",
+                "area": "این فضا را حلقوی کن."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "ساخت یک خط حلقوی.",
+                "area": "ساخت یک فضای حلقوی."
+            },
+            "not_closed": "نمیشود این را حلقوی کرد چون این یک حلقه نیست."
+        },
+        "orthogonalize": {
+            "title": "گرد کردن",
+            "description": {
+                "line": "گرد کردن گوشه های این خط.",
+                "area": "گرد کردن گوشه های این فضا."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "گوشه های خط گرد شد.",
+                "area": "گوشه های فضا گرد شد."
+            },
+            "not_squarish": "اینرا نمیتوان گرد کرد چون تقریبا چهارگوش نیست."
+        },
+        "straighten": {
+            "title": "مرتب کردن",
+            "description": "مرتب کردن این خط.",
+            "key": "S",
+            "annotation": "خط مرتب شد.",
+            "too_bendy": "این خط قابل مرتب شدن نیست زیرا بیش از حد انحراف دارد."
         },
         "delete": {
-            "title": "حذف"
+            "title": "حذف",
+            "description": "حذف این از نقشه.",
+            "annotation": {
+                "point": "نقطه حذف شد.",
+                "vertex": "گره از راه حذف شد.",
+                "line": "خط حذف شد.",
+                "area": "فضا حذف شد.",
+                "relation": "ارتباطی حذف شد.",
+                "multiple": "{n} شیئ حذف شد."
+            },
+            "incomplete_relation": "این ویژگی قابل حذف نیست زیرا کاملا دانلود نشده."
+        },
+        "add_member": {
+            "annotation": "عضو به ارتباط اضافه شد."
+        },
+        "delete_member": {
+            "annotation": "عضو از ارتباط حذف شد."
+        },
+        "connect": {
+            "annotation": {
+                "point": "راه به نقطه ای متصل شد.",
+                "vertex": "راه به بقیه متصل شد.",
+                "line": "راه به خطی متصل شد.",
+                "area": "راه به فضایی متصل شد."
+            }
+        },
+        "disconnect": {
+            "title": "قطع اتصال",
+            "description": "قطع ارتباط این خطوط/فضاها از هر چیز دیگری.",
+            "key": "D",
+            "annotation": "ارتباط خطوط/فضاها قطع شد.",
+            "not_connected": "خطوط/فضاهای کافی برای قطع اتصال وجود ندارد."
+        },
+        "merge": {
+            "title": "ترکیب کردن",
+            "description": "ترکیب این خطوط.",
+            "key": "C",
+            "annotation": "{n} خط ترکیب شد.",
+            "not_eligible": "این ویژگی قابل ترکیب نیست.",
+            "not_adjacent": "این خطوط قابل ترکیب نیستند زیرا به هم متصل نیستند.",
+            "restriction": "این خط قابل ترکیب شدن نیست چرا که حداقل یک عضو از \"{relation}\" مرتبط است."
+        },
+        "move": {
+            "title": "انتقال",
+            "description": "انتقال این به مکان دیگری.",
+            "key": "M",
+            "annotation": {
+                "point": "نقطه منتقل شد.",
+                "vertex": "گره در راه منتقل شد.",
+                "line": "خط منتقل شد.",
+                "area": "فضا منتقل شد.",
+                "multiple": "چند شیئ منتقل شد."
+            },
+            "incomplete_relation": "این ویژگی قابل انتقال نیست زیرا بطور کامل دانلود نشده."
+        },
+        "rotate": {
+            "title": "چرخش",
+            "description": "چرخش این شیئ حول نقطه ی مرکزی آن.",
+            "key": "R",
+            "annotation": {
+                "line": "خط چرخش یافت.",
+                "area": "فضا چرخش یافت."
+            }
+        },
+        "reverse": {
+            "title": "وارونه",
+            "description": "این خط را به جهت مخالف ببر.",
+            "key": "V",
+            "annotation": "خط وارونه شد."
+        },
+        "split": {
+            "title": "جداسازی",
+            "description": {
+                "line": "تقسیم این خط به دو تا در این گره.",
+                "area": "تقسیم مرز این منطقه به دو.",
+                "multiple": "تقسیم مرز های خطوط/منطقه به دو تا در این گره."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "تقسیم خط.",
+                "area": "تقسیم مرز منطقه.",
+                "multiple": "تقسیم مرز {n} خط/فضا"
+            },
+            "not_eligible": "خطوط در شروع و پایانشان قابل تقسیم نیستند.",
+            "multiple_ways": "تعداد خیلی زیادی خط برای تقسیم اینجا وجود دارد."
         }
     },
+    "undo": {
+        "tooltip": "برگرداندن: {action}",
+        "nothing": "چیزی برای برگرداندن نیست."
+    },
+    "redo": {
+        "tooltip": "انجام دوباره: {action}",
+        "nothing": "چیزی برای انجام دوباره نیست."
+    },
+    "tooltip_keyhint": "میانبر:",
+    "browser_notice": "این ویرایشگر در فایرفاکس، کروم، سافاری، اپرا و اینترنت اکسپلورر 9 به بالا پشتیبانی میشود، لطفا مرورگرتان را ارتقا دهید یا از Potltatch 2 برای ویرایش نقشه استفاده کنید.",
     "translate": {
-        "translate": "برگردان",
-        "localized_translation_language": "گزینش زبان",
+        "translate": "ترجمه",
+        "localized_translation_label": "نام چند زبانه",
+        "localized_translation_language": "انتخاب زبان",
         "localized_translation_name": "نام"
     },
-    "zoom_in_edit": "بزرگنمایی درون به ویرایش",
+    "zoom_in_edit": "بزرگنمایی برای ویرایش",
+    "logout": "خروج",
+    "loading_auth": "در حال اتصال به OpenStreetMap...",
+    "report_a_bug": "گزارش یک باگ",
+    "status": {
+        "error": "اتصال به API ممکن نیست.",
+        "offline": "API آفلاین است. لطفا ویرایش را بعدا مجدد انجام دهید.",
+        "readonly": "API فقط خواندنی است. شما برای دخیره ی تغییراتتان باید صبر کنید."
+    },
     "commit": {
-        "message_label": "پیام بکاربردن",
-        "save": "انباره",
+        "title": "ذخیره تغییرات",
+        "description_placeholder": "شرح مختصری از کمک های شما",
+        "message_label": "پیام تعهد",
+        "upload_explanation": "تغییراتی که بارگذاری میکنید در همه ی نقشه هایی که از داده های OpenStreetMap استفاده میکنند پدیدار میشوند.",
+        "upload_explanation_with_user": "تفییراتی که شما به عنوان {user} بارگذاری میکنید در همه ی نقشه هایی که از داده های OpenStreetMap استفاده میکنند پدیدار میشوند.",
+        "save": "ذخیره",
         "cancel": "لغو",
         "warnings": "اخطارها",
         "modified": "اصلاح شد",
-        "deleted": "پاک شد",
+        "deleted": "حذف شد",
         "created": "ساخته شد"
     },
     "contributors": {
         "list": "ویرایش توسط {users}",
-        "truncated_list": "ویرایش توسط  {users} و {count}  دیگران"
+        "truncated_list": "ویرایش توسط  {users} و {count}  نفر دیگر"
+    },
+    "geocoder": {
+        "search": "جستجو در سراسر جهان ...",
+        "no_results_visible": "هیچ نتیجه ای در ناحیه نقشه ی مشاهده شده نیسن",
+        "no_results_worldwide": "نتیجه ای یافت نشد"
+    },
+    "geolocate": {
+        "title": "نمایش مکان من"
     },
     "inspector": {
-        "show_more": "بیشتر نمایش بده",
+        "no_documentation_combination": "برای این ترکیب برچسب اسنادی موجود نیست",
+        "no_documentation_key": "برای این کلید اسنادی موجود نیست",
+        "show_more": "نمایش بیشتر",
         "view_on_osm": "نمایش در openstreetmap.org",
         "all_tags": "همه برچسب ها",
-        "all_members": "همه عضوها",
+        "all_members": "همه اعضا",
+        "all_relations": "تمام روابط",
+        "new_relation": "رابطه جدید...",
         "role": "نقش",
+        "choose": "انتخاب نوع ویژگی",
+        "results": "{n} نتیجه برای   {search}",
         "reference": "نمایش در ویکی  OpenStreetMap",
-        "remove": "پلک کردن",
+        "back_tooltip": "تغییر ویژگی",
+        "remove": "پاک کردن",
         "search": "جسنجو",
-        "multiselect": "گزینش موارد",
-        "unknown": "ناشناس",
-        "edit": "ویرایش ویژگیها",
-        "none": "هیچ"
+        "multiselect": "موارد انتخاب شدند",
+        "unknown": "ناشناخته",
+        "incomplete": "<دانلود نشده>",
+        "feature_list": "جستجوی ویژگی ها",
+        "edit": "ویرایش ویژگی",
+        "none": "هیچ",
+        "node": "گره",
+        "way": "راه",
+        "relation": "ارتباط",
+        "location": "مکان"
     },
     "background": {
+        "title": "پس زمینه",
+        "description": "تنظیمات پس زمینه",
+        "percent_brightness": "{opacity}% روشنایی",
         "none": "هیچ",
         "custom": "سفارشی",
-        "reset": "نوسازی"
+        "custom_prompt": "قالب کاشی را وارد کنید. نشانه های مشخص  {z}, {x}, {y} هستند برای طرح  Z/X/Y و {u} برای طرح چهار کاشی.",
+        "fix_misalignment": "تعمیر تراز",
+        "reset": "باز نشاندن"
     },
     "restore": {
-        "restore": "بازیابی"
+        "heading": "شما تغییرات ذخیره نشده دارید",
+        "description": "آیا مایلید تغییرات ذخیره نشده جلسه قبل را بازیابی کنید؟",
+        "restore": "بازیابی",
+        "reset": "باز نشانی"
     },
     "save": {
-        "title": "انباره"
+        "title": "ذخیره",
+        "help": "ذخیره تغییرات در OpenStreetMap, آنها را برای دیگران قابل نمایش می سازد.",
+        "no_changes": "تغییراتی برای دخیره نیست.",
+        "error": "هنگام تلاش برای ذخیره خطایی رخ داده است",
+        "uploading": "در حال بارگذاری تغییرات در OpenStreetMap.",
+        "unsaved_changes": "شما تغییرات ذخیره نشده دارید"
     },
     "success": {
         "edited_osm": "OSMویرایش شد!",
-        "twitter": "اشتراک در twitter",
-        "google": "اشتراک گذاری در Google+"
+        "just_edited": "شما فقط OpenStreetMap را ویرایش کردید!",
+        "view_on_osm": "نمایش در OSM",
+        "facebook": "اشتراک گذاری در فیسبوک",
+        "twitter": "اشتراک گذاری در تویتر",
+        "google": "اشتراک گذاری در Google+",
+        "help_html": "تغییرات شما در نمای \"استاندارد\" در چند دقیقه قابل رؤیت است. سایر نما ها، و ویژگی های خاص، ممکن است بیشتر طول کشد\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>جزییات</a>).\n"
+    },
+    "confirm": {
+        "okay": "باشه"
     },
     "splash": {
-        "walkthrough": "آغاز پیاده روی",
+        "welcome": "به ویرایشگر ID OpenStreetMap خوش آمدید",
+        "text": "iD یک ابزار دوستانه اما قدرتمند برای کمک کردن به بهترین نقشه رایگان جهان است. این نسخه ی  {version} است. برای اطلاعات بیشتر {website} را ببینید و باگ را در {github} گزارش دهید.",
+        "walkthrough": "آغاز گردش",
         "start": "حالا ویرایش کن"
     },
+    "source_switch": {
+        "live": "زنده",
+        "lose_changes": "شما تغییرات ذخیره نشده دارید. تغییر سرور نقشه آنها را دور می اندازد. مطمئنید میخواهید سرور را تغییر دهید؟",
+        "dev": "توسعه"
+    },
     "tag_reference": {
-        "description": "توضیحات"
+        "description": "توضیحات",
+        "on_wiki": "{tag} در wiki.osm.org",
+        "used_with": "با  {type} استفاده شده"
     },
     "validations": {
-        "untagged_point": "نقطه برچسب نخورده"
+        "untagged_point": "نقطه برچسب نخورده",
+        "untagged_line": "خط برچسب گذاری نشده",
+        "untagged_area": "فضای برچسب گذاری نشده",
+        "many_deletions": "شما در حال حذف {n} شیئ هستید. مطمئنید میخواهید این کار را انجام دهید؟ این کار آنها را از نقشه ای که دیگران در openstreetmap.org میبینند حذف می کند.",
+        "tag_suggests_area": "برچسب  {tag} پیشنهاد میکند خط باید یک فضا باشد، اما این یک فضا نیست",
+        "untagged_tooltip": "یک نوع ویژگی را انتخاب کنید که توصیف کند این {geometry} چیست.",
+        "deprecated_tags": "برچسب های توصیه شده: {tags}"
     },
     "zoom": {
-        "in": "بزرگنمایی درون",
-        "out": "بزرگنمایی برون"
+        "in": "بزرگنمایی",
+        "out": "کوچک نمایی"
     },
+    "cannot_zoom": "در حالت فعلی بیش از این نمیتوان کوچک نمایی کرد.",
     "gpx": {
-        "local_layer": "فایل GPX محلی"
+        "local_layer": "فایل GPX محلی",
+        "drag_drop": "یک پرونده ی .gpx را بکشید و در این صفحه رها کنید، یا برای مرور دکمه ی سمت راست را کلیک کنید",
+        "zoom": "بزرگنمایی به ردپای GPX",
+        "browse": "مرور برای یک پرونده ی .gpx"
     },
     "help": {
-        "title": "کمک"
+        "title": "کمک",
+        "help": "#کمک\n\nاین یک ویرایشگر برای  [OpenStreetMap](http://www.openstreetmap.org/) است،\nنقشه ای رایگان و قابل ویرایش از جهان. شما میتوانید از آن برای افزودن و بروز رسانی\nداده ها در ناحیه تان استفاده کنید، ساختن نقشه ی منبع باز و داده باز از جهان\nبرای همه کس بهتر است.\n\nویرایش هایی که شما در این نقشه می سازید برای هر کسی که از OpenStreetMap استفاده میکند\nقابل استفاده است. برای ایجاد یک ویرایش، شما نیاز دارید به\n[حساب رایگان OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[ویرایشگر ID](http://ideditor.com/) یک پروژه مشترک است با [منبع کد در GitHub \nموجود است](https://github.com/systemed/iD).\n",
+        "roads": "# جاده ها\n\nشما میتوانید جاده ها را ایجاد کنید، تعمیر کنید، و حذف کنید به وسیله ی این ویرایشگر. جاده ها میتوانند همه نوعی باشند:\nپیاده روی، بزرگراه، راه آهن، راه موتور سیکلت، و بیشتر - هر چیزی که غالبا - برای عبور است \nباید نقشه شود.\n\n### انتخاب کردن\n\nروی جاده کلیک کنید تا انتخاب شود. طرح کلی باید قابل نمایش باشد، همراه\nیک منوی ابزار کوچک روی نقشه و یک نوار کناری نشان میدهد اطلاعات بیشتری\nدرباره جاده.\n\n### اصلاح کردن\n\nاغلب جاده هایی که میبینید با تصاویر نقشه نگاری پشت سرشان یا پیگیری GPS\nهم طراز نیستند. شما میتوانید این جاده ها را در مکان درستشان تطبیق\nدهید.\n\nاولین کلیک روی نقشه شما میخواهید تغییر دهید. اینکار آنرا برجسته میکند و نقاط\nکنترل را نشان میدهد شما میتوانید آنرا به مکان بهتری بکشید. اگر\nبخواهید نقاط کنترل جدید بیشتری برای اطلاعات بیشتر اضافه کنید، روی قسمتی\nاز نقشه که بدون گره است دوبار کلیک کنید، و یکی اضاف خواهد شد.\n\nاگر جاده به جاده های دیگر متصل باشد، اما روی نقشه به درستی \nمتصل نباشد، شما میتوانید یکی از نقاط کنترل را بکشید به سایر جاده ها برای\nفراهم کردن پیوستن آنها. داشتن جاده های پیوسته و متصل  برای نقشه مهم است\nو ارائه دستورالعمل ها ی رانندگی ضروری است.\n\nهمچنین میتوانید روی ابزار 'انتقال' کلیک کنید یا کلید میانبر `M` را فشار دهید تا همه جاده یک بار منتقل\nشود، و بعد دوباره کلیک کنید تا جابجایی ذخیره شود.\n\n### حذف کردن\n\nاگر جاده کامل اشتباه است - میتوانید ببینید که در تصویر ماهواره ای موجود نیست و بصورت ایده آل\nبطور محلی پذیرفته شده که در حال حاضر موجود نیست - شما میتوانید\nآنرا حذف کنید، با پاک کردن آن از نقشه. هنگام حذف ویژگی محتاط باشید-\nشبیه هر ویرایش دیگری، نتایج توسط هر کسی دیده میشود تصاویر ماهواره ای غالبا تاریخ گذشته اند،\nپس ممکن است به طور ساده جاده جدیدا ساخته شده باشد.\n\nشما میتوانید جاده ای را حذف کنید با کلیک روی آن و انتخاب آن، سپس کلیک روی آیکون سطل زباله\nیا فشار دکمه ی  'Delete'.\n\n### ایجاد کردن\n\nجاهایی یافت میشوند که باید جاده باشند ولی اینگونه نیست؟ روی آیکون  'خط'\nدر بالا سمت چپ ویرایشگر کلیک کنید یا کلید میانبر`2` را فشار دهید\nتا کشیدن یک خط شروع شود.\n\nبرای شروع کشیدن روی ابتدای جاده کلیک کنید. اگر جاده\nشاخه ای از جاده ی موجود باشد، با کلیک روی مکانی که به هم متصل اند شروع کنید.\n\nسپس روی نقاط در امتداد جاده کلیک کنید به طوری که از مسیر سمت راست ، طبق تصاویر ماهواره ای\nیا GPS پیروی کند. اگر جاده ی در حال کشیدن شما از سایر جاده ها میگذرد، با کلیک\nروی نقطه تقاطع آنرا متصل کنید. وقتی کشیدنتان انجان شد، دوبار کلیک کنید\nیا 'بازگشت' را فشار دهید یا روی صفحه کلید 'Enter' را فشار دهید.\n",
+        "addresses": "# آدرس ها\n\nآدرس ها مقداری از اطلاعات بسیار سودمند برای نقشه هستند.\n\nاگرچه آدرس ها اغلب بعنوان بخش هایی از جاده نمایان میشوند، در OpenStreetMap\nآنها بعنوان ویژگی هایی از ساختمان ها و مکان ها در امتداد خیابان ها ثبت میشوند.\n\nشما میتوانید اطلاعات آدرس را به مکان های نقشه شده بعنوان خطوط اضافه ساخته شده و\nهمچنین آنهایی که بعنوان یک نقطه نقشه شده اند اضافه کنید. منبع مناسب برای داده های آدرس\nبررسی بر روی زمین و دانش شخصی است -مثل هر ویژگی دیگری،\nکپی برداری از منابع تجاری مثل نقشه های گوگل به شدت\nممنوع است.\n",
+        "buildings": "# ساختمان ها\n\nOpenStreetMap یک دیتابیس عظیم جهان  از ساختمان ها است. شما میتوانید\nاین دیتابیس را بسازید و بهبود بخشید.\n\n### انتخاب کردن\n\nمیتوانید با کلیک روی مرز ساختمان آن را انتخاب کنید. اینکار ساختمان را\nبرجسته میکند و یک منو ابزار کوچک باز میکند همجنین یک نوار کناری اطلاعات بیشتری \nدرباره ی ساختمان نشان میدهد.\n\n### اصلاح کردن\n\nگاهی اوقات ساختمان ها نادرست جاگذاری شده اند یا برچسب نادرست دارند.\n\nبرای انتقال کل ساختمان، آنرا انتخاب کنید، بعد روی ابزار 'انتقال' کلیک کنید. موس تان\nرا برای تغییر ساختمان حرکت دهید، و وقتی به درستی جایگذاری شد کلیک کنید.\n\nبرای تعمیر قسمت خاصی از ساختمان، روی گره هایی که مرز را مشخص میکنند کلیک کنید\nو آنها را به مکان بهتری بکشید.\n\n### ایجاد کردن\n\nیکی از موضوعات اصلی پیرامون افزودن ساختمان ها به نقشه این است که \nOpenStreetMap ساختمان ها را هم بصورت نقاط و هم شکل ها ثبت میکند. قاعده کلی برای\n _نقشه کردن ساختمان ها بصورت شکل هر وقت ممکن باشد_ این است، و نقشه کردن شرکت ها، خانه ها،\nامکانات رفاهی، و چیزهای دیگری که به عنوان ساختمان کاربرد دارند قرار گرفتن نقاط با شکل\nساختمان است\n\nکشیدن ساختمان بصورت شکل را شروع کنید با کلیک روی کلید 'فضا' در بالا سمت چپ \nرابط کاربری، و به آن پایان دهید توسط فشار دادن دکمه ی 'بازگشت' در صفحه کلیدتان\nیا کلیک روی اولین گره کشیده شده تا شکل بسته شود.\n\n### حذف کردن\n\nاگر ساختمانی کاملا نادرست است- میتوانید ببینید که در تصویر ماهواره ای\nموجود نیست و ایده آل تر بصورت محلی پذیرفته شده که موجود نیست - میتوانید\nآن را حذف کنید، با پاک کردن آن از نقشه. هنگام حذف ویژگی محتاط باشید\nشبیه هر ویرایش دیگری، نتایج توسط هر کسی دیده میشود و تصاویر ماهواره ای\nغالبا تاریخ گذشته است، پس بطور ساده ممکن است ساختمان جدیدا ساخته شده.\n\nمیتوانید یک ساختمان را حذف کنید با کلیک روی آن و انتخاب آن، سپس\nروی آیکون سطل زباله کلیک کنید یا کلید  'Delete' را فشار دهید.\n"
     },
     "intro": {
+        "navigation": {
+            "title": "ناوبری",
+            "drag": "ناحیه اصلی نقشه داده های OpenStreetMap را در بالای پس زمینه نشان می دهد. شما میتوانید با کشیدن و اسکرول کردن هدایت کنید، شبیه هر نقشه ی تحت وب دیگری. **نقشه را بکشید!**",
+            "select": "ویژگی های نقشه به سه روش نمایان میشوند: استفاده از نقاط، خطوط یا فضاها. همه ی ویژگی ها یا کلیک روی آنها قابل انتخاب اند.**برای انتخاب نقطه روی آن کلیک کنید.**",
+            "header": "سربرگ نوع ویژگی را به ما نشان می دهد.",
+            "pane": "وقتی یک ویژگی انتخاب میشود، ویرایشگر ویژگی نمایان میشود. سربرگ نوع ویژگی را به ما نشان میدهد و قطعه اصلی خواص ویژگی را، مثل نام و آدرس آن.**ویرایشگر ویژگی را توسط دکمه بستن در بالا سمت راست ببندید.**"
+        },
         "points": {
-            "title": "نقاط"
+            "title": "نقاط",
+            "add": "نقاط میتوانند برای نشان دادن ویژگی هایی مثل فروشگاه ها، رستوران ها، و کوه ها استفاده شوند. آنها یک مکان خاص را تعیین میکنند، و آنچه آنجا است را توصیف می کنند.** برای افزودن نقطه جدید روی دکمه ی نقطه کلیک کنید.**",
+            "place": "نقطه میتواند با کلیک کردن روی نقشه جایگذاری شود.**نقطه را بالای ساختمان جای دهید.**",
+            "search": "ویژگی های مختلف زیادی وجود دارند که توسط نقاط ارائه میشوند. نقطه ای که فقط شما اضافه کردید یک کافه است.**جستجو کنید برای '{name}'**",
+            "choose": "**کافه را از لیست انتخاب کنید.**",
+            "describe": "نقطه اکنون به عنوان کافه تعیین شد. با استفاده از ویرایشگر ویژگی، میتوانیم اطلاعات بیشتری درباره ویژگی اضافه کنیم.**اسمی را اضافه کنید.**",
+            "close": "ویرایشگر ویژگی میتواند با کلیک بر روی دکمه ی بستن بسته شود.**ویراشگر ویژگی را ببندید**",
+            "reselect": "غالبا نقاط از قبل موجود خواهند بود، اما دارای اشتباه یا ناقص اند. ما میتوانیم نقاط موجود را ویرایش کنیم.**نقطه ای را که فقط شما ساخته اید انتخاب کنید.**",
+            "fixname": "**اسم را تغییر دهید و ویرایشگر ویژگی را ببندید.**",
+            "reselect_delete": "همه ی ویژگی های روی نقشه قابل حذف هستند.**روی نقطه ای که ساخته اید کلیک کنید.**",
+            "delete": "منوی دور نقطه دارای عملیاتی است که می توان روی آن انجام داد، شامل حذف.**نقطه را حذف کنید.**"
         },
         "areas": {
-            "title": "فضاها"
+            "title": "فضاها",
+            "add": "فضا ها یک راه جزییاتی بیشتر برای نمایش مشخصات اند. آنها اطلاعاتی درباره ویژگی های مرزی ارائه میدهند. فضا ها میتوانند برای انواع بیشتری ویژگی استفاده شوند نقاط میتوانند استفاده شوند و، اغلب مقدم ترند.**برای افزودن فضای جدید روی دکمه ی فضا کلیک کنید.**",
+            "corner": "مناطق با گذاشتن گره هایی در مرز منطقه کشیده می شوند.**گره آغازین را در یکی از گوشه های زمین بازی قرار دهید.**",
+            "place": "فضا را با گذاشتن گره های بیشتر بکشید. فضا را با کلیک روی نقطه ی شروع پایان دهید.**فضایی برای زمین بازی بکشید.**",
+            "search": "**برای  '{name}' جستجو کنید.**",
+            "choose": "**زمین بازی را از لیست انتخاب کنید.**",
+            "describe": "**اسمی اضافه کنید، و ویرایشگر ویژگی را ببندید**"
         },
         "lines": {
-            "title": "خطوط"
+            "title": "خطوط",
+            "add": "خطوط برای نشان دادن ویژگی هایی مثل جاده ها، راه آهن ها و رودخانه ها استفاده میشوند.**روی دکمه ی خط کلیک کنید تا خط جدیدی اضافه کنید.**",
+            "start": "**خط را با کلیک روی پایان جاده آغاز کنید.**",
+            "intersect": "برای افزودن گره به خط کلیک کنید. میتوانید نقشه را حرکت دهید هنگام کشیدن اگر نیاز باشد. جاده ها، و انواع بیشتر دیگری از خط ها، قسمتی از یک شبکه ی بزرگند. این مهم است برای خط ها تا بطور صحیح متصل شده باشند تا برنامه های مسیریابی بتوانند کار کنند.\n**روی خیابان Flower کلیک کنید، برای ایجاد یک تقاطع از دو خط.**",
+            "finish": "خط ها میتوانند با کلیک دوباره روی آخرین نقطه پایان یابند.**کشیدن نقشه را تمام کنید.**",
+            "road": "**جاده را از لیست انتخاب کنید**",
+            "residential": "انواع مختلفی از جاده وجود دارد، شایع ترینش مسکونی است.**نوع را جاده ی مسکونی انتخاب کنید**",
+            "describe": "**جاده را نامگذاری کنید و ویرایشگر ویژگی را ببندید.**",
+            "restart": "جاده نیاز به اتصال به تقاطع خیابان Flower دارد.",
+            "wrong_preset": "شما نوع جاده را مسکونی انتخاب نکرده اید.**برای انتخاب دوباره اینجا کلیک کنید**"
         },
         "startediting": {
-            "title": "ویرایش آغاز شد"
+            "title": "شروع ویرایش",
+            "help": "اسناد بیشتر و این گرشگری در اینجا یافت میشوند.",
+            "save": "فراموش نکنید که به طور منظم تغییرات را ذخیره کنید!",
+            "start": "شروع نقشه کشی!"
         }
     },
     "presets": {
+        "categories": {
+            "category-building": {
+                "name": "ساختمان"
+            },
+            "category-golf": {
+                "name": "گلف"
+            },
+            "category-landuse": {
+                "name": "کاربرد زمین"
+            },
+            "category-path": {
+                "name": "مسیر"
+            },
+            "category-rail": {
+                "name": "راه آهن"
+            },
+            "category-road": {
+                "name": "جاده"
+            },
+            "category-route": {
+                "name": "مسیر"
+            },
+            "category-water-area": {
+                "name": "آب"
+            },
+            "category-water-line": {
+                "name": "آب"
+            }
+        },
         "fields": {
             "access": {
-                "label": "دسترسي"
+                "label": "دسترسي",
+                "placeholder": "ناشناخته",
+                "types": {
+                    "access": "عمومی",
+                    "foot": "پیاده",
+                    "motor_vehicle": "وسایل نقلیه موتوری",
+                    "bicycle": "دوچرخه ها",
+                    "horse": "اسب ها"
+                },
+                "options": {
+                    "yes": {
+                        "title": "مجاز",
+                        "description": "دسترسی مجاز طبق قانون: حق از راه"
+                    },
+                    "no": {
+                        "title": "ممنوع",
+                        "description": "دسترسی برای عموم مردم مجاز نیست"
+                    },
+                    "permissive": {
+                        "title": "مجاز",
+                        "description": "دسترسی تا وقتی صاحبش مجوز را لغو نکند مجاز است"
+                    },
+                    "private": {
+                        "title": "خصوصی",
+                        "description": "دسترسی فقط با اجازه از صاحب بصورت انفرادی مجاز است"
+                    },
+                    "designated": {
+                        "title": "تعیین شده",
+                        "description": "دسترسی با توجه به علائم و قوانین محلی مجاز است"
+                    },
+                    "destination": {
+                        "title": "مقصد",
+                        "description": "دسترسی فقط برای رسیدن به مقصدی مجاز است"
+                    }
+                }
+            },
+            "access_simple": {
+                "label": "دسترسی"
             },
             "address": {
                 "label": "ادرس",
                     "housename": "نام خانه",
                     "number": "123",
                     "street": "خيابان",
-                    "city": "شهر"
+                    "city": "شهر",
+                    "postcode": "کد پستی"
                 }
             },
+            "admin_level": {
+                "label": "سطح مدیریت"
+            },
+            "aerialway": {
+                "label": "نوع"
+            },
+            "aerialway/access": {
+                "label": "دسترسی"
+            },
+            "aerialway/bubble": {
+                "label": "قل قل کردن"
+            },
+            "aerialway/capacity": {
+                "label": "ظرفیت (بر ساعت)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "مدت زمان (دقیقه)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "گرم شده"
+            },
+            "aerialway/occupancy": {
+                "label": "تصرف",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "دسترسی (تابستان)"
+            },
             "aeroway": {
                 "label": "نوع"
             },
             "amenity": {
                 "label": "نوع"
             },
+            "artist": {
+                "label": "هنرمند"
+            },
             "artwork_type": {
                 "label": "نوع"
             },
             "atm": {
-                "label": "ATM"
+                "label": "خودپرداز"
+            },
+            "backrest": {
+                "label": "تکیه گاه"
             },
             "barrier": {
                 "label": "نوع"
             "building_area": {
                 "label": "ساختمان"
             },
+            "cans": {
+                "label": "پذیرش قوطی ها"
+            },
             "capacity": {
-                "label": "ظرفيت"
+                "label": "ظرفيت",
+                "placeholder": "50, 100, 200..."
+            },
+            "cardinal_direction": {
+                "label": "جهت"
+            },
+            "clock_direction": {
+                "label": "جهت",
+                "options": {
+                    "clockwise": "ساعتگرد",
+                    "anticlockwise": "پاد ساعتگرد"
+                }
+            },
+            "clothes": {
+                "label": "پذیرش لباس ها"
+            },
+            "collection_times": {
+                "label": "مجموع دفعات"
             },
             "construction": {
                 "label": "نوع"
             },
+            "country": {
+                "label": "کشور"
+            },
+            "covered": {
+                "label": "سرپوشیده"
+            },
             "crossing": {
                 "label": "نوع"
             },
+            "cuisine": {
+                "label": "غذا"
+            },
+            "denomination": {
+                "label": "پول"
+            },
+            "denotation": {
+                "label": "مفهوم"
+            },
+            "description": {
+                "label": "توضیحات"
+            },
+            "electrified": {
+                "label": "برق رسانی"
+            },
             "elevation": {
                 "label": "ارتفاع"
             },
+            "emergency": {
+                "label": "اورژانس"
+            },
             "entrance": {
                 "label": "نوع"
             },
             "fax": {
-                "label": "نمابر"
+                "label": "نمابر",
+                "placeholder": "+31 42 123 4567"
+            },
+            "fee": {
+                "label": "دستمزد"
             },
             "fire_hydrant/type": {
                 "label": "نوع"
             },
+            "fixme": {
+                "label": "تصحیح من"
+            },
+            "gauge": {
+                "label": "مقیاس"
+            },
+            "generator/method": {
+                "label": "شیوه"
+            },
+            "generator/source": {
+                "label": "منبع"
+            },
             "generator/type": {
                 "label": "نوع"
             },
+            "glass": {
+                "label": "پذیرش عینک"
+            },
+            "golf_hole": {
+                "label": "مراجعه",
+                "placeholder": "تعداد سوراخ (1-18)"
+            },
+            "handicap": {
+                "label": "مانع",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "نوع"
             },
             "historic": {
                 "label": "نوع"
             },
+            "iata": {
+                "label": "یاتا"
+            },
+            "icao": {
+                "label": "ایکائو"
+            },
+            "incline": {
+                "label": "شیب"
+            },
+            "information": {
+                "label": "نوع"
+            },
             "internet_access": {
                 "label": "دسترسی اینترنت",
                 "options": {
             "landuse": {
                 "label": "نوع"
             },
+            "lanes": {
+                "label": "خطوط",
+                "placeholder": "1, 2, 3..."
+            },
             "layer": {
                 "label": "لايه"
             },
                 "label": "نوع"
             },
             "levels": {
-                "label": "لایه ها"
+                "label": "سطح",
+                "placeholder": "2, 4, 6..."
+            },
+            "lit": {
+                "label": "لیتر"
+            },
+            "location": {
+                "label": "مکان"
             },
             "man_made": {
                 "label": "نوع"
             },
+            "maxspeed": {
+                "label": "محدودیت سرعت",
+                "placeholder": "40, 50, 60..."
+            },
+            "name": {
+                "label": "اسم",
+                "placeholder": "نام مشترک (در صورت وجود)"
+            },
+            "natural": {
+                "label": "طبیعی"
+            },
             "network": {
                 "label": "شبکه"
             },
             "oneway": {
                 "label": "يک طرفه"
             },
+            "oneway_yes": {
+                "label": "یک طرفه"
+            },
             "opening_hours": {
                 "label": "ساعت"
             },
             "operator": {
                 "label": "اپراتور"
             },
+            "paper": {
+                "label": "پذیرش کاغذ"
+            },
+            "par": {
+                "label": "برابری",
+                "placeholder": "3, 4, 5..."
+            },
+            "park_ride": {
+                "label": "پارک و سوار شدن"
+            },
             "parking": {
                 "label": "نوع"
             },
             "phone": {
-                "label": "تلفن"
+                "label": "تلفن",
+                "placeholder": "+31 42 123 4567"
+            },
+            "piste/difficulty": {
+                "label": "سختی"
+            },
+            "piste/grooming": {
+                "label": "تیمار کردن"
+            },
+            "piste/type": {
+                "label": "نوع"
             },
             "place": {
                 "label": "نوع"
             "railway": {
                 "label": "نوع"
             },
+            "ref": {
+                "label": "مراجعتی"
+            },
             "relation": {
                 "label": "نوع"
             },
+            "religion": {
+                "label": "دین",
+                "options": {
+                    "christian": "مسیحی",
+                    "muslim": "مسلمان",
+                    "buddhist": "بودایی",
+                    "jewish": "یهودی",
+                    "hindu": "هندو",
+                    "shinto": "شینتو",
+                    "taoist": "تائو"
+                }
+            },
             "restriction": {
                 "label": "نوع"
             },
             "route_master": {
                 "label": "نوع"
             },
+            "sac_scale": {
+                "label": "سختی مسیر"
+            },
             "service": {
                 "label": "نوع"
             },
+            "shelter": {
+                "label": "پناه گاه"
+            },
+            "shelter_type": {
+                "label": "نوع"
+            },
             "shop": {
                 "label": "نوع"
             },
+            "source": {
+                "label": "منبع"
+            },
             "sport": {
                 "label": "ورزشي"
             },
             "structure": {
+                "label": "ساختاری",
+                "placeholder": "ناشناخته",
                 "options": {
                     "bridge": "پل",
-                    "tunnel": "تونل"
+                    "tunnel": "تونل",
+                    "embankment": "خاکریز",
+                    "cutting": "برش"
                 }
             },
+            "studio_type": {
+                "label": "نوع"
+            },
+            "supervised": {
+                "label": "نظارت"
+            },
+            "surface": {
+                "label": "سطح"
+            },
+            "toilets/disposal": {
+                "label": "در اختیار"
+            },
             "tourism": {
                 "label": "نوع"
             },
             "tracktype": {
                 "label": "نوع"
             },
+            "trail_visibility": {
+                "label": "مسیر پیاده روی"
+            },
+            "tree_type": {
+                "label": "نوع"
+            },
+            "tunnel": {
+                "label": "تونل"
+            },
             "vending": {
                 "label": "نوع محموله"
             },
                 "label": "نوع"
             },
             "website": {
-                "label": "وب سايت"
+                "label": "وب سايت",
+                "placeholder": "http://example.com/"
             },
             "wetland": {
                 "label": "نوع"
             },
+            "wheelchair": {
+                "label": "دسترسی ویلچر"
+            },
             "wikipedia": {
                 "label": "ويکي پديا"
             },
             }
         },
         "presets": {
+            "address": {
+                "name": "آدرس",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آدرس'، با کاما جدا میشوند>"
+            },
+            "aerialway": {
+                "name": "بالابر"
+            },
+            "aerialway/cable_car": {
+                "name": "ماشین کابلی"
+            },
+            "aerialway/chair_lift": {
+                "name": "صندلی بالابر"
+            },
+            "aerialway/gondola": {
+                "name": "تله کابین"
+            },
+            "aerialway/magic_carpet": {
+                "name": "آسانسور اسکی"
+            },
+            "aerialway/platter": {
+                "name": "بالابر بشقابی"
+            },
+            "aerialway/pylon": {
+                "name": "برج بالابر"
+            },
+            "aerialway/rope_tow": {
+                "name": "بالابر دو طنابه"
+            },
+            "aerialway/station": {
+                "name": "ایستگاه بالابر"
+            },
+            "aerialway/t-bar": {
+                "name": "بالابر نوار T"
+            },
+            "aeroway": {
+                "name": "کاربری راه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای ' راه فرود'، با کاما جدا میشوند>"
+            },
             "aeroway/aerodrome": {
-                "name": "فرودگاه"
+                "name": "فرودگاه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'فرودگاه'، با کاما جدا میشوند>"
+            },
+            "aeroway/apron": {
+                "name": "صحن",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'صحن'، با کاما جدا میشوند>"
+            },
+            "aeroway/gate": {
+                "name": "دروازه فرودگاه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ورودی فرودگاه'، با کاما جدا میشوند>"
+            },
+            "aeroway/hangar": {
+                "name": "آشیانه هواپیما",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آشیانه هواپیما'، با کاما جدا میشوند>"
+            },
+            "aeroway/helipad": {
+                "name": "محل فرود هلی کوپتر",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'محل فرود هلی کوپتر'، با کاما جدا میشوند>"
+            },
+            "aeroway/runway": {
+                "name": "باند فرودگاه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر فرود'، با کاما جدا میشوند>"
+            },
+            "aeroway/taxiway": {
+                "name": "راه فرود به پارکینگ",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'فرود به پارک'، با کاما جدا میشوند>"
+            },
+            "aeroway/terminal": {
+                "name": "پایانه فرودگاه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پایانه فرودگاه'، با کاما جدا میشوند>"
+            },
+            "amenity": {
+                "name": "کاربری",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کاربری اراضی'، با کاما جدا میشوند>"
+            },
+            "amenity/arts_centre": {
+                "name": "مرکز هنری"
+            },
+            "amenity/atm": {
+                "name": "خودپرداز",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خودپرداز'، با کاما جدا میشوند>"
             },
             "amenity/bank": {
-                "name": "بانک"
+                "name": "بانک",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بانک'، با کاما جدا میشوند>"
             },
             "amenity/bar": {
-                "name": "بار"
+                "name": "بار",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بار'، با کاما جدا میشوند>"
+            },
+            "amenity/bench": {
+                "name": "نیمکت",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'نیمکت'، با کاما جدا میشوند>"
+            },
+            "amenity/bicycle_parking": {
+                "name": "پارکینگ دوچرخه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پارکینگ دوچرخه'، با کاما جدا میشوند>"
+            },
+            "amenity/bicycle_rental": {
+                "name": "اجاره دوچرخه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اجاره دوچرخه'، با کاما جدا میشوند>"
+            },
+            "amenity/boat_rental": {
+                "name": "کرایه قایق"
             },
             "amenity/cafe": {
-                "name": "کافه"
+                "name": "کافه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کافه'، با کاما جدا میشوند>"
+            },
+            "amenity/car_rental": {
+                "name": "کرایه ماشین",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کرایه خودرو'، با کاما جدا میشوند>"
+            },
+            "amenity/car_sharing": {
+                "name": "به اشتراک گذاری خودرو",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اشتراک گذاری خودرو'، با کاما جدا میشوند>"
+            },
+            "amenity/car_wash": {
+                "name": "کارواش",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کارواش'، با کاما جدا میشوند>"
+            },
+            "amenity/childcare": {
+                "name": "مراقبت از کودک",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مراقبت از کودک'، با کاما جدا میشوند>"
+            },
+            "amenity/cinema": {
+                "name": "سینما",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سینما'، با کاما جدا میشوند>"
+            },
+            "amenity/clinic": {
+                "name": "کلینیک"
+            },
+            "amenity/clock": {
+                "name": "ساعت"
+            },
+            "amenity/college": {
+                "name": "دانشکده",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دانشکده'، با کاما جدا میشوند>"
+            },
+            "amenity/courthouse": {
+                "name": "دادگاه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دادگاه'، با کاما جدا میشوند>"
+            },
+            "amenity/dentist": {
+                "name": "دندانپزشک"
+            },
+            "amenity/doctor": {
+                "name": "دکتر"
+            },
+            "amenity/drinking_water": {
+                "name": "آب آشامیدنی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آب آشامیدنی'، با کاما جدا میشوند>"
+            },
+            "amenity/embassy": {
+                "name": "سفارت خانه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سفارت'، با کاما جدا میشوند>"
+            },
+            "amenity/fast_food": {
+                "name": "غذای آماده",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'غذای آماده'، با کاما جدا میشوند>"
             },
             "amenity/fire_station": {
-                "name": "ایستگاه آتش نشانی"
+                "name": "ایستگاه آتش نشانی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ایستگاه آتش نشانی'، با کاما جدا میشوند>"
+            },
+            "amenity/fountain": {
+                "name": "فواره",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'فواره'، با کاما جدا میشوند>"
+            },
+            "amenity/fuel": {
+                "name": "پمپ گاز",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پمپ گاز'، با کاما جدا میشوند>"
+            },
+            "amenity/grave_yard": {
+                "name": "مقبره",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مقبره'، با کاما جدا میشوند>"
             },
             "amenity/hospital": {
-                "name": "بیمارستان"
+                "name": "بیمارستان",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بیمارستان'، با کاما جدا میشوند>"
+            },
+            "amenity/kindergarten": {
+                "name": "مهد کودک",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مهد کودک'، با کاما جدا میشوند>"
             },
             "amenity/library": {
-                "name": "کتابخانه"
+                "name": "کتابخانه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کتابخانه'، با کاما جدا میشوند>"
+            },
+            "amenity/marketplace": {
+                "name": "بازار",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بازار'، با کاما جدا میشوند>"
+            },
+            "amenity/parking": {
+                "name": "پارکینگ خودرو"
             },
             "amenity/pharmacy": {
-                "name": "داروخانه"
+                "name": "داروخانه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'داروخانه'، با کاما جدا میشوند>"
+            },
+            "amenity/place_of_worship": {
+                "name": "مکانی از عبادتگاه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مکان مذهبی'، با کاما جدا میشوند>"
+            },
+            "amenity/place_of_worship/buddhist": {
+                "name": "معبد بودایی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'معبد بودایی'، با کاما جدا میشوند>"
             },
             "amenity/place_of_worship/christian": {
-                "name": "کلیسا"
+                "name": "کلیسا",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کلیسا'، با کاما جدا میشوند>"
+            },
+            "amenity/place_of_worship/jewish": {
+                "name": "کنیسه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کنیسه'، با کاما جدا میشوند>"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "مسجد"
+                "name": "مسجد",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسجد'، با کاما جدا میشوند>"
             },
             "amenity/police": {
-                "name": "پليس"
+                "name": "پليس",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پلیس'، با کاما جدا میشوند>"
             },
             "amenity/post_box": {
-                "name": "صندوق پستی"
+                "name": "صندوق پستی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'صندوق پستی'، با کاما جدا میشوند>"
             },
             "amenity/post_office": {
-                "name": "اداره پست"
+                "name": "اداره پست",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اداره پست'، با کاما جدا میشوند>"
+            },
+            "amenity/pub": {
+                "name": "میخانه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'میخانه'، با کاما جدا میشوند>"
+            },
+            "amenity/ranger_station": {
+                "name": "ایستگاه جنگل بانی"
+            },
+            "amenity/recycling": {
+                "name": "بازیافت مواد"
+            },
+            "amenity/restaurant": {
+                "name": "رستوران",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'رستوران'، با کاما جدا میشوند>"
             },
             "amenity/school": {
-                "name": "مدرسه"
+                "name": "مدرسه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مدرسه'، با کاما جدا میشوند>"
+            },
+            "amenity/shelter": {
+                "name": "پناه گاه"
+            },
+            "amenity/studio": {
+                "name": "استدیو"
+            },
+            "amenity/swimming_pool": {
+                "name": "استخر شنا",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'استخر شنا'، با کاما جدا میشوند>"
+            },
+            "amenity/taxi": {
+                "name": "ایستگاه تاکسی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ایستگاه تاکسی'، با کاما جدا میشوند>"
+            },
+            "amenity/telephone": {
+                "name": "تلفن عمومی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تلفن عمومی'، با کاما جدا میشوند>"
             },
             "amenity/theatre": {
-                "name": "تئاتر"
+                "name": "تئاتر",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تئاتر'، با کاما جدا میشوند>"
+            },
+            "amenity/toilets": {
+                "name": "سرویس بهداشتی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سرویس بهداشتی'، با کاما جدا میشوند>"
+            },
+            "amenity/townhall": {
+                "name": "تالار شهر",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تالار شهر'، با کاما جدا میشوند>"
             },
             "amenity/university": {
-                "name": "دانشگاه"
+                "name": "دانشگاه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دانشگاه'، با کاما جدا میشوند>"
             },
-            "barrier/wall": {
-                "name": "دیوار"
+            "amenity/vending_machine": {
+                "name": "دستگاه فروش"
             },
-            "building": {
-                "name": "ساختÙ\85اÙ\86"
+            "amenity/veterinary": {
+                "name": "داÙ\85پزشکÛ\8c"
             },
-            "highway": {
-                "name": "بزرگراه"
+            "amenity/waste_basket": {
+                "name": "سطل زباله",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سطل زباله'، با کاما جدا میشوند>"
             },
-            "highway/bus_stop": {
-                "name": "ایستاه اتوبوس"
+            "area": {
+                "name": "فضا",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'فضا'، با کاما جدا میشوند>"
             },
-            "highway/cycleway": {
-                "name": "مسیر دوچرخه سواری"
+            "barrier": {
+                "name": "مانع",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مانع'، با کاما جدا میشوند>"
             },
-            "highway/footway": {
-                "name": "مسیر پیاده روی"
+            "barrier/block": {
+                "name": "بلوک",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بلوک'، با کاما جدا میشوند>"
             },
-            "highway/motorway": {
-                "name": "مسیر موتور سواری"
+            "barrier/bollard": {
+                "name": "بولارد",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بولارد'، با کاما جدا میشوند>"
             },
-            "highway/path": {
-                "name": "مسیر"
+            "barrier/cattle_grid": {
+                "name": "شبکه آهنی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای'Cattle Grid'  ، با کاما جدا میشوند>"
             },
-            "historic/castle": {
-                "name": "قلعه"
+            "barrier/city_wall": {
+                "name": "دیوار شهر",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دیوار شهر'، با کاما جدا میشوند>"
             },
-            "landuse/forest": {
-                "name": "جنگل"
+            "barrier/cycle_barrier": {
+                "name": "مانع مستطیلی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مانع مستطیلی'، با کاما جدا میشوند>"
             },
-            "leisure/park": {
-                "name": "پارک"
+            "barrier/ditch": {
+                "name": "جوی آب",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Ditch'، با کاما جدا میشوند>"
             },
-            "leisure/stadium": {
-                "name": "استودیوم"
+            "barrier/entrance": {
+                "name": "ورودی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
             },
-            "natural/water": {
-                "name": "آب"
+            "barrier/fence": {
+                "name": "حصار",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Fence'، با کاما جدا میشوند>"
             },
-            "natural/wood": {
-                "name": "چوب"
+            "barrier/gate": {
+                "name": "دروازه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دروازه'، با کاما جدا میشوند>"
             },
-            "office": {
-                "name": "اداره"
+            "barrier/hedge": {
+                "name": "پرچین",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Hedge'، با کاما جدا میشوند>"
             },
-            "place/locality": {
-                "name": "محلی"
+            "barrier/kissing_gate": {
+                "name": "دروازه مخصوص انسان",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'Kissing Gate'، با کاما جدا میشوند>"
             },
-            "shop": {
-                "name": "فروشگاه"
+            "barrier/lift_gate": {
+                "name": "دروازه بالا رونده",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Lift Gate'، با کاما جدا میشوند>"
             },
-            "shop/electronics": {
-                "name": "فروشگاه الکترونیک"
+            "barrier/retaining_wall": {
+                "name": "دیوار نگه دارنده",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'Retaining Wall' ، با کاما جدا میشوند>"
             },
-            "shop/supermarket": {
-                "name": "سوپرمارکت"
+            "barrier/stile": {
+                "name": "حصار نردبانی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'Stile' ، با کاما جدا میشوند>"
             },
-            "tourism": {
-                "name": "توریستی"
+            "barrier/toll_booth": {
+                "name": "عوارضی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Toll Booth'، با کاما جدا میشوند>"
             },
-            "tourism/hotel": {
-                "name": "هتل"
+            "barrier/wall": {
+                "name": "دیوار",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دیوار'، با کاما جدا میشوند>"
             },
-            "tourism/museum": {
-                "name": "موزه"
+            "boundary/administrative": {
+                "name": "مرز اداری",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مرز اداری'، با کاما جدا میشوند>"
             },
-            "tourism/zoo": {
-                "name": "باغ وحش"
+            "building": {
+                "name": "ساختمان",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان'، با کاما جدا میشوند>"
             },
-            "waterway/canal": {
-                "name": "کانال"
+            "building/apartments": {
+                "name": "آپارتمان ها",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آپارتمان'، با کاما جدا میشوند>"
+            },
+            "building/commercial": {
+                "name": "ساختمان ارتباطی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان ارتباطی'، با کاما جدا میشوند>"
+            },
+            "building/entrance": {
+                "name": "ورودی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
+            },
+            "building/garage": {
+                "name": "گاراژ",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گاراژ'، با کاما جدا میشوند>"
+            },
+            "building/house": {
+                "name": "خانه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خانه'، با کاما جدا میشوند>"
+            },
+            "building/hut": {
+                "name": "کلبه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کلبه'، با کاما جدا میشوند>"
+            },
+            "building/industrial": {
+                "name": "ساختمان صنعتی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان صنعتی'، با کاما جدا میشوند>"
+            },
+            "building/residential": {
+                "name": "ساختمان مسکونی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان مسکونی'، با کاما جدا میشوند>"
+            },
+            "craft/basket_maker": {
+                "name": "سبد ساز"
+            },
+            "craft/beekeeper": {
+                "name": "پرورش دهنده زنبور عسل"
+            },
+            "craft/blacksmith": {
+                "name": "آهنگر"
+            },
+            "craft/boatbuilder": {
+                "name": "قایق ساز"
+            },
+            "craft/bookbinder": {
+                "name": "صحافی"
+            },
+            "craft/brewery": {
+                "name": "آبجو سازی"
+            },
+            "craft/carpenter": {
+                "name": "نجاری"
+            },
+            "craft/carpet_layer": {
+                "name": "قالیبافی"
+            },
+            "craft/caterer": {
+                "name": "آذوقه رسان"
+            },
+            "craft/clockmaker": {
+                "name": "ساعت سازی"
+            },
+            "craft/confectionary": {
+                "name": "قنادی"
+            },
+            "craft/dressmaker": {
+                "name": "خیاطی زنانه"
+            },
+            "craft/electrician": {
+                "name": "متخصص برق"
+            },
+            "craft/gardener": {
+                "name": "باغبان"
+            },
+            "craft/glaziery": {
+                "name": "شیشه بری"
+            },
+            "craft/handicraft": {
+                "name": "صنایع دستی"
+            },
+            "craft/hvac": {
+                "name": "گرمایش و تهویه مطبوع"
+            },
+            "craft/insulator": {
+                "name": "عایق سازی"
+            },
+            "craft/jeweler": {
+                "name": "جواهر سازی"
+            },
+            "craft/key_cutter": {
+                "name": "برش های کلیدی"
+            },
+            "craft/locksmith": {
+                "name": "قفل ساز"
+            },
+            "craft/metal_construction": {
+                "name": "ساخت و ساز فلزی"
+            },
+            "craft/optician": {
+                "name": "عینک ساز"
+            },
+            "craft/painter": {
+                "name": "نقاش"
+            },
+            "craft/photographer": {
+                "name": "عکاس"
+            },
+            "craft/photographic_labratory": {
+                "name": "آزمایشگاه عکس برداری"
+            },
+            "craft/plasterer": {
+                "name": "گچ کار"
+            },
+            "craft/plumber": {
+                "name": "لوله کش"
+            },
+            "craft/pottery": {
+                "name": "سفالگری"
+            },
+            "craft/rigger": {
+                "name": "لولزم سازی"
+            },
+            "craft/roofer": {
+                "name": "سقف ساز"
+            },
+            "craft/saddler": {
+                "name": "زین ساز"
+            },
+            "craft/sailmaker": {
+                "name": "بادبان ساز"
+            },
+            "craft/sawmill": {
+                "name": "چوب بری"
+            },
+            "craft/scaffolder": {
+                "name": "داربستی"
+            },
+            "craft/sculpter": {
+                "name": "حجاری"
+            },
+            "craft/shoemaker": {
+                "name": "کفاش"
+            },
+            "craft/stonemason": {
+                "name": "سنگ تراش"
+            },
+            "craft/sweep": {
+                "name": "جاروکش شومینه"
+            },
+            "craft/tailor": {
+                "name": "خیاط"
+            },
+            "craft/tiler": {
+                "name": "آجر پز"
+            },
+            "craft/tinsmith": {
+                "name": "حلبساز"
+            },
+            "craft/upholsterer": {
+                "name": "خیاط پرده و رومبلی"
+            },
+            "craft/watchmaker": {
+                "name": "ساعت ساز"
+            },
+            "craft/window_construction": {
+                "name": "ساخت و ساز پنجره"
+            },
+            "embankment": {
+                "name": "خاک ریز"
+            },
+            "emergency/ambulance_station": {
+                "name": "ایستگاه آمبولانس"
+            },
+            "emergency/fire_hydrant": {
+                "name": "آتش نشانی"
+            },
+            "emergency/phone": {
+                "name": "تلفن اورژانسی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تلفن اورژانسی'، با کاما جدا میشوند>"
+            },
+            "entrance": {
+                "name": "درب ورودی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
+            },
+            "footway/crossing": {
+                "name": "خط عابر پیاده"
+            },
+            "footway/sidewalk": {
+                "name": "پیاده رو"
+            },
+            "golf/bunker": {
+                "name": "تله شن و ماسه"
+            },
+            "golf/fairway": {
+                "name": "چمن راه راه"
+            },
+            "golf/green": {
+                "name": "چمن سبز نزدیک سوراخ"
+            },
+            "golf/hole": {
+                "name": "سوراخ گلف"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "خطر آب های کناری"
+            },
+            "golf/rough": {
+                "name": "منطقه زمخت"
+            },
+            "golf/tee": {
+                "name": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "name": "تهدید آبی"
+            },
+            "highway": {
+                "name": "بزرگراه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بزرگراه'، با کاما جدا میشوند>"
+            },
+            "highway/bridleway": {
+                "name": "مسیر حیوانات اهلی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Bridle Path'، با کاما جدا میشوند>"
+            },
+            "highway/bus_stop": {
+                "name": "ایستگاه اتوبوس",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ایستگاه اتوبوس'، با کاما جدا میشوند>"
+            },
+            "highway/crossing": {
+                "name": "محل عبور عابر",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خط کشی عابر پیاده'، با کاما جدا میشوند>"
+            },
+            "highway/cycleway": {
+                "name": "مسیر دوچرخه سواری",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر دوچرخه'، با کاما جدا میشوند>"
+            },
+            "highway/footway": {
+                "name": "مسیر پیاده روی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر پیاده'، با کاما جدا میشوند>"
+            },
+            "highway/living_street": {
+                "name": "خیابان  محدوده زندگی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خیابان محل زندگی'، با کاما جدا میشوند>"
+            },
+            "highway/mini_roundabout": {
+                "name": "میدان کوچک",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Mini-Roundabout'، با کاما جدا میشوند>"
+            },
+            "highway/motorway": {
+                "name": "مسیر موتور سواری",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راه وسایل موتوری'، با کاما جدا میشوند>"
+            },
+            "highway/motorway_junction": {
+                "name": "محل اتصال جاده موتور سیکلت",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'Motorway Junction'، با کاما جدا میشوند>"
+            },
+            "highway/motorway_link": {
+                "name": "اتصال جاده موتور سیکلت",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن جاده موتور'، با کاما جدا میشوند>"
+            },
+            "highway/path": {
+                "name": "مسیر",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر'، با کاما جدا میشوند>"
+            },
+            "highway/pedestrian": {
+                "name": "عبور پیاده",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Pedestrian'، با کاما جدا میشوند>"
+            },
+            "highway/primary": {
+                "name": "جاده اصلی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راه اصلی'، با کاما جدا میشوند>"
+            },
+            "highway/primary_link": {
+                "name": "اتصال اصلی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن راه اصلی'، با کاما جدا میشوند>"
+            },
+            "highway/residential": {
+                "name": "جاده ی مسکونی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده مسکونی'، با کاما جدا میشوند>"
+            },
+            "highway/rest_area": {
+                "name": "فضای استراحت"
+            },
+            "highway/road": {
+                "name": "جاده ناشناخته",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده ناشناخته'، با کاما جدا میشوند>"
+            },
+            "highway/secondary": {
+                "name": "جاده دوم",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده دوم'، با کاما جدا میشوند>"
+            },
+            "highway/secondary_link": {
+                "name": "اتصال دومی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن دومی'، با کاما جدا میشوند>"
+            },
+            "highway/service": {
+                "name": "جاده خدماتی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده خدماتی'، با کاما جدا میشوند>"
+            },
+            "highway/service/alley": {
+                "name": "کوچه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کوچه'، با کاما جدا میشوند>"
+            },
+            "highway/service/drive-through": {
+                "name": "پرداخت سواره",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پرداخت سواره'، با کاما جدا میشوند>"
+            },
+            "highway/service/driveway": {
+                "name": "جاده به خانه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Driveway'، با کاما جدا میشوند>"
+            },
+            "highway/service/emergency_access": {
+                "name": "دسترسی اورژانسی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دسترسی اورژانسی'، با کاما جدا میشوند>"
+            },
+            "highway/service/parking_aisle": {
+                "name": "راهرو پارکینگ",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راهرو پارکینگ'، با کاما جدا میشوند>"
+            },
+            "highway/services": {
+                "name": "فضای خدماتی"
+            },
+            "highway/steps": {
+                "name": "پله",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پله'، با کاما جدا میشوند>"
+            },
+            "highway/stop": {
+                "name": "علامت توقف"
+            },
+            "highway/tertiary": {
+                "name": "جاده سوم",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده سوم'، با کاما جدا میشوند>"
+            },
+            "highway/tertiary_link": {
+                "name": "اتصال سومی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوند سوم'، با کاما جدا میشوند>"
+            },
+            "highway/track": {
+                "name": "مسیر خاکی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راه خاکی'، با کاما جدا میشوند>"
+            },
+            "highway/traffic_signals": {
+                "name": "چراغ راهنمایی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'چراغ راهنمایی'، با کاما جدا میشوند>"
+            },
+            "highway/trunk": {
+                "name": "جاده ی ملی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده ملی'، با کاما جدا میشوند>"
+            },
+            "highway/trunk_link": {
+                "name": "اتصال جاده ملی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوند جاده ملی'، با کاما جدا میشوند>"
+            },
+            "highway/turning_circle": {
+                "name": "بنبست قابل دور زدن",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بنبست قابل دور زدن'، با کاما جدا میشوند>"
+            },
+            "highway/unclassified": {
+                "name": "جاده طبقه بندی نشده",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده طبقه بندی نشده'، با کاما جدا میشوند>"
+            },
+            "historic": {
+                "name": "مکان تاریخی",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مکان تاریخی'، با کاما جدا میشوند>"
+            },
+            "historic/archaeological_site": {
+                "name": "مکان باستان شناسی"
+            },
+            "historic/boundary_stone": {
+                "name": "سنگ مرزی"
+            },
+            "historic/castle": {
+                "name": "قلعه"
+            },
+            "historic/memorial": {
+                "name": "یادبود"
+            },
+            "historic/monument": {
+                "name": "مقبره"
+            },
+            "historic/ruins": {
+                "name": "ویرانه"
+            },
+            "historic/wayside_cross": {
+                "name": "صلیب کنار جاده"
+            },
+            "historic/wayside_shrine": {
+                "name": "آرامگاه کنار جاده"
+            },
+            "landuse": {
+                "name": "کاربری زمین ها"
+            },
+            "landuse/allotments": {
+                "name": "بخش پرورش گل و سبزیجات"
+            },
+            "landuse/basin": {
+                "name": "حوزه رودخانه"
+            },
+            "landuse/cemetery": {
+                "name": "قبرستان"
+            },
+            "landuse/commercial": {
+                "name": "تجاری"
+            },
+            "landuse/construction": {
+                "name": "ساخت و ساز"
+            },
+            "landuse/farm": {
+                "name": "مزرعه"
+            },
+            "landuse/farmland": {
+                "name": "زمین کشاورزی"
+            },
+            "landuse/farmyard": {
+                "name": "محوطه مزرعه"
+            },
+            "landuse/forest": {
+                "name": "جنگل"
+            },
+            "landuse/grass": {
+                "name": "علف زار"
+            },
+            "landuse/industrial": {
+                "name": "صنعتی"
+            },
+            "landuse/meadow": {
+                "name": "مرغزار"
+            },
+            "landuse/orchard": {
+                "name": "باغ میوه"
+            },
+            "landuse/quarry": {
+                "name": "معدن سنگ"
+            },
+            "landuse/residential": {
+                "name": "مسکونی"
+            },
+            "landuse/retail": {
+                "name": "خرده فروشی"
+            },
+            "landuse/vineyard": {
+                "name": "باغ انگور"
+            },
+            "leisure": {
+                "name": "اوقات فراغت"
+            },
+            "leisure/common": {
+                "name": "عمومی"
+            },
+            "leisure/dog_park": {
+                "name": "پارک سگ"
+            },
+            "leisure/garden": {
+                "name": "باغ"
+            },
+            "leisure/golf_course": {
+                "name": "زمین گلف"
+            },
+            "leisure/marina": {
+                "name": "تفرجگاه ساحلی"
+            },
+            "leisure/park": {
+                "name": "پارک"
+            },
+            "leisure/pitch": {
+                "name": "زمین ورزشی"
+            },
+            "leisure/pitch/american_football": {
+                "name": "میدان فوتبال آمریکایی"
+            },
+            "leisure/pitch/baseball": {
+                "name": "الماسی شکل بیسبال"
+            },
+            "leisure/pitch/basketball": {
+                "name": "محوطه بسکتبال"
+            },
+            "leisure/pitch/skateboard": {
+                "name": "پارک اسکیت"
+            },
+            "leisure/pitch/soccer": {
+                "name": "میدان فوتبال"
+            },
+            "leisure/pitch/tennis": {
+                "name": "محوطه تنیس"
+            },
+            "leisure/pitch/volleyball": {
+                "name": "سالن والیبال"
+            },
+            "leisure/playground": {
+                "name": "زمین بازی"
+            },
+            "leisure/slipway": {
+                "name": "قایق ساکن"
+            },
+            "leisure/sports_center": {
+                "name": "مرکز ورزشی"
+            },
+            "leisure/stadium": {
+                "name": "ورزشگاه"
+            },
+            "leisure/swimming_pool": {
+                "name": "استخر شنا"
+            },
+            "leisure/track": {
+                "name": "مسیر مسابقه"
+            },
+            "line": {
+                "name": "خط"
+            },
+            "man_made": {
+                "name": "سازه ی انسانی"
+            },
+            "man_made/breakwater": {
+                "name": "موج شکن"
+            },
+            "man_made/cutline": {
+                "name": "خط برش"
+            },
+            "man_made/embankment": {
+                "name": "خاک ریز"
+            },
+            "man_made/flagpole": {
+                "name": "میله پرچم"
+            },
+            "man_made/lighthouse": {
+                "name": "فانوس دریایی"
+            },
+            "man_made/observation": {
+                "name": "برج رصد"
+            },
+            "man_made/pier": {
+                "name": "اسکله"
+            },
+            "man_made/pipeline": {
+                "name": "خط لوله"
+            },
+            "man_made/survey_point": {
+                "name": "نقطه مطالعاتی"
+            },
+            "man_made/tower": {
+                "name": "دکل، برج"
+            },
+            "man_made/wastewater_plant": {
+                "name": "تصفیه خانه ی فاضلاب"
+            },
+            "man_made/water_tower": {
+                "name": "برج مخزن آب"
+            },
+            "man_made/water_well": {
+                "name": "چاه آب"
+            },
+            "man_made/water_works": {
+                "name": "امور آب"
+            },
+            "military/airfield": {
+                "name": "پایگاه هوایی"
+            },
+            "military/barracks": {
+                "name": "پادگان"
+            },
+            "military/bunker": {
+                "name": "سنگر زیرزمینی"
+            },
+            "military/range": {
+                "name": "محدوده نظامی"
+            },
+            "natural": {
+                "name": "طبیعی"
+            },
+            "natural/bay": {
+                "name": "خلیج کوچک"
+            },
+            "natural/beach": {
+                "name": "ساحل"
+            },
+            "natural/cliff": {
+                "name": "صخره"
+            },
+            "natural/coastline": {
+                "name": "خط ساحلی"
+            },
+            "natural/fell": {
+                "name": "تپه سنگی"
+            },
+            "natural/glacier": {
+                "name": "یخچال طبیعی"
+            },
+            "natural/grassland": {
+                "name": "مرتع"
+            },
+            "natural/heath": {
+                "name": "بوته زار"
+            },
+            "natural/peak": {
+                "name": "قله"
+            },
+            "natural/scree": {
+                "name": "سنگ ریزه"
+            },
+            "natural/scrub": {
+                "name": "خارزار"
+            },
+            "natural/spring": {
+                "name": "چشمه"
+            },
+            "natural/tree": {
+                "name": "درخت"
+            },
+            "natural/water": {
+                "name": "آب"
+            },
+            "natural/water/lake": {
+                "name": "برکه ، استخر"
+            },
+            "natural/water/pond": {
+                "name": "دریاچه"
+            },
+            "natural/water/reservoir": {
+                "name": "آب انبار"
+            },
+            "natural/wetland": {
+                "name": "تالاب"
+            },
+            "natural/wood": {
+                "name": "چوب"
+            },
+            "office": {
+                "name": "اداره"
+            },
+            "office/accountant": {
+                "name": "حسابدار"
+            },
+            "office/administrative": {
+                "name": "دفتر اداری"
+            },
+            "office/architect": {
+                "name": "معمار"
+            },
+            "office/company": {
+                "name": "دفتر شرکت"
+            },
+            "office/educational_institution": {
+                "name": "مؤسسه آموزشی"
+            },
+            "office/employment_agency": {
+                "name": "آژانس کاریابی"
+            },
+            "office/estate_agent": {
+                "name": "دفتر املاک"
+            },
+            "office/financial": {
+                "name": "اداره مالی"
+            },
+            "office/government": {
+                "name": "اداره دولتی"
+            },
+            "office/insurance": {
+                "name": "دفتر بیمه"
+            },
+            "office/it": {
+                "name": "سازمان آی تی"
+            },
+            "office/lawyer": {
+                "name": "دفتر حقوقی"
+            },
+            "office/newspaper": {
+                "name": "روزنامه"
+            },
+            "office/ngo": {
+                "name": "سازمان غیر دولتی"
+            },
+            "office/physician": {
+                "name": "پزشک"
+            },
+            "office/political_party": {
+                "name": "حزب سیاسی"
+            },
+            "office/research": {
+                "name": "سازمان تحقیقاتی و پژوهشی"
+            },
+            "office/telecommunication": {
+                "name": "اداره مخابرات"
+            },
+            "office/therapist": {
+                "name": "درمان شناس"
+            },
+            "office/travel_agent": {
+                "name": "آژانس مسافرتی"
+            },
+            "piste": {
+                "name": "پیست/ مسیر اسکی"
+            },
+            "place": {
+                "name": "محل"
+            },
+            "place/city": {
+                "name": "شهر"
+            },
+            "place/hamlet": {
+                "name": "دهکده"
+            },
+            "place/island": {
+                "name": "جزیره"
+            },
+            "place/isolated_dwelling": {
+                "name": "مسکن ایزوله"
+            },
+            "place/locality": {
+                "name": "محلی"
+            },
+            "place/town": {
+                "name": "شهر کوچک"
+            },
+            "place/village": {
+                "name": "روستا"
+            },
+            "point": {
+                "name": "نقطه"
+            },
+            "power": {
+                "name": "نیرو"
+            },
+            "power/generator": {
+                "name": "مولد برق"
+            },
+            "power/line": {
+                "name": "خط نیرو"
+            },
+            "power/minor_line": {
+                "name": "خط برق ضعیف"
+            },
+            "power/pole": {
+                "name": "مسیر برق متوسط"
+            },
+            "power/sub_station": {
+                "name": "ایستگاه فرعی"
+            },
+            "power/tower": {
+                "name": "دکل ولتاژ قوی"
+            },
+            "power/transformer": {
+                "name": "مبدل برق"
+            },
+            "public_transport/platform": {
+                "name": "پلتفورم"
+            },
+            "public_transport/stop_position": {
+                "name": "موقعیت توقف"
+            },
+            "railway": {
+                "name": "راه آهن"
+            },
+            "railway/abandoned": {
+                "name": "راه آهن متروکه"
+            },
+            "railway/disused": {
+                "name": "راه آهن بلا استفاده"
+            },
+            "railway/funicular": {
+                "name": "کابلی"
+            },
+            "railway/halt": {
+                "name": "توقف گاه راه آهن"
+            },
+            "railway/level_crossing": {
+                "name": "تقاطع راه آهن"
+            },
+            "railway/monorail": {
+                "name": "ترن هوایی"
+            },
+            "railway/narrow_gauge": {
+                "name": "راه آهن باریک کابلی"
+            },
+            "railway/platform": {
+                "name": "بستر راه آهن"
+            },
+            "railway/rail": {
+                "name": "ریل قطار"
+            },
+            "railway/station": {
+                "name": "ایستگاه راه آهن"
+            },
+            "railway/subway": {
+                "name": "مترو"
+            },
+            "railway/subway_entrance": {
+                "name": "ورودی مترو"
+            },
+            "railway/tram": {
+                "name": "واگن برقی"
+            },
+            "relation": {
+                "name": "رابطه"
+            },
+            "route/ferry": {
+                "name": "مسیر کشتی"
+            },
+            "shop": {
+                "name": "فروشگاه"
+            },
+            "shop/alcohol": {
+                "name": "مغازه مشروب فروشی"
+            },
+            "shop/bakery": {
+                "name": "نانوایی"
+            },
+            "shop/beauty": {
+                "name": "فروشگاه زیبایی"
+            },
+            "shop/beverages": {
+                "name": "فروشگاه آشامیدنی"
+            },
+            "shop/bicycle": {
+                "name": "فروشگاه دوچرخه"
+            },
+            "shop/books": {
+                "name": "کتاب فروشی"
+            },
+            "shop/boutique": {
+                "name": "بوتیک"
+            },
+            "shop/butcher": {
+                "name": "قصابی"
+            },
+            "shop/car": {
+                "name": "نمایندگی خودرو"
+            },
+            "shop/car_parts": {
+                "name": "فروشگاه قطعات خودرو"
+            },
+            "shop/car_repair": {
+                "name": "تعمیرگاه خودرو"
+            },
+            "shop/chemist": {
+                "name": "داروسازی"
+            },
+            "shop/clothes": {
+                "name": "فروشگاه لباس"
+            },
+            "shop/computer": {
+                "name": "فروشگاه کامپیوتر"
+            },
+            "shop/confectionery": {
+                "name": "شیرینی پزی"
+            },
+            "shop/convenience": {
+                "name": "فروشگاه زنجیره ای"
+            },
+            "shop/deli": {
+                "name": "اغذیه فروشی"
+            },
+            "shop/department_store": {
+                "name": "کل فروشی"
+            },
+            "shop/doityourself": {
+                "name": "فروشگاه DIY"
+            },
+            "shop/dry_cleaning": {
+                "name": "پاک کننده های خشک"
+            },
+            "shop/electronics": {
+                "name": "فروشگاه الکترونیک"
+            },
+            "shop/farm": {
+                "name": "تولید پایه"
+            },
+            "shop/fishmonger": {
+                "name": "ماهی فروشی"
+            },
+            "shop/florist": {
+                "name": "گل فروشی"
+            },
+            "shop/furniture": {
+                "name": "فروشگاه مبلمان"
+            },
+            "shop/garden_centre": {
+                "name": "مرکز خرید باغچه"
+            },
+            "shop/gift": {
+                "name": "هدیه فروشی"
+            },
+            "shop/greengrocer": {
+                "name": "سبزی فروشی"
+            },
+            "shop/hairdresser": {
+                "name": "آرایش و پیرایش"
+            },
+            "shop/hardware": {
+                "name": "فروشگاه سخت افزار"
+            },
+            "shop/hifi": {
+                "name": "فروشگاه Hifi"
+            },
+            "shop/jewelry": {
+                "name": "جواهر فروشی"
+            },
+            "shop/kiosk": {
+                "name": "دکه"
+            },
+            "shop/laundry": {
+                "name": "خشک شویی"
+            },
+            "shop/locksmith": {
+                "name": "قفل سازی"
+            },
+            "shop/mall": {
+                "name": "مرکز خرید"
+            },
+            "shop/mobile_phone": {
+                "name": "فروشگاه تلفن همراه"
+            },
+            "shop/motorcycle": {
+                "name": "نمایندگی موتور سیکلت"
+            },
+            "shop/music": {
+                "name": "فروشگاه موسیقی"
+            },
+            "shop/newsagent": {
+                "name": "دکه ی روزنامه"
+            },
+            "shop/optician": {
+                "name": "عینک سازی"
+            },
+            "shop/outdoor": {
+                "name": "فروشگاه فضای باز"
+            },
+            "shop/pet": {
+                "name": "فروشگاه حیوانات خانگی"
+            },
+            "shop/photo": {
+                "name": "فروشگاه عکاسی"
+            },
+            "shop/shoes": {
+                "name": "کفش فروشی"
+            },
+            "shop/sports": {
+                "name": "فروشگاه لوازم ورزشی"
+            },
+            "shop/stationery": {
+                "name": "فروشگاه لوازم التحریر"
+            },
+            "shop/supermarket": {
+                "name": "سوپرمارکت"
+            },
+            "shop/toys": {
+                "name": "اسباب بازی فروشی"
+            },
+            "shop/travel_agency": {
+                "name": "آژانس مسافرتی"
+            },
+            "shop/tyres": {
+                "name": "تایر فروشی"
+            },
+            "shop/vacant": {
+                "name": "فروشگاه بدون متصدی"
+            },
+            "shop/variety_store": {
+                "name": "فروشگاه متنوع"
+            },
+            "shop/video": {
+                "name": "فیلم فروشی"
+            },
+            "tourism": {
+                "name": "توریستی"
+            },
+            "tourism/alpine_hut": {
+                "name": "کلبه ارائه خدمات"
+            },
+            "tourism/artwork": {
+                "name": "اثر هنری"
+            },
+            "tourism/attraction": {
+                "name": "جاذبه های توریستی"
+            },
+            "tourism/camp_site": {
+                "name": "اردوگاه"
+            },
+            "tourism/caravan_site": {
+                "name": "پارکینگ ماشین کاروان"
+            },
+            "tourism/chalet": {
+                "name": "کلبه ییلاقی"
+            },
+            "tourism/guest_house": {
+                "name": "مهمان خانه"
+            },
+            "tourism/hostel": {
+                "name": "مسافرخانه"
+            },
+            "tourism/hotel": {
+                "name": "هتل"
+            },
+            "tourism/information": {
+                "name": "اطلاعات"
+            },
+            "tourism/motel": {
+                "name": "متل"
+            },
+            "tourism/museum": {
+                "name": "موزه"
+            },
+            "tourism/picnic_site": {
+                "name": "مکان پیک نیک"
+            },
+            "tourism/theme_park": {
+                "name": "پارک تفریحی"
+            },
+            "tourism/viewpoint": {
+                "name": "منظره"
+            },
+            "tourism/zoo": {
+                "name": "باغ وحش"
+            },
+            "type/boundary": {
+                "name": "مرز"
+            },
+            "type/boundary/administrative": {
+                "name": "مرز اداری"
+            },
+            "type/multipolygon": {
+                "name": "چند ضلعی"
+            },
+            "type/restriction": {
+                "name": "محدوده"
+            },
+            "type/route": {
+                "name": "مسیر"
+            },
+            "type/route/bicycle": {
+                "name": "مسیر دوچرخه"
+            },
+            "type/route/bus": {
+                "name": "مسیر اتوبوس"
+            },
+            "type/route/detour": {
+                "name": "مسیر جایگزین"
+            },
+            "type/route/ferry": {
+                "name": "مسیر کشتی"
+            },
+            "type/route/foot": {
+                "name": "مسیر پیاده"
+            },
+            "type/route/hiking": {
+                "name": "مسیر کوهنوردی"
+            },
+            "type/route/pipeline": {
+                "name": "مسیر خط لوله"
+            },
+            "type/route/power": {
+                "name": "مسیر برق"
+            },
+            "type/route/road": {
+                "name": "مسیر جاده"
+            },
+            "type/route/train": {
+                "name": "مسیر راه آهن"
+            },
+            "type/route/tram": {
+                "name": "مسیر قطار برقی"
+            },
+            "type/route_master": {
+                "name": "مسیر اصلی"
+            },
+            "vertex": {
+                "name": "سایر"
+            },
+            "waterway": {
+                "name": "راه آبی"
+            },
+            "waterway/canal": {
+                "name": "کانال"
+            },
+            "waterway/dam": {
+                "name": "سد"
+            },
+            "waterway/ditch": {
+                "name": "جوی آب"
+            },
+            "waterway/drain": {
+                "name": "فاضلاب"
+            },
+            "waterway/river": {
+                "name": "رودخانه"
+            },
+            "waterway/riverbank": {
+                "name": "حاشیه رودخانه"
+            },
+            "waterway/stream": {
+                "name": "نهر"
+            },
+            "waterway/weir": {
+                "name": "بند"
             }
         }
     }
index f7901c4a496c38da18fff24dc5cbc972479d2aa3..b4ee46bb6f01a41fafb63a283266eb91d87e5ee0 100644 (file)
@@ -45,6 +45,7 @@
             "title": "Pidennä",
             "description": "Jatka ja pidennä tätä viivaa.",
             "not_eligible": "Viivaa ei voi jatkaa tästä.",
+            "multiple": "Useita viivoja voidaan jatkaa tässä. Viivan valitsemiseksi paina Shift-painiketta ja napsauta sitä.",
             "annotation": {
                 "line": "Viivan muokkaaminen aloitettu.",
                 "area": "Alueen muokkaaminen aloitettu."
             "annotation": {
                 "line": "Viiva muutettu suorakulmaiseksi.",
                 "area": "Alue muutettu suorakulmaiseksi."
-            }
+            },
+            "not_squarish": "Nelikulmion tekeminen epäonnistui, koska se ei ole neliömäinen."
         },
         "straighten": {
             "title": "Suorista",
             "description": "Suorista tämä viiva.",
             "key": "S",
-            "annotation": "Viiva suoristettiin."
+            "annotation": "Viiva suoristettiin.",
+            "too_bendy": "Oikaiseminen epäonnistui, koska se taipuu liian paljon."
         },
         "delete": {
             "title": "Poista",
         "incomplete": "<ei ladattu>",
         "feature_list": "Etsi ominaisuuksia",
         "edit": "Muokkaa ominaisuutta",
-        "none": "Ei kohteita"
+        "none": "Ei kohteita",
+        "node": "Noodi",
+        "way": "Tie",
+        "relation": "Relaatio",
+        "location": "Sijainti"
     },
     "background": {
         "title": "Tausta",
         },
         "lines": {
             "title": "Viivat",
+            "add": "Viivoja käytetään esittämään sellaisia ominaisuuksia kuin tiet, rautatiet ja joet. **Napsauta Line-painiketta uuden viivan lisäämiseksi.**",
             "start": "**Aloita viiva napsauttamalla tien loppupistettä.**",
             "intersect": "Lisää pisteitä viivaan napsauttamalla karttaa. Karttaa voi liikuttaa vetämällä viivan piirtämisen aikana. Tiet ja monet muutkin viivat ovat osa isompaa kokonaisuutta. Reitityksen takia on tärkeää, että tiet on yhdistetty toisiinsa oikein. **Luo kahden kadun risteys napsauttamalla Flower Streetiä.**",
             "finish": "Viimeistele viiva kaksoisnapsauttamalla viimeisen viivapisteen kohdalla. **Lopeta viivan piirtäminen.**",
                     "postcode": "Postinumero"
                 }
             },
+            "aerialway": {
+                "label": "Tyyppi"
+            },
+            "aerialway/access": {
+                "label": "Käyttöoikeus"
+            },
+            "aerialway/bubble": {
+                "label": "kupla"
+            },
+            "aerialway/capacity": {
+                "label": "Kapasiteetti (per tunti)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Kesto (minuuttia)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/occupancy": {
+                "label": "asuminen",
+                "placeholder": "2, 4, 8..."
+            },
             "aeroway": {
                 "label": "Tyyppi"
             },
             "fixme": {
                 "label": "Korjaa minut"
             },
+            "gauge": {
+                "label": "Raideväli"
+            },
             "highway": {
                 "label": "Tyyppi"
             },
                 "label": "Puhelinnumero",
                 "placeholder": "+358 40 123 4567"
             },
+            "piste/difficulty": {
+                "label": "haastavuus"
+            },
+            "piste/grooming": {
+                "label": "siistiytyminen"
+            },
+            "piste/type": {
+                "label": "Tyyppi"
+            },
             "place": {
                 "label": "Tyyppi"
             },
                     "cutting": "Kallioleikkaus"
                 }
             },
+            "studio_type": {
+                "label": "Tyyppi"
+            },
             "supervised": {
                 "label": "Valvonta"
             },
             "trail_visibility": {
                 "label": "Polun näkyvyys"
             },
+            "tunnel": {
+                "label": "Tunneli"
+            },
             "water": {
                 "label": "Tyyppi"
             },
             "address": {
                 "name": "Osoite"
             },
+            "aerialway": {
+                "name": "ilmarata"
+            },
+            "aerialway/cable_car": {
+                "name": "köysirata"
+            },
+            "aerialway/chair_lift": {
+                "name": "tuolihissi"
+            },
+            "aerialway/gondola": {
+                "name": "gondolivaunu"
+            },
+            "aerialway/magic_carpet": {
+                "name": "taikamattohissi"
+            },
+            "aerialway/platter": {
+                "name": "Köysihinaushissi"
+            },
+            "aerialway/pylon": {
+                "name": "ilmaradan pylväs"
+            },
+            "aerialway/rope_tow": {
+                "name": "hinaushiihtohissi"
+            },
+            "aerialway/station": {
+                "name": "Ilmarata-asema"
+            },
+            "aerialway/t-bar": {
+                "name": "hiihtohissi"
+            },
             "aeroway": {
                 "name": "Kiitorata",
                 "terms": "kiitorata, kiitotie, lentokone, lentoonlähtörata, lentoonlähtötie, rullaustie, lentokenttätie, lentokonetie, lentokoneväylä"
                 "name": "Elokuvateatteri",
                 "terms": "leffa, leffateatteri, elokuva, elokuvateatteri"
             },
+            "amenity/clinic": {
+                "name": "klinikka"
+            },
+            "amenity/clock": {
+                "name": "Kello"
+            },
             "amenity/college": {
                 "name": "Ammattiopisto",
                 "terms": "ammattiopisto, amis, ammattikoulu, koulu, koulutus, oppilaitos, toinen aste"
                 "name": "Käräjäoikeus",
                 "terms": "oikeustalo, käräjätalo, alioikeus, kihlakunnanoikeus, syyttäjäntalo, raastupa, käräjätuomari, syyttäjä, lautamies, käräjäoikeus"
             },
+            "amenity/dentist": {
+                "name": "hammaslääkäri"
+            },
+            "amenity/doctor": {
+                "name": "lääkäri"
+            },
             "amenity/drinking_water": {
                 "name": "Juomavesi"
             },
                 "name": "Koulu",
                 "terms": "koulu, alakoulu, ala-aste, yläaste, yläkoulu, lukio, yhteislukio, keskikoulu, koulutus, opiskelu, oppilaitos"
             },
+            "amenity/studio": {
+                "name": "Studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Uima-allas"
             },
                 "name": "Korkeakoulu",
                 "terms": "yliopisto, korkeakoulu, college, ammattikorkeakoulu, amk"
             },
+            "amenity/veterinary": {
+                "name": "eläinlääkäri"
+            },
             "amenity/waste_basket": {
                 "name": "Roskakori",
                 "terms": "roska-astia, roskis, roskapönttö, jäte-astia, kierrätyspiste, kierrätyslaatikko, roska, kierrätys, jäte, jätteet"
             "building/residential": {
                 "name": "Asuinrakennus"
             },
+            "craft/basket_maker": {
+                "name": "korintekijä"
+            },
+            "craft/beekeeper": {
+                "name": "mehiläistarhuri"
+            },
+            "craft/blacksmith": {
+                "name": "seppä"
+            },
+            "craft/boatbuilder": {
+                "name": "veneentekijä"
+            },
+            "craft/bookbinder": {
+                "name": "kirjansitoja"
+            },
+            "craft/brewery": {
+                "name": "panimo"
+            },
+            "craft/carpenter": {
+                "name": "kirvesmies"
+            },
+            "craft/carpet_layer": {
+                "name": "matontekijä"
+            },
+            "craft/caterer": {
+                "name": "pitopalvelu"
+            },
+            "craft/clockmaker": {
+                "name": "kelloseppä"
+            },
+            "craft/confectionary": {
+                "name": "konditori"
+            },
+            "craft/dressmaker": {
+                "name": "ompelija"
+            },
+            "craft/electrician": {
+                "name": "sähköasentaja"
+            },
+            "craft/gardener": {
+                "name": "puutarhuri"
+            },
+            "craft/glaziery": {
+                "name": "lasittaja"
+            },
+            "craft/handicraft": {
+                "name": "käsityö"
+            },
+            "craft/hvac": {
+                "name": "LVI"
+            },
+            "craft/insulator": {
+                "name": "eriste"
+            },
+            "craft/jeweler": {
+                "name": "kultaseppä"
+            },
+            "craft/key_cutter": {
+                "name": "avaimentekijä"
+            },
+            "craft/locksmith": {
+                "name": "lukkoseppä"
+            },
+            "craft/metal_construction": {
+                "name": "metallirakennelma"
+            },
+            "craft/optician": {
+                "name": "optikko"
+            },
+            "craft/painter": {
+                "name": "maalari"
+            },
+            "craft/photographer": {
+                "name": "valokuvaaja"
+            },
+            "craft/photographic_labratory": {
+                "name": "valokuvauslaboratorio"
+            },
+            "craft/plasterer": {
+                "name": "rappaaja"
+            },
+            "craft/plumber": {
+                "name": "putkiasentaja"
+            },
+            "craft/pottery": {
+                "name": "savenvalimo"
+            },
+            "craft/rigger": {
+                "name": "nosturi"
+            },
+            "craft/roofer": {
+                "name": "katontekijä"
+            },
+            "craft/saddler": {
+                "name": "satulaseppä"
+            },
+            "craft/sailmaker": {
+                "name": "purjeentekijä"
+            },
+            "craft/sawmill": {
+                "name": "saha"
+            },
+            "craft/scaffolder": {
+                "name": "rakennustelineasentaja"
+            },
+            "craft/sculpter": {
+                "name": "kuvanveistäjä"
+            },
+            "craft/shoemaker": {
+                "name": "suutari"
+            },
+            "craft/stonemason": {
+                "name": "kivenhakkaaja"
+            },
+            "craft/sweep": {
+                "name": "nuohooja"
+            },
+            "craft/tailor": {
+                "name": "räätäli"
+            },
+            "craft/tiler": {
+                "name": "laatoittaja"
+            },
+            "craft/tinsmith": {
+                "name": "tinaseppä"
+            },
+            "craft/upholsterer": {
+                "name": "verhoilija"
+            },
+            "craft/watchmaker": {
+                "name": "kelloseppä"
+            },
             "emergency/ambulance_station": {
                 "name": "Ambulanssiasema",
                 "terms": "ambulanssi, ambulanssit, hälytysajoneuvo, ambulanssihalli, ambulanssivarasto, ambulanssitalli, hälytysajoneuvohalli, hälytysajoneuvotalli, hälytysajoneuvovarasto"
             "entrance": {
                 "name": "Sisäänkäynti"
             },
+            "golf/hole": {
+                "name": "golf-reikä"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "sivusuuntainen vesieste"
+            },
+            "golf/rough": {
+                "name": "karheikko"
+            },
+            "golf/tee": {
+                "name": "tiiauspaikka"
+            },
+            "golf/water_hazard": {
+                "name": "vesieste"
+            },
             "highway": {
                 "name": "Tie"
             },
             "highway/residential": {
                 "name": "Asuinaluetie"
             },
+            "highway/rest_area": {
+                "name": "Lepoalue"
+            },
             "highway/road": {
                 "name": "Tuntematon tie"
             },
             "highway/service/parking_aisle": {
                 "name": "Pysäköintiväylä"
             },
+            "highway/services": {
+                "name": "Huoltoalue"
+            },
             "highway/steps": {
                 "name": "Portaat"
             },
             "office": {
                 "name": "Toimisto"
             },
+            "piste": {
+                "name": "rinne/hiihtoreitti"
+            },
             "place": {
                 "name": "Paikka"
             },
             "railway/disused": {
                 "name": "Käytöstä poistettu rautatie"
             },
+            "railway/funicular": {
+                "name": "funikulaari"
+            },
             "railway/level_crossing": {
                 "name": "Tasoristeys"
             },
             "railway/monorail": {
                 "name": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Kapearaiteinen rautatie"
+            },
             "railway/platform": {
                 "name": "Rautatielaituri"
             },
index 9da59afbe838fbb82df14c906480f1b256a649ad..33f8fcac9f6f7ac8195e9ae164e918c6787c45a7 100644 (file)
         "incomplete": "<non téléchargé>",
         "feature_list": "Rechercher des objets",
         "edit": "Modifier l'élément",
-        "none": "Aucun"
+        "none": "Aucun",
+        "node": "Noeud",
+        "way": "Chemin",
+        "relation": "Relation",
+        "location": "Endroit"
     },
     "background": {
         "title": "Fond de carte",
         "untagged_area": "Polygone sans aucun attribut",
         "many_deletions": "Vous allez supprimer {n} objets. Êtes-vous sûr de vouloir faire cela ? Ces éléments seront supprimés de la carte visible sur openstreetmap.org.",
         "tag_suggests_area": "Cet attribut {tag} suppose que cette ligne devrait être un polygone, or ce n'est pas le cas",
+        "untagged_tooltip": "Sélectionnez un type d'élément pour décrire cette {geometry}.",
         "deprecated_tags": "Attributs obsolètes : {tags}"
     },
     "zoom": {
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Bâtiment "
+            },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Usage du terrain"
             },
             },
             "category-route": {
                 "name": "Route"
+            },
+            "category-water-area": {
+                "name": "Eau"
+            },
+            "category-water-line": {
+                "name": "Eau"
             }
         },
         "fields": {
                     }
                 }
             },
+            "access_simple": {
+                "label": "Accès"
+            },
             "address": {
                 "label": "Adresse",
                 "placeholders": {
             "admin_level": {
                 "label": "Niveau administratif"
             },
+            "aerialway": {
+                "label": "Type"
+            },
+            "aerialway/access": {
+                "label": "Accès"
+            },
+            "aerialway/capacity": {
+                "label": "Capacité (par heure)"
+            },
+            "aerialway/duration": {
+                "label": "Durée (minutes)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Chauffé"
+            },
+            "aerialway/summer/access": {
+                "label": "Accès (été)"
+            },
             "aeroway": {
                 "label": "Type"
             },
                     "anticlockwise": "Sens anti-horaire"
                 }
             },
+            "clothes": {
+                "label": "Accepte les vêtements"
+            },
             "collection_times": {
                 "label": "Horaires de collecte"
             },
             "country": {
                 "label": "Pays"
             },
+            "covered": {
+                "label": "Couvert"
+            },
             "crossing": {
                 "label": "Type"
             },
             "generator/type": {
                 "label": "Type"
             },
+            "glass": {
+                "label": "Accepte le verre"
+            },
+            "golf_hole": {
+                "label": "Référence",
+                "placeholder": "Nombre de trous (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Type"
             },
             "incline": {
                 "label": "Pente"
             },
+            "information": {
+                "label": "Type"
+            },
             "internet_access": {
                 "label": "Accès internet",
                 "options": {
             "operator": {
                 "label": "Opérateur"
             },
+            "paper": {
+                "label": "Accepte le papier"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Parking-relais"
             },
                 "label": "Téléphone ",
                 "placeholder": "+33 1 23 45 67 89"
             },
+            "piste/difficulty": {
+                "label": "Difficulté"
+            },
+            "piste/type": {
+                "label": "Type"
+            },
             "place": {
                 "label": "Type"
             },
             "shelter": {
                 "label": "Abri"
             },
+            "shelter_type": {
+                "label": "Type"
+            },
             "shop": {
                 "label": "Type"
             },
             "trail_visibility": {
                 "label": "Visibilité du sentier"
             },
+            "tree_type": {
+                "label": "Type"
+            },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Type de marchandises"
             },
                 "name": "Adresse",
                 "terms": "Adresse"
             },
+            "aerialway/cable_car": {
+                "name": "Téléphérique"
+            },
+            "aerialway/chair_lift": {
+                "name": "Télésiège"
+            },
             "aeroway": {
                 "name": "Aviation",
                 "terms": "Piste de décollage, Piste d'atterissage, Piste"
                 "name": "Cinéma",
                 "terms": "Cinéma"
             },
+            "amenity/clinic": {
+                "name": "Clinique"
+            },
             "amenity/college": {
                 "name": "Enseignement supérieur (non universitaire)",
                 "terms": "Institut, École supérieure, Enseignement supérieur, Haute école, CÉGEP, cégep"
                 "name": "Tribunal",
                 "terms": "Palais de Justice, Tribunal"
             },
+            "amenity/dentist": {
+                "name": "Dentiste"
+            },
+            "amenity/doctor": {
+                "name": "Médecin"
+            },
             "amenity/drinking_water": {
                 "name": "Eau potable",
                 "terms": "Eau potable"
                 "name": "Poste de garde",
                 "terms": "Poste de garde, gardien"
             },
+            "amenity/recycling": {
+                "name": "Recyclage",
+                "terms": "Recyclage"
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "Restaurant"
                 "name": "École",
                 "terms": "Ecole"
             },
+            "amenity/shelter": {
+                "name": "Abri",
+                "terms": "Abri"
+            },
             "amenity/swimming_pool": {
                 "name": "Piscine",
                 "terms": "Piscine"
                 "name": "Bâtiment résidentiel",
                 "terms": "Bâtiment résidentiel"
             },
+            "craft/blacksmith": {
+                "name": "Forgeron"
+            },
+            "craft/boatbuilder": {
+                "name": "Constructeur de bateaux"
+            },
+            "craft/bookbinder": {
+                "name": "Relieur"
+            },
+            "craft/brewery": {
+                "name": "Brasserie"
+            },
+            "craft/carpenter": {
+                "name": "Charpentier"
+            },
+            "craft/caterer": {
+                "name": "Traiteur"
+            },
+            "craft/clockmaker": {
+                "name": "Horloger"
+            },
+            "craft/confectionary": {
+                "name": "Confiserie"
+            },
+            "craft/dressmaker": {
+                "name": "Couturier"
+            },
+            "craft/electrician": {
+                "name": "Electricien"
+            },
+            "craft/gardener": {
+                "name": "Jardinier"
+            },
+            "craft/glaziery": {
+                "name": "Vitrerie",
+                "terms": "Vitrier"
+            },
+            "craft/handicraft": {
+                "name": "Artisanat",
+                "terms": "Artisan"
+            },
+            "craft/hvac": {
+                "name": "CVC",
+                "terms": "chauffage,ventilation,climatisation,chauffagistes"
+            },
+            "craft/jeweler": {
+                "name": "Bijoutier"
+            },
+            "craft/locksmith": {
+                "name": "Serrurier"
+            },
+            "craft/metal_construction": {
+                "name": "Constructions métalliquess",
+                "terms": "Construction métallique"
+            },
+            "craft/optician": {
+                "name": "Opticien"
+            },
+            "craft/painter": {
+                "name": "peintre"
+            },
+            "craft/photographer": {
+                "name": "Photographe"
+            },
+            "craft/photographic_labratory": {
+                "name": "Laboratoire Photographique"
+            },
+            "craft/plasterer": {
+                "name": "Plâtrier"
+            },
+            "craft/plumber": {
+                "name": "Plombier"
+            },
+            "craft/pottery": {
+                "name": "Pottier"
+            },
+            "craft/roofer": {
+                "name": "Couvreur"
+            },
+            "craft/saddler": {
+                "name": "Sellier"
+            },
+            "craft/sailmaker": {
+                "name": "Voilerie",
+                "terms": "Voilier"
+            },
+            "craft/sawmill": {
+                "name": "Scierie"
+            },
+            "craft/sculpter": {
+                "name": "Sculpteur"
+            },
+            "craft/shoemaker": {
+                "name": "Cordonnier"
+            },
+            "craft/stonemason": {
+                "name": "Tailleur de pierre"
+            },
+            "craft/sweep": {
+                "name": "Ramoneur"
+            },
+            "craft/tailor": {
+                "name": "Tailleur"
+            },
+            "craft/tiler": {
+                "name": "Carreleur"
+            },
+            "craft/tinsmith": {
+                "name": "Ferblantier"
+            },
+            "craft/upholsterer": {
+                "name": "Tapissier"
+            },
+            "craft/watchmaker": {
+                "name": "Horloger"
+            },
+            "embankment": {
+                "name": "Terre-plein"
+            },
             "emergency/ambulance_station": {
                 "name": "Station d'ambulance",
                 "terms": "Station d'ambulance"
                 "name": "Entrée",
                 "terms": "Entrée"
             },
+            "footway/crossing": {
+                "name": "Passage pieton ",
+                "terms": "Passage piéton"
+            },
+            "footway/sidewalk": {
+                "name": "Trottoir",
+                "terms": "Trottoir"
+            },
+            "golf/bunker": {
+                "name": "Bunker"
+            },
+            "golf/fairway": {
+                "name": "Allée (golf)"
+            },
+            "golf/hole": {
+                "name": "Trou de golf",
+                "terms": "Trou de golf"
+            },
             "highway": {
                 "name": "Route",
                 "terms": "Autoroute"
                 "name": "Cultures",
                 "terms": "Ferme"
             },
+            "landuse/farmland": {
+                "name": "Terre agricole",
+                "terms": "Terre agricole, Cultures"
+            },
             "landuse/farmyard": {
                 "name": "Bâtiments de ferme",
                 "terms": "Cour de ferme"
                 "name": "Ligne de coupe",
                 "terms": "ligne de coupe forestière"
             },
+            "man_made/embankment": {
+                "name": "Terre-plein"
+            },
+            "man_made/flagpole": {
+                "name": "Porte-drapeau"
+            },
             "man_made/lighthouse": {
                 "name": "Phare",
                 "terms": "Phare"
                 "name": "Station de pompage d'eau potable",
                 "terms": "Station de pompage"
             },
+            "military/airfield": {
+                "name": "Aérodrome"
+            },
+            "military/barracks": {
+                "name": "Caserne",
+                "terms": "Caserne"
+            },
+            "military/bunker": {
+                "name": "Bunker",
+                "terms": "casemate, blockhaus"
+            },
+            "military/range": {
+                "name": "Stand de tir"
+            },
             "natural": {
                 "name": "Nature",
                 "terms": "Nature"
                 "name": "Agence immobilière",
                 "terms": "Agence immobilière"
             },
+            "office/financial": {
+                "name": "Établissement financier"
+            },
+            "office/government": {
+                "name": "Établissement Public"
+            },
             "office/insurance": {
                 "name": "Agence d'assurance",
                 "terms": "Agence d'assurance"
             },
+            "office/it": {
+                "name": "Bureau informatique"
+            },
             "office/lawyer": {
                 "name": "Cabinet d'avocats",
                 "terms": "Cabinet d'avocats"
             },
+            "office/newspaper": {
+                "name": "Journal",
+                "terms": "Journal, Presse"
+            },
+            "office/ngo": {
+                "name": "ONG",
+                "terms": "ONG"
+            },
             "office/physician": {
                 "name": "Médecin",
                 "terms": "Médecin, Docteur"
                 "name": "Parti politique",
                 "terms": "Parti politique"
             },
+            "office/research": {
+                "name": "Organisme de recherche",
+                "terms": "Centre de recherches"
+            },
             "office/telecommunication": {
                 "name": "Agence télécom",
                 "terms": "Agence télécom"
                 "name": "Transformateur",
                 "terms": "Transformateur"
             },
+            "public_transport/platform": {
+                "name": "Plateforme"
+            },
+            "public_transport/stop_position": {
+                "name": "Arrêt"
+            },
             "railway": {
                 "name": "Ferroviaire",
                 "terms": "Voie ferrée, Chemin de fer"
index bd4ccf613d32ad9200ab8419e143942d8dad0371..13b5627245a1cc6d89ceaec242bb857469575e16 100644 (file)
         "incomplete": "<nije preuzeto>",
         "feature_list": "Pretraži svojstva",
         "edit": "Uredi svojstvo",
-        "none": "Nijedna"
+        "none": "Nijedna",
+        "node": "Točka",
+        "way": "Put",
+        "relation": "Relacija",
+        "location": "Lokacija"
     },
     "background": {
         "title": "Pozadina",
         "untagged_area": "Neoznačeno područje",
         "many_deletions": "Brišeš {n} objekata. Jesi li siguran/na da to želiš učiniti? Ovo će ih obrisati sa karte koju svi vide na openstreetmap.org.",
         "tag_suggests_area": "Oznaka {tag} ukazuje da bi linija trebala biti područje, ali nije područje",
+        "untagged_tooltip": "Odaberi značajku koja opisuje što ova {geometrija} predstavlja.",
         "deprecated_tags": "Zastarjele oznake: {tags}"
     },
     "zoom": {
             "trail_visibility": {
                 "label": "Vidljivost staze"
             },
+            "tunnel": {
+                "label": "Tunel"
+            },
             "vending": {
                 "label": "Vrsta robe"
             },
index e9e0eb9ecba09d5de0014b1be11203d81851637b..8205bb9c410f9007b8700c4a26665527d871c15f 100644 (file)
         "none": "Nincs",
         "custom": "Egyéni",
         "custom_prompt": "Adj meg egy csempe sablont. Érvényes tokenek: {z}, {x}, {y} a Z/X/Y rendszerű URL-ekhez és {u} a kvadratikusakhoz.",
+        "fix_misalignment": "Eltolódás korrigálása",
         "reset": "visszavonás"
     },
     "restore": {
         "view_on_osm": "Megtekintés OSM-en",
         "facebook": "Megosztás Facebookon",
         "twitter": "Megosztás Twitteren",
-        "google": "Megosztás Google+-on"
+        "google": "Megosztás Google+-on",
+        "help_html": "Módosításaid néhány perc múlva megjelennek a \"Standard\" rétegen. Más rétegeken ez tovább tarthat\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>details</a>).\n"
     },
     "confirm": {
         "okay": "Oké"
         "untagged_area": "Címkézetlen terület",
         "many_deletions": "{n} objektum törlésére készülsz. Biztos vagy benne? Ez törli őket a térképről, amit mindenki más lát az openstreetmap.org-on.",
         "tag_suggests_area": "A(z) {tag} címke alapján a vonal terület kéne legyen, de ez nem terület",
+        "untagged_tooltip": "Válassz egy elemtípust, ami leírja, hogy mi ez a {geometry}.",
         "deprecated_tags": "Elavult címkék: {tags}"
     },
     "zoom": {
         },
         "lines": {
             "title": "Vonalak",
+            "add": "Vonalakkal jelöljük az utakat, vasutakat és folyókat. **Kattints a vonal gombra új vonal rajzolásához.**",
             "start": "**Indítsd a vonalat az út végére kattintva.**",
             "intersect": "Kattints, hogy több pontot adj a vonalhoz. Ha szükséges, rajzolás közben is arrébb húzhatod a térképet. Az utak és sok más vonaltípus egy nagyobb hálózat tagja. Fontos, hogy ezek a vonalak megfelelően csatlakozzanak, hogy az útvonaltervezők használni tudják. **Kattints a Flower Streetre, hogy létrehozd a két vonalat összekapcsoló kereszteződést.**",
             "finish": "A vonalat az utolsó pontjára való ismételt kattintással lehet befejezni. **Fejezd be az út rajzolását.**",
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Épület"
+            },
             "category-landuse": {
                 "name": "Területfunkció"
             },
             },
             "category-route": {
                 "name": "Útvonal"
+            },
+            "category-water-area": {
+                "name": "Víz"
+            },
+            "category-water-line": {
+                "name": "Víz"
             }
         },
         "fields": {
                     }
                 }
             },
+            "access_simple": {
+                "label": "Behajtás"
+            },
             "address": {
                 "label": "Cím",
                 "placeholders": {
             "admin_level": {
                 "label": "Adminisztratív szint"
             },
+            "aerialway": {
+                "label": "Típus"
+            },
+            "aerialway/access": {
+                "label": "Be- és kiszállás"
+            },
+            "aerialway/bubble": {
+                "label": "Védőburok"
+            },
+            "aerialway/capacity": {
+                "label": "Kapacitás (óránként)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Menetidő (perc)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Fűtött"
+            },
+            "aerialway/occupancy": {
+                "label": "Férőhely",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Be- és kiszállás (nyáron)"
+            },
             "aeroway": {
                 "label": "típus"
             },
             "lit": {
                 "label": "Világítás"
             },
+            "location": {
+                "label": "Hely"
+            },
             "man_made": {
                 "label": "Típus"
             },
                 "label": "Telefonszám",
                 "placeholder": "+36 1 123 45 67"
             },
+            "piste/difficulty": {
+                "label": "Nehézség"
+            },
+            "piste/grooming": {
+                "label": "Kezelés"
+            },
+            "piste/type": {
+                "label": "Típus"
+            },
             "place": {
                 "label": "Típus"
             },
             "shelter": {
                 "label": "Esőbeálló"
             },
+            "shelter_type": {
+                "label": "Típus"
+            },
             "shop": {
                 "label": "Típus"
             },
             "trail_visibility": {
                 "label": "Ösvény láthatósága"
             },
+            "tree_type": {
+                "label": "Típus"
+            },
             "vending": {
                 "label": "Termékek típusa"
             },
         },
         "presets": {
             "address": {
-                "name": "Lakcím"
+                "name": "Lakcím",
+                "terms": "cím, lakcím"
+            },
+            "aerialway": {
+                "name": "Drótkötélpálya",
+                "terms": "kötélpálya"
+            },
+            "aerialway/cable_car": {
+                "name": "Sikló",
+                "terms": "kötélvillamos"
+            },
+            "aerialway/chair_lift": {
+                "name": "Ülőlift",
+                "terms": "libegő"
+            },
+            "aerialway/gondola": {
+                "name": "Gondola",
+                "terms": "gondolakabinos felvonó"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Szállítószalag-felvonó",
+                "terms": "varázsszőnyeg"
+            },
+            "aerialway/platter": {
+                "name": "Tányéros felvonó"
+            },
+            "aerialway/pylon": {
+                "name": "Drótkötélpálya-oszlop",
+                "terms": "oszlop"
+            },
+            "aerialway/rope_tow": {
+                "name": "Kapaszkodólift"
+            },
+            "aerialway/station": {
+                "name": "Felvonóállomás",
+                "terms": "kötélpálya-állomás"
+            },
+            "aerialway/t-bar": {
+                "name": "Csákányos felvonó"
             },
             "aeroway": {
                 "name": "Légi közeledés"
             },
             "aeroway/aerodrome": {
-                "name": "Repülőtér"
+                "name": "Repülőtér",
+                "terms": "repülőtér, reptér"
             },
             "aeroway/apron": {
                 "name": "Forgalmi előtér"
                 "name": "Reptér kapu"
             },
             "aeroway/hangar": {
-                "name": "Hangár"
+                "name": "Hangár",
+                "terms": "hangár"
             },
             "aeroway/helipad": {
                 "name": "Helikopter leszállóhely"
             },
             "aeroway/runway": {
-                "name": "Kifutópálya"
+                "name": "Kifutópálya",
+                "terms": "kifutópálya"
             },
             "aeroway/taxiway": {
                 "name": "Gurulóút"
             "amenity/car_wash": {
                 "name": "Autómosó"
             },
+            "amenity/childcare": {
+                "name": "Gyermekgondozás",
+                "terms": "bölcsőde, óvoda, nevelési tanácsadó"
+            },
             "amenity/cinema": {
                 "name": "Mozi"
             },
             "amenity/marketplace": {
                 "name": "Piac"
             },
+            "amenity/parking": {
+                "name": "Parkoló",
+                "terms": "parkolóház"
+            },
             "amenity/pharmacy": {
                 "name": "Gyógyszertár"
             },
             "amenity/ranger_station": {
                 "name": "Vadőrház"
             },
+            "amenity/recycling": {
+                "name": "Hulladékgyűjtő",
+                "terms": "hulladék, szelektív hulladék, szeméttelep, szemétlerakó, veszélyes hulladék"
+            },
             "amenity/restaurant": {
                 "name": "Étterem"
             },
             "amenity/school": {
                 "name": "Iskola"
             },
+            "amenity/shelter": {
+                "name": "Menedék",
+                "terms": "fedett, fedél, esőház, esőkunyhó, menedékház"
+            },
             "amenity/swimming_pool": {
                 "name": "Úszómedence"
             },
                 "name": "Adminisztratív határvonal"
             },
             "building": {
-                "name": "Épület"
+                "name": "Épület",
+                "terms": "építmény, ház, lakás,"
             },
             "building/apartments": {
                 "name": "Lakások"
             "building/house": {
                 "name": "Ház"
             },
+            "building/hut": {
+                "name": "Kunyhó"
+            },
             "building/industrial": {
-                "name": "Ipari épület"
+                "name": "Ipari épület",
+                "terms": "Gyárépület"
             },
             "building/residential": {
-                "name": "Lakóépület"
+                "name": "Lakóépület",
+                "terms": "Lakóház, lakás, ház"
+            },
+            "embankment": {
+                "name": "Töltés"
             },
             "emergency/ambulance_station": {
                 "name": "Mentőállomás",
             "entrance": {
                 "name": "Bejárat"
             },
+            "footway/crossing": {
+                "name": "Kereszteződés"
+            },
+            "footway/sidewalk": {
+                "name": "Járda"
+            },
             "highway": {
                 "name": "Közút"
             },
             "landuse/farm": {
                 "name": "Farm"
             },
+            "landuse/farmland": {
+                "name": "Mezőgazdaság"
+            },
             "landuse/farmyard": {
                 "name": "Tanyaudvar"
             },
             "leisure": {
                 "name": "Szabadidő"
             },
+            "leisure/common": {
+                "name": "Közterület"
+            },
             "leisure/dog_park": {
                 "name": "Kutyafuttató",
                 "terms": "Kutyasétáltató"
             "man_made/cutline": {
                 "name": "Irtás"
             },
+            "man_made/embankment": {
+                "name": "Töltés"
+            },
+            "man_made/flagpole": {
+                "name": "Zászlórúd"
+            },
             "man_made/lighthouse": {
                 "name": "Világítótorony"
             },
             "man_made/water_works": {
                 "name": "Vízmű"
             },
+            "military/airfield": {
+                "name": "Replülőtér"
+            },
+            "military/barracks": {
+                "name": "Barakk"
+            },
+            "military/bunker": {
+                "name": "Bunker"
+            },
+            "military/range": {
+                "name": "Katonai lőtér"
+            },
             "natural": {
                 "name": "Természet"
             },
             "office": {
                 "name": "Iroda"
             },
+            "office/accountant": {
+                "name": "Könyvelő",
+                "terms": "könyvvizsgálat"
+            },
+            "office/administrative": {
+                "name": "Közhivatal",
+                "terms": "hivatal, közigazgatási hivatal"
+            },
+            "office/architect": {
+                "name": "Építész"
+            },
+            "office/company": {
+                "name": "Cég",
+                "terms": "vállalkozás, iroda, magánvállalkozás"
+            },
+            "office/educational_institution": {
+                "name": "Foglalkoztatási hivatal"
+            },
+            "office/employment_agency": {
+                "name": "Foglalkoztatási hivatal",
+                "terms": "munkaügyi hivatal"
+            },
+            "office/estate_agent": {
+                "name": "Ingatlanközvetítő"
+            },
+            "office/financial": {
+                "name": "Pénzügyi iroda"
+            },
+            "office/government": {
+                "name": "Kormányhivatal",
+                "terms": "kormányzati hivatal"
+            },
+            "office/insurance": {
+                "name": "Biztosító"
+            },
+            "office/it": {
+                "name": "Informatika",
+                "terms": "számítástechnika, IT, információ-technológia"
+            },
+            "office/lawyer": {
+                "name": "Jogász",
+                "terms": "ügyvéd, bíróság, közjegyző, ügyész"
+            },
+            "office/newspaper": {
+                "name": "Újságos"
+            },
+            "office/ngo": {
+                "name": "Civil szervezet"
+            },
+            "office/physician": {
+                "name": "Orvos",
+                "terms": "doktor"
+            },
+            "office/political_party": {
+                "name": "Politikai párt"
+            },
+            "office/research": {
+                "name": "Kutatóintézet"
+            },
+            "office/telecommunication": {
+                "name": "Telekommunikációs iroda"
+            },
+            "office/therapist": {
+                "name": "Gyógyítás",
+                "terms": "gyógyász, gyógyító"
+            },
+            "office/travel_agent": {
+                "name": "Utazási iroda"
+            },
+            "piste": {
+                "name": "Sípálya",
+                "terms": "sífutóút, lesiklópálya"
+            },
             "place": {
                 "name": "Hely"
             },
             "power/line": {
                 "name": "Távvezeték"
             },
+            "power/minor_line": {
+                "name": "Elektromos vezeték",
+                "terms": "távvezeték, villanyvezeték, magasfesztültségű vezeték"
+            },
             "power/pole": {
                 "name": "Villanyoszlop"
             },
             "power/transformer": {
                 "name": "Transzformátor"
             },
+            "public_transport/platform": {
+                "name": "Peron"
+            },
+            "public_transport/stop_position": {
+                "name": "Megállóhely"
+            },
             "railway": {
                 "name": "Vasút"
             },
                 "name": "Használaton kívüli vasút"
             },
             "railway/halt": {
-                "name": "Vasúti megállóhely"
+                "name": "Vasúti megállóhely",
+                "terms": "megállóhely"
             },
             "railway/level_crossing": {
                 "name": "Szintbeli kereszteződés"
             "shop/pet": {
                 "name": "Kisállatkereskedés"
             },
+            "shop/photo": {
+                "name": "Fotósbolt",
+                "terms": "fényképész, fényképezés, filmkidolgozás, előhívás, igazolványkép"
+            },
             "shop/shoes": {
                 "name": "Cipőbolt"
             },
index 28c89d6321d6be9a476b56d1062a169f622581ae..3392478f708623c5017f20b375f327d7cd51b21e 100644 (file)
@@ -16,7 +16,7 @@
             "tail": "Klik pada peta untuk menambah sebuah titik."
         },
         "browse": {
-            "title": "Lihat",
+            "title": "Arahkan",
             "description": "Geser dan perbesar tampilan peta."
         },
         "draw_area": {
         },
         "rotate": {
             "title": "Putar",
+            "description": "Putar obyek ini berdasar titik pusatnya.",
             "key": "R",
             "annotation": {
-                "line": "Memutas sebua garis.",
+                "line": "Memutar sebuah garis.",
                 "area": "Memutar sebuah area."
             }
         },
         }
     },
     "undo": {
+        "tooltip": "Batalkan: {action}",
         "nothing": "Tak ada yang bisa di ulang."
     },
     "redo": {
         "nothing": "Tak ada yang bisa di redo."
     },
     "tooltip_keyhint": "Pintasan:",
-    "browser_notice": "Penyuting ini mendukung di Firefox, Chrome, Safari, Opera, dan Internet Explorer 9 dan di atasnya. Sila tingkatnya peramban anda atau gunakan Potlatc 2 untuk menyuting peta.",
+    "browser_notice": "Penyunting ini bisa digunakan di Firefox, Chrome, Safari, Opera, dan Internet Explorer 9 dan versi yang lebih tinggi. Silahkan perbarui peramban Anda atau gunakan Potlatc 2 untuk menyuting peta.",
     "translate": {
         "translate": "Terjemahkan",
         "localized_translation_label": "Nama banyak-bahasa",
     },
     "commit": {
         "title": "Simpan Perubahan",
-        "description_placeholder": "Deskripsi singkat kontribusi anda",
+        "description_placeholder": "Deskripsi singkat kontribusi Anda",
         "message_label": "Sampaikan pesan",
+        "upload_explanation": "Perubahan yang anda unggah akan tampil di seluruh peta yang menggunakan data OpenStreetMap.",
+        "upload_explanation_with_user": "Perubahan yang anda unggah sebagai {user} akan tampil di seluruh peta yang menggunakan data OpenStreetMap.",
         "save": "Simpan",
         "cancel": "Batal",
         "warnings": "Peringatan",
-        "modified": "Berubah",
+        "modified": "Diubah",
         "deleted": "Terhapus",
-        "created": "Tercipta"
+        "created": "Dibuat"
     },
     "contributors": {
         "list": "Disunting oleh {users}",
         "back_tooltip": "Ubah Fitur",
         "remove": "Buang",
         "search": "Cari",
+        "multiselect": "Item terpilih",
         "unknown": "Tidak diketahui",
         "incomplete": "<tak terunduh>",
         "feature_list": "Cari fitur",
-        "edit": "Ubah Fitur"
+        "edit": "Ubah Fitur",
+        "none": "Tidak ada",
+        "relation": "Relasi",
+        "location": "Lokasi"
     },
     "background": {
         "title": "Latar",
         "description": "Pengaturan Latar",
         "percent_brightness": "{opacity}% kecerahan",
+        "fix_misalignment": "Perbaiki perataan",
         "reset": "ulang"
     },
     "restore": {
     },
     "cannot_zoom": "Tidak bisa memperbesar tampilan lebih jauh dengan mode ini.",
     "gpx": {
-        "local_layer": "File GPX lokal"
+        "local_layer": "File GPX lokal",
+        "drag_drop": "Geser dan letakan sebuah berkas .gpx di halaman, atau klik tombol ke kanan untuk menjelajah",
+        "zoom": "Perbesar ke jejak GPX"
     },
     "help": {
         "title": "Bantuan",
         },
         "lines": {
             "title": "Garis",
+            "add": "Garis biasa digunakan untuk mewakili fitur seperti jalan, rel dan sungai. **Klik tombol Garis untuk menambahkan sebuah garis baru.**",
             "start": "**Mulai garis dengan mengklik pada ujung sebuah jalan.**",
             "intersect": "Klik untuk menambahkan lagi simpul pada garis. Anda dapat menggeser peta ketika menggambar jika diperlukan. Jalan, dan banyak tipe lain dari garis, adalah bagian dari jaringan yang lebih besar. Ini penting untuk garis-garis ini untuk terhubung dengan baik agar alat penelusuran rute bisa berjalan. **Klik di Jalan Flower, untuk membuat percabangan yang menghubungkan dua garis.**",
             "finish": "Garis bisa diselesaikan dengan mengklik ulang pada simpul terakhir. **Selesaikan menggambar jalan.**",
             "road": "**Pilih Jalan dari daftar**",
             "residential": "Ada beberapa tipe jalan berbeda, yang paling umum adalah Jalan Perumahan. **Pilih tipe jalan Perumahan**",
             "describe": "**Namakan jalan dan tutup fitur penyunting.**",
-            "restart": "Jalan perlu memotong Jalan Flower."
+            "restart": "Jalan perlu memotong Jalan Flower.",
+            "wrong_preset": "Anda belum memilih tipe Jalan Perumahan. **Klik di sini untuk memilih lagi**"
         },
         "startediting": {
             "title": "Mulai Menyunting",
         },
         "presets": {
             "address": {
-                "name": "Alamat"
+                "name": "Alamat",
+                "terms": "Alamat"
             },
             "aeroway": {
                 "name": "Landas pacu"
             },
             "aeroway/aerodrome": {
-                "name": "Bandar udara"
+                "name": "Bandar udara",
+                "terms": "Bandara,Lapangan Terbang,"
             },
             "aeroway/gate": {
                 "name": "Gerbang Bandar Udara"
                 "name": "Jalur taksi"
             },
             "aeroway/terminal": {
-                "name": "Terminal Bandarudara"
+                "name": "Terminal Bandara"
             },
             "amenity": {
                 "name": "Keramahan"
                 "name": "Bar"
             },
             "amenity/bicycle_parking": {
-                "name": "Parkir Sepeda"
+                "name": "Parkir Sepeda",
+                "terms": "Parkir Sepeda"
             },
             "amenity/bicycle_rental": {
-                "name": "Penyewaan Sepeda"
+                "name": "Penyewaan Sepeda",
+                "terms": "Penyewaan Sepeda"
             },
             "amenity/cafe": {
-                "name": "Cafe"
+                "name": "Cafe",
+                "terms": "Warung Kopi"
+            },
+            "amenity/car_rental": {
+                "name": "Penyewaan Mobil",
+                "terms": "Penyewaan Mobil"
             },
             "amenity/car_wash": {
-                "name": "Pencucian Mobil"
+                "name": "Pencucian Mobil",
+                "terms": "Cuci Mobil"
             },
             "amenity/cinema": {
-                "name": "Bioskop"
+                "name": "Bioskop",
+                "terms": "Bioskop"
             },
             "amenity/college": {
-                "name": "Kampus"
+                "name": "Kampus",
+                "terms": "Kampus"
             },
             "amenity/courthouse": {
-                "name": "Pengadilan"
+                "name": "Pengadilan",
+                "terms": "Pengadilan"
+            },
+            "amenity/drinking_water": {
+                "name": "Air Minum"
             },
             "amenity/embassy": {
-                "name": "Kedutaan besar"
+                "name": "Kedutaan besar",
+                "terms": "Kedutaan"
             },
             "amenity/fast_food": {
-                "name": "Makanan Cepat Saji"
+                "name": "Makanan Cepat Saji",
+                "terms": "Makanan Cepatsaji"
             },
             "amenity/fire_station": {
-                "name": "Kantor Pemadam Kebakaran"
+                "name": "Kantor Pemadam Kebakaran",
+                "terms": "Kantor Pemadam Kebakaran"
             },
             "amenity/fuel": {
-                "name": "Pom Bensin"
+                "name": "Pom Bensin",
+                "terms": "SPBU, Pom Bensin,"
             },
             "amenity/grave_yard": {
-                "name": "Kuburan"
+                "name": "Kuburan",
+                "terms": "Kuburan"
             },
             "amenity/hospital": {
-                "name": "Rumah Sakit"
+                "name": "Rumah Sakit",
+                "terms": "Rumah Sakit, Puskesmas, Klinik"
             },
             "amenity/kindergarten": {
-                "name": "Taman Kanak-kanak"
+                "name": "Taman Kanak-kanak",
+                "terms": "Taman Kanak kanak,"
             },
             "amenity/library": {
-                "name": "Perpustakaan"
+                "name": "Perpustakaan",
+                "terms": "Perpustakaan"
             },
             "amenity/marketplace": {
                 "name": "Pasar"
                 "name": "Farmasi"
             },
             "amenity/place_of_worship": {
-                "name": "Tempat Beribadah"
+                "name": "Tempat Beribadah",
+                "terms": "Rumah Ibadah"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Candi Budha"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Gereja"
+                "name": "Gereja",
+                "terms": "Gereja"
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Sinagoga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Mesjid"
+                "name": "Masjid",
+                "terms": "Mesjid,Mushola,Langgar"
             },
             "amenity/police": {
-                "name": "Polisi"
+                "name": "Polisi",
+                "terms": "Polisi"
             },
             "amenity/post_box": {
                 "name": "Kotak surat"
             },
             "amenity/post_office": {
-                "name": "Kantor Pos"
+                "name": "Kantor Pos",
+                "terms": "Kantor Pos"
             },
             "amenity/pub": {
                 "name": "Pub"
             },
             "amenity/restaurant": {
-                "name": "Restoran"
+                "name": "Restoran",
+                "terms": "Restoran"
             },
             "amenity/school": {
-                "name": "Sekolah"
+                "name": "Sekolah",
+                "terms": "Sekolah"
             },
             "amenity/swimming_pool": {
-                "name": "Kolam Renang"
+                "name": "Kolam Renang",
+                "terms": "Kolam Renang"
             },
             "amenity/telephone": {
-                "name": "Telepon"
+                "name": "Telepon",
+                "terms": "Telepon"
             },
             "amenity/theatre": {
-                "name": "Teater"
+                "name": "Teater",
+                "terms": "Teater"
             },
             "amenity/toilets": {
-                "name": "Toilet"
+                "name": "Toilet",
+                "terms": "Toilet, WC,"
             },
             "amenity/townhall": {
-                "name": "Balai Kota"
+                "name": "Balai Kota",
+                "terms": "Balai Kota,"
             },
             "amenity/university": {
-                "name": "Universitas"
+                "name": "Universitas",
+                "terms": "Universitas, Kampus,"
             },
             "amenity/waste_basket": {
                 "name": "Tong Sampah"
             "area": {
                 "name": "Area"
             },
+            "barrier/ditch": {
+                "name": "Parit"
+            },
             "barrier/entrance": {
                 "name": "Pintu Masuk"
             },
             "building/entrance": {
                 "name": "Masuk"
             },
+            "building/garage": {
+                "name": "Garasi"
+            },
             "building/house": {
                 "name": "Rumah"
             },
                 "name": "Jalur Pejalan Kaki"
             },
             "highway/living_street": {
-                "name": "Jalan TInggal"
+                "name": "Jalan Tinggal"
             },
             "highway/motorway": {
                 "name": "Jalur Motor"
             "waterway/dam": {
                 "name": "Bendungan"
             },
+            "waterway/ditch": {
+                "name": "Selokan"
+            },
+            "waterway/drain": {
+                "name": "Saluran"
+            },
             "waterway/river": {
                 "name": "Sungai"
+            },
+            "waterway/stream": {
+                "name": "Aliran"
             }
         }
     }
index 175d826170870fb3e4b3e62be4d353558389460d..be46a72d75cb41a948b379b206459996d5639cbe 100644 (file)
         "incomplete": "<non scaricato>",
         "feature_list": "Cerca elementi",
         "edit": "Modifica elemento",
-        "none": "Nessuno"
+        "none": "Nessuno",
+        "node": "Nodo",
+        "way": "Linea",
+        "relation": "Relazione",
+        "location": "Posizione"
     },
     "background": {
         "title": "Sfondo",
         "untagged_area": "Area senza tag",
         "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
         "tag_suggests_area": "Il tag {tag} fa pensare che la linea sia un'area, ma non rappresenta un'area",
+        "untagged_tooltip": "Seleziona un tipo di elemento che descriva il tipo di {geometry}.",
         "deprecated_tags": "Tag deprecati: {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "Edifici"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Utilizzi del terreno"
             },
             "admin_level": {
                 "label": "Livello di Amministrazione"
             },
+            "aerialway": {
+                "label": "Tipo"
+            },
+            "aerialway/access": {
+                "label": "Accesso"
+            },
+            "aerialway/bubble": {
+                "label": "Copertura paravento"
+            },
+            "aerialway/capacity": {
+                "label": "Portata (persone/ora)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Durata (minuti)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Riscaldamento"
+            },
+            "aerialway/occupancy": {
+                "label": "Capacità",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Accesso (estate)"
+            },
             "aeroway": {
                 "label": "Tipo"
             },
             "building_area": {
                 "label": "Edificio"
             },
+            "cans": {
+                "label": "Lattine"
+            },
             "capacity": {
                 "label": "Capienza",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Senso antiorario"
                 }
             },
+            "clothes": {
+                "label": "Vestiti"
+            },
             "collection_times": {
                 "label": "Orari di raccolta"
             },
             "country": {
                 "label": "Stato"
             },
+            "covered": {
+                "label": "Coperto"
+            },
             "crossing": {
                 "label": "Tipo"
             },
             "description": {
                 "label": "Descrizione"
             },
+            "electrified": {
+                "label": "Elettrificata"
+            },
             "elevation": {
                 "label": "Altitudine"
             },
             "fixme": {
                 "label": "Sistemare"
             },
+            "gauge": {
+                "label": "Scartamento"
+            },
             "generator/method": {
                 "label": "Metodo"
             },
             "generator/type": {
                 "label": "Tipo"
             },
+            "glass": {
+                "label": "Vetro"
+            },
+            "golf_hole": {
+                "label": "Codice",
+                "placeholder": "Numero buca (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tipo"
             },
             "incline": {
                 "label": "Pendenza"
             },
+            "information": {
+                "label": "Tipo"
+            },
             "internet_access": {
                 "label": "Accesso ad Internet",
                 "options": {
             "operator": {
                 "label": "Operatore"
             },
+            "paper": {
+                "label": "Carta"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Parcheggio di Interscambio"
             },
                 "label": "Telefono",
                 "placeholder": "+39 01 123 456"
             },
+            "piste/difficulty": {
+                "label": "Difficoltà"
+            },
+            "piste/grooming": {
+                "label": "Terreno"
+            },
+            "piste/type": {
+                "label": "Tipo"
+            },
             "place": {
                 "label": "Tipo"
             },
                     "cutting": "Infossato"
                 }
             },
+            "studio_type": {
+                "label": "Tipo"
+            },
             "supervised": {
                 "label": "Custodito"
             },
             "tree_type": {
                 "label": "Tipo"
             },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Beni venduti"
             },
                 "name": "Indirizzo",
                 "terms": "numero civico,indirizzo,cap,città,località,luogo"
             },
+            "aerialway": {
+                "name": "Trasporto a fune",
+                "terms": "seggiovia,funivia,funicolare,cabinovia,slittovia,rotovia,funivia aerea,cestovia,seggiovia navale,sciovia,teleferica,manovia,palorcio"
+            },
+            "aerialway/cable_car": {
+                "name": "Funivia",
+                "terms": "funivia"
+            },
+            "aerialway/chair_lift": {
+                "name": "Seggiovia",
+                "terms": "seggiovia"
+            },
+            "aerialway/gondola": {
+                "name": "Cabinovia",
+                "terms": "cabinovia"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Tapis roulant",
+                "terms": "tappeto rollante"
+            },
+            "aerialway/platter": {
+                "name": "Skilift",
+                "terms": "skylift,sciovia,skilift"
+            },
+            "aerialway/pylon": {
+                "name": "Pilone di trasporto a fune",
+                "terms": "pilone,palone,traliccio"
+            },
+            "aerialway/rope_tow": {
+                "name": "Manovia",
+                "terms": "manovia"
+            },
+            "aerialway/station": {
+                "name": "Stazione trasporto a fune",
+                "terms": "seggiovia,funivia,funicolare,cabinovia,slittovia,rotovia,funivia aerea,cestovia,seggiovia navale,sciovia,teleferica,manovia,palorcio"
+            },
+            "aerialway/t-bar": {
+                "name": "Skilift ad ancora",
+                "terms": "skilift,sciovia"
+            },
             "aeroway": {
                 "name": "Aeroporto",
                 "terms": "pista aeroportuale,aerei,elicotteri,eliporto,aerodromo,aeroscalo,aerostazione,aeroplani,paracadutisti,aviazione,idroscalo"
                 "name": "Cinema",
                 "terms": "cinema,cine,film,cinematografo,proiezione"
             },
+            "amenity/clinic": {
+                "name": "Clinica medica",
+                "terms": "clinica,poliambulatori,policlinica"
+            },
+            "amenity/clock": {
+                "name": "Orologio",
+                "terms": "ora,orario,orologio"
+            },
             "amenity/college": {
                 "name": "College",
                 "terms": "Accademia"
                 "name": "Tribunale",
                 "terms": "Palazzo di Giustizia"
             },
+            "amenity/dentist": {
+                "name": "Dentista",
+                "terms": "dentista,odontoiatra,odontotecnico"
+            },
+            "amenity/doctor": {
+                "name": "Medico di base",
+                "terms": "dottore,medico,studio medico"
+            },
             "amenity/drinking_water": {
                 "name": "Fontanella",
                 "terms": "fontana,fontanella,acqua potabile,nasone"
                 "name": "Guardiaparco",
                 "terms": "Stazione guardia forestale"
             },
+            "amenity/recycling": {
+                "name": "Isola ecologica",
+                "terms": "riciclo,raccolta differenziata,cestino,pattume,riciclaggio"
+            },
             "amenity/restaurant": {
                 "name": "Ristorante",
                 "terms": "bar,caffetteria,caffè,ristorante self-service,braceria,trattoria,negozio di ciambelle,bettola,griglieria,venditore di hamburger,venditore di hotdog,pizzeria"
                 "name": "Riparo",
                 "terms": "ricovero,rifugio,tettoia,pensilina,bivacco,grotta"
             },
+            "amenity/studio": {
+                "name": "Studio radiotelevisivo",
+                "terms": "studio,radio,televisione,registrazione,in onda,studio di registrazione"
+            },
             "amenity/swimming_pool": {
                 "name": "Piscina",
                 "terms": "Piscina"
                 "name": "Distributore automatico",
                 "terms": "distributore automatico,macchinetta"
             },
+            "amenity/veterinary": {
+                "name": "Veterinario",
+                "terms": "animali,dottore,medicina,farmacia"
+            },
             "amenity/waste_basket": {
                 "name": "Cestino della spazzatura",
                 "terms": "sacchetto della spazzatura,cestino della spazzatura,cassonetto della spazzatura,cassonetto,cestino"
                 "name": "Edificio residenziale",
                 "terms": "Edificio residenziale"
             },
+            "craft/blacksmith": {
+                "name": "Maniscalco",
+                "terms": "ferri di cavallo"
+            },
+            "craft/brewery": {
+                "name": "Birrificio",
+                "terms": "birreria,birra"
+            },
+            "craft/carpenter": {
+                "name": "Carpentiere",
+                "terms": "carpenteria,legno"
+            },
+            "craft/clockmaker": {
+                "name": "Costruttore di orologi",
+                "terms": "orologi"
+            },
+            "craft/electrician": {
+                "name": "Elettricista",
+                "terms": "elettronica,elettricità"
+            },
+            "craft/gardener": {
+                "name": "Giardiniere",
+                "terms": "giardinaggio,giardino"
+            },
+            "craft/jeweler": {
+                "name": "Gioielliere",
+                "terms": "gioielli,bigiotteria,orafo,gioielleria"
+            },
+            "craft/locksmith": {
+                "name": "Fabbro",
+                "terms": "fabbro,ferraio,ferro battuto,officina"
+            },
+            "craft/optician": {
+                "name": "Ottico",
+                "terms": "ottica,occhiali"
+            },
+            "craft/photographer": {
+                "name": "Fotografo",
+                "terms": "fotografia,stampe"
+            },
+            "craft/shoemaker": {
+                "name": "Calzolaio",
+                "terms": "scarpe,scarpino,calzature"
+            },
+            "craft/watchmaker": {
+                "name": "Orologiaio",
+                "terms": "orologi,riparazione"
+            },
             "embankment": {
                 "name": "Terrapieno",
                 "terms": "argine,muraglia,muro,collina,terra"
                 "name": "Marciapiede",
                 "terms": "marciapiedi,passeggio,salvagente,banchina"
             },
+            "golf/bunker": {
+                "name": "Bunker",
+                "terms": "sabbia"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "fairway"
+            },
+            "golf/green": {
+                "name": "Gree",
+                "terms": "campo da golf,green"
+            },
+            "golf/hole": {
+                "name": "Buca del golf",
+                "terms": "buca,golf"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Ostacolo d'acqua laterale",
+                "terms": "buca,acqua,golf,ostacolo"
+            },
+            "golf/water_hazard": {
+                "name": "Ostacolo d'acqua",
+                "terms": "buca,acqua,golf,ostacolo"
+            },
             "highway": {
                 "name": "Strada",
                 "terms": "Strada"
                 "name": "Residenziale",
                 "terms": "Residenziale"
             },
+            "highway/rest_area": {
+                "name": "Area di sosta",
+                "terms": "sosta"
+            },
             "highway/road": {
                 "name": "Tipo sconosciuto",
                 "terms": "Tipo sconosciuto"
                 "name": "Corsia di un parcheggio",
                 "terms": "Corsia parcheggio"
             },
+            "highway/services": {
+                "name": "Area di servizio",
+                "terms": "servizio"
+            },
             "highway/steps": {
                 "name": "Scale",
                 "terms": "scale,scalinata,gradini"
                 "name": "Agenzia di viaggi",
                 "terms": "travel,tour operator,turismo,viaggi,escursionismo"
             },
+            "piste": {
+                "name": "Piste da sci",
+                "terms": "pista da sci,sci,impianto sciistico,impianto"
+            },
             "place": {
                 "name": "Luogo",
                 "terms": "Luogo"
                 "terms": "Pilone elettricità"
             },
             "power/sub_station": {
-                "name": "Sottostazione",
-                "terms": "Sottostazione"
+                "name": "Sottostazione elettrica",
+                "terms": "Sottostazione elettrica,centralina,trasformatore"
             },
             "power/tower": {
                 "name": "Traliccio ad alta tensione",
                 "name": "Ferrovia in disuso",
                 "terms": "Ferrovia di disuso"
             },
+            "railway/funicular": {
+                "name": "Funicolare",
+                "terms": "funicolare,treno,trenino"
+            },
             "railway/halt": {
                 "name": "Fermata ferroviaria",
                 "terms": "Fermata ferroviaria,fermata,stazione,stazione non custodita,fermata a richiesta"
                 "name": "Monorotaia",
                 "terms": "Monorotaia"
             },
+            "railway/narrow_gauge": {
+                "name": "Ferrovia a scartamento ridotto",
+                "terms": "scartamento ridotto"
+            },
             "railway/platform": {
                 "name": "Piattaforma della stazione ferroviaria",
                 "terms": "Piattafirna ferroviaria"
index 2173cdcfca82d94aac6421dd358c745a9193ceb6..6cb70f06bf55fba09c23f4000f5757a7ac3f1c09 100644 (file)
@@ -2,7 +2,7 @@
     "modes": {
         "add_area": {
             "title": "エリア",
-            "description": "公園や建物、湖沼など、エリア情報を描画",
+            "description": "公園や建物、湖沼等を地図に追加",
             "tail": "クリックするとエリアの描画が開始されます。公園や湖沼、建物などを描くことができます。"
         },
         "add_line": {
         "incomplete": "<ダウンロード未完了>",
         "feature_list": "地物を検索",
         "edit": "地物を編集",
-        "none": "なし"
+        "none": "なし",
+        "node": "ノード",
+        "way": "ウェイ",
+        "relation": "リレーション",
+        "location": "位置"
     },
     "background": {
         "title": "背景画像",
         "untagged_area": "エリアにタグが付与されていません",
         "many_deletions": "{n} オブジェクトを削除しています。本当に削除してよろしいですか? 削除した結果はopenstreetmap.orgに反映されます。",
         "tag_suggests_area": "ラインに {tag} タグが付与されています。エリアで描かれるべきです",
+        "untagged_tooltip": "この {geometry} があらわす地物の種類を選択してください。",
         "deprecated_tags": "タグの重複: {tags}"
     },
     "zoom": {
         "gps": "# GPS\n\nOpenStreetMapにおいて、GPSデータは最も信用できる情報源です。iDエディタはあなたのPC上にある`.gpx`ファイルのトレース機能をサポートしています。GPSログは、スマートフォンのアプリケーションやGPSロガーを使用することで収集することができます。\n\nGPSを使用した現地調査の詳細な進め方については、[GPSによる調査](http://learnosm.org/jp/beginner/using-gps/)を参照してください。\n\nGPXログファイルをエディタの上にドラッグ&ドロップすることで、ファイルの内容をエディタ上に表示させることができます。ファイル形式の読み込みが正常に完了すると、ログは明るい緑色の線としてエディタ上に表示されます。エディタの左側に配置されている'背景画像設定'メニューをクリックすると、ログの表示/非表示、GPXが配置されたレイヤーへのズームを設定することができます。\n\nこのGPXログファイルはOpenStreetMapへ直接アップロードされたものではありません。このログを参考情報として地図を描いたり、あなたが追加する地物の配置場所の参考情報とするのがよいでしょう。また、あなた以外のユーザにもGPSログを使ってもらうためには[OpenStreetMapへのアップロード機能](http://www.openstreetmap.org/trace/create)を利用してください。\n",
         "imagery": "# 背景画像\n\n地図を作成するにあたって、航空写真は重要なリソースのひとつです。上空からの撮影、衛星写真、自由な利用が認められた情報源などは、画面左側の'背景画像設定'メニューから表示させることが可能です。\n\nデフォルト設定では[Bing Maps](http://www.bing.com/maps/)の衛星写真レイヤーが表示されていますが、地図のズームレベル変更などで新しい場所を表示する際に別のリソースを表示させることが可能です。英国やフランス、デンマークでは、特定の地域に限り非常に細密な画像が利用可能です。\n\n画像提供側の間違いが原因で、背景画像と地図データの位置がずれていることがあります。既存道路の多くが一方向にずれている場合、すべての地物の位置を一度に移動させてしまう前に、背景画像の表示位置を調整してみて、オフセットがされていないか確認を行なってください。位置の調整は、背景画像設定の一番下に表示されている'背景画像をずらす'という項目から行うことができます。\n",
         "addresses": "# 住所\n\n住所情報は地図において最も有用な情報のひとつです。\n\n住所情報は街路の付帯情報として扱われることがほとんどですが、OpenStreetMapにおける住所情報は、街路にそって配置されている建物の属性として記録されます。\n\n住所情報は建物を表す輪郭に付与しても構いませんし、独立したポイントとして配置してもかまいません。また、住所データの最適な情報源は現地調査、あるいは個人の記憶によるものです。GoogleMapsなど、他の地図からの転載は特別な許諾がない限り固く禁止されています。\n\n注: 日本では住所システムの体系が異なるため、街路を基とする上記の方法を適用することはできません。\n",
+        "inspector": "# 地物情報表示ウィンドウ\n\n地図上の地物を選択すると、画面左側に入力ウィンドウが表示されます。地物に関する詳細情報の編集はこのウィンドウから行います。\n\n### 地物種別の選択\n\nポイントやライン、エリアを描画する際、描いた地物の種別を選択することができます。これによって、ラインが高速道路なのか住宅道路なのか、ポイントがスーパーマーケットなのか喫茶店なのか、などを表現します。地物情報表示ウィンドウには、よく利用される地物が表示されています。その他の地物を表示させたい場合は、検索ボックスから検索を行なってください。\n\n地物種別が表示されている右下にある'i'ボタンをクリックすることで、その種別の詳細情報を表示させることができます。アイコンをクリックすることで、種別を確定させることができます。\n\n### フォームを利用したタグ編集\n\n地物の種別を選択した後、あるいは既に種別が割り当てられた地物を選択した際には、その地物の名称や住所などの詳細情報がウィンドウ内に表示されます。\n\n表示中のフィールドの下部にあるアイコンをクリックすると、追加の入力フィールドが表示されます。例えば[Wikipedia](http://www.wikipedia.org/)情報や、車椅子の利用可否などです。\n\n入力ウィンドウの一番下に配置されている 'タグ項目を追加'をクリックすると、要素に対する自由記入フォームが表示されます。利用されることが多いタグの組み合わせは[Taginfo](http://taginfo.openstreetmap.org/)から検索が可能です。\n\n入力ウィンドウに記入した内容は、エディタ上の地図に即座に反映されます。'やり直し'ボタンをクリックすることで、いつでも入力内容を取り消すことが可能です。\n\n### 地物情報表示ウィンドウを閉じる\n\nウィンドウを閉じるには、ウィンドウ右上のXボタンをクリックするか、キーボードの'Escape'キーを押すか、地図上のどこかをクリックしてください。\n",
         "buildings": "# 建物\n\nOpenStreetMapは世界でも有数の建物情報データベースです。このデータベースへの情報追加や改善は誰しもが参加可能です。\n\n### 選択\n\n建物の輪郭をクリックすると、その建物を選択することができます。建物はハイライト表示され、小さなツール項目と、画面右側にその建物の詳細情報が表示されます。\n\n### 修正\n\n建物の位置や、付与されているタグが誤っていることがあります。\n\n建物全体の位置を移動させるには、'移動'ツールのアイコンをクリックしてください。マウスを動かして建物を正しい位置へ移動させ、もう一度クリックして位置を確定させます。\n\n同様に、建物を形成しているポイントをクリックして正しい位置へ移動させることで、建物の形状を修正することができます。\n\n### 新規作成\n\nOpenStreetMapで建物を描く場合によくあがる質問として、建物をエリアとポイントのどちらで描いたほうがよいか、というものがあります。最善の方法では _できる限り、建物はエリアとして描き_  、会社や個人宅、施設など、建物から独立した情報は別途ポイントとして、エリアとして描かれた建物の内側に配置します。\n\n画面左上に表示されている項目から'エリア'ボタンをクリックして、建物をエリアとして描いてみましょう。エリアの描画を終了するにはキーボードの'Return'キーを押すか、エリアを描き始めたポイントをもう一度クリックしてください。\n\n### 削除\n\nもし建物の情報が完全に間違っている場合 - 衛星写真に映っておらず、より理想としては実際に現地で建物が無いことを確認できた場合 - その建物データそのものを削除し、地図から消去することが可能です。地物を削除する際の注意として、編集結果は他の編集と同様すべての利用者の目に触れること、また、衛星写真は撮影日時が古い可能性があり、建物が新しく建設されているかもしれないことを意識してください。\n\n建物を削除するには、対象をクリックして選択し、ツール項目からゴミ箱アイコンをクリックするか、'Delete'キーを押してください。\n",
         "relations": "# リレーション\n\nリレーションとはOpenStreetMapで地物を表現する際の特殊な記法で、複数の地物をひとつのグループとして扱うことが可能です。例えばリレーションでよく使われるものは、特定の高速道路や有料道路を複数のウェイを使って表現する *route リレーション* 、そして複数のラインをグループ化することによって分割されたエリアやドーナツ型の空洞部分などの複雑な表現を行う *マルチポリゴン* があげられます。\n\nリレーションを構成する地物は *メンバー* と呼ばれます。OSM上の地物がどのリレーションのメンバーになっているかはサイドバーに表示され、選択することが可能です。リレーションを選択するとその所属メンバーがすべてサイドバーにリストアップされ、地図上にその位置がハイライト表示されます。\n\niDでは編集中のリレーション情報はほとんどの場合、自動的に補完されます。ただし、例えば位置が間違っている道路をいったん削除して新しく書き直す際などは、書き直した道路ウェイが削除したウェイと同じリレーションに再度所属するように編集するべきです。\n\n## リレーションの編集\n\nリレーションを編集する場合、基本の形は以下のとおりです。\n\nリレーションに地物を追加してメンバーにする場合、まず対象の地物を選択した状態で、サイドバーの \"すべてのリレーション\" に表示されている \"+\" ボタンをクリックします。クリックしたら、リレーションの名称を入力するか、一覧から選んでください。\n\nリレーションを新しく作成する場合は、メンバーとして所属することになる最初の地物を選択した状態で \"すべてのリレーション\" に表示されている \"+\" ボタンをクリックし、\"新しいリレーション\"を選択してください。\n\nリレーションから地物を除外する場合は、対象の地物を選択し、除外を行いたいリレーションの隣に表示されているゴミ箱アイコンをクリックします。\n\nまた、\"結合\"機能を使うことで、空洞部分をもつマルチポリゴンを作成することができます。2つのエリアを描き、それぞれを内側(inner)と外側(outer)とします。次に、キーボードのShiftキーを押しながらそれぞれの地物をクリックし、両方を選択状態にしてから \"結合\" (+) ボタンをクリックしてください。\n"
     },
             "category-building": {
                 "name": "建物"
             },
+            "category-golf": {
+                "name": "ゴルフ"
+            },
             "category-landuse": {
                 "name": "土地利用"
             },
             "category-path": {
-                "name": "小"
+                "name": "小"
             },
             "category-rail": {
                 "name": "線路"
                 "name": "水面"
             },
             "category-water-line": {
-                "name": "水"
+                "name": "水"
             }
         },
         "fields": {
             "admin_level": {
                 "label": "Admin Level"
             },
-            "aeroway": {
+            "aerialway": {
                 "label": "タイプ"
             },
+            "aerialway/access": {
+                "label": "通行制限"
+            },
+            "aerialway/bubble": {
+                "label": "覆い"
+            },
+            "aerialway/capacity": {
+                "label": "運搬人数(1時間当たり)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "所用時間(分)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "暖房"
+            },
+            "aerialway/occupancy": {
+                "label": "重量",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "夏季運行"
+            },
+            "aeroway": {
+                "label": "形態"
+            },
             "amenity": {
-                "label": "種"
+                "label": "種"
             },
             "artist": {
                 "label": "アーティスト"
                 "label": "タイプ"
             },
             "bicycle_parking": {
-                "label": "タイプ"
+                "label": "種類"
             },
             "boundary": {
                 "label": "タイプ"
             },
             "building": {
-                "label": "建物種別"
+                "label": "建物"
             },
             "building_area": {
-                "label": "建物種別"
+                "label": "建物"
+            },
+            "cans": {
+                "label": "空き缶回収"
             },
             "capacity": {
-                "label": "収容可能な数量",
+                "label": "収容",
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
                     "anticlockwise": "左回り"
                 }
             },
+            "clothes": {
+                "label": "古着回収"
+            },
             "collection_times": {
-                "label": "情報取得日時"
+                "label": "収集時刻"
             },
             "construction": {
-                "label": "タイプ"
+                "label": "種類"
             },
             "country": {
-                "label": "Country"
+                "label": "国"
+            },
+            "covered": {
+                "label": "屋根"
             },
             "crossing": {
-                "label": "タイプ"
+                "label": "種類"
             },
             "cuisine": {
-                "label": "メニュー種別"
+                "label": "料理の種類"
             },
             "denomination": {
                 "label": "宗派"
             },
             "denotation": {
-                "label": "表示"
+                "label": "意味"
             },
             "description": {
-                "label": "詳しい内容"
+                "label": "説明"
+            },
+            "electrified": {
+                "label": "電化状態"
             },
             "elevation": {
                 "label": "標高"
             },
             "emergency": {
-                "label": "緊急医療"
+                "label": "緊急設備"
             },
             "entrance": {
                 "label": "タイプ"
             },
             "fax": {
-                "label": "Fax",
+                "label": "FAX",
                 "placeholder": "+31 42 123 4567"
             },
             "fee": {
                 "label": "タイプ"
             },
             "fixme": {
-                "label": "Fix Me"
+                "label": "要修正"
+            },
+            "gauge": {
+                "label": "軌間"
             },
             "generator/method": {
                 "label": "方式"
             },
             "generator/source": {
-                "label": "参照した情報"
+                "label": "情報源"
             },
             "generator/type": {
                 "label": "タイプ"
             },
+            "glass": {
+                "label": "草回収"
+            },
+            "golf_hole": {
+                "label": "参照",
+                "placeholder": "ホール(1-18)"
+            },
+            "handicap": {
+                "label": "ハンデ",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "道路区分"
             },
             "incline": {
                 "label": "傾斜"
             },
+            "information": {
+                "label": "タイプ"
+            },
             "internet_access": {
                 "label": "インターネット利用",
                 "options": {
                 "placeholder": "1, 2, 3..."
             },
             "layer": {
-                "label": "レイヤ"
+                "label": "レイヤ"
             },
             "leisure": {
                 "label": "タイプ"
                 "label": "位置"
             },
             "man_made": {
-                "label": "タイプ"
+                "label": "種類"
             },
             "maxspeed": {
                 "label": "最高速度",
             "operator": {
                 "label": "管理主体"
             },
+            "paper": {
+                "label": "古紙回収"
+            },
+            "par": {
+                "label": "パー",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "パーク&ライド"
             },
                 "label": "電話番号",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "難易度"
+            },
+            "piste/grooming": {
+                "label": "整備状況"
+            },
+            "piste/type": {
+                "label": "種別"
+            },
             "place": {
                 "label": "タイプ"
             },
                 "label": "通行の困難さ"
             },
             "service": {
-                "label": "タイプ"
+                "label": "種類"
             },
             "shelter": {
                 "label": "避難所"
                 "label": "店舗種別"
             },
             "source": {
-                "label": "参照した情報"
+                "label": "情報源"
             },
             "sport": {
                 "label": "スポーツ"
                 "label": "構造",
                 "placeholder": "不明",
                 "options": {
-                    "bridge": "橋",
+                    "bridge": "橋",
                     "tunnel": "トンネル",
-                    "embankment": "土手, 堤防",
-                    "cutting": "切土, 掘割"
+                    "embankment": "土手",
+                    "cutting": "切り通し"
                 }
             },
+            "studio_type": {
+                "label": "タイプ"
+            },
             "supervised": {
                 "label": "管理"
             },
             "surface": {
-                "label": "è·¯é\9d¢ç¨®å\88¥"
+                "label": "è·¯é\9d¢ç\8a¶æ\85\8b"
             },
             "toilets/disposal": {
                 "label": "汚物処理"
             },
             "tourism": {
-                "label": "タイプ"
+                "label": "種類"
             },
             "towertype": {
                 "label": "塔の用途"
             "tree_type": {
                 "label": "タイプ"
             },
+            "tunnel": {
+                "label": "トンネル"
+            },
             "vending": {
                 "label": "販売商品の種別"
             },
             "water": {
-                "label": "タイプ"
+                "label": "種類"
             },
             "waterway": {
                 "label": "水路区分"
         "presets": {
             "address": {
                 "name": "住所",
-                "terms": "住所,郵便,じゅうしょ"
+                "terms": "住所"
+            },
+            "aerialway": {
+                "name": "索道",
+                "terms": "索道,ロープウェイ,リフト"
+            },
+            "aerialway/cable_car": {
+                "name": "ケーブルカー",
+                "terms": "ケーブルカー,インクライン"
+            },
+            "aerialway/chair_lift": {
+                "name": "チェアリフト",
+                "terms": "チェアリフト,椅子リフト,いすリフト"
+            },
+            "aerialway/gondola": {
+                "name": "ゴンドラ",
+                "terms": "ゴンドラ"
+            },
+            "aerialway/magic_carpet": {
+                "name": "マジックカーペットリフト",
+                "terms": "マジックカーペットリフト"
+            },
+            "aerialway/platter": {
+                "name": "プラッターリフト",
+                "terms": "プラッターリフト"
+            },
+            "aerialway/pylon": {
+                "name": "索道用支柱",
+                "terms": "索道用支柱,パイロン"
+            },
+            "aerialway/rope_tow": {
+                "name": "ロープタウリフト",
+                "terms": "ロープタウリフト"
+            },
+            "aerialway/station": {
+                "name": "索道駅",
+                "terms": "索道駅,ロープウェイ駅,リフト駅"
+            },
+            "aerialway/t-bar": {
+                "name": "Tバーリフト",
+                "terms": "Tバーリフト"
             },
             "aeroway": {
-                "name": "航空施設"
+                "name": "航空施設",
+                "terms": "索道,ロープウェイ,リフト"
             },
             "aeroway/aerodrome": {
                 "name": "空港",
                 "terms": "空港,飛行場"
             },
             "aeroway/apron": {
-                "name": "エプロン"
+                "name": "エプロン",
+                "terms": "エプロン"
             },
             "aeroway/gate": {
-                "name": "空港ゲート"
+                "name": "搭乗口",
+                "terms": "搭乗口, 搭乗ゲート"
             },
             "aeroway/hangar": {
-                "name": "格納庫"
+                "name": "格納庫",
+                "terms": "格納庫"
             },
             "aeroway/helipad": {
-                "name": "ヘリポート"
+                "name": "ヘリパッド",
+                "terms": "ヘリパッド,ヘリコプター発着所"
             },
             "aeroway/runway": {
-                "name": "滑走路"
+                "name": "滑走路",
+                "terms": "滑走路"
             },
             "aeroway/taxiway": {
-                "name": "航空機誘導路"
+                "name": "航空機誘導路",
+                "terms": "誘導路"
             },
             "aeroway/terminal": {
                 "name": "空港ターミナル",
                 "terms": "空港ターミナル,ターミナル,空港"
             },
             "amenity": {
-                "name": "(公共)施設"
+                "name": "施設",
+                "terms": "飲食店,設備"
             },
             "amenity/arts_centre": {
-                "name": "アートセンター"
+                "name": "アートセンター",
+                "terms": "アートセンター"
             },
             "amenity/atm": {
                 "name": "ATM",
-                "terms": "atm,ATM,えーてぃーえむ,預貯金,引き出し"
+                "terms": "ATM,CD,現金自動預払機"
             },
             "amenity/bank": {
                 "name": "銀行",
-                "terms": "銀行,ぎんこう,バンク,信用金庫,振り込み"
+                "terms": "銀行,信用金庫,信用組合"
             },
             "amenity/bar": {
                 "name": "バー",
                 "terms": "バー,飲み屋,呑み屋,ばー"
             },
             "amenity/bench": {
-                "name": "ベンチ"
+                "name": "ベンチ",
+                "terms": "ベンチ"
             },
             "amenity/bicycle_parking": {
-                "name": "駐輪場"
+                "name": "駐輪場",
+                "terms": "駐輪場,自転車駐車場"
             },
             "amenity/bicycle_rental": {
-                "name": "レンタル自転車店"
+                "name": "レンタサイクル",
+                "terms": "レンタサイクル"
             },
             "amenity/boat_rental": {
-                "name": "貸ボート"
+                "name": "貸しボート",
+                "terms": "貸しボート"
             },
             "amenity/cafe": {
-                "name": "カフェ"
+                "name": "喫茶店",
+                "terms": "喫茶店,カフェ"
             },
             "amenity/car_rental": {
-                "name": "レンタカー"
+                "name": "レンタカー",
+                "terms": "レンタカー,貸自動車,カーレンタル"
             },
             "amenity/car_sharing": {
-                "name": "カーシェアリング"
+                "name": "カーシェアリング",
+                "terms": "カーシェアリング"
             },
             "amenity/car_wash": {
-                "name": "車の洗浄"
+                "name": "車の洗浄",
+                "terms": "洗車機, 洗車, 車洗浄, カーウォッシュ"
             },
             "amenity/childcare": {
-                "name": "保育施設"
+                "name": "保育施設",
+                "terms": "託児所,保育園,幼稚園,学童保育"
             },
             "amenity/cinema": {
-                "name": "映画館"
+                "name": "映画館",
+                "terms": "映画館,上映施設,スクリーン,銀幕"
+            },
+            "amenity/clinic": {
+                "name": "クリニック",
+                "terms": "クリニック"
+            },
+            "amenity/clock": {
+                "name": "時計",
+                "terms": "時計"
             },
             "amenity/college": {
-                "name": "単科大学"
+                "name": "単科大学",
+                "terms": "大学,短大,専門学校,高専"
             },
             "amenity/courthouse": {
-                "name": "裁判所"
+                "name": "裁判所",
+                "terms": "裁判所"
+            },
+            "amenity/dentist": {
+                "name": "歯医者",
+                "terms": "歯科"
+            },
+            "amenity/doctor": {
+                "name": "医院",
+                "terms": "医者,医師"
             },
             "amenity/drinking_water": {
-                "name": "水飲み場"
+                "name": "水飲み場",
+                "terms": "水飲み場"
             },
             "amenity/embassy": {
-                "name": "大使館"
+                "name": "大使館",
+                "terms": "大使館"
             },
             "amenity/fast_food": {
-                "name": "ファストフード"
+                "name": "ファストフード",
+                "terms": "ファストフード店,ファストフード,ジャンクフード,ジャンク"
             },
             "amenity/fire_station": {
-                "name": "消防署"
+                "name": "消防署",
+                "terms": "消防署"
             },
             "amenity/fountain": {
-                "name": "噴水"
+                "name": "噴水",
+                "terms": "泉,噴水"
             },
             "amenity/fuel": {
-                "name": "ガソリンスタンド"
+                "name": "ガソリンスタンド",
+                "terms": "ガソリンスタンド,ガス,ガスステーション"
             },
             "amenity/grave_yard": {
-                "name": "墓地"
+                "name": "(教会・寺院にある)墓所",
+                "terms": "墓地,霊園,墓場,お墓,墓苑"
             },
             "amenity/hospital": {
-                "name": "病院"
+                "name": "病院",
+                "terms": "病院, 医院,総合病院"
             },
             "amenity/kindergarten": {
-                "name": "幼稚園"
+                "name": "幼稚園",
+                "terms": "保育園,幼稚園"
             },
             "amenity/library": {
-                "name": "図書館"
+                "name": "図書館",
+                "terms": "図書館,ライブラリ,ライブラリー"
             },
             "amenity/marketplace": {
-                "name": "市場"
+                "name": "市場",
+                "terms": "市場,マーケット,朝市,マルシェ"
             },
             "amenity/parking": {
-                "name": "駐車場"
+                "name": "駐車場",
+                "terms": "駐車場"
             },
             "amenity/pharmacy": {
-                "name": "薬局, ドラッグストア"
+                "name": "薬局",
+                "terms": "調剤,調剤薬局,薬局"
             },
             "amenity/place_of_worship": {
-                "name": "宗教施設"
+                "name": "宗教施設",
+                "terms": "礼拝所,祈りの場所,参拝所"
             },
             "amenity/place_of_worship/buddhist": {
-                "name": "仏閣"
+                "name": "仏教寺院",
+                "terms": "寺院,仏閣,寺,寺社,院,堂"
             },
             "amenity/place_of_worship/christian": {
-                "name": "教会"
+                "name": "教会",
+                "terms": "教会,礼拝堂,礼拝所,チャーチ"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "シナゴーグ"
+                "name": "シナゴーグ",
+                "terms": "シナゴーグ"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "モスク"
+                "name": "モスク",
+                "terms": "モスク"
             },
             "amenity/police": {
-                "name": "警察"
+                "name": "警察",
+                "terms": "警察,警察署,交番,駐在所"
             },
             "amenity/post_box": {
-                "name": "郵便ポスト"
+                "name": "郵便ポスト",
+                "terms": "郵便ポスト,郵便箱"
             },
             "amenity/post_office": {
-                "name": "郵便局"
+                "name": "郵便局",
+                "terms": "郵便局"
             },
             "amenity/pub": {
-                "name": "居酒屋"
+                "name": "居酒屋",
+                "terms": "パブ,居酒屋"
             },
             "amenity/ranger_station": {
-                "name": "レンジャーステーション"
+                "name": "レンジャーの詰所",
+                "terms": "レンジャーの詰所, レンジャーステーション"
+            },
+            "amenity/recycling": {
+                "name": "リサイクルボックス",
+                "terms": "リサイクルボックス"
             },
             "amenity/restaurant": {
-                "name": "レストラン"
+                "name": "レストラン",
+                "terms": "レストラン,食堂"
             },
             "amenity/school": {
-                "name": "学校"
+                "name": "学校",
+                "terms": "学校,スクール"
             },
             "amenity/shelter": {
-                "name": "避難所"
+                "name": "避難所",
+                "terms": "避難所,シェルター,逃げ場"
+            },
+            "amenity/studio": {
+                "name": "スタジオ",
+                "terms": "スタジオ"
             },
             "amenity/swimming_pool": {
-                "name": "プール"
+                "name": "遊泳プール",
+                "terms": "遊泳プール"
             },
             "amenity/taxi": {
-                "name": "タクシー乗り場"
+                "name": "タクシー乗り場",
+                "terms": "タクシー乗り場"
             },
             "amenity/telephone": {
-                "name": "公衆電話"
+                "name": "公衆電話",
+                "terms": "公衆電話"
             },
             "amenity/theatre": {
-                "name": "劇場"
+                "name": "劇場",
+                "terms": "劇場,ホール"
             },
             "amenity/toilets": {
-                "name": "お手洗い, トイレ"
+                "name": "トイレ",
+                "terms": "トイレ,便所"
             },
             "amenity/townhall": {
-                "name": "市町村役場"
+                "name": "役場",
+                "terms": "市役所,区役所,町役場,村役場,市庁"
             },
             "amenity/university": {
-                "name": "大学"
+                "name": "大学",
+                "terms": "大学"
             },
             "amenity/vending_machine": {
-                "name": "自動販売機"
+                "name": "自動販売機",
+                "terms": "自動販売機"
+            },
+            "amenity/veterinary": {
+                "name": "獣医",
+                "terms": "獣医, ペット医"
             },
             "amenity/waste_basket": {
-                "name": "ゴミ箱"
+                "name": "ゴミ箱",
+                "terms": "ゴミ箱"
             },
             "area": {
-                "name": "エリア"
+                "name": "エリア",
+                "terms": "エリア, 領域, 範囲"
             },
             "barrier": {
-                "name": "障害物"
+                "name": "障害物",
+                "terms": "障害物"
             },
             "barrier/block": {
-                "name": "車止め"
+                "name": "車止め",
+                "terms": "ブロック"
             },
             "barrier/bollard": {
-                "name": "杭"
+                "name": "車止め杭",
+                "terms": "車止め杭"
             },
             "barrier/cattle_grid": {
-                "name": "家畜柵"
+                "name": "家畜脱出防止溝",
+                "terms": "家畜脱出防止溝"
             },
             "barrier/city_wall": {
-                "name": "市壁"
+                "name": "市壁",
+                "terms": "市壁"
             },
             "barrier/cycle_barrier": {
-                "name": "自転車止め"
+                "name": "自転車止め",
+                "terms": "自転車止め"
             },
             "barrier/ditch": {
-                "name": "溝"
+                "name": "堀",
+                "terms": "堀"
             },
             "barrier/entrance": {
-                "name": "出入り口"
+                "name": "出入口",
+                "terms": "出入口"
             },
             "barrier/fence": {
-                "name": "フェンス, 柵"
+                "name": "フェンス",
+                "terms": "フェンス, 柵"
             },
             "barrier/gate": {
-                "name": "門, ゲート"
+                "name": "門",
+                "terms": "門, ゲート"
             },
             "barrier/hedge": {
-                "name": "垣根"
+                "name": "生垣",
+                "terms": "生垣"
             },
             "barrier/kissing_gate": {
-                "name": "牧場用ゲート"
+                "name": "キッシングゲート",
+                "terms": "キッシングゲート, V字形自在門, U字形自在門"
             },
             "barrier/lift_gate": {
-                "name": "遮断ゲート"
+                "name": "遮断機",
+                "terms": "遮断機"
             },
             "barrier/retaining_wall": {
-                "name": "擁壁"
+                "name": "擁壁",
+                "terms": "擁壁"
             },
             "barrier/stile": {
-                "name": "踏み越し段"
+                "name": "通路",
+                "terms": "通路, 踏み越し段"
             },
             "barrier/toll_booth": {
-                "name": "料金所"
+                "name": "料金所",
+                "terms": "料金所"
             },
             "barrier/wall": {
-                "name": "壁"
+                "name": "壁",
+                "terms": "壁"
             },
             "boundary/administrative": {
-                "name": "行政区境"
+                "name": "行政境界",
+                "terms": "行政境界, 都道府県境, 都境, 道境, 府境, 県境, 市区町村境, 市境, 区境, 町境, 村境"
             },
             "building": {
-                "name": "建物"
+                "name": "建物",
+                "terms": "建物, ビル"
             },
             "building/apartments": {
-                "name": "アパート"
+                "name": "アパート",
+                "terms": "アパート"
             },
             "building/commercial": {
-                "name": "商業建築"
+                "name": "オフィスビル",
+                "terms": "オフィスビル"
             },
             "building/entrance": {
-                "name": "エントランス"
+                "name": "出入口",
+                "terms": "出入口, エントランス"
             },
             "building/garage": {
-                "name": "ガレージ"
+                "name": "車庫",
+                "terms": "車庫,ガレージ"
             },
             "building/house": {
-                "name": "民家"
+                "name": "住宅",
+                "terms": "住宅"
             },
             "building/hut": {
-                "name": "山小屋"
+                "name": "小屋",
+                "terms": "小屋, 休憩小屋, 漁師小屋, 狩猟小屋"
             },
             "building/industrial": {
-                "name": "工場"
+                "name": "工場",
+                "terms": "工場"
             },
             "building/residential": {
-                "name": "住宅建築"
+                "name": "住宅",
+                "terms": "住宅, アパート, マンション"
+            },
+            "craft/basket_maker": {
+                "name": "かご製造所",
+                "terms": "かご,籠"
+            },
+            "craft/beekeeper": {
+                "name": "養蜂所",
+                "terms": "養蜂所"
+            },
+            "craft/blacksmith": {
+                "name": "鍛冶屋",
+                "terms": "鍛冶屋"
+            },
+            "craft/boatbuilder": {
+                "name": "ボート製造所",
+                "terms": "ボート製造所"
+            },
+            "craft/bookbinder": {
+                "name": "製本所",
+                "terms": "製本所"
+            },
+            "craft/brewery": {
+                "name": "ビール醸造所",
+                "terms": "ビール醸造所"
+            },
+            "craft/carpenter": {
+                "name": "工務店",
+                "terms": "工務店"
+            },
+            "craft/carpet_layer": {
+                "name": "畳・カーペット工事店",
+                "terms": "畳・カーペット工事店"
+            },
+            "craft/caterer": {
+                "name": "仕出し料理店",
+                "terms": "仕出し料理店"
+            },
+            "craft/clockmaker": {
+                "name": "時計製造所",
+                "terms": "時計製造所"
+            },
+            "craft/confectionary": {
+                "name": "製菓店",
+                "terms": "製菓店"
+            },
+            "craft/dressmaker": {
+                "name": "衣服製造所",
+                "terms": "衣服製造所"
+            },
+            "craft/electrician": {
+                "name": "電気工事店",
+                "terms": "電気工事店"
+            },
+            "craft/gardener": {
+                "name": "庭師",
+                "terms": "庭師"
+            },
+            "craft/glaziery": {
+                "name": "ガラス細工師",
+                "terms": "ガラス細工師"
+            },
+            "craft/handicraft": {
+                "name": "手工芸品",
+                "terms": "手工芸品"
+            },
+            "craft/hvac": {
+                "name": "空調設計",
+                "terms": "空調設計"
+            },
+            "craft/insulator": {
+                "name": "断熱材",
+                "terms": "断熱材"
+            },
+            "craft/jeweler": {
+                "name": "宝石加工",
+                "terms": "宝石加工"
+            },
+            "craft/key_cutter": {
+                "name": "合鍵作成",
+                "terms": "合鍵作成"
+            },
+            "craft/locksmith": {
+                "name": "錠前師",
+                "terms": "錠前師,鍵屋"
+            },
+            "craft/metal_construction": {
+                "name": "金属加工",
+                "terms": "金属加工,鋳造"
+            },
+            "craft/optician": {
+                "name": "眼鏡士",
+                "terms": "眼鏡士"
+            },
+            "craft/painter": {
+                "name": "塗装業",
+                "terms": "塗装業"
+            },
+            "craft/photographer": {
+                "name": "写真屋",
+                "terms": "カメラマン,写真屋"
+            },
+            "craft/photographic_labratory": {
+                "name": "現像所",
+                "terms": "現像所"
+            },
+            "craft/plasterer": {
+                "name": "左官",
+                "terms": "左官"
+            },
+            "craft/plumber": {
+                "name": "配管工",
+                "terms": "配管工"
+            },
+            "craft/pottery": {
+                "name": "窯元",
+                "terms": "窯元,陶器製造業"
+            },
+            "craft/rigger": {
+                "name": "艤装者",
+                "terms": "艤装者"
+            },
+            "craft/roofer": {
+                "name": "屋根ふき職人",
+                "terms": "屋根ふき職人"
+            },
+            "craft/saddler": {
+                "name": "馬具製造人",
+                "terms": "馬具製造人"
+            },
+            "craft/sailmaker": {
+                "name": "製帆職人",
+                "terms": "製帆職人"
+            },
+            "craft/sawmill": {
+                "name": "製材",
+                "terms": "製材"
+            },
+            "craft/scaffolder": {
+                "name": "足場職人",
+                "terms": "足場職人,とび職"
+            },
+            "craft/sculpter": {
+                "name": "彫刻家",
+                "terms": "彫刻家"
+            },
+            "craft/shoemaker": {
+                "name": "製靴",
+                "terms": "製靴,靴製造"
+            },
+            "craft/stonemason": {
+                "name": "石工",
+                "terms": "石工,石材加工"
+            },
+            "craft/sweep": {
+                "name": "煙突掃除",
+                "terms": "煙突掃除"
+            },
+            "craft/tailor": {
+                "name": "仕立て屋",
+                "terms": "仕立て屋,テイラー"
+            },
+            "craft/tiler": {
+                "name": "タイル職人",
+                "terms": "タイル職人"
+            },
+            "craft/tinsmith": {
+                "name": "すず細工職人",
+                "terms": "ブリキ屋,すず細工職人"
+            },
+            "craft/upholsterer": {
+                "name": "椅子張り職人",
+                "terms": "椅子張り職人"
+            },
+            "craft/watchmaker": {
+                "name": "時計製造業",
+                "terms": "時計製造業"
+            },
+            "craft/window_construction": {
+                "name": "窓職人",
+                "terms": "窓職人"
             },
             "embankment": {
-                "name": "土堤"
+                "name": "土手",
+                "terms": "土手"
             },
             "emergency/ambulance_station": {
-                "name": "救急看護"
+                "name": "救急車の基地",
+                "terms": "救急車の基地"
             },
             "emergency/fire_hydrant": {
-                "name": "消火栓"
+                "name": "消火栓",
+                "terms": "消火栓"
             },
             "emergency/phone": {
-                "name": "緊急電話"
+                "name": "緊急電話",
+                "terms": "緊急電話"
             },
             "entrance": {
-                "name": "エントランス"
+                "name": "出入口",
+                "terms": "出入口"
             },
             "footway/crossing": {
-                "name": "横断歩道"
+                "name": "横断歩道",
+                "terms": "横断歩道, 自転車横断帯"
             },
             "footway/sidewalk": {
-                "name": "歩道"
+                "name": "歩道",
+                "terms": "歩道"
+            },
+            "golf/bunker": {
+                "name": "サンドトラップ",
+                "terms": "サンドトラップ,バンカー"
+            },
+            "golf/fairway": {
+                "name": "フェアウェイ",
+                "terms": "フェアウェー,フェアウェイ"
+            },
+            "golf/green": {
+                "name": "グリーン",
+                "terms": "グリーン"
+            },
+            "golf/hole": {
+                "name": "ゴルフホール",
+                "terms": "ホール"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "ラテラルウォーターハザード",
+                "terms": "ラテラルウォーターハザード"
+            },
+            "golf/rough": {
+                "name": "ラフ",
+                "terms": "ラフ"
+            },
+            "golf/tee": {
+                "name": "ティー",
+                "terms": "ティー"
+            },
+            "golf/water_hazard": {
+                "name": "ウォーターハザード",
+                "terms": "ウォーターハザード, 池ポチャ"
             },
             "highway": {
-                "name": "道路"
+                "name": "道路",
+                "terms": "道路"
             },
             "highway/bridleway": {
-                "name": "乗馬道"
+                "name": "乗馬道",
+                "terms": "乗馬道"
             },
             "highway/bus_stop": {
-                "name": "バス停"
+                "name": "バス停",
+                "terms": "バス停, バス停留所, 停留所, バス乗り場"
             },
             "highway/crossing": {
-                "name": "横断歩道"
+                "name": "横断歩道",
+                "terms": "横断歩道, 自転車横断帯"
             },
             "highway/cycleway": {
-                "name": "自転車道"
+                "name": "自転車道",
+                "terms": "自転車道, サイクリング道路"
             },
             "highway/footway": {
-                "name": "歩道"
+                "name": "歩道",
+                "terms": "歩道, 歩行者用道路"
             },
             "highway/living_street": {
-                "name": "路地"
+                "name": "生活道路",
+                "terms": "生活道路, 路地"
             },
             "highway/mini_roundabout": {
-                "name": "ラウンドアバウト(小)"
+                "name": "小さなロータリー",
+                "terms": "小さなロータリー, ラウンドアバウト"
             },
             "highway/motorway": {
-                "name": "高速道路"
+                "name": "自動車専用道路",
+                "terms": "自動車専用道路,高速道路"
             },
             "highway/motorway_junction": {
-                "name": "高速道ジャンクション"
+                "name": "自動車道のIC/JCT",
+                "terms": "自動車道のIC/JCT,インターチェンジ,ジャンクション"
             },
             "highway/motorway_link": {
-                "name": "高速道路 - 接続道"
+                "name": "自動車専用道路の接続路",
+                "terms": "自動車専用道路の連絡路"
             },
             "highway/path": {
-                "name": "小道"
+                "name": "小道",
+                "terms": "小道"
             },
             "highway/pedestrian": {
-                "name": "歩行者道"
+                "name": "歩行者専用道路",
+                "terms": "歩行者専用道路, 歩行者天国"
             },
             "highway/primary": {
-                "name": "主要地方道"
+                "name": "主要地方道",
+                "terms": "主要地方道"
             },
             "highway/primary_link": {
-                "name": "主要地方道 - 接続路"
+                "name": "主要地方道の接続路",
+                "terms": "主要地方道の連絡路"
             },
             "highway/residential": {
-                "name": "住宅道路"
+                "name": "居住区域内道路",
+                "terms": "居住区域内道路"
+            },
+            "highway/rest_area": {
+                "name": "パーキングエリア",
+                "terms": "パーキングエリア, PA, チェーンベース"
             },
             "highway/road": {
-                "name": "道路区分不明"
+                "name": "道路(区分不明)",
+                "terms": "道路(区分不明), その他道路"
             },
             "highway/secondary": {
-                "name": "一般地方道"
+                "name": "一般都道府県道",
+                "terms": "一般都道府県道,都道,道道,府道,県道"
             },
             "highway/secondary_link": {
-                "name": "一般地方道 - 接続路"
+                "name": "一般都道府県道の接続路",
+                "terms": "一般都道府県道の連絡路"
             },
             "highway/service": {
-                "name": "私道"
+                "name": "敷地内道路",
+                "terms": "敷地内道路"
             },
             "highway/service/alley": {
-                "name": "横町"
+                "name": "路地",
+                "terms": "路地"
             },
             "highway/service/drive-through": {
-                "name": "ドライブスルー"
+                "name": "ドライブスルー",
+                "terms": "ドライブスルー"
             },
             "highway/service/driveway": {
-                "name": "私設車道"
+                "name": "私道",
+                "terms": "私道"
             },
             "highway/service/emergency_access": {
-                "name": "緊急通用路"
+                "name": "緊急通用路",
+                "terms": "緊急通用路, 消防車専用口"
             },
             "highway/service/parking_aisle": {
-                "name": "駐車構内路"
+                "name": "駐車場内通路",
+                "terms": "駐車場内通路"
+            },
+            "highway/services": {
+                "name": "サービスエリア",
+                "terms": "サービスエリア, 道の駅"
             },
             "highway/steps": {
-                "name": "階段"
+                "name": "階段",
+                "terms": "階段"
             },
             "highway/stop": {
-                "name": "停止標識"
+                "name": "一時停止標識",
+                "terms": "一時停止標識"
             },
             "highway/tertiary": {
-                "name": "主要な一般道"
+                "name": "一般道(2車線以上)",
+                "terms": "一般道(2車線以上)"
             },
             "highway/tertiary_link": {
-                "name": "主要な一般道 - 接続路"
+                "name": "一般道(2車線以上)の接続路",
+                "terms": "一般道(2車線以上)の接続路"
             },
             "highway/track": {
-                "name": "農道"
+                "name": "農道・林道",
+                "terms": "農道,林道"
             },
             "highway/traffic_signals": {
-                "name": "信号機"
+                "name": "信号機",
+                "terms": "信号機"
             },
             "highway/trunk": {
-                "name": "国道"
+                "name": "国道",
+                "terms": "国道,一般国道"
             },
             "highway/trunk_link": {
-                "name": "国道 - 接続路"
+                "name": "国道の接続路",
+                "terms": "国道の接続路"
             },
             "highway/turning_circle": {
-                "name": "車回し"
+                "name": "転回場",
+                "terms": "転回場, 車回し"
             },
             "highway/unclassified": {
-                "name": "一般道"
+                "name": "一般道(2車線未満)",
+                "terms": "一般道(2車線未満)"
             },
             "historic": {
-                "name": "歴史的な場所"
+                "name": "史跡",
+                "terms": "史跡, 歴史的建造物"
             },
             "historic/archaeological_site": {
-                "name": "考古遺跡"
+                "name": "遺跡",
+                "terms": "遺跡, 貝塚, 古墳"
             },
             "historic/boundary_stone": {
-                "name": "境界石碑"
+                "name": "境界石",
+                "terms": "境界石, 境界杭"
             },
             "historic/castle": {
-                "name": "城郭"
+                "name": "城",
+                "terms": "城, 城郭"
             },
             "historic/memorial": {
-                "name": "記念碑, プレート"
+                "name": "記念碑",
+                "terms": "記念碑"
             },
             "historic/monument": {
-                "name": "記念碑, モニュメント"
+                "name": "記念堂",
+                "terms": "記念堂, 記念建造物"
             },
             "historic/ruins": {
-                "name": "廃墟"
+                "name": "廃墟",
+                "terms": "廃墟"
             },
             "historic/wayside_cross": {
-                "name": "十字架"
+                "name": "道路際の十字架",
+                "terms": "道路際の十字架"
             },
             "historic/wayside_shrine": {
-                "name": "地蔵, 道祖碑"
+                "name": "道祖神",
+                "terms": "道祖神"
             },
             "landuse": {
-                "name": "土地利用"
+                "name": "土地利用",
+                "terms": "土地利用"
             },
             "landuse/allotments": {
-                "name": "市民菜園"
+                "name": "市民農園",
+                "terms": "市民農園, 市民菜園, クラインガルテン"
             },
             "landuse/basin": {
-                "name": "遊水地"
+                "name": "遊水地",
+                "terms": "遊水地"
             },
             "landuse/cemetery": {
-                "name": "霊園"
+                "name": "霊園",
+                "terms": "霊園, 墓地"
             },
             "landuse/commercial": {
-                "name": "ビジネス街"
+                "name": "オフィス地区",
+                "terms": "ビジネス街,オフィス街,オフィス地区"
             },
             "landuse/construction": {
-                "name": "施設建築中"
+                "name": "建設用地",
+                "terms": "工事中用地, 建設用地"
             },
             "landuse/farm": {
-                "name": "田畑"
+                "name": "農地(旧)",
+                "terms": "農地(旧)"
             },
             "landuse/farmland": {
-                "name": "農園"
+                "name": "農地",
+                "terms": "農地"
             },
             "landuse/farmyard": {
-                "name": "農場"
+                "name": "農業施設用地",
+                "terms": "農業施設用地"
             },
             "landuse/forest": {
-                "name": "森林"
+                "name": "人工林",
+                "terms": "人工林, 営林, 保安林, 鉄道林"
             },
             "landuse/grass": {
-                "name": "草地"
+                "name": "草地",
+                "terms": "草地, 芝生"
             },
             "landuse/industrial": {
-                "name": "工業区"
+                "name": "工業用地",
+                "terms": "工業用地"
             },
             "landuse/meadow": {
-                "name": "牧草地"
+                "name": "牧草地",
+                "terms": "牧草地"
             },
             "landuse/orchard": {
-                "name": "果樹園"
+                "name": "果樹園",
+                "terms": "果樹園, 果物畑, リンゴ畑, ミカン畑"
             },
             "landuse/quarry": {
-                "name": "採掘場"
+                "name": "露天掘り鉱山",
+                "terms": "採石場, 石切り場, 露天掘り鉱山"
             },
             "landuse/residential": {
-                "name": "住宅区"
+                "name": "住宅地",
+                "terms": "住宅地, 宅地, 居住区域"
             },
             "landuse/retail": {
-                "name": "商業区"
+                "name": "商業地",
+                "terms": "商業地,ショッピング地区,ショッピング街"
             },
             "landuse/vineyard": {
-                "name": "ワイン畑"
+                "name": "ぶどう畑",
+                "terms": "ぶどう畑"
             },
             "leisure": {
-                "name": "レジャー"
+                "name": "レジャー",
+                "terms": "レジャー, 娯楽"
+            },
+            "leisure/common": {
+                "name": "共通地",
+                "terms": "共有地, コモンズ"
             },
             "leisure/dog_park": {
-                "name": "公園 (飼い犬用)"
+                "name": "ドッグパーク",
+                "terms": "ドッグパーク, ドッグラン"
             },
             "leisure/garden": {
-                "name": "庭園"
+                "name": "庭園",
+                "terms": "庭園"
             },
             "leisure/golf_course": {
-                "name": "ゴルフ場"
+                "name": "ゴルフコース",
+                "terms": "ゴルフコース"
             },
             "leisure/marina": {
-                "name": "停泊所"
+                "name": "マリーナ",
+                "terms": "マリーナ, ヨットハーバー"
             },
             "leisure/park": {
-                "name": "公園"
+                "name": "公園",
+                "terms": "公園"
             },
             "leisure/pitch": {
-                "name": "運動場"
+                "name": "スポーツ競技場",
+                "terms": "スポーツ競技場, 運動場"
             },
             "leisure/pitch/american_football": {
-                "name": "アメフト競技場"
+                "name": "アメリカンフットボール場",
+                "terms": "アメリカンフットボール場, アメフト競技場"
             },
             "leisure/pitch/baseball": {
-                "name": "野球場"
+                "name": "野球場",
+                "terms": "野球場"
             },
             "leisure/pitch/basketball": {
-                "name": "バスケットボール・コート"
+                "name": "バスケットボール場",
+                "terms": "バスケットボール場"
             },
             "leisure/pitch/skateboard": {
-                "name": "スケート広場"
+                "name": "スケートパーク",
+                "terms": "スケートパーク"
             },
             "leisure/pitch/soccer": {
-                "name": "サッカー場"
+                "name": "サッカー場",
+                "terms": "サッカー場"
             },
             "leisure/pitch/tennis": {
-                "name": "テニスコート"
+                "name": "テニスコート",
+                "terms": "テニスコート, テニス場, 庭球場"
             },
             "leisure/pitch/volleyball": {
-                "name": "バレーボールコート"
+                "name": "バレーボールコート",
+                "terms": "バレーボールコート"
             },
             "leisure/playground": {
-                "name": "児童公園"
+                "name": "児童公園",
+                "terms": "児童公園, 遊び場"
             },
             "leisure/slipway": {
-                "name": "進水所"
+                "name": "進水路",
+                "terms": "進水路, スリップウェイ"
             },
             "leisure/sports_center": {
-                "name": "スポーツセンター"
+                "name": "スポーツセンター",
+                "terms": "スポーツセンター"
             },
             "leisure/stadium": {
-                "name": "スタジアム"
+                "name": "スタジアム",
+                "terms": "スタジアム, 競技場"
             },
             "leisure/swimming_pool": {
-                "name": "プール"
+                "name": "遊泳プール",
+                "terms": "遊泳プール"
             },
             "leisure/track": {
-                "name": "競技場"
+                "name": "競技トラック",
+                "terms": "競技トラック"
             },
             "line": {
-                "name": "ライン"
+                "name": "線",
+                "terms": "線, ライン"
             },
             "man_made": {
-                "name": "人工物"
+                "name": "人工物",
+                "terms": "人工物"
             },
             "man_made/breakwater": {
-                "name": "防波堤"
+                "name": "防波堤",
+                "terms": "防波堤"
             },
             "man_made/cutline": {
-                "name": "森林カットライン"
+                "name": "森林の切れ目",
+                "terms": "森林の切れ目, カットライン"
             },
             "man_made/embankment": {
-                "name": "土堤"
+                "name": "土手",
+                "terms": "土手"
             },
             "man_made/flagpole": {
-                "name": "掲揚柱"
+                "name": "旗竿",
+                "terms": "旗竿"
             },
             "man_made/lighthouse": {
-                "name": "灯台"
+                "name": "灯台",
+                "terms": "灯台, ライトハウス"
             },
             "man_made/observation": {
-                "name": "監視塔"
+                "name": "監視塔",
+                "terms": "監視塔"
             },
             "man_made/pier": {
-                "name": "桟橋"
+                "name": "桟橋",
+                "terms": "桟橋"
             },
             "man_made/pipeline": {
-                "name": "パイプライン"
+                "name": "パイプライン",
+                "terms": "パイプライン"
             },
             "man_made/survey_point": {
-                "name": "調査・観測地点"
+                "name": "観測設備",
+                "terms": "観測設備, 観測地点, 測候所"
             },
             "man_made/tower": {
-                "name": "塔"
+                "name": "塔",
+                "terms": "塔, タワー"
             },
             "man_made/wastewater_plant": {
-                "name": "下水処理施設"
+                "name": "下水処理場",
+                "terms": "下水処理場"
             },
             "man_made/water_tower": {
-                "name": "給水塔"
+                "name": "給水塔",
+                "terms": "給水塔"
             },
             "man_made/water_well": {
-                "name": "井戸"
+                "name": "井戸",
+                "terms": "井戸"
             },
             "man_made/water_works": {
-                "name": "上下水施設"
+                "name": "浄水場",
+                "terms": "浄水場"
+            },
+            "military/airfield": {
+                "name": "軍用飛行場",
+                "terms": "軍用飛行場, 航空基地"
+            },
+            "military/barracks": {
+                "name": "兵舎",
+                "terms": "兵舎,兵営"
             },
             "military/bunker": {
-                "name": "バンカー"
+                "name": "バンカー",
+                "terms": "掩蔽壕,観測室,バンカー"
             },
             "military/range": {
-                "name": "軍事用地"
+                "name": "軍事演習場",
+                "terms": "軍事演習場"
             },
             "natural": {
-                "name": "自然物"
+                "name": "自然",
+                "terms": "自然"
             },
             "natural/bay": {
-                "name": "港湾"
+                "name": "湾",
+                "terms": "湾"
             },
             "natural/beach": {
-                "name": "浜辺, ビーチ"
+                "name": "砂浜",
+                "terms": "砂浜, ビーチ"
             },
             "natural/cliff": {
-                "name": "崖"
+                "name": "崖",
+                "terms": "崖, 断崖"
             },
             "natural/coastline": {
-                "name": "海岸線"
+                "name": "海岸線",
+                "terms": "海岸線"
             },
             "natural/fell": {
-                "name": "がれ場"
+                "name": "高原",
+                "terms": "高原"
             },
             "natural/glacier": {
-                "name": "氷河, 凍土"
+                "name": "氷河",
+                "terms": "氷河"
             },
             "natural/grassland": {
-                "name": "草地"
+                "name": "草原",
+                "terms": "草地, 草原"
             },
             "natural/heath": {
-                "name": "低木地"
+                "name": "荒地",
+                "terms": "荒地"
             },
             "natural/peak": {
-                "name": "山頂"
+                "name": "山頂",
+                "terms": "山頂, 頂"
             },
             "natural/scree": {
-                "name": "がれ場"
+                "name": "ガレ場",
+                "terms": "ガレ場"
             },
             "natural/scrub": {
-                "name": "茂み"
+                "name": "低木",
+                "terms": "低木, 茂み"
             },
             "natural/spring": {
-                "name": "湧水"
+                "name": "泉",
+                "terms": "泉, 湧水"
             },
             "natural/tree": {
-                "name": "樹木"
+                "name": "樹木・林",
+                "terms": "樹木, 林"
             },
             "natural/water": {
-                "name": "水域"
+                "name": "水域",
+                "terms": "水域"
             },
             "natural/water/lake": {
-                "name": "湖"
+                "name": "湖",
+                "terms": "湖"
             },
             "natural/water/pond": {
-                "name": "池"
+                "name": "池",
+                "terms": "池"
             },
             "natural/water/reservoir": {
-                "name": "貯水池"
+                "name": "貯水池",
+                "terms": "貯水池"
             },
             "natural/wetland": {
-                "name": "湿地"
+                "name": "湿地帯",
+                "terms": "湿地帯"
             },
             "natural/wood": {
-                "name": "自然林"
+                "name": "自然林",
+                "terms": "自然林, 原生林"
             },
             "office": {
-                "name": "オフィス"
+                "name": "オフィス",
+                "terms": "オフィス"
             },
             "office/accountant": {
-                "name": "会計士"
+                "name": "会計事務所",
+                "terms": "会計事務所, 会計士"
             },
             "office/administrative": {
-                "name": "市町村役所"
+                "name": "地方行政事務所",
+                "terms": "地方行政事務所"
             },
             "office/architect": {
-                "name": "建築家"
+                "name": "建築事務所",
+                "terms": "建築事務所, 建設事務所"
             },
             "office/company": {
-                "name": "会社事務所"
+                "name": "会社事務所",
+                "terms": "会社事務所, 営業所"
             },
             "office/educational_institution": {
-                "name": "教育機関"
+                "name": "教育機関事務所",
+                "terms": "教育機関事務所"
             },
             "office/employment_agency": {
-                "name": "人材紹介"
+                "name": "職業安定所",
+                "terms": "職業安定所, ハローワーク"
             },
             "office/estate_agent": {
-                "name": "不動産屋"
+                "name": "不動産代理店",
+                "terms": "不動産代理店"
             },
             "office/financial": {
-                "name": "経理事務所"
+                "name": "会計事務所",
+                "terms": "会計事務所"
             },
             "office/government": {
-                "name": "役所"
+                "name": "行政機関事務所",
+                "terms": "行政機関事務所"
             },
             "office/insurance": {
-                "name": "保健屋"
+                "name": "保険代理店",
+                "terms": "保険代理店"
             },
             "office/it": {
-                "name": "ITオフィス"
+                "name": "IT事務所",
+                "terms": "IT事務所, システムベンダー"
             },
             "office/lawyer": {
-                "name": "法律事務所"
+                "name": "法律事務所",
+                "terms": "法律事務所"
             },
             "office/newspaper": {
-                "name": "新聞屋"
+                "name": "新聞社",
+                "terms": "新聞社"
             },
             "office/ngo": {
-                "name": "NGO事務所"
+                "name": "NGO事務所",
+                "terms": "NGO事務所"
             },
             "office/physician": {
-                "name": "医者"
+                "name": "医者",
+                "terms": "医者"
             },
             "office/political_party": {
-                "name": "政党事務所"
+                "name": "政党事務所",
+                "terms": "政党事務所"
             },
             "office/research": {
-                "name": "研究所"
+                "name": "研究所",
+                "terms": "研究所"
             },
             "office/telecommunication": {
-                "name": "通信事業者"
+                "name": "通信会社事務所",
+                "terms": "通信会社事務所"
             },
             "office/therapist": {
-                "name": "心療内科"
+                "name": "セラピスト",
+                "terms": "セラピスト"
             },
             "office/travel_agent": {
-                "name": "旅行代理店"
+                "name": "旅行代理店",
+                "terms": "旅行代理店,トラベル,ツアー"
+            },
+            "piste": {
+                "name": "ゲレンデ/スキー路",
+                "terms": "ゲレンデ,スキーコース"
             },
             "place": {
-                "name": "地名"
+                "name": "地名",
+                "terms": "地名, 市名, 区名, 町名, 村名"
             },
             "place/city": {
-                "name": "都市名称"
+                "name": "市名",
+                "terms": "市名"
             },
             "place/hamlet": {
-                "name": "Hamlet"
+                "name": "集落",
+                "terms": "集落"
             },
             "place/island": {
-                "name": "島"
+                "name": "島",
+                "terms": "島"
             },
             "place/isolated_dwelling": {
-                "name": "街区外居住地"
+                "name": "一軒家, 街区外居住地",
+                "terms": "一軒家"
             },
             "place/locality": {
-                "name": "Locality"
+                "name": "地形名",
+                "terms": "地形名"
             },
             "place/town": {
-                "name": "町"
+                "name": "町",
+                "terms": "町"
             },
             "place/village": {
-                "name": "村"
+                "name": "村",
+                "terms": "村"
             },
             "point": {
-                "name": "ポイント"
+                "name": "ポイント",
+                "terms": "ポイント"
             },
             "power": {
-                "name": "電力"
+                "name": "電力関係",
+                "terms": "電力関係"
             },
             "power/generator": {
-                "name": "発電所"
+                "name": "発電機",
+                "terms": "発電機"
             },
             "power/line": {
-                "name": "送電線"
+                "name": "送電線",
+                "terms": "送電線"
             },
             "power/minor_line": {
-                "name": "電線"
+                "name": "配電線",
+                "terms": "配電線"
             },
             "power/pole": {
-                "name": "電柱"
+                "name": "電柱",
+                "terms": "電柱"
             },
             "power/sub_station": {
-                "name": "変電所"
+                "name": "変電所",
+                "terms": "変電所"
             },
             "power/tower": {
-                "name": "送電塔"
+                "name": "送電塔",
+                "terms": "送電塔"
             },
             "power/transformer": {
-                "name": "変圧施設"
+                "name": "変圧器",
+                "terms": "変圧器"
             },
             "public_transport/platform": {
-                "name": "プラットフォーム"
+                "name": "プラットホーム",
+                "terms": "プラットホーム, ホーム"
             },
             "public_transport/stop_position": {
-                "name": "停車位置"
+                "name": "停車位置",
+                "terms": "停車位置"
             },
             "railway": {
-                "name": "線路"
+                "name": "鉄道",
+                "terms": "鉄道"
             },
             "railway/abandoned": {
-                "name": "路線跡"
+                "name": "線路跡",
+                "terms": "鉄道跡, 線路跡"
             },
             "railway/disused": {
-                "name": "廃路線"
+                "name": "休止線路",
+                "terms": "休止線路"
+            },
+            "railway/funicular": {
+                "name": "ケーブルカー",
+                "terms": "ケーブルカー"
             },
             "railway/halt": {
-                "name": "鉄道車輌停車場"
+                "name": "信号場",
+                "terms": "信号場"
             },
             "railway/level_crossing": {
-                "name": "踏切"
+                "name": "踏切",
+                "terms": "踏切"
             },
             "railway/monorail": {
-                "name": "モノレール"
+                "name": "モノレール",
+                "terms": "モノレール"
+            },
+            "railway/narrow_gauge": {
+                "name": "軽便鉄道",
+                "terms": "軽便鉄道, ナローゲージ"
             },
             "railway/platform": {
-                "name": "プラットフォーム"
+                "name": "プラットホーム(旧)",
+                "terms": "プラットホーム(旧), ホーム(旧)"
             },
             "railway/rail": {
-                "name": "線路"
+                "name": "線路",
+                "terms": "線路"
             },
             "railway/station": {
-                "name": "鉄道駅"
+                "name": "鉄道駅",
+                "terms": "鉄道駅, 駅"
             },
             "railway/subway": {
-                "name": "地下鉄"
+                "name": "地下鉄",
+                "terms": "地下鉄"
             },
             "railway/subway_entrance": {
-                "name": "地下鉄入り口"
+                "name": "地下鉄の出入口",
+                "terms": "地下鉄の出入口"
             },
             "railway/tram": {
-                "name": "路面電車"
+                "name": "路面電車",
+                "terms": "路面電車"
             },
             "relation": {
-                "name": "リレーション"
+                "name": "リレーション",
+                "terms": "リレーション, 関連"
             },
             "route/ferry": {
-                "name": "フェリー・ルート"
+                "name": "フェリールート",
+                "terms": "フェリールート, 航路"
             },
             "shop": {
-                "name": "店舗"
+                "name": "店舗",
+                "terms": "店舗"
             },
             "shop/alcohol": {
-                "name": "酒屋"
+                "name": "酒店",
+                "terms": "酒店, 酒屋"
             },
             "shop/bakery": {
-                "name": "パン屋"
+                "name": "パン屋",
+                "terms": "パン屋, ベーカリー"
             },
             "shop/beauty": {
-                "name": "美容品店"
+                "name": "美容サービス",
+                "terms": "美容サービス, エステサロン, ネイルサロン"
             },
             "shop/beverages": {
-                "name": "飲料品店"
+                "name": "飲料店",
+                "terms": "飲料店"
             },
             "shop/bicycle": {
-                "name": "自転車屋"
+                "name": "自転車店",
+                "terms": "自転車店"
             },
             "shop/books": {
-                "name": "本屋"
+                "name": "書店",
+                "terms": "書店, 本屋"
             },
             "shop/boutique": {
-                "name": "ブティック"
+                "name": "ブティック",
+                "terms": "ブティック, 婦人服店"
             },
             "shop/butcher": {
-                "name": "肉屋"
+                "name": "精肉店",
+                "terms": "精肉店, 肉屋"
             },
             "shop/car": {
-                "name": "乗用車販売"
+                "name": "自動車販売店",
+                "terms": "自動車販売店, カーディーラー"
             },
             "shop/car_parts": {
-                "name": "車輌部品, グッズ販売"
+                "name": "自動車部品店",
+                "terms": "自動車部品店, カーパーツショップ"
             },
             "shop/car_repair": {
-                "name": "車輌修理"
+                "name": "自動車修理工場",
+                "terms": "自動車修理工場"
             },
             "shop/chemist": {
-                "name": "化粧品店"
+                "name": "薬品・化粧品店",
+                "terms": "薬品店, 化粧品店"
             },
             "shop/clothes": {
-                "name": "衣料品店"
+                "name": "衣料品店",
+                "terms": "衣料品店, 洋服店, 呉服店"
             },
             "shop/computer": {
-                "name": "コンピュータ店"
+                "name": "コンピューター店",
+                "terms": "コンピューター店, パソコン店"
             },
             "shop/confectionery": {
-                "name": "菓子屋"
+                "name": "菓子店",
+                "terms": "菓子店"
             },
             "shop/convenience": {
-                "name": "コンビニ"
+                "name": "コンビニエンスストア",
+                "terms": "コンビニエンスストア, コンビニ"
             },
             "shop/deli": {
-                "name": "惣菜屋"
+                "name": "惣菜屋",
+                "terms": "惣菜屋, 弁当屋"
             },
             "shop/department_store": {
-                "name": "百貨店"
+                "name": "百貨店",
+                "terms": "百貨店, デパート"
             },
             "shop/doityourself": {
-                "name": "日曜大工用品"
+                "name": "日曜大工用品店",
+                "terms": "日曜大工用品店, 工具店, DIYショップ, ホームセンター"
             },
             "shop/dry_cleaning": {
-                "name": "クリーニング"
+                "name": "ドライクリーニング店",
+                "terms": "ドライクリーニング店"
             },
             "shop/electronics": {
-                "name": "電子部品"
+                "name": "家電販売店",
+                "terms": "家電販売店"
             },
             "shop/farm": {
-                "name": "産地直売"
+                "name": "農産物直売所",
+                "terms": "農産物直売所"
             },
             "shop/fishmonger": {
-                "name": "魚屋"
+                "name": "魚屋",
+                "terms": "魚屋"
             },
             "shop/florist": {
-                "name": "花屋"
+                "name": "生花店",
+                "terms": "生花店"
             },
             "shop/furniture": {
-                "name": "家具用品"
+                "name": "家具店",
+                "terms": "家具店, インテリア用品店"
             },
             "shop/garden_centre": {
-                "name": "ガーデンセンター"
+                "name": "園芸用品店",
+                "terms": "園芸用品店, ガーデンセンター"
             },
             "shop/gift": {
-                "name": "ギフト用品"
+                "name": "ギフト店",
+                "terms": "ギフト店, ギフト用品店, 土産店"
             },
             "shop/greengrocer": {
-                "name": "八百屋"
+                "name": "八百屋",
+                "terms": "八百屋, 青果店"
             },
             "shop/hairdresser": {
-                "name": "床屋, 美容室"
+                "name": "理美容店",
+                "terms": "理容店, 床屋, 美容室, 美容院"
             },
             "shop/hardware": {
-                "name": "金物屋"
+                "name": "金物屋",
+                "terms": "金物屋, 金物店"
             },
             "shop/hifi": {
-                "name": "音響設備"
+                "name": "音響機器店",
+                "terms": "音響機器店, オーディオ店"
             },
             "shop/jewelry": {
-                "name": "宝石店"
+                "name": "宝石店",
+                "terms": "宝石店"
             },
             "shop/kiosk": {
-                "name": "キオスク"
+                "name": "キオスク",
+                "terms": "キオスク"
             },
             "shop/laundry": {
-                "name": "コインランドリー"
+                "name": "洗濯屋・コインランドリー",
+                "terms": "洗濯屋, コインランドリー"
             },
             "shop/locksmith": {
-                "name": "錠前屋"
+                "name": "錠前屋",
+                "terms": "錠前屋"
             },
             "shop/mall": {
-                "name": "ショッピングセンター"
+                "name": "ショッピングセンター",
+                "terms": "ショッピングセンター, ショッピングモール, 複合商業施設"
             },
             "shop/mobile_phone": {
-                "name": "携帯電話"
+                "name": "携帯電話店",
+                "terms": "携帯電話店, ケータイショップ"
             },
             "shop/motorcycle": {
-                "name": "バイク販売"
+                "name": "バイク店",
+                "terms": "バイク店, オートバイ店"
             },
             "shop/music": {
-                "name": "CD/レコード"
+                "name": "CD/レコード店",
+                "terms": "CD店, レコード店"
             },
             "shop/newsagent": {
-                "name": "新聞"
+                "name": "新聞・雑誌販売店",
+                "terms": "新聞・雑誌販売店, 新聞販売店, 雑誌販売店"
             },
             "shop/optician": {
-                "name": "メガネ"
+                "name": "メガネ",
+                "terms": "メガネ,眼鏡,メガネ屋,眼鏡屋"
             },
             "shop/outdoor": {
-                "name": "アウトドア"
+                "name": "アウトドア",
+                "terms": "アウトドアショップ"
             },
             "shop/pet": {
-                "name": "ペットショップ"
+                "name": "ペットショップ",
+                "terms": "ペット売り場,ペット,家禽,ペットショップ"
             },
             "shop/photo": {
-                "name": "写真販売"
+                "name": "写真屋",
+                "terms": "写真屋"
             },
             "shop/shoes": {
-                "name": "靴屋"
+                "name": "靴店",
+                "terms": "靴店"
             },
             "shop/sports": {
-                "name": "スポーツ用品"
+                "name": "スポーツ用品店",
+                "terms": "スポーツ用品店"
             },
             "shop/stationery": {
-                "name": "文具店"
+                "name": "文具店",
+                "terms": "文具店"
             },
             "shop/supermarket": {
-                "name": "スーパーマーケット"
+                "name": "スーパーマーケット",
+                "terms": "スーパーマーケット, スーパー"
             },
             "shop/toys": {
-                "name": "おもちゃ屋"
+                "name": "玩具店",
+                "terms": "玩具店, おもちゃ屋"
             },
             "shop/travel_agency": {
-                "name": "旅行代理店"
+                "name": "旅行代理店",
+                "terms": "旅行代理店,トラベル,ツアー"
             },
             "shop/tyres": {
-                "name": "タイヤ販売"
+                "name": "タイヤ店",
+                "terms": "タイヤ店, タイヤ販売店"
             },
             "shop/vacant": {
-                "name": "未入居店舗"
+                "name": "空き店舗",
+                "terms": "空き店舗,未入居店舗"
             },
             "shop/variety_store": {
-                "name": "雑貨屋"
+                "name": "雑貨店",
+                "terms": "雑貨店"
             },
             "shop/video": {
-                "name": "ビデオ屋"
+                "name": "ビデオソフト店",
+                "terms": "ビデオソフト店, DVD店"
             },
             "tourism": {
-                "name": "観光"
+                "name": "観光",
+                "terms": "旅行, 観光"
             },
             "tourism/alpine_hut": {
-                "name": "山小屋"
+                "name": "山小屋",
+                "terms": "山小屋"
             },
             "tourism/artwork": {
-                "name": "芸術品展示"
+                "name": "芸術作品",
+                "terms": "芸術作品"
             },
             "tourism/attraction": {
-                "name": "観光施設"
+                "name": "観光名所",
+                "terms": "観光名所, 見どころ"
             },
             "tourism/camp_site": {
-                "name": "キャンプ場"
+                "name": "キャンプ場",
+                "terms": "キャンプ場"
             },
             "tourism/caravan_site": {
-                "name": "公園(キャンプカー用)"
+                "name": "オートキャンプ場",
+                "terms": "オートキャンプ場"
             },
             "tourism/chalet": {
-                "name": "コテージ"
+                "name": "貸別荘",
+                "terms": "貸別荘, コテージ"
             },
             "tourism/guest_house": {
-                "name": "民宿"
+                "name": "民宿",
+                "terms": "民宿, ゲストハウス"
             },
             "tourism/hostel": {
-                "name": "共同宿泊"
+                "name": "簡易宿泊所",
+                "terms": "簡易宿泊所, ホステル"
             },
             "tourism/hotel": {
-                "name": "ホテル"
+                "name": "ホテル",
+                "terms": "ホテル, 旅館"
             },
             "tourism/information": {
-                "name": "観光案内"
+                "name": "観光案内",
+                "terms": "観光案内"
             },
             "tourism/motel": {
-                "name": "モーテル"
+                "name": "モーテル",
+                "terms": "モーテル"
             },
             "tourism/museum": {
-                "name": "博物館, 美術館"
+                "name": "博物館・美術館",
+                "terms": "博物館, 美術館, 資料館"
             },
             "tourism/picnic_site": {
-                "name": "ピクニック場"
+                "name": "ピクニック場",
+                "terms": "ピクニック場, バーベキュー場"
             },
             "tourism/theme_park": {
-                "name": "テーマパーク"
+                "name": "テーマパーク",
+                "terms": "テーマパーク, 遊園地"
             },
             "tourism/viewpoint": {
-                "name": "展望台"
+                "name": "展望台",
+                "terms": "展望台"
             },
             "tourism/zoo": {
-                "name": "遊園地"
+                "name": "動物園",
+                "terms": "動物園"
             },
             "type/boundary": {
-                "name": "行政境界"
+                "name": "境界",
+                "terms": "境界, 境界線"
             },
             "type/boundary/administrative": {
-                "name": "行政境界"
+                "name": "行政境界",
+                "terms": "行政境界, 都道府県境, 都境, 道境, 府境, 県境, 市区町村境, 市境, 区境, 町境, 村境"
             },
             "type/multipolygon": {
-                "name": "マルチポリゴン"
+                "name": "マルチポリゴン",
+                "terms": "マルチポリゴン"
             },
             "type/restriction": {
-                "name": "制限"
+                "name": "進行方向制限",
+                "terms": "進行方向制限"
             },
             "type/route": {
-                "name": "ルート"
+                "name": "ルート",
+                "terms": "ルート"
             },
             "type/route/bicycle": {
-                "name": "サイクリングルート"
+                "name": "サイクリングルート",
+                "terms": "サイクリングルート, サイクリングコース"
             },
             "type/route/bus": {
-                "name": "バスルート"
+                "name": "バスルート",
+                "terms": "バスルート, バス路線, バス系統"
             },
             "type/route/detour": {
-                "name": "迂回ルート"
+                "name": "迂回ルート",
+                "terms": "迂回ルート"
             },
             "type/route/ferry": {
-                "name": "フェリールート"
+                "name": "フェリーのルート",
+                "terms": "フェリールート, 航路"
             },
             "type/route/foot": {
-                "name": "歩道ルート"
+                "name": "徒歩ルート",
+                "terms": "徒歩ルート"
             },
             "type/route/hiking": {
-                "name": "ハイキングコース"
+                "name": "ハイキングルート",
+                "terms": "ハイキングルート, ハイキングコース"
             },
             "type/route/pipeline": {
-                "name": "パイプラインルート"
+                "name": "パイプラインルート",
+                "terms": "パイプラインルート"
             },
             "type/route/power": {
-                "name": "電力線ルート"
+                "name": "電力線ルート",
+                "terms": "電力線ルート"
             },
             "type/route/road": {
-                "name": "道路ルート"
+                "name": "道路ルート",
+                "terms": "道路ルート"
             },
             "type/route/train": {
-                "name": "鉄道ルート"
+                "name": "鉄道ルート",
+                "terms": "鉄道ルート"
             },
             "type/route/tram": {
-                "name": "路面電車ルート"
+                "name": "路面電車系統",
+                "terms": "路面電車系統"
             },
             "type/route_master": {
-                "name": "ルートマスター"
+                "name": "ルートマスター",
+                "terms": "ルートマスター"
             },
             "vertex": {
                 "name": "その他",
                 "terms": "その他"
             },
             "waterway": {
-                "name": "水路, 河川"
+                "name": "水路",
+                "terms": "水路"
             },
             "waterway/canal": {
                 "name": "運河",
                 "terms": "ダム"
             },
             "waterway/ditch": {
-                "name": "堀, 用水路"
+                "name": "排水路",
+                "terms": "排水路"
             },
             "waterway/drain": {
-                "name": "排水路"
+                "name": "放水路",
+                "terms": "放水路"
             },
             "waterway/river": {
                 "name": "河川",
                 "terms": "川,河川"
             },
             "waterway/riverbank": {
-                "name": "河川流域"
+                "name": "河岸",
+                "terms": "河岸"
             },
             "waterway/stream": {
-                "name": "小川"
+                "name": "小川",
+                "terms": "小川,せせらぎ"
             },
             "waterway/weir": {
-                "name": "堰"
+                "name": "堰",
+                "terms": "堰"
             }
         }
     }
diff --git a/vendor/assets/iD/iD/locales/kn.json b/vendor/assets/iD/iD/locales/kn.json
new file mode 100644 (file)
index 0000000..b8d30a1
--- /dev/null
@@ -0,0 +1,54 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "ಪ್ರದೇಶ"
+        },
+        "add_point": {
+            "title": "ಬಿಂದು"
+        }
+    },
+    "help": {
+        "title": "ಸಹಾಯ"
+    },
+    "presets": {
+        "fields": {
+            "address": {
+                "placeholders": {
+                    "city": "ನಗರ"
+                }
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "religion": {
+                "options": {
+                    "christian": "ಕ್ರೈಸ್ತ",
+                    "hindu": "ಹಿಂದು"
+                }
+            },
+            "source": {
+                "label": "ಮೂಲ"
+            }
+        },
+        "presets": {
+            "amenity/bank": {
+                "name": "ಬ್ಯಾಂಕ್"
+            },
+            "amenity/cinema": {
+                "name": "ಸಿನಿಮಾ"
+            },
+            "amenity/hospital": {
+                "name": "ಆಸ್ಪತ್ರೆ"
+            },
+            "amenity/library": {
+                "name": "ಗ್ರಂಥಾಲಯ"
+            },
+            "amenity/school": {
+                "name": "ಶಾಲೆ"
+            },
+            "highway/bus_stop": {
+                "name": "ಬಸ್ ನಿಲ್ದಾಣ"
+            }
+        }
+    }
+}
\ No newline at end of file
index c288a0b77c76613fd31c568b6c52798aaef19fcf..45bf2d67b58da2dbcc3b2f35e24eb0ac8f42f634 100644 (file)
         "incomplete": "<다운로드되지 않음>",
         "feature_list": "기능 검색",
         "edit": "기능 편집",
-        "none": "없음"
+        "none": "없음",
+        "node": "노드",
+        "way": "길",
+        "relation": "관계",
+        "location": "위치"
     },
     "background": {
         "title": "배경",
         "untagged_area": "태그되지 않은 지역",
         "many_deletions": "개체 {n}개를 삭제하고 있습니다. 이를 수행하겠습니까? 다른 사람이 openstreetmap.org에서 보는 지도에서 삭제됩니다.",
         "tag_suggests_area": "{tag} 태그 제안 선은 지역이여야 하지만 태그는 지역이 아닙니다",
+        "untagged_tooltip": "이 {geometry}가 무엇인지 설명하는 기능 유형을 선택하세요.",
         "deprecated_tags": "사용되지 않는 태그: {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "건물"
             },
+            "category-golf": {
+                "name": "골프"
+            },
             "category-landuse": {
                 "name": "토지 이용"
             },
             "generator/type": {
                 "label": "유형"
             },
+            "golf_hole": {
+                "label": "참고",
+                "placeholder": "홀 수 (1-18)"
+            },
             "highway": {
                 "label": "유형"
             },
             "incline": {
                 "label": "경사"
             },
+            "information": {
+                "label": "유형"
+            },
             "internet_access": {
                 "label": "인터넷 액세스",
                 "options": {
             "operator": {
                 "label": "운영자"
             },
+            "par": {
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "파크 앤드 라이드"
             },
                 "name": "관리소",
                 "terms": "레인저 스테이션"
             },
+            "amenity/recycling": {
+                "name": "재활용"
+            },
             "amenity/restaurant": {
                 "name": "음식점"
             },
             "footway/sidewalk": {
                 "name": "보도"
             },
+            "golf/bunker": {
+                "name": "샌드 트랩",
+                "terms": "모래 함정"
+            },
+            "golf/fairway": {
+                "name": "페어웨이"
+            },
+            "golf/green": {
+                "name": "퍼팅 그린"
+            },
+            "golf/hole": {
+                "name": "골프 홀",
+                "terms": "골프 구멍"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "래터럴 워터 해저드"
+            },
+            "golf/rough": {
+                "name": "러프"
+            },
+            "golf/tee": {
+                "name": "티 박스"
+            },
+            "golf/water_hazard": {
+                "name": "워터 해저드"
+            },
             "highway": {
                 "name": "고속도로"
             },
index 1a6d367d73186ea6f74b4d075e590b963293b8ea..75381511af9e951a64a72e31ca677cd38dff710b 100644 (file)
@@ -59,6 +59,7 @@
             "not_closed": "Šo objektu nevar pārveidot par apļveida, jo tas nav pabeigts."
         },
         "orthogonalize": {
+            "title": "Kvadrāts",
             "annotation": {
                 "line": "Līnijas leņķi pārvedoti par taisnleņķiem.",
                 "area": "Apgabala leņķi pārvedoti par taisnleņķiem."
         }
     },
     "undo": {
+        "tooltip": "Atcelt: {action}",
         "nothing": "Nav nekā, ko atcelt"
     },
     "redo": {
+        "tooltip": "Atgriezt: {action}",
         "nothing": "Nav nekā, ko atsaukt"
     },
     "browser_notice": "Šis redaktors tiek atbalstīts ar Firefox, Chrome, Safari, Opera, un Internet Explorer 9 un jaunāku. Lūdzu, atjauniniet savu pārlūkprogrammu vai izmantojiet Potlatch 2 kartes rediģēšanai",
+    "translate": {
+        "translate": "Tulkot",
+        "localized_translation_language": "Izvelties valodu"
+    },
     "zoom_in_edit": "Pietuvināt, lai labotu",
     "logout": "atslēgties",
     "loading_auth": "Savienojas ar OpenStreetMap...",
     "report_a_bug": "ziņot par kļūdu",
+    "status": {
+        "error": "Nevarēja savienoties ar API."
+    },
     "commit": {
         "title": "Saglabāt izmaiņas",
         "description_placeholder": "Īss apraksts par jūsu ieguldījumu",
         "choose": "Izvēlieties objekta tipu",
         "results": "Atrasti {n} rezultāti meklējot {search}",
         "reference": "Skatīt OpenStreetMap wiki →",
+        "remove": "Noņemt ",
         "search": "Meklēt",
         "unknown": "Nezināms",
         "incomplete": "<nav lejuplādēts>"
         "unsaved_changes": "Jums ir nesaglabātas izmaiņas"
     },
     "success": {
+        "edited_osm": "Jūs izmainījāt OSM!",
         "just_edited": "Jūs nupat rediģējāt OpenStreetMap",
         "view_on_osm": "Apskatīt OSM",
-        "facebook": "Dalīties Facebook"
+        "facebook": "Dalīties Facebook",
+        "twitter": "Dalīties uz Facebook",
+        "google": "Dalīties uz Google+"
     },
     "confirm": {
         "okay": "Labi"
index 288b2407dc942fd375798c88d29530c7f5c58cd5..4e8c585a15cb212a4c93a03abe8e047836906bca 100644 (file)
         "incomplete": "<nie pobrane>",
         "feature_list": "Wyszukiwanie rodzaju obiektu",
         "edit": "Edytuj obiekt",
-        "none": "Brak"
+        "none": "Brak",
+        "node": "Węzeł",
+        "way": "Droga",
+        "relation": "Ralacja",
+        "location": "Lokalizacja"
     },
     "background": {
         "title": "Tło",
         "untagged_area": "Nieoznaczony obszar",
         "many_deletions": "Usuwasz {n} obiektów. Czy na pewno chcesz to zrobić? Ta operacja usunie je z mapy, którą widzą wszyscy na openstreetmap.org.",
         "tag_suggests_area": "Tag {tag} sugeruje, że linia powinna być obszarem, ale nim nie jest.",
+        "untagged_tooltip": "Wybierz typ obiektu, króry opisuje czym to (geometria) jest.",
         "deprecated_tags": "Przestarzałe tagi: {tags}"
     },
     "zoom": {
index a7a99a3c83e17aeffe92ca88d80c4ce88e955eda..e4b899145f819f4a728cba396985160cdaaa9960 100644 (file)
         "incomplete": "<não baixado>",
         "feature_list": "Buscar elementos",
         "edit": "Editar elemento",
-        "none": "Nenhum"
+        "none": "Nenhum",
+        "node": "Nó",
+        "way": "Linha",
+        "relation": "Relação",
+        "location": "Local"
     },
     "background": {
         "title": "Imagem de Fundo",
         "untagged_area": "Área sem etiquetas",
         "many_deletions": "Você está deletando {n} objetos. Você tem certeza que quer fazer isto? Isto irá deletá-los do mapa que todos veem no openstreetmap.org.",
         "tag_suggests_area": "A etiqueta {tag} sugere que seja utilizada numa área, mas essa linha não é uma área",
+        "untagged_tooltip": "Selecione um tipo de feição que descreve o que esta {geometry} é.",
         "deprecated_tags": "Etiquetas obsoletas: {tags}"
     },
     "zoom": {
index a7e108d0a7dcccd2ceca6797b219612640d95c80..08c58a2d88b7273ca1447f40aa4ecea16384938e 100644 (file)
         "untagged_line": "Linha sem etiquetas",
         "untagged_area": "Área sem etiquetas",
         "many_deletions": "Está a eliminar {n} objetos. Tem a certeza que deseja continuar? Esta operação eliminará os objetos do mapa que outras pessoas visualizam no openstreetmap.org.",
-        "tag_suggests_area": "A etiqueta {tag} é utilizada normalmente em áreas, mas está a ser aplicada a uma linha.",
+        "tag_suggests_area": "A etiqueta {tag} sugere que a linha deveria ser uma área, mas não o é.",
+        "untagged_tooltip": "Selecione um tipo de funcionalidade que descreva o que esta {geometria} é .",
         "deprecated_tags": "Etiquetas obsoletas: {tags}"
     },
     "zoom": {
         },
         "startediting": {
             "title": "Começar a editar",
-            "help": "Este guia passo-a-passo e outras informações estão disponíveis neste botão sempre que precisar.",
+            "help": "Este guia passo-a-passo e outras informações estão disponíveis aqui sempre que precisar.",
             "save": "Não se esqueça de gravar as suas alterações regularmente clicando neste botão!",
             "start": "Começar a editar o mapa!"
         }
diff --git a/vendor/assets/iD/iD/locales/ro-RO.json b/vendor/assets/iD/iD/locales/ro-RO.json
new file mode 100644 (file)
index 0000000..3ff6be1
--- /dev/null
@@ -0,0 +1,39 @@
+{
+    "modes": {
+        "add_line": {
+            "title": "Linie"
+        },
+        "add_point": {
+            "title": "Punct"
+        }
+    },
+    "operations": {
+        "continue": {
+            "key": "A"
+        },
+        "orthogonalize": {
+            "key": "S"
+        },
+        "straighten": {
+            "key": "S"
+        }
+    },
+    "inspector": {
+        "role": "Rol",
+        "location": "Locație"
+    },
+    "success": {
+        "facebook": "Distribuie pe Facebook"
+    },
+    "intro": {
+        "points": {
+            "title": "Puncte"
+        },
+        "lines": {
+            "title": "Linii"
+        },
+        "startediting": {
+            "start": "Începe cartografierea!"
+        }
+    }
+}
\ No newline at end of file
index 501b341856a80c630f741d332df03b1d7e6e1dd9..991b617bdc4b5bb40e082deeb7cbd3c7074cb8eb 100644 (file)
         "incomplete": "<не скачено>",
         "feature_list": "Поиск объектов",
         "edit": "Редактировать объект",
-        "none": "Нет"
+        "none": "Нет",
+        "node": "Точка",
+        "way": "Линия",
+        "relation": "Отношение",
+        "location": "Местоположение"
     },
     "background": {
         "title": "Подложка",
         "untagged_area": "Контур без тегов",
         "many_deletions": "Вы удаляете {n} объектов. Уверены в своём решении? В результате они пропадут с карты, которую весь мир может видеть на openstreetmap.org.",
         "tag_suggests_area": "Тег {tag} обычно ставится на замкнутые контуры, но это не контур",
+        "untagged_tooltip": "Выберите тип объекта, который описывает, чем является эта {geometry}.",
         "deprecated_tags": "Теги устарели: {tags}"
     },
     "zoom": {
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Здание"
+            },
+            "category-golf": {
+                "name": "Гольф"
+            },
             "category-landuse": {
                 "name": "Землепользование"
             },
             },
             "category-route": {
                 "name": "Маршрут"
+            },
+            "category-water-area": {
+                "name": "Вода"
+            },
+            "category-water-line": {
+                "name": "Вода"
             }
         },
         "fields": {
                     }
                 }
             },
+            "access_simple": {
+                "label": "Ограничения"
+            },
             "address": {
                 "label": "Адрес",
                 "placeholders": {
             "admin_level": {
                 "label": "Административный уровень"
             },
+            "aerialway": {
+                "label": "Тип"
+            },
+            "aerialway/access": {
+                "label": "Ограничения"
+            },
+            "aerialway/capacity": {
+                "label": "Пропускная способность (в час)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Продолжительность (минут)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Обогреваемая"
+            },
+            "aerialway/occupancy": {
+                "label": "Вместимость",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Ограничения (летом)"
+            },
             "aeroway": {
                 "label": "Тип"
             },
             "building_area": {
                 "label": "Здание"
             },
+            "cans": {
+                "label": "Принимают жесть"
+            },
             "capacity": {
                 "label": "Вместимость",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Против часовой стрелки"
                 }
             },
+            "clothes": {
+                "label": "Принимают одежду"
+            },
             "collection_times": {
                 "label": "Расписание проверки"
             },
             "country": {
                 "label": "Страна"
             },
+            "covered": {
+                "label": "Крытое"
+            },
             "crossing": {
                 "label": "Тип"
             },
             "generator/type": {
                 "label": "Тип"
             },
+            "glass": {
+                "label": "Принимают стекло"
+            },
+            "golf_hole": {
+                "label": "Номер лунки",
+                "placeholder": "Число лунок (1-18)"
+            },
+            "handicap": {
+                "label": "Гандикап",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Тип"
             },
             "incline": {
                 "label": "Склон"
             },
+            "information": {
+                "label": "Тип"
+            },
             "internet_access": {
                 "label": "Доступ в интернет",
                 "options": {
             "operator": {
                 "label": "Владелец"
             },
+            "paper": {
+                "label": "Принимают бумагу"
+            },
+            "par": {
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Перехватывающая парковка"
             },
                 "label": "Телефон",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Сложность"
+            },
+            "piste/grooming": {
+                "label": "Подготовка"
+            },
+            "piste/type": {
+                "label": "Тип"
+            },
             "place": {
                 "label": "Тип"
             },
             "shelter": {
                 "label": "Укрытие"
             },
+            "shelter_type": {
+                "label": "Тип"
+            },
             "shop": {
                 "label": "Тип"
             },
                     "cutting": "Выемка"
                 }
             },
+            "studio_type": {
+                "label": "Тип"
+            },
             "supervised": {
                 "label": "Наблюдение"
             },
             "trail_visibility": {
                 "label": "Видимость"
             },
+            "tree_type": {
+                "label": "Тип"
+            },
+            "tunnel": {
+                "label": "Тоннель"
+            },
             "vending": {
                 "label": "Тип Товаров"
             },
                 "name": "Адрес",
                 "terms": "адрес"
             },
+            "aerialway": {
+                "name": "Подъёмник"
+            },
+            "aerialway/cable_car": {
+                "name": "Большая кабина (взад-вперёд)"
+            },
+            "aerialway/chair_lift": {
+                "name": "Ряд кресел"
+            },
+            "aerialway/gondola": {
+                "name": "Гондола-кабина (по кругу)",
+                "terms": "гондола, лодка"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Ковёр-лифт"
+            },
+            "aerialway/pylon": {
+                "name": "Опора канатной дороги"
+            },
+            "aerialway/station": {
+                "name": "Терминал канатной дороги"
+            },
             "aeroway": {
                 "name": "Взлётная полоса",
                 "terms": "Взлётная полоса"
                 "name": "Кинотеатр",
                 "terms": "кинотеатр, кино, кинозал, киноплекс, моноэкран, миниплекс, мультиплекс, мегаплекс"
             },
+            "amenity/clinic": {
+                "name": "Поликлиника",
+                "terms": "клиника, поликлиника, больница"
+            },
+            "amenity/clock": {
+                "name": "Часы"
+            },
             "amenity/college": {
                 "name": "Колледж",
                 "terms": "ПТУ, колледж, техникум"
                 "name": "Суд",
                 "terms": "Суд"
             },
+            "amenity/dentist": {
+                "name": "Дантист",
+                "terms": "стоматолог, дантист, зубной врач"
+            },
+            "amenity/doctor": {
+                "name": "Врач",
+                "terms": "врач, доктор"
+            },
             "amenity/drinking_water": {
                 "name": "Питьевая вода",
                 "terms": "Питьевая вода"
                 "name": "Рынок",
                 "terms": "Рынок"
             },
+            "amenity/parking": {
+                "name": "Автомобильная стоянка"
+            },
             "amenity/pharmacy": {
                 "name": "Аптека",
                 "terms": "Аптека"
                 "name": "Паб",
                 "terms": "Паб"
             },
+            "amenity/recycling": {
+                "name": "Переработка мусора"
+            },
             "amenity/restaurant": {
                 "name": "Ресторан",
                 "terms": "Ресторан, Столовая"
                 "name": "Школа",
                 "terms": "Школа, лицей, гимназия"
             },
+            "amenity/shelter": {
+                "name": "Укрытие"
+            },
+            "amenity/studio": {
+                "name": "Студия"
+            },
             "amenity/swimming_pool": {
                 "name": "Бассейн",
                 "terms": "плавательный бассейн, плавательный бассеин"
                 "name": "Барьер для велосипедистов"
             },
             "barrier/ditch": {
-                "name": "Траншея"
+                "name": "Траншея",
+                "terms": "канава, ров"
             },
             "barrier/entrance": {
                 "name": "Проход"
                 "name": "Преграда для животных"
             },
             "barrier/lift_gate": {
-                "name": "Шлагбаум"
+                "name": "Шлагбаум",
+                "terms": "шлагбаум"
             },
             "barrier/retaining_wall": {
                 "name": "Укрепляющая стена"
                 "name": "Жилой Дом",
                 "terms": "Жилой дом, Жилое здание"
             },
+            "craft/basket_maker": {
+                "name": "Корзина"
+            },
+            "craft/beekeeper": {
+                "name": "Пчеловод",
+                "terms": "пчеловод, пасечник"
+            },
+            "craft/blacksmith": {
+                "name": "Кузнец"
+            },
+            "craft/boatbuilder": {
+                "name": "Строительство лодок"
+            },
+            "craft/bookbinder": {
+                "name": "Книгосборка"
+            },
+            "craft/carpenter": {
+                "name": "Плотник",
+                "terms": "плотник, столяр"
+            },
+            "craft/carpet_layer": {
+                "name": "Ковровое покрытие"
+            },
+            "craft/clockmaker": {
+                "name": "Часовщик"
+            },
+            "craft/confectionary": {
+                "name": "Кондитерские изделия"
+            },
+            "craft/dressmaker": {
+                "name": "Портной"
+            },
+            "craft/electrician": {
+                "name": "Электрик"
+            },
+            "craft/gardener": {
+                "name": "Садовник"
+            },
+            "craft/handicraft": {
+                "name": "Рукодельник"
+            },
+            "craft/hvac": {
+                "name": "Установка кондиционеров"
+            },
+            "craft/jeweler": {
+                "name": "Ювелир"
+            },
+            "craft/locksmith": {
+                "name": "Изготовление ключей"
+            },
+            "craft/metal_construction": {
+                "name": "Мателоконструкции"
+            },
+            "craft/optician": {
+                "name": "Оптика"
+            },
+            "craft/painter": {
+                "name": "Маляр"
+            },
+            "craft/photographer": {
+                "name": "фотограф",
+                "terms": "фотограф, фото оператор"
+            },
+            "craft/photographic_labratory": {
+                "name": "Фото лаборатория"
+            },
+            "craft/plasterer": {
+                "name": "Скульптор"
+            },
+            "craft/plumber": {
+                "name": "Водопроводчик"
+            },
+            "craft/pottery": {
+                "name": "Портной"
+            },
+            "craft/rigger": {
+                "name": "Мачтовая мастерская"
+            },
+            "craft/roofer": {
+                "name": "Кровельщик"
+            },
+            "craft/saddler": {
+                "name": "Конюх"
+            },
+            "craft/sailmaker": {
+                "name": "Парусный мастер"
+            },
+            "craft/sawmill": {
+                "name": "Лесопилка",
+                "terms": "лесозавод, лесопильня, пилорама, лесопильный завод"
+            },
+            "craft/scaffolder": {
+                "name": "Строительные леса"
+            },
+            "craft/sculpter": {
+                "name": "Скульптор"
+            },
+            "craft/shoemaker": {
+                "name": "Сапожник"
+            },
+            "craft/stonemason": {
+                "name": "Каменщик"
+            },
+            "craft/tailor": {
+                "name": "Портной"
+            },
+            "craft/tiler": {
+                "name": "Плиточник"
+            },
+            "craft/tinsmith": {
+                "name": "Жестянщик"
+            },
+            "craft/upholsterer": {
+                "name": "Мебельщик"
+            },
+            "craft/watchmaker": {
+                "name": "Часовщик"
+            },
+            "craft/window_construction": {
+                "name": "Оконщик"
+            },
+            "embankment": {
+                "name": "Насыпь",
+                "terms": "насыпь"
+            },
             "emergency/ambulance_station": {
                 "name": "Станция Скорой Помощи",
                 "terms": "Пункт Скорой Помощи, Амбулатория, Пункт Первой Помощи"
             "entrance": {
                 "name": "Вход"
             },
+            "footway/crossing": {
+                "name": "Пешеходный переход"
+            },
+            "footway/sidewalk": {
+                "name": "Тротуар с дорогой"
+            },
+            "golf/bunker": {
+                "name": "Бункер",
+                "terms": "Песчаная ловушка, Песчаный Бункер, Бункер с песком"
+            },
+            "golf/fairway": {
+                "name": "Фервей",
+                "terms": "Гладкое поле"
+            },
+            "golf/green": {
+                "name": "Грин",
+                "terms": "Короткая трава, Паттинг-грин"
+            },
+            "golf/hole": {
+                "name": "Лунка",
+                "terms": "Лунка для гольфа"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Боковая водная преграда"
+            },
+            "golf/rough": {
+                "name": "Раф",
+                "terms": "Неровная площадка, Высокая трава"
+            },
+            "golf/water_hazard": {
+                "name": "Водная преграда"
+            },
             "highway": {
                 "name": "Дорога"
             },
                 "name": "Неотложная помощь"
             },
             "highway/service/parking_aisle": {
-                "name": "Парковочный проезд"
+                "name": "Парковочный проезд",
+                "terms": "парковочный проезд"
             },
             "highway/steps": {
-                "name": "Лестница"
+                "name": "Лестница",
+                "terms": "лестница, ступени, ступеньки"
             },
             "highway/stop": {
                 "name": "Знак Стоп",
-                "terms": "Ð\94вижение Ð±ÐµÐ· Ð\9eÑ\81Ñ\82ановки Ð\97апÑ\80еÑ\89ено"
+                "terms": "Ð\94вижение Ð±ÐµÐ· Ð¾Ñ\81Ñ\82ановки Ð·Ð°Ð¿Ñ\80еÑ\89ено, Ð·Ð½Ð°Ðº Ñ\81Ñ\82оп"
             },
             "highway/tertiary": {
                 "name": "Местная дорога"
                 "name": "Полевая / лесная дорога"
             },
             "highway/traffic_signals": {
-                "name": "Светофор"
+                "name": "Светофор",
+                "terms": "светофор"
             },
             "highway/trunk": {
                 "name": "Дорога федерального значения"
             },
             "highway/trunk_link": {
                 "name": "Съезд с дороги федерального значения",
-                "terms": "Ð\97аезд Ð½Ð° Ð\9cагиÑ\81Ñ\82Ñ\80алÑ\8c, Ð¡Ñ\8aезд Ñ\81 Ð\9cагистрали"
+                "terms": "Ð\97аезд Ð½Ð° Ð¼Ð°Ð³Ð¸Ñ\81Ñ\82Ñ\80алÑ\8c, Ð¡Ñ\8aезд Ñ\81 Ð¼агистрали"
             },
             "highway/turning_circle": {
                 "name": "Разворот"
                 "name": "Замок"
             },
             "historic/memorial": {
-                "name": "Памятник, мемориал"
+                "name": "Памятник, мемориал",
+                "terms": "памятник, мемориал"
             },
             "historic/monument": {
-                "name": "Памятник"
+                "name": "Памятник",
+                "terms": "монумент"
             },
             "historic/ruins": {
                 "name": "Развалины"
             "landuse/farm": {
                 "name": "Земельные угодья"
             },
+            "landuse/farmland": {
+                "name": "Сельскохозяйственные угодья"
+            },
             "landuse/farmyard": {
                 "name": "Ферма"
             },
                 "name": "Промышленная застройка"
             },
             "landuse/meadow": {
-                "name": "Луг"
+                "name": "Луг",
+                "terms": "луг"
             },
             "landuse/orchard": {
-                "name": "Кустарник"
+                "name": "Кустарник",
+                "terms": "фруктовый сад, сад"
             },
             "landuse/quarry": {
-                "name": "Карьер"
+                "name": "Карьер",
+                "terms": "карьер, каменоломня, открытая разработка"
             },
             "landuse/residential": {
                 "name": "Жилой квартал"
                 "name": "Торговля"
             },
             "landuse/vineyard": {
-                "name": "Виноградник"
+                "name": "Виноградник",
+                "terms": "виноградник"
             },
             "leisure": {
                 "name": "Отдых"
                 "name": "Яхтклуб"
             },
             "leisure/park": {
-                "name": "Парк"
+                "name": "Парк",
+                "terms": "парк"
             },
             "leisure/pitch": {
                 "name": "Спортплощадка"
             },
             "leisure/pitch/american_football": {
-                "name": "Регбийное поле"
+                "name": "Регбийное поле",
+                "terms": "поле для американского футбола"
             },
             "leisure/pitch/baseball": {
                 "name": "Бейсбольная площадка"
                 "terms": "Скейтпарк"
             },
             "leisure/pitch/soccer": {
-                "name": "Футбольное поле"
+                "name": "Футбольное поле",
+                "terms": "футбольное поле"
             },
             "leisure/pitch/tennis": {
-                "name": "Теннисный корт"
+                "name": "Теннисный корт",
+                "terms": "теннисный корт"
             },
             "leisure/pitch/volleyball": {
                 "name": "Волейбольная площадка"
             },
             "leisure/sports_center": {
                 "name": "Спортивный Комплекс",
-                "terms": "Спортивный Центр"
+                "terms": "Спортивный центр"
             },
             "leisure/stadium": {
                 "name": "Стадион",
                 "name": "Волнорез"
             },
             "man_made/cutline": {
-                "name": "Просека"
+                "name": "Просека",
+                "terms": "просека"
+            },
+            "man_made/embankment": {
+                "name": "Насыпь",
+                "terms": "насыпь"
+            },
+            "man_made/flagpole": {
+                "name": "Флагшток"
             },
             "man_made/lighthouse": {
-                "name": "Маяк"
+                "name": "Маяк",
+                "terms": "маяк"
             },
             "man_made/observation": {
                 "name": "Смотровая башня",
                 "terms": "Смотровая башня, Обзорная башня"
             },
             "man_made/pier": {
-                "name": "Пирс"
+                "name": "Пирс",
+                "terms": "пирс, причал"
             },
             "man_made/pipeline": {
-                "name": "Трубопровод"
+                "name": "Трубопровод",
+                "terms": "трубопровод"
             },
             "man_made/survey_point": {
                 "name": "Тригонометрический пункт"
                 "terms": "водонапорная башня, водонапорная вышка"
             },
             "man_made/water_well": {
-                "name": "Колодец"
+                "name": "Колодец",
+                "terms": "колодец"
             },
             "man_made/water_works": {
                 "name": "Станция водоподготовки"
             },
+            "military/airfield": {
+                "name": "Аэродром"
+            },
+            "military/barracks": {
+                "name": "Бараки"
+            },
+            "military/bunker": {
+                "name": "Бункер"
+            },
+            "military/range": {
+                "name": "Военный полигон"
+            },
             "natural": {
                 "name": "Природа"
             },
             "natural/bay": {
-                "name": "Бухта"
+                "name": "Бухта",
+                "terms": "бухта, залив"
             },
             "natural/beach": {
                 "name": "Пляж",
                 "name": "Поросший луг"
             },
             "natural/peak": {
-                "name": "Вершина"
+                "name": "Вершина",
+                "terms": "пик, гора"
             },
             "natural/scree": {
                 "name": "Осыпь"
                 "name": "Родник"
             },
             "natural/tree": {
-                "name": "Дерево"
+                "name": "Дерево",
+                "terms": "дерево"
             },
             "natural/water": {
                 "name": "Водоём"
             },
             "natural/water/lake": {
-                "name": "Озеро"
+                "name": "Озеро",
+                "terms": "озеро"
             },
             "natural/water/pond": {
-                "name": "Пруд"
+                "name": "Пруд",
+                "terms": "пруд"
             },
             "natural/water/reservoir": {
                 "name": "Водохранилище"
             },
             "natural/wetland": {
-                "name": "Болото"
+                "name": "Болото",
+                "terms": "болото, заболоченная территория"
             },
             "natural/wood": {
                 "name": "Лес"
                 "name": "Бухгалтерская контора",
                 "terms": "Бухгалтерская фирма, Бухгалтерский учёт, Аудит"
             },
+            "office/administrative": {
+                "name": "Административное учреждение"
+            },
             "office/architect": {
                 "name": "Архитектурная мастерская",
                 "terms": "Архитектурная студия, Дизайнерское бюро, Архитектор"
                 "name": "Частная фирма",
                 "terms": "Частная компания, Фирма, Организация"
             },
+            "office/educational_institution": {
+                "name": "Учебное заведение"
+            },
             "office/employment_agency": {
                 "name": "Кадровое агентство",
                 "terms": "Центр занятости, Биржа труда, Агентство по трудоустройству"
                 "name": "Агентство недвижимости",
                 "terms": "Бюро по недвижимости, Риелтор, Риелторская фирма, Риелторская компания,"
             },
+            "office/financial": {
+                "name": "Финансовая организация"
+            },
+            "office/government": {
+                "name": "Правительственное учреждение"
+            },
             "office/insurance": {
                 "name": "Страховая компания",
                 "terms": "Страховой агент, Страхование, Автострахование, Полис, ОМС, КАСКО, ОСАГО, Страховка,"
                 "name": "Общественная организация",
                 "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение,"
             },
+            "office/physician": {
+                "name": "Фельдшер"
+            },
+            "office/political_party": {
+                "name": "Политическая партия",
+                "terms": "политическая партия"
+            },
             "office/research": {
                 "name": "НИИ",
                 "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки"
             },
+            "office/telecommunication": {
+                "name": "Телеком"
+            },
+            "office/therapist": {
+                "name": "Терапевт"
+            },
             "office/travel_agent": {
                 "name": "Турагентство",
                 "terms": "Туристическое агентство, Бюро путешествий, Турфирма, Туристическая фирма"
                 "name": "Малое село"
             },
             "place/island": {
-                "name": "Остров"
+                "name": "Остров",
+                "terms": "остров"
             },
             "place/isolated_dwelling": {
                 "name": "Изолированное жильё"
                 "name": "ЛЭП",
                 "terms": "линия электропередачи, ЛЭП"
             },
+            "power/minor_line": {
+                "name": "Низковольтная ЛЭП"
+            },
             "power/pole": {
                 "name": "Столб ЛЭП"
             },
             "power/sub_station": {
-                "name": "Трансформаторная подстанция"
+                "name": "Трансформаторная подстанция",
+                "terms": "подстанция"
             },
             "power/tower": {
                 "name": "Опора ЛЭП"
             },
             "power/transformer": {
-                "name": "Трансформатор"
+                "name": "Трансформатор",
+                "terms": "трансформатор"
+            },
+            "public_transport/platform": {
+                "name": "Платформа"
+            },
+            "public_transport/stop_position": {
+                "name": "Место остановки транспорта",
+                "terms": "остановка"
             },
             "railway": {
                 "name": "Железная дорога"
             "railway/disused": {
                 "name": "Заброшенная железная дорога"
             },
+            "railway/funicular": {
+                "name": "Фуникулёр"
+            },
             "railway/halt": {
+                "name": "Железнодорожный остановочный пункт",
                 "terms": "Железнодорожная станция, ЖД станция"
             },
             "railway/level_crossing": {
                 "name": "Переезд"
             },
             "railway/monorail": {
-                "name": "Монорельс"
+                "name": "Монорельс",
+                "terms": "монорельсовая железная дорога, монорельс"
             },
             "railway/platform": {
-                "name": "Железнодорожная платформа"
+                "name": "Железнодорожная платформа",
+                "terms": "железнодорожная платформа, ж/д платформа"
             },
             "railway/rail": {
                 "name": "Рельсовый путь"
             },
             "railway/station": {
-                "name": "Железнодорожная станция"
+                "name": "Железнодорожная станция",
+                "terms": "железнодорожная станция, ж/д станция"
             },
             "railway/subway": {
                 "name": "Метро",
                 "name": "Веломагазин"
             },
             "shop/books": {
-                "name": "Книжный"
+                "name": "Книжный",
+                "terms": "книги, книжный"
             },
             "shop/boutique": {
                 "name": "Бутик"
                 "name": "Магазин \"Сделай сам\""
             },
             "shop/dry_cleaning": {
-                "name": "пылесосы"
+                "name": "пылесосы",
+                "terms": "химчистка"
             },
             "shop/electronics": {
                 "name": "Магазин электроники"
                 "name": "Ювелирный"
             },
             "shop/kiosk": {
-                "name": "Киоск"
+                "name": "Киоск",
+                "terms": "киоск"
             },
             "shop/laundry": {
-                "name": "Прачечная"
+                "name": "Прачечная",
+                "terms": "прачечная"
             },
             "shop/mall": {
                 "name": "Торговый центр"
                 "name": "Газеты-журналы"
             },
             "shop/optician": {
-                "name": "Оптика"
+                "name": "Оптика",
+                "terms": "оптика, очки"
             },
             "shop/outdoor": {
                 "name": "Товары для отдыха и туризма"
                 "name": "Гостевой дом"
             },
             "tourism/hostel": {
-                "name": "Хостел"
+                "name": "Хостел",
+                "terms": "хостел"
             },
             "tourism/hotel": {
-                "name": "Гостиница"
+                "name": "Гостиница",
+                "terms": "гостиница, отель"
             },
             "tourism/information": {
                 "name": "Инфопункт"
             },
             "tourism/motel": {
-                "name": "Мотель"
+                "name": "Мотель",
+                "terms": "мотель"
             },
             "tourism/museum": {
-                "name": "Музей"
+                "name": "Музей",
+                "terms": "музей"
             },
             "tourism/picnic_site": {
                 "name": "Место для пикника"
                 "name": "Обзорная точка"
             },
             "tourism/zoo": {
-                "name": "Зоопарк"
+                "name": "Зоопарк",
+                "terms": "зоопарк"
             },
             "type/boundary": {
                 "name": "Граница"
                 "name": "Водный путь"
             },
             "waterway/canal": {
-                "name": "Канал"
+                "name": "Канал",
+                "terms": "канал"
             },
             "waterway/dam": {
                 "name": "Дамба"
             },
             "waterway/ditch": {
-                "name": "Оросительная канава"
+                "name": "Оросительная канава",
+                "terms": "канава, ров"
             },
             "waterway/drain": {
                 "name": "Дренажный канал"
index 98b17ecdb102d522658e0e0d244d249d638e3335..2fe9f728a86c6cc38e76b8555c550a5c629ab6bc 100644 (file)
@@ -30,7 +30,7 @@
         "add": {
             "annotation": {
                 "point": "Pridanie bodu.",
-                "vertex": "Pridanie bodu k čiare.",
+                "vertex": "Pridanie uzla k čiare.",
                 "relation": "Pridanie relácie."
             }
         },
         "incomplete": "<nebolo stiahnuté>",
         "feature_list": "Hľadaj objekty",
         "edit": "Uprav objekt",
-        "none": "Žiadne"
+        "none": "Žiadne",
+        "node": "Uzol",
+        "way": "Cesta",
+        "relation": "Relácia",
+        "location": "Poloha"
     },
     "background": {
         "title": "Pozadie",
         "untagged_area": "Neoznačená plocha",
         "many_deletions": "Vymazávate {n} objektov. Ste si naozaj istý? Týmto ich vymažete z mapy na openstreetmap.org, ktorú používajú ďalší používatelia.",
         "tag_suggests_area": "Označenie {tag} predpokladá, že objekt by mal byť plochou a nie čiarou.",
+        "untagged_tooltip": "Vyberte typ objektu, ktorý popisuje, čo je tento/táto {geometry}.",
         "deprecated_tags": "Neschválené označenie: {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "Budova"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Využitie krajiny"
             },
             "address": {
                 "label": "Adresa",
                 "placeholders": {
-                    "housename": "Názov domu",
+                    "housename": "Adresný názov budovy",
                     "number": "123",
                     "street": "Ulica",
                     "city": "Mesto",
             "admin_level": {
                 "label": "Administratívna úroveň"
             },
+            "aerialway": {
+                "label": "Typ"
+            },
+            "aerialway/access": {
+                "label": "Prístup"
+            },
+            "aerialway/bubble": {
+                "label": "Štít proti vetru"
+            },
+            "aerialway/capacity": {
+                "label": "Kapacita (za hodinu)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Dĺžka trvania (minút)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Vyhrievaný"
+            },
+            "aerialway/occupancy": {
+                "label": "Kapacita",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Prístup (leto)"
+            },
             "aeroway": {
                 "label": "Typ"
             },
             "building_area": {
                 "label": "Budova"
             },
+            "cans": {
+                "label": "Prijíma plechovky"
+            },
             "capacity": {
                 "label": "Kapacita",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Proti smeru hodinových ručičiek"
                 }
             },
+            "clothes": {
+                "label": "Prijíma oblečenie"
+            },
             "collection_times": {
                 "label": "Časy výberov"
             },
             "country": {
                 "label": "štát"
             },
+            "covered": {
+                "label": "Krytý"
+            },
             "crossing": {
                 "label": "Typ"
             },
             "description": {
                 "label": "Popis"
             },
+            "electrified": {
+                "label": "Elektrifikovaná"
+            },
             "elevation": {
                 "label": "Nadmorská výška"
             },
             "fixme": {
                 "label": "Oprav ma!"
             },
+            "gauge": {
+                "label": "Rozchod"
+            },
             "generator/method": {
                 "label": "Metóda"
             },
             "generator/type": {
                 "label": "Typ"
             },
+            "glass": {
+                "label": "Prijíma sklo"
+            },
+            "golf_hole": {
+                "label": "Referenčné čislo",
+                "placeholder": "Číslo jamky (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Typ"
             },
             "incline": {
                 "label": "Sklon"
             },
+            "information": {
+                "label": "Typ"
+            },
             "internet_access": {
                 "label": "Prístup k Internetu",
                 "options": {
             },
             "name": {
                 "label": "Názov",
-                "placeholder": "Zaužívané meno (ak existuje)"
+                "placeholder": "Vlastné meno objektu (iba ak existuje)"
             },
             "natural": {
                 "label": "Prírodný"
             "operator": {
                 "label": "Operátor"
             },
+            "paper": {
+                "label": "Prijíma papier"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Odstavné parkovisko"
             },
                 "label": "Telefón",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Obtiažnosť"
+            },
+            "piste/grooming": {
+                "label": "Úprava"
+            },
+            "piste/type": {
+                "label": "Typ"
+            },
             "place": {
                 "label": "Typ"
             },
                     "cutting": "Výkop"
                 }
             },
+            "studio_type": {
+                "label": "Typ"
+            },
             "supervised": {
                 "label": "Pod dohľadom"
             },
             "tree_type": {
                 "label": "Typ"
             },
+            "tunnel": {
+                "label": "Tunel"
+            },
             "vending": {
                 "label": "Typ tovaru"
             },
                 "name": "Adresa",
                 "terms": "adresa,ŠPZ,SPZ,ulica"
             },
+            "aerialway": {
+                "name": "Vzdušná doprava",
+                "terms": "vzdusna doprava,letisko,lanovka,vlek"
+            },
+            "aerialway/cable_car": {
+                "name": "Kabínková lanovka",
+                "terms": "kyvadlova lanovka,kyvadlo,lanovka,kabínka,kabinka"
+            },
+            "aerialway/chair_lift": {
+                "name": "Kabínková lanovka",
+                "terms": "kabinkova lanovka,lanovka,kabinky,kabínky"
+            },
+            "aerialway/gondola": {
+                "name": "Kyvadlová lanovka",
+                "terms": "kyvadlova lanovka,kyvadlo,lanovka,kabínka,kabinka"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Pásový vlek",
+                "terms": "pasovy vlek"
+            },
+            "aerialway/platter": {
+                "name": "Kotvový vlek",
+                "terms": "kotvovy vlek,kotva"
+            },
+            "aerialway/pylon": {
+                "name": "Stožiar lanovky",
+                "terms": "stoziar lanovky,stoziar"
+            },
+            "aerialway/rope_tow": {
+                "name": "Lanový vlek",
+                "terms": "lanovy vlek"
+            },
+            "aerialway/station": {
+                "name": "Stanica lanovky",
+                "terms": "lanovkova stanica,lanovková stanica"
+            },
+            "aerialway/t-bar": {
+                "name": "Vlek s dvojmiestnou kotvou",
+                "terms": "T kotva,teckova kotva,téčková kotva"
+            },
             "aeroway": {
                 "name": "Letectvo",
                 "terms": "Letisko,pristávacia plocha,terminál,príletová hala,odbavovacia plocha"
                 "name": "Kino",
                 "terms": "veľké plátno,film,pohyblivé obrázky,filmový dom,filmové divadlo,najbližšie kino,premietanie,multiplex,kultúrny dom,dom kutúry,3D kino,velke platno,pohyblivé obrazky,filmovy dom,filmove divadlo,najblizsie kino,kulturny dom,dom kultury"
             },
+            "amenity/clinic": {
+                "name": "Klinika",
+                "terms": "doktor,ambulancia"
+            },
+            "amenity/clock": {
+                "name": "Hodiny",
+                "terms": "hodiny,čas,cas"
+            },
             "amenity/college": {
                 "name": "Fakulta",
                 "terms": "Vysoká škola,vysoka skola,univerzita,katedra,akadémia,akademia"
                 "name": "Súd",
                 "terms": "sud,súdna sieň,sudna sien,súdny dvor,sudny dvor"
             },
+            "amenity/dentist": {
+                "name": "Zubár",
+                "terms": "zubar,stomatológia,stomatologia"
+            },
+            "amenity/doctor": {
+                "name": "Lekár",
+                "terms": "lekar,doktor,ordinácia,ordinacia"
+            },
             "amenity/drinking_water": {
                 "name": "Pitná voda",
                 "terms": "fontánka na pitie, voda na pitie,pitna voda,pitná voda,fontanka na pitie,voda na pitie"
                 "name": "Stanica horskej služby",
                 "terms": "stanica horskej sluzby,sprava narodneho parku, správa národného parku,narodny park,národný park"
             },
+            "amenity/recycling": {
+                "name": "Recyklácia",
+                "terms": "recyklacia, zber, recyklovanie"
+            },
             "amenity/restaurant": {
                 "name": "Reštaurácia",
                 "terms": "bar,kafetéria,kantýna,jedáleň,pizzeria,jedlo,rýchloobčerstvenie,fastfood,večera,reštaurácia,reštika,jedenie,kantyna,jedalen,rychloobcerstvenie,vecera,restauracia,restika"
                 "name": "Prístrešok",
                 "terms": "pristresok,útulňa,utulna"
             },
+            "amenity/studio": {
+                "name": "Štúdio",
+                "terms": "Studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Plaváreň",
                 "terms": "Plavaren,kúpalisko,kupalisko"
                 "name": "Automat",
                 "terms": "automat na kávu,automat na kavu,kava,nápojový utomat,napojovy automat"
             },
+            "amenity/veterinary": {
+                "name": "Veterinár",
+                "terms": "veterinar"
+            },
             "amenity/waste_basket": {
                 "name": "Odpadový kôš",
                 "terms": "kontajner,kôš,smeti,kos,odpad,odpadkovy kos, odpadkový kôš"
                 "terms": "dom,stavba,vežiak,činžiak,veziak,cinziak,panelák,panelak,drevenica,chyža,chyza,chajda,chatž,chatrc,búda,buda"
             },
             "building/apartments": {
-                "name": "Obytná budova",
-                "terms": "Bytovka,obytna budova,panelak,panelák,vežiak,veziak,barak,barák,činžiak,cinziak"
+                "name": "Bytovka",
+                "terms": "Bytovka,obytna budova,panelak,panelák,vežiak,veziak,barak,barák,činžiak,cinziak,apartmany,apartmány"
             },
             "building/commercial": {
                 "name": "Komerčná budova",
                 "name": "Obytná budova",
                 "terms": "obytna budova,ubytovanie,bývanie,byvanie"
             },
+            "craft/basket_maker": {
+                "name": "Košikárstvo",
+                "terms": "kosikarstvo,vyroba kosikov,výroba košíkov"
+            },
+            "craft/beekeeper": {
+                "name": "Včelárstvo",
+                "terms": "vcelar,vcelarstvo,včelár"
+            },
+            "craft/blacksmith": {
+                "name": "Kováčstvo",
+                "terms": "kovac,kováč,kovacstvo"
+            },
+            "craft/boatbuilder": {
+                "name": "Výroba lodí",
+                "terms": "vyroba lodí,lodenica,lodiareň,lodiaren"
+            },
+            "craft/bookbinder": {
+                "name": "Knihviazačstvo",
+                "terms": "knihviazacstvo,knihviazač,knihviazac,knihy,viazacstvo,viazačstvo"
+            },
+            "craft/brewery": {
+                "name": "Pivovar",
+                "terms": "pivo,piváreň,pivaren"
+            },
+            "craft/carpenter": {
+                "name": "Stolárstvo",
+                "terms": "stolarstvo,tesarstvo,tesárstvo,tesár,tesar,stolár,stolar"
+            },
+            "craft/carpet_layer": {
+                "name": "Pokladanie kobercov",
+                "terms": "pokladanie kobercov,pokladanie podlahových krytín,pokladani podlahovych krytin"
+            },
+            "craft/caterer": {
+                "name": "Catering",
+                "terms": "zásobovanie,zasobovanie"
+            },
+            "craft/clockmaker": {
+                "name": "Výroba hodín",
+                "terms": "vyroba hodin"
+            },
+            "craft/confectionary": {
+                "name": "Cukrárstvo",
+                "terms": "cukrarstvo,cukrovinky"
+            },
+            "craft/dressmaker": {
+                "name": "Krajčírstvo",
+                "terms": "krajcirstvo,krajčír,krajcir,krajčírka,krajcirka"
+            },
+            "craft/electrician": {
+                "name": "Elektroinštalatér",
+                "terms": "elektroinstalater,elektrikár,elektrikar,elektrotechnik"
+            },
+            "craft/gardener": {
+                "name": "Záhradník",
+                "terms": "zahradnik"
+            },
+            "craft/glaziery": {
+                "name": "Sklenárstvo",
+                "terms": "sklenarstvo"
+            },
+            "craft/handicraft": {
+                "name": "Remeselníctvo",
+                "terms": "remeselnictvo"
+            },
+            "craft/hvac": {
+                "name": "Kúrenárstvo",
+                "terms": "kurenarstvo"
+            },
+            "craft/insulator": {
+                "name": "Zateplovanie",
+                "terms": "zateplovač,zateplovac"
+            },
+            "craft/jeweler": {
+                "name": "Klenotník",
+                "terms": "klenotnik,klenotnictvo,klentníctvo"
+            },
+            "craft/key_cutter": {
+                "name": "Výroba kľúčov",
+                "terms": "vyroba klucov"
+            },
+            "craft/locksmith": {
+                "name": "Zámočníctvo",
+                "terms": "zamocnictvo"
+            },
+            "craft/metal_construction": {
+                "name": "Výroba kovových plotov",
+                "terms": "vyroba kovovych plotov,kovanie,okrasná brána,brány"
+            },
+            "craft/optician": {
+                "name": "Optika",
+                "terms": "výroba okuliarov,vyroba okluliarov"
+            },
+            "craft/painter": {
+                "name": "Natierač",
+                "terms": "natierac,maliar"
+            },
+            "craft/photographer": {
+                "name": "Fotograf",
+                "terms": "fotografia,fotografovanie,fotka,fotky"
+            },
+            "craft/photographic_labratory": {
+                "name": "Fotografické laboratórium",
+                "terms": "fotograficke laboratorium,fotolab"
+            },
+            "craft/plasterer": {
+                "name": "Fasádnik",
+                "terms": "fasadnik,štukatér,stukater,omietkár,omietkar"
+            },
+            "craft/plumber": {
+                "name": "Inštalatér",
+                "terms": "instalater,klampiar"
+            },
+            "craft/pottery": {
+                "name": "Hrnčiarstvo",
+                "terms": "rnciarstvo,výroba keramiky,vyroba keramiky,keramika"
+            },
+            "craft/rigger": {
+                "name": "Lodiarsky špecialista",
+                "terms": "lodiarsky specialista"
+            },
+            "craft/roofer": {
+                "name": "Pokrývač striech",
+                "terms": "pokryvac striech"
+            },
+            "craft/saddler": {
+                "name": "Výroba sedadiel",
+                "terms": "vyroba sedadiel"
+            },
+            "craft/sailmaker": {
+                "name": "Lodné plachty",
+                "terms": "lodne plachty"
+            },
+            "craft/sawmill": {
+                "name": "Píla",
+                "terms": "pila"
+            },
+            "craft/scaffolder": {
+                "name": "Lešenárstvo",
+                "terms": "lesenarstvo,lešenie,lesenie"
+            },
+            "craft/sculpter": {
+                "name": "Sochár",
+                "terms": "sochar"
+            },
+            "craft/shoemaker": {
+                "name": "Obuvník",
+                "terms": "buvnik"
+            },
+            "craft/stonemason": {
+                "name": "Kamenárstvo",
+                "terms": "kamenarstvo,kamenár,kamenar"
+            },
+            "craft/sweep": {
+                "name": "Kominárstvo",
+                "terms": "kominarstvo,kominár,kominar"
+            },
+            "craft/tailor": {
+                "name": "Krajčír",
+                "terms": "krajcir,krajcirstvo,krajčírstvo"
+            },
+            "craft/tiler": {
+                "name": "Obkladač",
+                "terms": "obkladac,kachličky,kachlicky,obkladačky,obkladacky"
+            },
+            "craft/tinsmith": {
+                "name": "Klampiar",
+                "terms": "klampiarstvo"
+            },
+            "craft/upholsterer": {
+                "name": "Čaluníctvo",
+                "terms": "calunictvo"
+            },
+            "craft/watchmaker": {
+                "name": "Hodinár",
+                "terms": "oprava hodin,oprava hodin,hodinar,hodiny,hodinky"
+            },
+            "craft/window_construction": {
+                "name": "Výroba okien",
+                "terms": "vyroba okien"
+            },
             "embankment": {
                 "name": "Násyp",
                 "terms": "nasyp,hrádza,hradza,val"
                 "name": "Chodník",
                 "terms": "chodnik"
             },
+            "golf/bunker": {
+                "name": "Piesková jama",
+                "terms": "pieskova jama, bunker, piesok, sand trap"
+            },
+            "golf/fairway": {
+                "name": "Dráha jamky",
+                "terms": "draha jamky, fairway"
+            },
+            "golf/green": {
+                "name": "Jamkovisko",
+                "terms": "green, putting green"
+            },
+            "golf/hole": {
+                "name": "Golfová jamka",
+                "terms": "golfova jamka"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Pozdĺžna vodná prekážka",
+                "terms": "pozdlzna vodna prekazka, Lateral Water Hazard"
+            },
+            "golf/rough": {
+                "name": "Vysoká tráva",
+                "terms": "vysoka trava, rough"
+            },
+            "golf/tee": {
+                "name": "Začiatok odpaliska",
+                "terms": "zaciatok odpaliska,tee,tee box"
+            },
+            "golf/water_hazard": {
+                "name": "Vodná prekážka",
+                "terms": "vodna prekazka, water hazard"
+            },
             "highway": {
                 "name": "Cesta",
                 "terms": "dialnica,diľnica,ulica,komunikácia,komunikacia"
                 "name": "Obytná ulica",
                 "terms": "obytna ulica,rezidenčná ulica,rezidencna ulica"
             },
+            "highway/rest_area": {
+                "name": "Odpočívadlo",
+                "terms": "odpocivadlo,dialnicne odpocivadlo,dialničné odpočívadlo"
+            },
             "highway/road": {
                 "name": "Cesta bez označenia",
                 "terms": "cesta bez oznacenia,bez kategórie,bez kategorie,neoznačená cesta,neoznacena cesta"
                 "name": "Parkovacia ulička",
                 "terms": "parkovacia ulicka,parkovanie"
             },
+            "highway/services": {
+                "name": "Odpočívadlo s obsluhou",
+                "terms": "odpocivadlo s obsluhou"
+            },
             "highway/steps": {
                 "name": "Schody",
                 "terms": "schodisko,eskalátor,eskalator"
                 "name": "Cestovná agentúra",
                 "terms": "cestova agentura,cestovka,dovolenka,cestovanie"
             },
+            "piste": {
+                "name": "Lyžiarská dráha",
+                "terms": "lyziarska draha,svah,lyziarsky svah,lyžiarská svah"
+            },
             "place": {
                 "name": "Obec",
                 "terms": "dedina,mesto,sýdlo,sydlo"
                 "name": "Železnica mimo prevádzky",
                 "terms": "zeleznica mimo prevadzky,mimo prevadzky"
             },
+            "railway/funicular": {
+                "name": "Lanová dráha",
+                "terms": "lanova zeleznica,lanova draha"
+            },
             "railway/halt": {
                 "name": "Železničná zastávka",
                 "terms": "zeleznicna zastavka,zastavka,zástavka,vlak,vlaková zástavka,vlakova zastavka,stanica"
                 "name": "Jednokoľajnicová dráha",
                 "terms": "jednokolajnicova draha,jednokolajka,monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Úzkorozchodná železnica",
+                "terms": "uzkorozchodna zeleznica,uzkokolajka,úzkoľajka"
+            },
             "railway/platform": {
                 "name": "Železničné nástupište",
                 "terms": "zeleznicne nastupiste,nástupište,nastupiste,perón,peron"
index f80666196caddcbf88f08492f35a07df5f0aa34b..9521cd1ce2e77d47dc734608addfb82a61fbb30b 100644 (file)
     "restore": {
         "description": "Ali želite ponastaviti še ne shranjene spremembe iz predhodnega urejanja?",
         "restore": "Ponastavi",
-        "reset": "Ponastavi"
+        "reset": "Pozabi"
     },
     "save": {
         "title": "Shrani",
             "category-building": {
                 "name": "Zgradba"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Raba tal"
             },
                     }
                 }
             },
+            "access_simple": {
+                "label": "Dostop"
+            },
             "address": {
                 "label": "Naslov",
                 "placeholders": {
                     "postcode": "Poštna številka"
                 }
             },
+            "aerialway": {
+                "label": "Vrsta"
+            },
+            "aerialway/access": {
+                "label": "Dostop"
+            },
+            "aerialway/bubble": {
+                "label": "Pokrov za veter"
+            },
+            "aerialway/capacity": {
+                "label": "Zmogljivost (oseb na uro)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Čas vožnje (minut)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Ogrevanje"
+            },
+            "aerialway/occupancy": {
+                "label": "Število oseb",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Dostop (poleti)"
+            },
             "aeroway": {
                 "label": "Vrsta"
             },
             "atm": {
                 "label": "Bankomat"
             },
+            "backrest": {
+                "label": "Naslonjalo"
+            },
             "barrier": {
                 "label": "Vrsta"
             },
             "building_area": {
                 "label": "Zgradba"
             },
+            "cans": {
+                "label": "Sprejem pločevink"
+            },
             "capacity": {
                 "label": "Kapaciteta",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Proti smeri urinega kazalca"
                 }
             },
+            "clothes": {
+                "label": "Sprejem oblačil"
+            },
             "collection_times": {
                 "label": "Ure zbiranja"
             },
             "country": {
                 "label": "Država"
             },
+            "covered": {
+                "label": "Pokrito"
+            },
             "crossing": {
                 "label": "Vrsta"
             },
             "generator/type": {
                 "label": "Vrsta"
             },
+            "glass": {
+                "label": "Sprejem steklovine"
+            },
+            "golf_hole": {
+                "label": "Referenca",
+                "placeholder": "Številka luknje (1-18)"
+            },
+            "handicap": {
+                "label": "Hendikep",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Vrsta"
             },
             "incline": {
                 "label": "Naklon"
             },
+            "information": {
+                "label": "Vrsta"
+            },
             "internet_access": {
                 "label": "Dostop do interneta",
                 "options": {
             "operator": {
                 "label": "Operater"
             },
+            "paper": {
+                "label": "Sprejem papirja"
+            },
+            "par": {
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Parkiraj in odpelji"
             },
                 "label": "Telefon",
                 "placeholder": "+386 31 123 4567"
             },
+            "piste/type": {
+                "label": "Vrsta"
+            },
             "place": {
                 "label": "Vrsta"
             },
                 "placeholder": "Neznano",
                 "options": {
                     "bridge": "Most",
-                    "tunnel": "Tunel",
+                    "tunnel": "Predor",
                     "embankment": "Nasip",
                     "cutting": "Usek"
                 }
             },
+            "studio_type": {
+                "label": "Vrsta"
+            },
             "supervised": {
                 "label": "Nadzorovano"
             },
             "tree_type": {
                 "label": "Vrsta"
             },
+            "tunnel": {
+                "label": "Predor"
+            },
             "vending": {
                 "label": "Vrsta dobrin"
             },
             "address": {
                 "name": "Naslov"
             },
+            "aerialway": {
+                "name": "Žičnica"
+            },
+            "aerialway/cable_car": {
+                "name": "Nihalka",
+                "terms": "Gondola, Kabinska žičnica"
+            },
+            "aerialway/chair_lift": {
+                "name": "Sedežnica",
+                "terms": "Dvosedežnica, Trisedežnica, Štirisedežnica, Šestsedežnica"
+            },
+            "aerialway/gondola": {
+                "name": "Kabinska žičnica",
+                "terms": "Gondola"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Preproga",
+                "terms": "Vlečnica, Čarobna preproga"
+            },
+            "aerialway/platter": {
+                "name": "Krožniki",
+                "terms": "Vlečnica, Krožnički"
+            },
+            "aerialway/pylon": {
+                "name": "Steber žičnice",
+                "terms": "Žičniški steber, Steber vlečnice, Steber sedežnice, Steber gondole, Steber kabinske žičnice"
+            },
+            "aerialway/rope_tow": {
+                "name": "Vlečna vrv",
+                "terms": "Vlečnica"
+            },
+            "aerialway/station": {
+                "name": "Postaja žičnice"
+            },
+            "aerialway/t-bar": {
+                "name": "Sidra",
+                "terms": "Vlečnica, Sidro"
+            },
             "aeroway": {
                 "name": "Letalstvo"
             },
             "aeroway/terminal": {
                 "name": "Letališki terminal"
             },
+            "amenity": {
+                "name": "Storitev"
+            },
             "amenity/atm": {
                 "name": "Bankomat"
             },
                 "name": "Parkirišče za kolesa"
             },
             "amenity/bicycle_rental": {
-                "name": "Izposoja koles"
+                "name": "Izposoja koles",
+                "terms": "Najem koles, Rent-a-bike"
+            },
+            "amenity/boat_rental": {
+                "name": "Izposoja plovil",
+                "terms": "Najem čolnov, Rent-a-boat, Izposoja čolnov"
             },
             "amenity/cafe": {
                 "name": "Kavarna",
                 "terms": "bife,kava,bar"
             },
             "amenity/car_rental": {
-                "terms": "rent-a-car"
+                "name": "Izposoja avtomobilov",
+                "terms": "Najem avtomobilov, Rent-a-car"
             },
             "amenity/car_wash": {
                 "name": "Avtopralnica",
             "amenity/cinema": {
                 "name": "Kino"
             },
+            "amenity/clinic": {
+                "name": "Klinika"
+            },
             "amenity/college": {
                 "name": "Srednja šola",
                 "terms": "Šola, SŠ"
             "amenity/courthouse": {
                 "name": "Sodišče"
             },
+            "amenity/dentist": {
+                "name": "Zobozdravnik"
+            },
+            "amenity/doctor": {
+                "name": "Zdravnik",
+                "terms": "Doktor, Ambulanta"
+            },
             "amenity/drinking_water": {
                 "name": "Pitna voda"
             },
             },
             "amenity/hospital": {
                 "name": "Bolnišnica",
-                "terms": "bolnica,klinika"
+                "terms": "Bolnica, Klinika, Klinični center, Zdravstveni dom"
             },
             "amenity/kindergarten": {
                 "name": "Vrtec",
                 "name": "Knjižnica"
             },
             "amenity/marketplace": {
-                "name": "Tržnica"
+                "name": "Tržnica",
+                "terms": "Trg"
             },
             "amenity/parking": {
-                "name": "Parkirišče"
+                "name": "Parkirišče",
+                "terms": "Garaža, Parkirna hiša, Garažna hiša"
             },
             "amenity/pharmacy": {
                 "name": "Lekarna"
                 "name": "Pivnica",
                 "terms": "pivo,pijača"
             },
+            "amenity/recycling": {
+                "name": "Reciklaža",
+                "terms": "Recikliranje, Ekološki otok"
+            },
             "amenity/restaurant": {
                 "name": "Restavracija"
             },
                 "name": "Stanovanjska stavba",
                 "terms": "Hiša, Blok, Stanovanjski blok"
             },
+            "craft/beekeeper": {
+                "name": "Čebelarstvo",
+                "terms": "Čebelar, Čebelarka"
+            },
+            "craft/blacksmith": {
+                "name": "Kovač",
+                "terms": "Kovačija, Kovaštvo"
+            },
+            "craft/bookbinder": {
+                "name": "Knjigovez",
+                "terms": "Knjigoveznica, Knjigovezništvo"
+            },
+            "craft/brewery": {
+                "name": "Pivovarna",
+                "terms": "Pivovar, Pivovarstvo"
+            },
+            "craft/dressmaker": {
+                "name": "Šiviljstvo",
+                "terms": "Šivilja, Krojač"
+            },
+            "craft/electrician": {
+                "name": "Električarstvo",
+                "terms": "Električar"
+            },
+            "craft/gardener": {
+                "name": "Vrtnarstvo",
+                "terms": "Vrtnar"
+            },
+            "craft/optician": {
+                "name": "Optika",
+                "terms": "Optik"
+            },
+            "craft/photographer": {
+                "name": "Fotograf"
+            },
+            "craft/plumber": {
+                "name": "Vodovodarstvo",
+                "terms": "Vodovodar, Vodovodni inštalater"
+            },
+            "craft/pottery": {
+                "name": "Lončarstvo",
+                "terms": "Lončar"
+            },
+            "craft/roofer": {
+                "name": "Krovstvo",
+                "terms": "Krovec"
+            },
+            "craft/saddler": {
+                "name": "Sedlarstvo",
+                "terms": "Sedlar"
+            },
+            "craft/sailmaker": {
+                "name": "Jadrarstvo",
+                "terms": "Jadrar"
+            },
+            "craft/shoemaker": {
+                "name": "Čevljarstvo",
+                "terms": "Čevljar"
+            },
+            "craft/stonemason": {
+                "name": "Klesarstvo",
+                "terms": "Klesar"
+            },
+            "craft/sweep": {
+                "name": "Dimnikarstvo",
+                "terms": "Dimnikar"
+            },
+            "craft/tailor": {
+                "name": "Krojaštvo",
+                "terms": "Krojač, Šiviljstvo, Šivilja"
+            },
+            "craft/tiler": {
+                "name": "Keramičar",
+                "terms": "Ploščičar, Keramičarstvo, Ploščičarstvo"
+            },
+            "embankment": {
+                "name": "Nasip"
+            },
             "emergency/ambulance_station": {
                 "name": "Postaja nujne medicinske pomoči"
             },
+            "emergency/fire_hydrant": {
+                "name": "Požarni hidrant",
+                "terms": "hidrant, vodni hidrant"
+            },
             "entrance": {
                 "name": "Vhod"
             },
             "footway/sidewalk": {
                 "name": "Pločnik"
             },
+            "golf/water_hazard": {
+                "name": "Vodna ovira"
+            },
             "highway": {
                 "name": "Cesta"
             },
                 "name": "Stopnice",
                 "terms": "stopnišče"
             },
+            "highway/stop": {
+                "name": "Stop znak"
+            },
             "highway/tertiary": {
                 "name": "Lokalna cesta"
             },
                 "name": "Valobran",
                 "terms": "Lukobran, Pomol, Nasip, Zid"
             },
+            "man_made/embankment": {
+                "name": "Nasip"
+            },
+            "man_made/flagpole": {
+                "name": "Zastavni drog",
+                "terms": "Zastava, Drog za zastavo"
+            },
             "man_made/lighthouse": {
                 "name": "Svetilnik"
             },
+            "man_made/observation": {
+                "name": "Razgledni stolp",
+                "terms": "Opazovalnica, Opazovalni stolp"
+            },
             "man_made/pier": {
                 "name": "Pomol"
             },
                 "name": "Vodovod",
                 "terms": "Vodno črpališče, Vodno zajetje"
             },
+            "military/airfield": {
+                "name": "Vojaško letališče",
+                "terms": "Letališče"
+            },
+            "military/bunker": {
+                "name": "Bunker",
+                "terms": "Zaklonišče"
+            },
+            "military/range": {
+                "name": "Vojaško strelišče",
+                "terms": "Strelišče, Vadbišče"
+            },
             "natural": {
                 "name": "Naravno"
             },
                 "name": "Arhitekt",
                 "terms": "Arhitekturni biro"
             },
+            "office/company": {
+                "name": "Podjetje",
+                "terms": "Firma"
+            },
+            "office/educational_institution": {
+                "name": "Izobraževalna ustanova"
+            },
+            "office/employment_agency": {
+                "name": "Agencija za zaposlovanje",
+                "terms": "Zavod za zaposlovanje, Posredovanje dela"
+            },
+            "office/insurance": {
+                "name": "Zavarovalnica",
+                "terms": "Zavarovalniški agent, Zavarovalni agent, Zavarovalni posrednik"
+            },
             "office/lawyer": {
                 "name": "Pravna pisarna"
             },
+            "office/physician": {
+                "name": "Ambulanta",
+                "terms": "Zdravnik, Zdravnica"
+            },
             "office/political_party": {
                 "name": "Politična stranka"
             },
+            "office/research": {
+                "name": "Raziskave"
+            },
+            "office/telecommunication": {
+                "name": "Telekomunikacijska pisarna",
+                "terms": "Telekomunikacije, Telekom"
+            },
+            "office/therapist": {
+                "name": "Terapevt",
+                "terms": "terapevtka, psihoterapevt, psihoterapevtka, psihiater, psihiatrinja"
+            },
+            "office/travel_agent": {
+                "name": "Potovalna agencija"
+            },
+            "piste": {
+                "name": "Smučišče"
+            },
             "place": {
                 "name": "Kraj"
             },
             "place/city": {
-                "name": "Velemesto"
+                "name": "Velemesto",
+                "terms": "Mesto"
             },
             "place/hamlet": {
                 "name": "Zaselek"
             },
             "place/island": {
-                "name": "Otok"
+                "name": "Otok",
+                "terms": "Otoček"
+            },
+            "place/isolated_dwelling": {
+                "name": "Osamljeno bivališče",
+                "terms": "Domačija, Kmetija"
             },
             "place/locality": {
                 "name": "Krajevno ime"
             "power/transformer": {
                 "name": "Transformator"
             },
+            "public_transport/platform": {
+                "name": "Peron"
+            },
             "railway": {
                 "name": "Železnica"
             },
                 "name": "Monorail"
             },
             "railway/platform": {
-                "name": "Železniški peron"
+                "name": "Železniški peron",
+                "terms": "Peron"
             },
             "railway/rail": {
                 "name": "Železniški tir",
             "shop/pet": {
                 "name": "Trgovina za male živali"
             },
+            "shop/photo": {
+                "name": "Foto trgovina",
+                "terms": "Foto delavnica, Prodajalna fotografske opreme"
+            },
             "shop/shoes": {
                 "name": "Trgovina s čevlji"
             },
index 1546de38aa683b3f036648047e2eca85fe019f45..fc481baf7e415ec93665b0889082b44f9491a45b 100644 (file)
@@ -83,7 +83,8 @@
             "annotation": {
                 "line": "Исправљени углови путање.",
                 "area": "Исправљени углови области."
-            }
+            },
+            "not_squarish": "Ово не може бити квадратно, јер није сличног облика."
         },
         "straighten": {
             "title": "Исправљање",
         "back_tooltip": "Измените објекат",
         "remove": "Уклони",
         "search": "Претрага",
+        "multiselect": "Изабране ставке",
         "unknown": "Непознато",
         "incomplete": "<није преузето>",
         "feature_list": "Могућности претраге",
         "edit": "Уредите објекат",
-        "none": "Ниједан"
+        "none": "Ниједан",
+        "node": "Чвор",
+        "way": "Пут",
+        "relation": "Однос",
+        "location": "Локација"
     },
     "background": {
         "title": "Позадина",
         "none": "Ниједна",
         "custom": "Прилагођена",
         "custom_prompt": "Унесите образац плочица. Важеће вредности су {z}, {x}, {y} за Z/X/Y шему и {u} за квадратну шему.",
+        "fix_misalignment": "Поправи поравнање",
         "reset": "ресетовање"
     },
     "restore": {
         "untagged_area": "Неозначена област",
         "many_deletions": "Бришете {n} објеката. Да ли сте сигурни да желите то да урадите? Ово ће их избрисати са мапе коју сви виде на openstreetmap.org.",
         "tag_suggests_area": "Ознака {ознака} указује да би линија требало да буде област, али није област",
+        "untagged_tooltip": "Одаберите врсту обележја којим је ова {geometry} описана.",
         "deprecated_tags": "Застареле ознаке: {tags}"
     },
     "zoom": {
     },
     "cannot_zoom": "Не можете даље умањивати у тренутном режиму.",
     "gpx": {
-        "local_layer": "Локална GPX датотека"
+        "local_layer": "Локална GPX датотека",
+        "drag_drop": "Превуците и отпустите .gpx датотеку на страницу или кликните на дугме десно да је потражите",
+        "zoom": "Увећај на GPX стазу",
+        "browse": "Тражи .gpx датотеку"
     },
     "help": {
         "title": "Помоћ",
         "editing_saving": "# Уређивање и чување⏎\n⏎\nОвај уређивач је дизајниран да ради пре свега на мрежи, и ви му управо сада ⏎\nприступате преко сајта.⏎\n⏎\n### Одабир обележја⏎\n⏎\nДа бисте изабрали обележје на мапи, као што је пут или тражени објекат, кликните ⏎\nна њега на мапи. То ће обележити изабрани објекат, отворите панел са ⏎\nдетаљима о њему, и показати мени ствари које можете да урадите са обележјем.⏎\n⏎\nВише обележја може бити изабрано држањем 'Shift' тастера, кликом миша, ⏎\nи превлачењем на мапи. Ово ће обележити све објекте унутар оквира који ⏎\nје нацртан, што омогућава да урадите ствари над неколико објеката одједном.⏎\n⏎\n### Чување измена⏎\n⏎\nКада направите измене као што је измена путева, зграда и места, оне се ⏎\nчувају локално док их не сачувате на серверу. Не брините ако направите ⏎\nгрешку - можете опозвати измене тако што ћете кликнути на дугме за опозив, и ⏎\nповратити измене кликом на дугме за повраћај.⏎\n⏎\nКликните на „Сачувај“ да бисте завршили групу измена - на пример, ако сте завршили ⏎\nподручје града и желите да почнете на новом простору. Имаћете прилику ⏎\nда размотрите шта сте урадили, а уређивач вас снабдева корисним предлозима ⏎\nи упозорењима уколико нешто није у реду у вези са изменама.⏎\n⏎\nАко све изгледа добро, можете унети кратак коментар у којем је објашњена измена ⏎\nкоју сте направили, и кликните поново на „Сачувај“ да бисте поставили измене ⏎\nна [OpenStreetMap.org] (http://www.openstreetmap.org/), где су видљиве ⏎\nсвим другим корисницима и на располагању другима да надограђују и побољшавају.⏎\n⏎\nАко не можете да завршите своје измене у одједанпут, можете да напустите прозор ⏎\nуређивача и вратите се касније (на истом прегледачу и рачунару), а ⏎\nапликација ће понудити да обнови ваш рад.\n\nапликација уређивача ће понудити да обновите ваш рад.⏎\n",
         "roads": "# Путеви\n\nМожете правити, поправљати, и брисати путеве са овим уређивачем. Путеви могу бити \nсвих врста: стазе, ауто-путеви, путићи, бициклистичке стазе, и више - било који често \nкоришћени сегмент би требало да буде мапоиран.\n\n### Избор\n\nКликните на путу да бисте га изабрали. Контура би требало да постане видљива, \nзаједно са малим менијем алатки на мапи и траком са стране која показује више \nинформација о путу.\n\n### Измена\n\nЧесто ћете видети путеве који нису усклађени са сликом иза њих\nили са ГПС путањом. Можете да прилагодите ове путеве, тако буду на исправном\nместу.\n\nПрво кликните на путу који желите да промените. То ће га истаћи и показати\nконтролне тачке дуж пута које можете превући на боље локације. Ако\nжелите да додате нове контролне тачке за више детаља, кликните двапут део\nпута без чвора, и чвор ће бити додат.\n\nАко се пут повезује са другим путем, али је неправилно повезан на\nмапи, можете да повучете неку од његових контролних тачака на други пут с\nциљем да се повежу. Повезивање путева је важно за мапе\nи од суштинског значаја за пружање упутстава при вожњи.\n\nТакође можете да кликнете на 'Премести' алатку или притисните `M` тастер пречице за премештање целог \nпута одједном, а затим поново кликните да бисте сачували померање.\n\n### Брисање\n\nАко је пут потпуно неисправан - можете видети да он не постоји на сателитским\nснимцима и идеално су потврдили локално да није присутан - можете да избришете\nто, што га уклања са мапе. Будите опрезни приликом брисања објеката -\nкао и све друге измене, резултате виде сви, а сателитски снимци\nсу често застарели, тако да пут може бити у скорије време изграђен.\n\nМожете обрисати пут тако што ћете кликнути на њега да бисте га изабрали, затим кликните\nна иконицу канте за смеће или притисните тастер 'Delete'.\n\n### Прављење\n\nНашли сте да би негде требало да постоји пут, али га нема на мапи? Кликните на 'Путања'\nикону у горњем левом углу уређивача или притисните тастер за пречицу `2` да бисте \nпочели са цртањем путање.\n\nКликните на почетак пута на мапи да бисте почели са цртањем. Ако се пут\nодваја од постојећег пута, почните тако што ћете кликнути на месту где су повезани.\n\nЗатим кликните на места дуж пута, тако да следи праву путању, према\nсателитским снимцима или ГПС-у. Ако је пут који цртате укрштен другим путем, повежите\nих тако што ћете кликнути на тачку пресека. Када завршите цртање, кликните двапут\nили притисните 'Return' или 'Enter' на тастатури.\n",
         "gps": "# ГПС\n\nГПС подаци су најпоузданији извор података за Опенстреетмап. Овај уређивач\nподржава локалне путање - `.gpx` датотеке на локалном рачунару. Можете прикупити\nову врсту ГПС путања са бројних апликација за паметне телефоне , као и са\nличним ГПС хардвером.\n⏎\nЗа информације о томе како да извршите ГПС премеравање, прочитајте\n[Премеравање са ГПС] (http://learnosm.org/en/beginner/using-gps/).\n\nДа бисте користили GPX путању за мапирање, превуците и отпустите GPX датотеку\nна мапу уређивача. Ако је препозната, биће додата на мапу као светло зелена\nлинија. Кликните на мени 'Подешавања позадине' на левој страни како бисте омогућили,\nонемогућили, или увећали на овај нови GPX слој.\n\nGPX путања се директно не преноси на Опенстреетмап - најбољи начин да\nје користите јесте да исцртавате на мапи, користећи путању као водиљу за нове\nобјекте које додајете, као и да [учитавате податке на Поенстритмап](http://www.openstreetmap.org/trace/create)⏎\nкако би и други корисници могли да их користе.\n",
+        "imagery": "# Снимци\n\nСнимци из ваздуха су важан ресурс за мапирање. Комбинација \nавионских прелета, сателитских приказа и слободно састављених извора су на \nрасполагању у уређивачу испод менија 'Подешавања позадине' са десне стране.\n\nПодразумевано је представљен [Bing Maps] (http://www.bing.com/maps/) слој \nсателитских снимака у уређивачу, али као померате и увећавате мапу на нова географска \nподручја, нови извори ће постати доступни. Неке земље, попут Сједињених \nДржава, Француске и Данске имају веома квалитетне снимке доступна за неке области.\n\nСнимак је некада померен у односу на податке на мапи због грешке од страни \nдобављача снимака. Ако видите много путева померених у односу на позадину, \nнемојте их одмах преместити све да одговарају позадини. Уместо тога можете подесити \nслике тако да одговарају постојећим подацима кликом на 'Поправи поравнање' на \nдну интерфејса Подешавање позадине.\n",
         "addresses": "# Адресе\n\nАдресе су једне од најкориснијих информација на мапи.\n\nИако су адресе често представљене као делови улица, у Опенстреетмап\nсу забележене као атрибути објеката и места дуж улица.\n\nМожете да додате информације о адреси на местима мапираним као основе зграде\nкао и оних мапираних као појединачне тачке. Оптимални извор података  адреса\nје од премеравања на терену или лично знање - као и са било којим \nдругим објектом, копирање са комерцијалних извора, као што су Гугл мапе је строго\nзабрањено.\n",
+        "inspector": "# Коришћење инспектора\n\nИнспектор је елемент корисничког интерфејса на десној страни странице \nкоја се појављује када је објекат изабран и омогућава вам да измените његове детаље.\n\n### Избор врсте карактеристика\n\nНакон што додате чвор, линију, или област, можете да изаберете врсту карактеристика, \nредимо да ли је аутопут или стамбени пут, супермаркет или кафе.\nИнспектор ће приказати иконице за најчешће врсте карактеристика, а друге можете\nпронаћи куцањем оног што тражите у поље за претрагу.\n\nКликните на 'i' у доњем десном углу дугмета врсте могућности како бисте\nсазнали више о томе. Кликните на дугме како бисте изабрали дату врсту.\n\n### Коришћење образаца и уређивање ознака\n\nНакон што одаберете посебну врсту, или када изаберете објекат која већ\nима додељену врсту, инспектор ће приказати поља са детаљима о\nкарактеристикама као што су име и адреса.\n\nИспод поља које видите, можете да кликнете на иконе да бисте додали друге детаље,\nкао што су информације са [Википедије] (http://www.wikipedia.org/), приступ инвалидским \nколицима, и више од тога.\n\nНа дну инспектора, кликните на 'Додатне ознаке' да бисте произвољно додали \nдруге ознаке елементу. [Taginfo](http://taginfo.openstreetmap.org/) је\nобиман ресурс ако желите да за сазнате више о популарним комбинацијама ознака.\n\nПромене које направите у инспектора ће се аутоматски применити на мапи.\nМожете их опозвати у било ком тренутку тако што ћете кликнути на дугме 'Опозови'.\n",
         "buildings": "# Грађевине\n\nОпенстреетмап је највећа база података грађевина на свету. Можете правити \nи побољшати ову базу података.\n\n### Избор\n\nМожете изабрати грађевину кликом на њене оквире. То ће истаћи\nграђевину и отворити мали мени са алатима и траку са стране која приказује више \nинформација о грађевини.\n\n### Измена\n\nПонекад су зграде погрешно постављене или имају погрешне ознаке.\n\nДа бисте преместили читав објекат, изаберите га, а затим кликните на алат 'Премести'. Померите\nмиша да бисте преместили грађевину, и кликните поново када је правилно поставите.\n\nДа бисте поправили одређени облик грађевине, кликните и превуците чворове који чине\nњене границе на праве локације.\n\n### Прављење\n\nЈедно од главних недоумица око додавања грађевине на мапу јесте да\nОпенстреетмап заправо чува грађевине и као облик и као тачке. Правило\nје да се _мапирају грађевине као облик кад год је то могуће_, а да се мапирају предузећа, куће,\nпогодности, као и друге ствари које функционишу унутар грађевина као тачке постављене\nунутар облика зграде.\n\nПочните цртање грађевине као облика тако што ћете кликнути на дугме 'Област' на врху\nлево интерфејса, и завршите је било притиском на тастер 'Return' на тастатури\nили кликом на први исцртани чвор којим се затвара облик.\n\n### Брисање\n\nАко је грађевина потпуно неисправна - можете видети да она не постоји на сателитским\nснимцима и у најбољем случају потврђено је локално да није присутан - можете је избрисати, \nчиме се уклања са мапе. Будите опрезни приликом брисања објеката -\nкао и све друге измене, резултате виде сви, а сателитски снимци\nсу често застарели, тако да објекат може бити у новије време изграђен.\n\nМожете обрисати грађевину кликом на њу да бисте је изабрали, затим кликните\nна икону канте за смеће или притиском на тастер 'Delete'.\n",
         "relations": "# Односи\n\nОднос је посебна врста обележја у Опенстреетмапама која групише друга обележја. На пример, две основне врсте односа су *односи путева* којим се групишу заједно деонице пута које припадају одређеном аутопуту или магистралном путу, и * вишеструки полигони* којим се групише заједно неколико линија које дефинишу сложену област (један полигон од више делова или са рупом у себи попут крофне).\n\nГрупа обележја у односу се називају *чланови*. На бочној траци, можете видети којем односу припада обележје, и ту кликнути на релацију да бисте је изабрали. Када је однос изабран, можете видети све његове чланове наведени у бочној траци и означене на мапи.\n\nУ већини случајева, iD ће се побринути о одржавању односа аутоматски док правите измене. Најважнија ствар које би требало да будете свесни јесте да ако избришете део пута да бисте га прецизније исцртали, требало би да се уверите и да је нови одељак члан истог односа као и оригинал.\n\n## Уређивање односа\n\nАко желите да измените односе, овде су дате основе.\n\nДа бисте додали обележје у однос, изаберите обележје, кликните на дугме „+“ у одељку „Сви односи“ бочне траке, и изаберите или упишите име односа.\n\nДа бисте креирали нови однос, изаберите прво обележје које би требало да буде члан,\nкликните на дугме „+“ у одељку „Сви односи“, и одаберите „Нови однос...“.\n\nДа бисте уклонили обележје из односа, изаберите обележје и кликните на иконицу смеће\nпоред односа из којег желите да га уклоните.\n\nМожете да креирате вишеструке полигоне са рупама помоћу алат „Споји“. Нацртајте две области (унутрашњу и спољашњу), држите тастер Шифт и кликните на сваки од њих да бисте изабрали обоје, а затим кликните на дугме „Споји“ (+) дугме.\n"
     },
             "category-building": {
                 "name": "Зграда"
             },
+            "category-golf": {
+                "name": "Голф"
+            },
             "category-landuse": {
                 "name": "Коришћење земљишта"
             },
                     }
                 }
             },
+            "access_simple": {
+                "label": "Приступ"
+            },
             "address": {
                 "label": "Адреса",
                 "placeholders": {
             "admin_level": {
                 "label": "Административни ниво"
             },
+            "aerialway": {
+                "label": "Врста"
+            },
+            "aerialway/access": {
+                "label": "Приступ"
+            },
+            "aerialway/capacity": {
+                "label": "Капацитет (по сату)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Трајање (у минутама)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Грејано"
+            },
+            "aerialway/occupancy": {
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Приступ (лети)"
+            },
             "aeroway": {
                 "label": "Врста"
             },
             "generator/type": {
                 "label": "Врста"
             },
+            "golf_hole": {
+                "placeholder": "Број рупе (1-18)"
+            },
+            "handicap": {
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Врста"
             },
             "incline": {
                 "label": "Успон"
             },
+            "information": {
+                "label": "Врста"
+            },
             "internet_access": {
                 "label": "Приступ Интернету",
                 "options": {
             "operator": {
                 "label": "Руковалац"
             },
+            "par": {
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Подстицај паркирања"
             },
                 "label": "Телефон",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Тежина"
+            },
+            "piste/type": {
+                "label": "Врста"
+            },
             "place": {
                 "label": "Врста"
             },
             "tree_type": {
                 "label": "Врста"
             },
+            "tunnel": {
+                "label": "Тунел"
+            },
             "vending": {
                 "label": "Врста добара"
             },
             "address": {
                 "name": "Адреса"
             },
+            "aerialway/gondola": {
+                "name": "Гондола"
+            },
             "aeroway": {
                 "name": "Авио-пут"
             },
             "amenity/courthouse": {
                 "name": "Судница"
             },
+            "amenity/dentist": {
+                "name": "Зубар"
+            },
             "amenity/drinking_water": {
                 "name": "Пијаћа вода"
             },
             "building/residential": {
                 "name": "Стамбена зграда"
             },
+            "craft/beekeeper": {
+                "name": "Пчелар"
+            },
+            "craft/optician": {
+                "name": "Оптичар"
+            },
+            "craft/photographer": {
+                "name": "Фотограф"
+            },
+            "craft/saddler": {
+                "name": "Седлар"
+            },
+            "craft/shoemaker": {
+                "name": "Обућар"
+            },
+            "craft/stonemason": {
+                "name": "Каменорезац"
+            },
+            "craft/watchmaker": {
+                "name": "Часовничар"
+            },
             "emergency/ambulance_station": {
                 "name": "Амбуланта"
             },
             "footway/crossing": {
                 "name": "Прелаз"
             },
+            "golf/hole": {
+                "name": "Голф рупа",
+                "terms": "Голф рупица"
+            },
             "highway": {
                 "name": "Ауто-пут"
             },
             "man_made/water_works": {
                 "name": "Водовод"
             },
+            "military/barracks": {
+                "name": "Касарна"
+            },
+            "military/bunker": {
+                "name": "Бункер"
+            },
             "natural": {
                 "name": "Природно"
             },
             "power/transformer": {
                 "name": "Трансформатор"
             },
+            "public_transport/platform": {
+                "name": "Платформа"
+            },
             "railway": {
                 "name": "Железничка пруга"
             },
index 4510ddef07ef5f74cea0069cf3e122e9e7f374d3..b933cc8dbaa26a77055749940a9043880a25691d 100644 (file)
@@ -1,7 +1,8 @@
 {
     "modes": {
         "add_area": {
-            "title": "ప్రదేశం"
+            "title": "ప్రదేశం",
+            "description": "పార్కులను, కట్టడాలను, సరస్సులను లేదా ఇతర ప్రదేశాలను పటంలో చేర్చండి."
         },
         "add_line": {
             "title": "గీత"
@@ -25,6 +26,7 @@
         "continue": {
             "title": "కొనసాగించు",
             "description": "ఈ గీతను కొనసాగించండి.",
+            "not_eligible": "గీతను ఇక్కడకు కొనసాగించలేరు.",
             "annotation": {
                 "line": "ఒక గీతను కొనసాగించారు.",
                 "area": "ఒక ప్రదేశాన్ని కొనసాగించారు."
                 "area": "ఈ ప్రదేశాన్ని వృత్తంగా చేయి."
             }
         },
+        "orthogonalize": {
+            "title": "చతురస్రం"
+        },
         "straighten": {
+            "title": "తిన్నగాచేయి",
             "description": "ఈ గీతను తిన్నగా చేయి."
         },
         "delete": {
@@ -51,6 +57,9 @@
         "move": {
             "title": "తరలించు",
             "description": "దీన్ని వేరే చోటకు తరలించండి."
+        },
+        "rotate": {
+            "description": "ఈ అంశాన్ని దాని కేంద్ర బిందువు చుట్టూ తిప్పండి."
         }
     },
     "translate": {
@@ -77,6 +86,7 @@
         "show_more": "మరింత చూపించు",
         "all_members": "అందరు సభ్యులు",
         "all_relations": "అన్ని సంబంధాలు",
+        "new_relation": "కొత్త సంబంధం...",
         "role": "పాత్ర",
         "results": "{search} కి {n} ఫలితాలు",
         "remove": "తొలగించు",
index 70bb2a664eaddb9c928fce5accf71c89a72a2a82..c676d39cdf202abc50b9868c9911707ef040d4f4 100644 (file)
@@ -40,6 +40,9 @@
             }
         },
         "continue": {
+            "key": "A",
+            "title": "Devam et",
+            "description": "Çizgiye devam et.",
             "annotation": {
                 "line": "Çizgiye devam edildi.",
                 "area": "Alana devam edildi."
             "not_closed": "Bu daireleştirilemez çünkü döngü içerisinde değil."
         },
         "orthogonalize": {
+            "title": "Kare",
             "annotation": {
                 "line": "Çizginin köşeleri doğrultuldu.",
                 "area": "Alanın köşeleri doğrultuldu."
             }
         },
+        "straighten": {
+            "title": "Düzleştir",
+            "description": "Bu çizgiyi düzleştir."
+        },
         "delete": {
             "title": "Sil",
             "description": "Haritan bunu sil.",
     },
     "browser_notice": "Bu editör sadece Firefox, Chrome, Safari, Opera ile Internet Explorer 9 ve üstü tarayıcılarda çalışmaktadır. Lütfen tarayınıcı güncelleyin ya da Potlatch 2'yi kullanarak haritada güncelleme yapınız.",
     "translate": {
+        "translate": "Çevir",
         "localized_translation_name": "İsim"
     },
     "logout": "Çıkış",
     "contributors": {
         "list": "{users} tarafından yapılan katkılar"
     },
+    "geocoder": {
+        "search": "Dünya haritasında ara...",
+        "no_results_visible": "Harita alanının görünüşünde sonuçbulunamadı",
+        "no_results_worldwide": "Sonuç bulunamadı"
+    },
     "geolocate": {
         "title": "Konumumu göster"
     },
         "show_more": "Daha fazla göster",
         "view_on_osm": "OpenStreetMap.org üzerinde gör",
         "all_tags": "Tüm etiketler",
+        "all_members": "Tüm üyeler",
         "choose": "Kısım tipini seçiniz",
         "results": "{search} kelimesi için {n} adet sonuç ",
         "reference": "OpenStreetMap Wiki'de gör",
         "remove": "Kaldır",
-        "unknown": "Bilinmeyen"
+        "multiselect": "Nesneler seçildi",
+        "unknown": "Bilinmeyen",
+        "node": "Düğüm",
+        "way": "Yön",
+        "relation": "İlişki",
+        "location": "Konum"
     },
     "background": {
         "title": "Arkaplan",
     "success": {
         "just_edited": "Şu an OpenStreetMap'de bir değişiklik yaptınız!",
         "view_on_osm": "OSM üzerinde gör",
-        "facebook": "Facebook'da Paylaş"
+        "facebook": "Facebook'da Paylaş",
+        "twitter": "Twitter'da Paylaş",
+        "google": "Google+'da Paylaş"
     },
     "confirm": {
         "okay": "Tamam"
     },
     "intro": {
         "navigation": {
+            "title": "Navigasyon",
             "drag": "Ana harita alanı OpenStreetMap verisini arka plan olarak size sunmaktadır. Diğer harita uygulamalarında olduğu gibi sürekleyip yaklaş/uzaklaş ile haritada dolaşabilirsiniz. **Haritayı sürükleyin!** ",
             "select": "Harita nesneleri üç farklı şekilde gösterilir : noktalar, çizgiler ve alanlar. Tüm nesneler üzerine tıklanarak seçilebilir. **Bir nokta üzerine tıklayarak seçiniz.**",
             "header": "Başlık bize nesne tipini göstermektedir.",
             "restart": "Bu yolun \"Flower Street\" -sokağı- ile kesişmesi gerekiyor."
         },
         "startediting": {
+            "title": "Düzenlemeye Başla",
             "help": "Daha fazla dökümantasyon ve örnek burada mevcut.",
             "save": "Belli aralıklarla değişikliklerinizi kaydetmeyi unutmayınız!",
             "start": "Haritalamaya başla!"
             "maxspeed": {
                 "label": "Hız Limiti"
             },
+            "name": {
+                "label": "İsim"
+            },
             "natural": {
                 "label": "Doğal"
             },
             "tracktype": {
                 "label": "Tip"
             },
+            "tunnel": {
+                "label": "Tünel"
+            },
             "water": {
                 "label": "Tip"
             },
             "barrier/city_wall": {
                 "name": "Şehir Duvarı"
             },
+            "barrier/cycle_barrier": {
+                "name": "Bisiklet Bariyeri"
+            },
             "barrier/ditch": {
                 "name": "Sulama kanalı"
             },
             "shop/chemist": {
                 "name": "Eczacı"
             },
+            "shop/computer": {
+                "name": "Bilgisayar Mağazası"
+            },
             "shop/convenience": {
                 "name": "Bakkal"
             },
             "shop/mall": {
                 "name": "Alışveriş Merkezi"
             },
+            "shop/mobile_phone": {
+                "name": "Cep Telefonu Mağazası"
+            },
             "shop/optician": {
                 "name": "Optik"
             },
index cccefa67d218f3c42de3f14c6cb89532d9bb720c..f9846b7cfc4206938af224c6c6a1647f95ca96a1 100644 (file)
     "browser_notice": "Цей редактор працює в оглядачах Firefox, Chrome, Safari, Opera і Internet Explorer версії 9 і вище.  Будь ласка, оновіть свій оглядач або скористайтеся редактором Potlatch 2.",
     "translate": {
         "translate": "Перекласти",
-        "localized_translation_label": "Ð\91агаÑ\82омовна Ð½Ð°Ð·Ð²Ð°",
+        "localized_translation_label": "Ð\9dазва Ñ\96нÑ\88оÑ\8e Ð¼Ð¾Ð²Ð¾Ñ\8e",
         "localized_translation_language": "Обрати мову",
         "localized_translation_name": "Назва"
     },
         "incomplete": "<не завантажено>",
         "feature_list": "Пошук об’єктів",
         "edit": "Властивості об’єкта",
-        "none": "Нічого"
+        "none": "Нічого",
+        "node": "Точка",
+        "way": "Лінія",
+        "relation": "Зв’язок",
+        "location": "Місцезнаходження"
     },
     "background": {
         "title": "Тло",
         "untagged_area": "Полігон без  теґів",
         "many_deletions": "Ви збираєтесь вилучити {n} об’єктів. Ви дійсно бажаєте це зробити? Таке вилучення призведе до їх зникнення з мапи openstreetmap.org.",
         "tag_suggests_area": "Теґ {tag} зазвичай ставиться на полігони, але об’єкт не є полігоном",
+        "untagged_tooltip": "Оберіть тип об’єкту, що описує чим є {geometry}.",
         "deprecated_tags": "Застарілі теґи: {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "Будинок"
             },
+            "category-golf": {
+                "name": "Гольф"
+            },
             "category-landuse": {
                 "name": "Землекористування"
             },
             "admin_level": {
                 "label": "Адміністративний рівень"
             },
+            "aerialway": {
+                "label": "Тип"
+            },
+            "aerialway/access": {
+                "label": "Доступ"
+            },
             "aeroway": {
                 "label": "Тип"
             },
             "building_area": {
                 "label": "Будинок"
             },
+            "cans": {
+                "label": "Бляшанки"
+            },
             "capacity": {
                 "label": "Міськість",
                 "placeholder": "50, 100, 200…"
                     "anticlockwise": "Проти годинникової стрілки"
                 }
             },
+            "clothes": {
+                "label": "Одяг"
+            },
             "collection_times": {
                 "label": "Час виїмки пошти"
             },
             "generator/type": {
                 "label": "Тип"
             },
+            "glass": {
+                "label": "Скло"
+            },
+            "golf_hole": {
+                "label": "Лунка",
+                "placeholder": "Номер лунки (1-18)"
+            },
+            "handicap": {
+                "label": "Перешкода",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Тип"
             },
             "incline": {
                 "label": "Нахил"
             },
+            "information": {
+                "label": "Тип"
+            },
             "internet_access": {
                 "label": "Доступ до Інтеренету",
                 "options": {
             "operator": {
                 "label": "Оператор"
             },
+            "paper": {
+                "label": "Макулатура"
+            },
+            "par": {
+                "placeholder": "3, 4, 5…"
+            },
             "park_ride": {
                 "label": "Перехоплююча стоянка"
             },
                 "label": "Телефон",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Складність"
+            },
+            "piste/type": {
+                "label": "Тип"
+            },
             "place": {
                 "label": "Тип"
             },
                     "cutting": "Виїмка"
                 }
             },
+            "studio_type": {
+                "label": "Тип"
+            },
             "supervised": {
                 "label": "Під наглядом"
             },
             "tree_type": {
                 "label": "Тип"
             },
+            "tunnel": {
+                "label": "Тунель"
+            },
             "vending": {
                 "label": "Тип товарів"
             },
                 "name": "Контора лісництва",
                 "terms": "Ranger Station,rjynjhf kscybwndf, лісник, лісництво"
             },
+            "amenity/recycling": {
+                "name": "Переробка"
+            },
             "amenity/restaurant": {
                 "name": "Ресторан",
                 "terms": "Restaurant, htcnjhfy"
                 "name": "Житлова будівля",
                 "terms": "Residential Building,bnkjdf elsdkz"
             },
+            "craft/photographer": {
+                "name": "Фотограф"
+            },
+            "craft/photographic_labratory": {
+                "name": "Фотолабораторія"
+            },
             "embankment": {
                 "name": "Насип"
             },
             "footway/sidewalk": {
                 "name": "Тротуар"
             },
+            "golf/bunker": {
+                "name": "Піщана пастка"
+            },
             "highway": {
                 "name": "Дорога",
                 "terms": "Highway,ljhjuf,шлях,автомагістраль,шосе,тротуар,стежка,тропа,путівець,напрямок,проїзд"
                 "name": "Агенція з нерухомості",
                 "terms": "ріелтор, Агенція з нерухомості, futywsz p ythejvjcns, Real Estate Office"
             },
+            "office/ngo": {
+                "name": "Недержавна громадська організація"
+            },
+            "office/political_party": {
+                "name": "Політична партія"
+            },
             "office/therapist": {
                 "name": "Терапевт"
             },
index df49e697c8b060d604d5aedae4599ff1e2a7eac8..04f0296a0e90b621d988895d050c772b86d3308b 100644 (file)
         "incomplete": "<chưa tải về>",
         "feature_list": "Tìm kiếm đối tượng",
         "edit": "Sửa đối tượng",
-        "none": "Không có"
+        "none": "Không có",
+        "node": "Nốt",
+        "way": "Lối",
+        "relation": "Quan hệ",
+        "location": "Vị trí"
     },
     "background": {
         "title": "Hình nền",
         "untagged_area": "Vùng không có thẻ",
         "many_deletions": "Bạn có chắc chắn muốn xóa {n} đối tượng? Các đối tượng này sẽ bị xóa khỏi bản đồ công cộng tại openstreetmap.org.",
         "tag_suggests_area": "Thẻ {tag} có lẽ dành cho vùng nhưng được gắn vào đường kẻ",
+        "untagged_tooltip": "Chọn loại {geometry} của đối tượng này.",
         "deprecated_tags": "Không khuyến khích sử dụng các thẻ: {tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "Tòa nhà"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Sử dụng Đất"
             },
             "admin_level": {
                 "label": "Cấp Hành chính"
             },
+            "aerialway": {
+                "label": "Kiểu"
+            },
+            "aerialway/access": {
+                "label": "Quyền Truy cập"
+            },
+            "aerialway/bubble": {
+                "label": "Mái vòm"
+            },
+            "aerialway/capacity": {
+                "label": "Số khách (Mỗi giờ)",
+                "placeholder": "500, 2500, 5000…"
+            },
+            "aerialway/duration": {
+                "label": "Mất Thời gian (Phút)",
+                "placeholder": "1, 2, 3…"
+            },
+            "aerialway/heating": {
+                "label": "Máy sưởi"
+            },
+            "aerialway/occupancy": {
+                "label": "Số khách",
+                "placeholder": "2, 4, 8…"
+            },
+            "aerialway/summer/access": {
+                "label": "Quyền Truy cập (Mùa hè)"
+            },
             "aeroway": {
                 "label": "Loại"
             },
             "building_area": {
                 "label": "Tòa nhà"
             },
+            "cans": {
+                "label": "Nhận Đồ Hộp"
+            },
             "capacity": {
                 "label": "Sức chứa",
                 "placeholder": "50, 100, 200…"
                     "anticlockwise": "Ngược Chiều kim Đồng hồ"
                 }
             },
+            "clothes": {
+                "label": "Nhận Quần áo"
+            },
             "collection_times": {
                 "label": "Giờ Lấy thư"
             },
             "country": {
                 "label": "Quốc gia"
             },
+            "covered": {
+                "label": "Có Mái Che"
+            },
             "crossing": {
                 "label": "Kiểu"
             },
             "description": {
                 "label": "Miêu tả"
             },
+            "electrified": {
+                "label": "Điện khí hóa"
+            },
             "elevation": {
                 "label": "Cao độ"
             },
             "fixme": {
                 "label": "Cần Sửa chữa"
             },
+            "gauge": {
+                "label": "Khổ"
+            },
             "generator/method": {
                 "label": "Phương pháp"
             },
             "generator/type": {
                 "label": "Kiểu"
             },
+            "glass": {
+                "label": "Nhận Đồ Thủy tinh"
+            },
+            "golf_hole": {
+                "label": "Số",
+                "placeholder": "Số lỗ (1–18)"
+            },
+            "handicap": {
+                "label": "Điểm chấp",
+                "placeholder": "1–18"
+            },
             "highway": {
                 "label": "Kiểu"
             },
             "incline": {
                 "label": "Nghiêng"
             },
+            "information": {
+                "label": "Kiểu"
+            },
             "internet_access": {
                 "label": "Truy cập Internet",
                 "options": {
             "operator": {
                 "label": "Cơ quan Chủ quản"
             },
+            "paper": {
+                "label": "Nhận Tờ giấy"
+            },
+            "par": {
+                "label": "Điểm chuẩn",
+                "placeholder": "3, 4, 5…"
+            },
             "park_ride": {
                 "label": "Trung chuyển"
             },
                 "label": "Số Điện thoại",
                 "placeholder": "+84 1 234 5678"
             },
+            "piste/difficulty": {
+                "label": "Độ Hiểm trở"
+            },
+            "piste/grooming": {
+                "label": "Kiểu Ủi Tuyết"
+            },
+            "piste/type": {
+                "label": "Kiểu"
+            },
             "place": {
                 "label": "Kiểu"
             },
                     "cutting": "Đường xẻ"
                 }
             },
+            "studio_type": {
+                "label": "Loại"
+            },
             "supervised": {
                 "label": "Canh gác"
             },
             "tree_type": {
                 "label": "Loại"
             },
+            "tunnel": {
+                "label": "Đường hầm"
+            },
             "vending": {
                 "label": "Loại Hàng hóa"
             },
                 "name": "Địa chỉ",
                 "terms": "địa chỉ, số địa chỉ, số nhà, số tòa nhà, dia chi, so dia chi, so nha, so toa nha"
             },
+            "aerialway": {
+                "name": "Cáp treo",
+                "terms": "cáp treo, thang kéo, cap treo, thang keo"
+            },
+            "aerialway/cable_car": {
+                "name": "Xe Cáp treo Lớn",
+                "terms": "xe cáp treo lớn, toa cáp treo lớn, xe cap treo lon, toa cap treo lon"
+            },
+            "aerialway/chair_lift": {
+                "name": "Ghế Cáp treo",
+                "terms": "ghế cáp treo, thang kéo ngồi ghế, thang kéo ghế, ghe cap treo, thang keo ngoi ghe, thang keo ghe"
+            },
+            "aerialway/gondola": {
+                "name": "Xe Cáp treo Nhỏ",
+                "terms": "xe cáp treo nhỏ, toa cáp treo nhỏ, xe cap treo nho, toa cap treo nho"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Băng chuyền Trượt tuyết",
+                "terms": "băng chuyền trượt tuyết, băng tải trượt tuyết, bang chuyen truot tuyet, bang tai truot tuyet"
+            },
+            "aerialway/platter": {
+                "name": "Đĩa Treo",
+                "terms": "đĩa treo, thang kéo đĩa, dia treo, thang keo dia"
+            },
+            "aerialway/pylon": {
+                "name": "Tháp Cáp treo",
+                "terms": "tháp cáp treo, tháp thang kéo"
+            },
+            "aerialway/rope_tow": {
+                "name": "Cáp kéo",
+                "terms": "cáp kéo, cap keo"
+            },
+            "aerialway/station": {
+                "name": "Trạm Cáp treo",
+                "terms": "trạm cáp treo, trạm thang kéo, trạm cáp treo, trạm thang kéo"
+            },
+            "aerialway/t-bar": {
+                "name": "T-bar",
+                "terms": "t-bar"
+            },
             "aeroway": {
                 "name": "Hàng không",
                 "terms": "đường băng, đường lăn, đường máy bay, đường phi cơ, duong bang, duong lan, duong may bay, duong phi co"
                 "name": "Rạp phim",
                 "terms": "rạp phim, rạp điện ảnh, xi nê, xi-nê, xinê, phim, điện ảnh, rap phim, rap dien anh, xi ne, xi-ne, xine, phim, dien anh"
             },
+            "amenity/clinic": {
+                "name": "Trạm Y tế",
+                "terms": "trạm y tế, trung tâm y tế, trạm xá, bệnh xá, tram y te, trung tam y te, tram xa, benh xa"
+            },
+            "amenity/clock": {
+                "name": "Đồng hồ",
+                "terms": "đồng hồ, dong ho"
+            },
             "amenity/college": {
                 "name": "Trường Cao đẳng",
                 "terms": "trường cao đẳng, cao đẳng, CĐ, truong cao dang, cao dang, CD"
                 "name": "Tòa",
                 "terms": "tòa án, tòa, toà án, toà, toa an, toa"
             },
+            "amenity/dentist": {
+                "name": "Nha sĩ",
+                "terms": "văn phòng nha sĩ, văn phòng nha sỹ, văn phòng bác sĩ nha khoa, văn phòng bác sỹ nha khoa, văn phòng chữa răng, van phong nha si, van phong nha sy, van phong bac si nha khoa, van phong bac sy nha khoa, van phong chua rang"
+            },
+            "amenity/doctor": {
+                "name": "Bác sĩ",
+                "terms": "văn phòng bác sĩ, văn phòng bác sỹ, văn phòng thầy thuốc, van phong bac si, van phong bac sy, van phong thay thuoc"
+            },
             "amenity/drinking_water": {
                 "name": "Nước Uống",
                 "terms": "máy nước, vòi nước uống, nước uống, uống, may nuoc, voi nuoc uong, nuoc uong, uong"
                 "name": "Trạm Kiểm lâm",
                 "terms": "trạm kiểm lâm, trạm lâm nghiệp, tram kiem lam, tram lam nghiep"
             },
+            "amenity/recycling": {
+                "name": "Tái chế",
+                "terms": "tái chế, thu hồi, rác rưởi, rác thải, sọt rác, tai che, thu hoi, rac ruoi, rac thai, sot rac"
+            },
             "amenity/restaurant": {
                 "name": "Nhà hàng",
                 "terms": "quán ăn, nhà hàng, tiệm ăn, nhà ăn, phòng ăn, quán ăn nhanh, nhà hàng ăn nhanh, quán ăn qua loa, căng tin, căng-tin, xe đẩy, quán rượu, quán bia, tiệm rượu, hiệu chả cá, quán chả nướng, quán phở, tiệm phở, quán cơm, quán bánh cuốn, tiệm bánh cuốn, quán bánh mì, tiệm bánh mì, quán bánh xèo, tiệm bánh xèo, quán chè, tiệm chè, quán gỏi cuốn, quán bún, quán hải sản, quán gà, quán cà ri, quán cà-ri, tiệm cà ri, tiệm cà-ri, quan an, nha hang, tiem an, nha an, phong an, quan an nhanh, nha hang an nhanh, quan an qua loa, can tin, cang-tin, xe day, quan ruou, quan bia, tiem ruou, hieu cha ca, quan cha nuong, quan pho, tiem pho, quan com, quan banh cuon, tiem banh cuon, quan banh mi, tiem banh mi, quan banh xeo, tiem banh xeo, quan che, tiem che, quan goi cuon, quan bun, quan hai san, quan ga, quan ca ri, quan ca-ri, tiem ca ri, tiem ca-ri"
                 "name": "Nhà trú",
                 "terms": "nhà trú, chỗ che chở, nhà trú bão, nhà trú mưa, nhà trú ẩn, điểm trú bão, điểm trú mưa, điểm trú ẩn, túp lều, mái, nóc, cho che cho, nha tru bao, nha tru mua, nha tru an, diem tru bao, diem tru mau, diem tru an, tup leu, mai, noc"
             },
+            "amenity/studio": {
+                "name": "Studio",
+                "terms": "studio, xtuđiô, đài radio, đài rađiô, kênh radio, kênh rađiô, đài vô tuyến, kênh vô tuyến, đài phát thanh, đài TV, kênh TV, đài tivi, kênh tivi, đài truyền hình, kênh truyền hình, đài quảng bá, đài kênh quảng bá, phát tin, kênh phát tin, studio, xtudio, dai radio, dai radio, kenh radio, kenh radio, dai vo tuyen, kenh vo tuyen, dai phat thanh, dai TV, kenh TV, dai tivi, kenh tivi, dai truyen hinh, kenh truyen hinh, dai quang ba, dai kenh quang ba, phat tin, kenh phat tin"
+            },
             "amenity/swimming_pool": {
                 "name": "Hồ Bơi",
                 "terms": "hồ bơi, hồ tắm, ho boi, ho tam"
                 "name": "Máy bán hàng",
                 "terms": "máy bán hàng, máy bán hàng tự động, máy bán nước uống, máy bán đồ ăn, máy bán kẹo, máy bán dao cạo, máy bán tem, quán ăn tự động, may ban hang, may ban hang tu dong, may ban nuoc uong, may ban do an, may ban keo, may ban dao cao, may ban tem, quan an tu dong"
             },
+            "amenity/veterinary": {
+                "name": "Thú y",
+                "terms": "bác sĩ thú y, bác sỹ thú y, thầy thuốc thú y, bệnh viện thú y, nhà thương thú y, trung tâm thú y, bác sĩ chó, bác sỹ chó, bác sĩ mèo, bác sỹ mèo, bac si thu y, bac sy thu y, thay thuoc thu y, benh vien thu y, nha thuong thu y, trung tam thu y, bac si cho, bac sy cho, bac si meo, bac sy meo"
+            },
             "amenity/waste_basket": {
                 "name": "Thùng rác",
                 "terms": "thùng rác, sọt rác, thung rac, sot rac"
                 "name": "Tòa nhà Dân cư",
                 "terms": "tòa nhà dân cư, toà nhà dân cư, nhà ở, căn nhà, toa nha dan cu, nha o, can nha"
             },
+            "craft/basket_maker": {
+                "name": "Đan Rổ rá",
+                "terms": "nghề đan rổ rá, người đan rổ rá, tiệm đan rổ rá, nghe dan ro ra, nguoi dan ro ra, tiem dan ro ra"
+            },
+            "craft/beekeeper": {
+                "name": "Nuôi Ong",
+                "terms": "người nuôi ong, mật ong, nguoi nuoi ong, mat ong"
+            },
+            "craft/blacksmith": {
+                "name": "Rèn Kim loại",
+                "terms": "thợ rèn kim loại, thợ sắt, thợ thép, thợ thiếc, tho ren kim loai, tho sat, tho thep, tho thiec"
+            },
+            "craft/boatbuilder": {
+                "name": "Xây Thuyền",
+                "terms": "người xây thuyền, tiệm xây thuyền, nguoi xay thuyen, tiem xay thuyen"
+            },
+            "craft/bookbinder": {
+                "name": "Đóng Sách",
+                "terms": "thợ đóng sách, thợ đóng cuốn, thợ đóng sổ, tho dong sach, tho dong cuon, tho dong so"
+            },
+            "craft/brewery": {
+                "name": "Ủ Bia",
+                "terms": "nhà máy bia, nhà máy rượu, người ủ rượu, người ủ bia, nha may bia, nha may ruou, nguoi u ruou, nguoi u bia"
+            },
+            "craft/carpenter": {
+                "name": "Đóng Đồ Gỗ",
+                "terms": "thợ mộc, người đóng đồ gỗ, tho moc, nguoi dong do go"
+            },
+            "craft/carpet_layer": {
+                "name": "Lắp Thảm",
+                "terms": "người lắp thảm, người trải thảm, nguoi lap tham, nguoi trai tham"
+            },
+            "craft/caterer": {
+                "name": "Suất ăn",
+                "terms": "người suất ăn, nguoi suat an"
+            },
+            "craft/clockmaker": {
+                "name": "Xây Đồng hồ",
+                "terms": "thợ đồng hồ, người làm đồng hồ, người xây đồng hồ, tho dong ho, nguoi lam dong ho, nguoi xay dong ho"
+            },
+            "craft/confectionary": {
+                "name": "Mứt kẹo",
+                "terms": "tiệm mứt kẹo, cửa hàng mứt kẹo, tiem mut keo, cua hang mut keo"
+            },
+            "craft/dressmaker": {
+                "name": "May Áo Phụ nữ",
+                "terms": "may áo phụ nữ, may quần áo phụ nữ, may áo đàn bà, may quần áo đàn bà, may ao phu nu, may quan ao phu nu, may ao dan ba, may quan ao dan ba"
+            },
+            "craft/electrician": {
+                "name": "Lắp Điện",
+                "terms": "thợ lắp điện, người lắp điện, tho lap dien, nguoi lap dien"
+            },
+            "craft/gardener": {
+                "name": "Làm vườn",
+                "terms": "người làm vườn, người trồng hoa, người cắt cỏ, nguoi lam vuon, nguoi trong hoa, nguoi cat co"
+            },
+            "craft/glaziery": {
+                "name": "Lắp Kính",
+                "terms": "người lắp kính, người lắp kiếng, tiệm lắp kính, tiệm lắp kiếng, cửa hàng lắp kính, cửa hàng lắp kiếng, nguoi lap kinh, nguoi lap kieng, tiem lap kinh, tiem lap kieng, cua hang lap kinh, cua hang lap kieng"
+            },
+            "craft/handicraft": {
+                "name": "Thủ công",
+                "terms": "thợ thủ công, tho thu cong"
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "terms": "người thiết kế HVAC, máy điều hòa không khí, máy điều hoà không khí, máy lạnh, máy sưởi, máy thông gió, nguoi thiet ke hvac, may dien hoa khong khi, may lanh, may suoi, may thong gio"
+            },
+            "craft/insulator": {
+                "name": "Lắp Bông Thủy tinh",
+                "terms": "người lắp bông thủy tinh, người lắp bông thuỷ tinh, nguoi lap bong thuy tinh"
+            },
+            "craft/jeweler": {
+                "name": "Kim hoàn",
+                "terms": "thợ kim hoàn, người bán đồ nữ trang, người làm đồ nữa trang, chuỗi hạt, đồng hồ đeo tay, mề đay, ngọc đá, tho kim hoan, nguoi ban do nu trang, nguoi lam do nua trang, chuoi hat, dong ho deo tay, me day, ngoc da"
+            },
+            "craft/key_cutter": {
+                "name": "Làm thêm Chìa khóa",
+                "terms": "tiệm làm thêm chìa khóa, tiệm làm thêm chìa khoá, cửa hàng làm thêm chìa khóa, cửa hàng làm thêm chìa khoá, quầy làm thêm chìa khóa, quầy làm thêm chìa khoá, người làm thêm chìa khóa, người làm thêm chìa khoá, cờ-lê, clê, tiem lam them chia khoa, cua hang lam them chia khoa, quay lam them chia khoa, nguoi lam them chia khoa, co-le, cle"
+            },
+            "craft/locksmith": {
+                "name": "Thợ Khóa",
+                "terms": "thợ khóa, thợ khoá, ổ khóa, ổ khoá, cắt khóa, cắt khoá, tho khoa, o khoa, cat khoa"
+            },
+            "craft/metal_construction": {
+                "name": "Đồ Kim loại",
+                "terms": "tiệm làm đồ kim loại, cửa hàng làm đồ kim loại, xưởng làm đồ kim loại, chỗ làm đồ kim loại, người làm đồ kim loại, tay vịn, lan can, cổng, dốc, cầu thang, băng tải, bảng, biển, tiem lam do kim loai, cua hang lam do kim loai, xuong lam do kim loai, cho lam do kim loai, nguoi lam do kim loai, tay vin, cong, doc, cau thang, bang tai, bang, bien"
+            },
+            "craft/optician": {
+                "name": "Kính mắt",
+                "terms": "tiệm bán kính mắt, tiệm bán kiếng mắt, cửa hàng bán kính mắt, cửa hàng bán kiếng mắt, bác sĩ mắt, bác sỹ mắt, bác sĩ chữa mắt, bác sỹ chữa mắt, tiem ban kinh mat, tiem ban kieng mat, cua hang ban kinh mat, cua hang ban kieng mat, bac si mat, bac sy mat, bac si chua mat, bac sy chua mat"
+            },
+            "craft/painter": {
+                "name": "Thợ Sơn",
+                "terms": "thợ sơn, họa sĩ, hoạ sĩ, họa sỹ, hoạ sỹ, sơn tường, sơn cửa, tho son, hoa si, hoa sy, son tuong, son cua"
+            },
+            "craft/photographer": {
+                "name": "Chụp hình",
+                "terms": "nhà chụp hình, nhà nhiếp ảnh, phòng chụp hình, phòng nhiếp ảnh, cửa hàng chụp hình, tiệm chụp hình, tiệm nhiếp ảnh, cửa hàng nhiếp ảnh, chân dung, bức tranh, hình ảnh, máy ảnh, nha chup hinh, nha nhiep anh, phong chup hinh, phong nhiep anh, cua hang chup hinh, tiem chup hinh, tiem nhiep anh, cua hang nhiep anh, chan dung, buc tranh, hinh anh, may anh"
+            },
+            "craft/photographic_labratory": {
+                "name": "Rửa Hình",
+                "terms": "buồng tối, tiệm rửa ảnh, tiệm rửa hình, cửa hàng rửa ảnh, cửa hàng rửa hình, buong toi, tiem rua anh, tiem rua hinh, cua hang rua anh, cua hang rua hinh"
+            },
+            "craft/plasterer": {
+                "name": "Trát Vữa",
+                "terms": "thợ trát vữa, người trát vữa, tho trat vua, nguoi trat vua"
+            },
+            "craft/plumber": {
+                "name": "Sửa Ống nước",
+                "terms": "thợ ống nước, thợ sửa ống nước, người sửa ống nước, cầu tiêu, bồn rửa tay, bồn rửa mặt, bồn vệ sinh, chậu treo tường, tho ong nuoc, tho sua ong nuoc, nguoi sua ong nuoc, cau tieu, bon rua tay, bon rua mat, bon ve sinh, chau treo tuong"
+            },
+            "craft/pottery": {
+                "name": "Thợ Gốm",
+                "terms": "thợ gốm, người làm đồ gốm, bát chén, tho gom, nguoi lam do gom, bat chen"
+            },
+            "craft/rigger": {
+                "name": "Dựng Cột Buồm",
+                "terms": "người dựng cột buồm, nguoi dung cot buom"
+            },
+            "craft/roofer": {
+                "name": "Lợp Nhà",
+                "terms": "thợ lợp mái nhà, thợ lợp ngói nhà, thợ lợp nhà, người lợp mái nhà, người lợp ngói nhà, người lợp nhà, tho lop mai nha, tho lop ngoi nha, tho lop nha, nguoi lop mai nha, nguoi lop ngoi nha, nguoi lop nha"
+            },
+            "craft/saddler": {
+                "name": "Yên cương",
+                "terms": "người làm yên cương, người bán yên cương, người sửa yên cương, tiệm yên cương, cửa hàng yên cương, chỗ bán yên cương, ghế xe, ghế thuyền, nguoi lam yen cuong, nguoi ban yen cuong, nguoi sua yen cuong, tiem yen cuong, cua hang yen cuong, cho ban yen cuong, ghe xe, ghe thuyen"
+            },
+            "craft/sailmaker": {
+                "name": "Dựng Buồm",
+                "terms": "người dựng buồm, người làm buồm, tiệm dựng buồm, cửa hàng dựng buồm, chỗ dựng buồm, nguoi dung buom, nguoi lam buom, tiem dung buom, cua hang dung buom, cho dung buom"
+            },
+            "craft/sawmill": {
+                "name": "Nhà máy Cưa",
+                "terms": "nhà máy cưa, nha may cua"
+            },
+            "craft/scaffolder": {
+                "name": "Xây Giàn",
+                "terms": "người xây giàn, người lắp dựng giàn, nguoi xay gian, nguoi lap dung gian"
+            },
+            "craft/sculpter": {
+                "name": "Điêu khắc",
+                "terms": "nhà điều khắc, thợ chạm trổ, bức tượng điêu khắc, nha dieu khac, tho cham tro, buc tuong dieu khac"
+            },
+            "craft/shoemaker": {
+                "name": "Đóng Giày",
+                "terms": "thợ đóng giày dép, người đóng giày dép, người làm giày dép, thợ sửa giày dép, người sửa giày dép, tho dong giay dep, nguoi dong giay dep, nguoi lam giay dep, tho sua giay dep, nguoi sua giay dep"
+            },
+            "craft/stonemason": {
+                "name": "Xây Đá",
+                "terms": "thợ xây đá, người xây đá, tho xay da, nguoi xay da"
+            },
+            "craft/sweep": {
+                "name": "Quét Bồ hóng",
+                "terms": "người quét bồ hóng, người cạo ống khói, thợ quét bồ hóng, thợ quét ống khói, nguoi quet bo hong, nguoi cao ong khoi, tho quet bo hong, tho quet ong khoi"
+            },
+            "craft/tailor": {
+                "name": "May Quần áo",
+                "terms": "thợ may quần áo, người may quần áo, người sửa quần áo, tho may quan ao, nguoi may quan ao, nguoi sua quan ao"
+            },
+            "craft/tiler": {
+                "name": "Lợp Ngói",
+                "terms": "thợ lợp ngói, thợ lợp mái, thợ lắp ngói, thợ lắp ngói, thợ lát ngói, thợ lát mái, người lợp ngói, người lợp mái, người lắp ngói, người lắp ngói, người lát ngói, người lát mái, tho lop ngoi, tho lop mai, tho lap ngoi, tho lap ngoi, tho lat ngoi, tho lat mai, nguoi lop ngoi, nguoi lop mai, nguoi lap ngoi, nguoi lap ngoi, nguoi lat ngoi, nguoi lat mai"
+            },
+            "craft/tinsmith": {
+                "name": "Thợ Thiếc",
+                "terms": "thợ thiếc, người làm đồ thiếc, xưởng làm đồ thiếc, tho thiec, nguoi lam do thiec, xuong lam do thiec"
+            },
+            "craft/upholsterer": {
+                "name": "Bọc Ghế",
+                "terms": "người bọc ghế, người làm nệm ghế, nguoi boc ghe, nguoi lam nem ghe"
+            },
+            "craft/watchmaker": {
+                "name": "Sửa Đồng hồ",
+                "terms": "người sửa đồng hồ đeo tay, người làm đồng hồ đeo tay, tiệm sửa đồng hồ đeo tay, tiệm làm đồng hồ đeo tay, cửa hàng sửa đồng hồ đeo tay, cửa hàng làm đồng hồ đeo tay, chỗ sửa đồng hồ đeo tay, chỗ làm đồng hồ đeo tay, nguoi sua dong ho deo tay, nguoi lam dong ho deo tay, tiem sua dong ho deo tay, tiem lam dong ho deo tay, cua hang sua dong ho deo tay, cua hang lam dong ho deo tay, cho sua dong ho deo tay, cho lam dong ho deo tay"
+            },
+            "craft/window_construction": {
+                "name": "Xây Cửa sổ",
+                "terms": "thợ xây cửa sổ, người xây cửa sổ, tho xay cua so, nguoi xay cua so"
+            },
             "embankment": {
                 "name": "Đường đắp cao",
                 "terms": "đường đắp cao, đê, duong dap cao, de"
                 "name": "Lề đường",
                 "terms": "lề đường, vỉa hè, đường đi bộ, đường dạo, le duong, vie he, duong di bo, duong dao"
             },
+            "golf/bunker": {
+                "name": "Bẫy Cát",
+                "terms": "bẫy cát, hố cát, boongke, boong-ke, boong ke, bunker, bay cat, ho cat"
+            },
+            "golf/fairway": {
+                "name": "Đường Bóng Lăn",
+                "terms": "đường bóng lăn, duong bong lan"
+            },
+            "golf/green": {
+                "name": "Khu Gạt bóng",
+                "terms": "khu gạt bóng, vùng gạt bóng, sân gạt bóng, khu gat bong, vung gat bong, san gat bong"
+            },
+            "golf/hole": {
+                "name": "Lỗ Golf",
+                "terms": "lỗ golf, lỗ gôn, hố golf, hố gôn, lo golf, lo gon, ho golf, ho gon"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Bẫy Nước Cắt ngang",
+                "terms": "bẫy nước cắt ngang, chướng ngại nước cắt ngang, dòng sông, dòng suối, bay nuoc cat ngang, chuong ngai nuoc cat ngang, dong song, dong suoi"
+            },
+            "golf/rough": {
+                "name": "Cỏ Cao",
+                "terms": "vùng cỏ cao, chướng ngại cỏ, cỏ gồ ghề, bụi rậm, vung co cao, chuong ngai co, co go ghe, bui ram"
+            },
+            "golf/tee": {
+                "name": "Điểm Phát bóng",
+                "terms": "điểm phát bóng, vị trí phát bóng, diem phat bong, vi tri phat bong"
+            },
+            "golf/water_hazard": {
+                "name": "Bẫy Nước",
+                "terms": "bẫy nước, chướng ngại nước, ao hồ, ao nước, hồ nước, bay nuoc, chuong ngai nuoc, ao ho, ao nuoc, ho nuoc"
+            },
             "highway": {
                 "name": "Đường Giao thông",
                 "terms": "đường giao thông, đường, duong giao thong, duong"
                 "name": "Ngõ Dân cư",
                 "terms": "ngõ dân cư, ngõ, đường dân cư, dân cư, kiệt, ngo dan cu, ngo, duong dan cu, dan cu, kiet"
             },
+            "highway/rest_area": {
+                "name": "Khu Vệ sinh và Nơi Nghỉ ngơi",
+                "terms": "khu vệ sinh, phòng vệ sinh, nơi nghỉ ngơi, chỗ nghỉ ngơi, trạm thông tin, khu ve sinh, phong ve sinh, noi nghi ngoi, cho nghi ngoi, tram thong tin"
+            },
             "highway/road": {
                 "name": "Đường Nói chung",
                 "terms": "đường nói chung, đường không rõ, duong noi chung, duong khong ro"
                 "name": "Lối trong Bãi đậu xe",
                 "terms": "lối trong bãi đậu xe, lối trong sân đậu xe, loi trong bai dau xe, loi trong san dau xe"
             },
+            "highway/services": {
+                "name": "Trạm Dừng chân",
+                "terms": "trạm dừng chân đường bộ, trạm dừng chân đường cao tốc, trạm dừng chân dọc đường, trạm dừng nghỉ đường bộ, trạm dừng nghỉ đường cao tốc, trạm dừng nghỉ dọc đường, tiệm mua sắm, nhà hàng ăn nhanh, cây xăng, khu vệ sinh, trạm thông tin, tram dung chan duong bo, tram dung chan duong cao toc, tram dung chan doc duong, tram dung nghi duong bo, tram dung nghi duong cao toc, tram dung nghi doc duong, tiem mua sam, nha hang an nhanh, cay xang, khu ve sinh, tram thong tin"
+            },
             "highway/steps": {
                 "name": "Cầu thang",
                 "terms": "cầu thang, cau thang"
                 "name": "Văn phòng Du lịch",
                 "terms": "văn phòng du lịch, công ty du lịch, công ti du lịch, cty du lịch, đại lý du lịch, đại lí du lịch, du lịch theo nhóm, tour, vé máy bay, van phong du lich, cong ty du lich, cong ti du lich, cty du lich, dai ly du lich, dai li du lich, du lich theo nhom, ve may bay"
             },
+            "piste": {
+                "name": "Đường Trượt tuyết",
+                "terms": "đường trượt tuyết, đường mòn trượt tuyết, duong truot tuyet, duong mon truot tuyet"
+            },
             "place": {
                 "name": "Địa phương",
                 "terms": "địa phương, nơi, dia phuong, noi"
                 "name": "Đường sắt Không hoạt động",
                 "terms": "đường sắt không hoạt động, duong sat khong hoat dong"
             },
+            "railway/funicular": {
+                "name": "Đường sắt Leo núi",
+                "terms": "đường sắt leo núi, đường ray leo núi, duong sat leo nui, duong ray leo nui"
+            },
             "railway/halt": {
                 "name": "Ga xép",
                 "terms": "ga xép, ga nhỏ, ga xep, ga nho"
                 "name": "Đường sắt Một ray",
                 "terms": "đường sắt một ray, duong sat mot ray"
             },
+            "railway/narrow_gauge": {
+                "name": "Đường sắt Khổ hẹp",
+                "terms": "đường sắt khổ hẹp, đường ray khổ hẹp, đường sắt hẹp, đường ray hẹp, duong sat kho hep, duong ray kho hep, duong sat hep, duong ray hep"
+            },
             "railway/platform": {
                 "name": "Nhà ga",
                 "terms": "ke ga"
index 0998612dc858e6f942f4e2a7a37654c4c0bc756d..d1ccb9113364d28046dfc3e8c4f76b097f4fcf57 100644 (file)
         "incomplete": "<無傳落來>",
         "feature_list": "搵地貌",
         "edit": "改地貌",
-        "none": "無"
+        "none": "無",
+        "node": "節",
+        "way": "徑",
+        "relation": "關聯",
+        "location": "地點"
     },
     "background": {
         "title": "背景",
         "untagged_area": "冇籤嘅範圍",
         "many_deletions": "你要刪走物件{n}個。你真係想咁做?咁人人用開嘅公家街圖入便,都會刪走埋。",
         "tag_suggests_area": "{tag}籤話條綫係範圍,實情佢唔係。",
+        "untagged_tooltip": "揀個地貌,形容到爾一{geometry}。",
         "deprecated_tags": "廢籤:{tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "屋宇"
             },
+            "category-golf": {
+                "name": "哥夫球"
+            },
             "category-landuse": {
                 "name": "用地"
             },
             "admin_level": {
                 "label": "行政層次"
             },
+            "aerialway": {
+                "label": "類"
+            },
+            "aerialway/access": {
+                "label": "通"
+            },
+            "aerialway/bubble": {
+                "label": "泡"
+            },
+            "aerialway/capacity": {
+                "label": "載量(一小時計)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "行程(分鐘)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "有暖氣"
+            },
+            "aerialway/occupancy": {
+                "label": "一車人數",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "通(夏天)"
+            },
             "aeroway": {
                 "label": "類"
             },
             "building_area": {
                 "label": "屋宇"
             },
+            "cans": {
+                "label": "收罐"
+            },
             "capacity": {
                 "label": "容納",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "逆時針"
                 }
             },
+            "clothes": {
+                "label": "收衫"
+            },
             "collection_times": {
                 "label": "收集時間"
             },
             "country": {
                 "label": "國"
             },
+            "covered": {
+                "label": "有蓋"
+            },
             "crossing": {
                 "label": "類"
             },
             "description": {
                 "label": "描述"
             },
+            "electrified": {
+                "label": "用電"
+            },
             "elevation": {
                 "label": "海拔"
             },
             "generator/type": {
                 "label": "類"
             },
+            "glass": {
+                "label": "收玻璃"
+            },
+            "golf_hole": {
+                "label": "參攷",
+                "placeholder": "洞數(一到十八)"
+            },
+            "handicap": {
+                "label": "差點",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "類"
             },
             "incline": {
                 "label": "斜"
             },
+            "information": {
+                "label": "類"
+            },
             "internet_access": {
                 "label": "用到互聯網",
                 "options": {
             "operator": {
                 "label": "承辦商"
             },
+            "paper": {
+                "label": "收紙"
+            },
+            "par": {
+                "label": "標準桿",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "泊車轉乖"
             },
                 "label": "電話",
                 "placeholder": "+852 12345678"
             },
+            "piste/difficulty": {
+                "label": "難度"
+            },
+            "piste/grooming": {
+                "label": "雪道類"
+            },
+            "piste/type": {
+                "label": "類"
+            },
             "place": {
                 "label": "類"
             },
             "tree_type": {
                 "label": "類"
             },
+            "tunnel": {
+                "label": "隧道"
+            },
             "vending": {
                 "label": "貨類"
             },
                 "name": "地埗",
                 "terms": "Address,地址,地埗,址"
             },
+            "aerialway": {
+                "name": "吊道",
+                "terms": "Aerialway,吊道"
+            },
+            "aerialway/cable_car": {
+                "name": "吊車",
+                "terms": "Cable Car,吊車,䌫車"
+            },
+            "aerialway/chair_lift": {
+                "name": "吊櫈",
+                "terms": "Chair Lift,吊櫈"
+            },
+            "aerialway/gondola": {
+                "name": "吊船",
+                "terms": "Gondola,吊船"
+            },
             "aeroway": {
                 "name": "航空設施",
                 "terms": "Aeroway,機場,機場相關設施,機場相關道路,航空,航空設施"
                 "terms": "Fast Food,快餐店"
             },
             "amenity/fire_station": {
-                "name": "æ\88é\98²局",
-                "terms": "Fire Station,æ°´è»\8a館,æ¶\88è²»å±\80,æ¶\88é\98²å±\80,æ¶\88é\98²ç«\99"
+                "name": "æ»\85ç\81«局",
+                "terms": "Fire Station,æ»\85ç\81«å±\80,æ°´è»\8a館,æ¶\88é\98²å±\80,æ¶\88é\98²ç«\99\95\91ç\81«å±\80"
             },
             "amenity/fountain": {
                 "name": "噴水池",
                 "name": "郊野訪客處",
                 "terms": "Ranger Station,郊野訪客處,野郊訪客處"
             },
+            "amenity/recycling": {
+                "name": "囘收桶",
+                "terms": "Recycling,囘收桶,囘收箱,回收桶,回收箱"
+            },
             "amenity/restaurant": {
                 "name": "餐廳",
                 "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
                 "name": "住宅樓宇",
                 "terms": "Residential Building,住宅建築物,住宅樓宇"
             },
+            "craft/watchmaker": {
+                "name": "鐘錶匠",
+                "terms": "Watchmaker,鐘錶匠"
+            },
+            "craft/window_construction": {
+                "name": "造窗",
+                "terms": "Window Construction,造窗"
+            },
             "embankment": {
                 "name": "基堤",
                 "terms": "Embankment,基堤,堤,堤壩,堤岸"
                 "name": "行人路",
                 "terms": "Sidewalk,行人路"
             },
+            "golf/bunker": {
+                "name": "沙坑",
+                "terms": "Sand Trap,沙坑"
+            },
+            "golf/fairway": {
+                "name": "球道",
+                "terms": "Fairway,球道"
+            },
+            "golf/green": {
+                "name": "菓嶺",
+                "terms": "Putting Green,果嶺,菓嶺"
+            },
+            "golf/hole": {
+                "name": "歌夫球洞",
+                "terms": "Golf Hole,歌夫球洞"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "側面水障區",
+                "terms": "Lateral Water Hazard,側面水障區"
+            },
+            "golf/rough": {
+                "name": "深草區",
+                "terms": "Rough,深草區"
+            },
+            "golf/tee": {
+                "name": "發球區",
+                "terms": "Tee Box,發球區,開球區"
+            },
+            "golf/water_hazard": {
+                "name": "水障區",
+                "terms": "Water Hazard,水障區"
+            },
             "highway": {
                 "name": "公路",
                 "terms": "Highway,公路"
                 "name": "單軌",
                 "terms": "Monorail,單軌,單軌鐵路,單軌電車"
             },
+            "railway/narrow_gauge": {
+                "name": "窄軌火車",
+                "terms": "Narrow Gauge Rails,窄軌火車,窄軌,窄軌鐵路"
+            },
             "railway/platform": {
                 "name": "月臺",
                 "terms": "Railway Platform,月臺,站臺,鐵道月台"
index 82f571bbc29c4d152361fc871da73b77c23d4634..095cbf5766c75beb0d81ea0cc4ba1a02e341c919 100644 (file)
@@ -2,13 +2,13 @@
     "modes": {
         "add_area": {
             "title": "区域",
-            "description": "向地图中添加公园、建筑物、湖泊或其它区域。",
+            "description": "添加公园、建筑、湖或其它区域到地图上。",
             "tail": "在地图上单击开始绘制区域,如公园、湖泊或建筑物。"
         },
         "add_line": {
             "title": "线",
-            "description": "向地图中添加高速公路、街道、人行道、沟渠或其它线。",
-            "tail": "å\9c¨å\9c°å\9b¾ä¸\8aå\8d\95å\87»开始绘制道路、小径或路线。"
+            "description": "添加公路、街道、人行道、沟渠或其它线到地图上。",
+            "tail": "å\8d\95å\87»å\9c°å\9b¾开始绘制道路、小径或路线。"
         },
         "add_point": {
             "title": "点",
     "operations": {
         "add": {
             "annotation": {
-                "point": "添加了一个点。",
-                "vertex": "向路径添加了一个节点。",
-                "relation": "æ\96°å¢\9eä¸\80个关系。"
+                "point": "添加点。",
+                "vertex": "添加节点到路径。",
+                "relation": "æ·»å\8a 关系。"
             }
         },
         "start": {
             "annotation": {
-                "line": "开始了一条线。",
-                "area": "开始了一个区域。"
+                "line": "开始绘制线。",
+                "area": "开始绘制区域。"
             }
         },
         "continue": {
             "not_eligible": "这里没有线可以在继续。",
             "multiple": "可以选择多条线。要增加选择一条直线,按住Shift键并单击以选中它。",
             "annotation": {
-                "line": "继续绘制了一条线。",
-                "area": "继续绘制了一个面。"
+                "line": "继续绘制线。",
+                "area": "继续绘制区域。"
             }
         },
         "cancel_draw": {
-            "annotation": "绘制已取消。"
+            "annotation": "取消绘制。"
         },
         "change_role": {
             "annotation": "已更改关系成员的角色。"
         },
         "change_tags": {
-            "annotation": "æ \87è®°å·²æ\9b´æ\94¹。"
+            "annotation": "æ\9b´æ\94¹æ \87ç­¾。"
         },
         "circularize": {
             "title": "环形化",
             "description": {
-                "line": "把此线段环形化。",
-                "area": "把此区域环形化。"
+                "line": "环形化该线。",
+                "area": "环形化该区域。"
             },
             "key": "O",
             "annotation": {
-                "line": "将线段变成环形。",
-                "area": "将一区域制成环形。"
+                "line": "环形化线。",
+                "area": "环形化区域。"
             },
             "not_closed": "非圈状物件,不能环形化。"
         },
@@ -81,7 +81,7 @@
             },
             "key": "S",
             "annotation": {
-                "line": "已将线段上的弯角换成直角。",
+                "line": "拉直线上角的边。",
                 "area": "已将区域的弯角换成直角。"
             },
             "not_squarish": "因为它不是近似方形的,这不能被直角化。"
             "title": "删除",
             "description": "从地图上删除。",
             "annotation": {
-                "point": "删除了一个点。",
-                "vertex": "删除了路径上的一个节点。",
-                "line": "删除了一条线。",
-                "area": "删除了一个区域。",
-                "relation": "删除一个关系。",
-                "multiple": "删除了 {n} 个对象。"
+                "point": "删除点。",
+                "vertex": "删除路径上的节点。",
+                "line": "删除线。",
+                "area": "删除区域。",
+                "relation": "删除关系。",
+                "multiple": "删除{n}个对象。"
             },
             "incomplete_relation": "此内容暂未下载完成无法删除。"
         },
         },
         "connect": {
             "annotation": {
-                "point": "连接了一条路径到一个点。",
-                "vertex": "è¿\9eæ\8e¥äº\86两æ\9d¡è·¯å¾\84ã\80\82",
-                "line": "连接了一条路径到一条线。",
-                "area": "连接了一条路径到一区域。"
+                "point": "连接条路径到点。",
+                "vertex": "连接两条路径。",
+                "line": "连接路径到线。",
+                "area": "连接条路径到区域。"
             }
         },
         "disconnect": {
             "title": "断开连接",
-            "description": "断开这些线。",
+            "description": "断开这些线/区域之间的连接。",
             "key": "D",
-            "annotation": "断开线。",
+            "annotation": "断开线/区域连接。",
             "not_connected": "没有足够的线/面来断开。"
         },
         "merge": {
             "annotation": {
                 "point": "移动了一个点。",
                 "vertex": "移动了路径中的一个节点。",
-                "line": "移动了一条线。",
-                "area": "移动了一个区域",
-                "multiple": "移动多个对象。"
+                "line": "移动线。",
+                "area": "移动区域。",
+                "multiple": "移动多个对象。"
             },
             "incomplete_relation": "此要素暂未下载完成,无法删除。"
         },
             "description": "绕这个对象的中心点旋转。",
             "key": "R",
             "annotation": {
-                "line": "旋转了一条线。",
-                "area": "旋转了一个区域。"
+                "line": "旋转线。",
+                "area": "旋转区域。"
             }
         },
         "reverse": {
         "localized_translation_language": "选择语言",
         "localized_translation_name": "名称"
     },
-    "zoom_in_edit": "放大进行编辑",
-    "logout": "注销",
-    "loading_auth": "正在连接 OpenStreetMap...",
-    "report_a_bug": "反馈 BUG",
+    "zoom_in_edit": "放大地图以编辑",
+    "logout": "退出",
+    "loading_auth": "正在连接OpenStreetMap...",
+    "report_a_bug": "报告漏洞",
     "status": {
         "error": "无法连接到 API。",
         "offline": "API 已下线,请稍后再尝试编辑。",
         "readonly": "API 目前处于只读状态,您需要等候一段时间才能保存您的更改。"
     },
     "commit": {
-        "title": "保存更改",
+        "title": "保存变更",
         "description_placeholder": "简单说明你的贡献。",
         "message_label": "提交信息",
         "upload_explanation": "你的修改将会在所有使用OpenStreetMap的数据的地图上看得见。",
         "created": "已创建"
     },
     "contributors": {
-        "list": "由 {users} 编辑",
-        "truncated_list": "由 {users} 等 {count} 位编辑"
+        "list": "{users}编辑",
+        "truncated_list": "{users}及另外{count}人编辑"
     },
     "geocoder": {
         "search": "在全球搜索...",
         "no_documentation_key": "这个键值没有可用的说明",
         "show_more": "显示更多",
         "view_on_osm": "在openstreetmap.org中查看",
-        "all_tags": "所有标",
+        "all_tags": "所有标",
         "all_members": "所有成员",
         "all_relations": "所有关系",
-        "new_relation": "æ\96°å»ºå\85³ç³»...",
+        "new_relation": "新关系...",
         "role": "角色",
         "choose": "选择标记内容种类。",
-        "results": " 搜索 {search} 有 {n} 个结果。",
+        "results": "{search}有{n}个结果。",
         "reference": "在OpenStreetMap Wiki中查看",
         "back_tooltip": "修改物件",
         "remove": "删除",
         "multiselect": "选择项目",
         "unknown": "未知",
         "incomplete": "<未有下载>",
-        "feature_list": "搜索要素",
-        "edit": "编辑要素",
-        "none": "空"
+        "feature_list": "搜索特征",
+        "edit": "编辑特征",
+        "none": "空",
+        "node": "节点",
+        "way": "路径",
+        "relation": "关系",
+        "location": "位置"
     },
     "background": {
         "title": "背景",
     "save": {
         "title": "保存",
         "help": "保存改变至OpenStreetMap,让其他用户可见。",
-        "no_changes": "没有要保存的更改。",
-        "error": "å°\9dè¯\95ä¿\9då­\98æ\97¶å\8f\91ç\94\9fé\94\99误。",
+        "no_changes": "没有待保存变更。",
+        "error": "å°\9dè¯\95ä¿\9då­\98æ\97¶å\87ºé\94\99。",
         "uploading": "正在向 OpenStreetMap 上传更改。",
-        "unsaved_changes": "您有未保存的更改"
+        "unsaved_changes": "你有未保存变更"
     },
     "success": {
         "edited_osm": "编辑了 OSM!",
         "just_edited": "您刚刚编辑了 OpenStreetMap!",
         "view_on_osm": "在 OSM 上查看",
-        "facebook": "分享到 Facebook",
+        "facebook": "分享到Facebook",
         "twitter": "分享到 Twitter",
         "google": "分享到 Google+",
         "help_html": "你的更新应该在几分钟后出现在“标准”图层上。其他图层和某些功能,可能需要更长的时间\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>详情</a>).\n"
         "okay": "确定"
     },
     "splash": {
-        "welcome": "欢迎使用 iD OpenStreetMap 编辑器",
+        "welcome": "欢迎使用OpenStreetMap iD编辑器",
         "text": "ID编辑器是一个既易用而又功能强大的工具,以助您编辑世界上最好的自由世界地图。这是{version}版本。欲知详情,请浏览{website}及在{github}报告程序错误。“",
-        "walkthrough": "开始演示",
+        "walkthrough": "开始导览",
         "start": "现在编辑"
     },
     "source_switch": {
         "dev": "开发模式"
     },
     "tag_reference": {
-        "description": "描述",
-        "on_wiki": "wiki.osm.org 上的 {tag}",
+        "description": "说明",
+        "on_wiki": "wiki.osm.org上的{tag}",
         "used_with": "使用 {type}"
     },
     "validations": {
         "untagged_line": "未标记的线",
         "untagged_area": "未标记的区域",
         "many_deletions": "您正在删除 {n} 个对象,您确定要这么做吗?这将会把它们从大家所见的 openstreetmap.org 地图上删除。",
-        "tag_suggests_area": "{tag}的标签所建议的线段应为区域,但这个不是一区域",
-        "deprecated_tags": "已弃用的标签︰{tags}"
+        "tag_suggests_area": "标签{tag}表明线应该为区域,但它不是区域",
+        "untagged_tooltip": "选择一个用来描述{geometry}的要输类型。",
+        "deprecated_tags": "弃用标签:{tags}"
     },
     "zoom": {
         "in": "放大",
     },
     "cannot_zoom": "在此模式下不能再缩小",
     "gpx": {
-        "local_layer": "本地 GPX 文件",
+        "local_layer": "本地GPX文件",
         "drag_drop": "拖放GPX文件到页面上,或按一下浏览按钮,",
         "zoom": "缩放到GPX轨迹",
         "browse": "浏览GPX文件"
             "title": "导航",
             "drag": "主地图区域在背景上展示了 OpenStreetMap 数据。您可以像在其它网络地图一样通过拖动和滚动来移动。**拖动地图!**",
             "select": "地图物件有三种表示方式:点、线以及区域,所有要素都可以通过点击选择。 **点击该点来选择它**",
-            "header": "上方显示要素种类",
+            "header": "上方显示特征类型",
             "pane": "选择一个要素后,会显示要素编辑器。上方显示物件类型,主面板则显示物件的属性,如物件的名称与地址等。 **点击物件编辑器右上角的关闭按钮,关闭要素编辑器**"
         },
         "points": {
             "add": "点可以用来表示像是商店、餐厅与古迹之类的要素,它们标示一个特定位置,并且描述那里有什么。 **点击「点」按钮以新增一点**",
             "place": "在地图上点击,可以地图上新增的一点。 **将该点放到建筑物上方**",
             "search": "很多不同的物体可以用点来代表。您刚刚新增加的点是一间咖啡厅。**搜索'{name}'**",
-            "choose": "**从列表中选择咖啡厅。**",
+            "choose": "**在列表中选择咖啡馆。**",
             "describe": "这个点现在标示为咖啡厅,通过要素编辑器,我们可以加入更多相关信息。 **新增一个名称**",
             "close": "点选关闭按钮就可以关闭物件编辑器。 **关闭要素编辑器**",
             "reselect": "很多时候,所需的点已经存在,但有错误或不完整。我们可以编辑现有的点。 **选择您刚创建的点**",
             "title": "区域",
             "add": "区域能较详细地代表物件,提供该物件的边界资料。大部份以点可以代表的物件类别,都可以用区域代表,而后者往往更为适合。 **点击「区域」按钮,以新增一个区域**",
             "corner": "通过将节点放到面的边界上,可绘制面。 **将起始节点置于游乐场的其中一角**",
+            "place": "放置更多节点可绘制区域。点击开始节点即可完成绘制。**在沙盒绘制一个区域。**",
             "search": "**搜索'{name}'。**",
-            "choose": "**从列表中选择游乐场。**",
+            "choose": "**在列表中选择儿童游乐场。**",
             "describe": "**添加一个名字,并关闭该要素编辑器**"
         },
         "lines": {
             "title": "线",
             "start": "**点击道路末端,以开始绘制线段。 **",
-            "road": "**从列表中选择道路**",
+            "intersect": "点击向线添加更多节点。必要时您可以在绘制时拖动地图。道路和许多其它类型的线都是一个更大的网络的组成部分,因此正确连接这些线以便导航应用使用是十分重要的。**点击 Flower Street 创建连接两条线的交叉点。**",
+            "finish": "再次点击最后一个节点可结束绘制线。**完成道路的绘制。**",
+            "road": "**在列表中选择道路**",
             "residential": "道路有不同种类,最常见的为住宅区道路。 **选择住宅区道路**",
             "describe": "**给道路命名,并关闭该要素编辑器。**",
             "restart": "道路需要花街相交。",
             "title": "开始编辑",
             "help": "在这里有更多使用说明,还可以重温简介",
             "save": "不要忘了定期保存你的修改!",
-            "start": "开始图!"
+            "start": "开始绘制地图!"
         }
     },
     "presets": {
             "category-building": {
                 "name": "建筑物"
             },
+            "category-golf": {
+                "name": "高尔夫球"
+            },
             "category-landuse": {
                 "name": "土地使用"
             },
             "category-path": {
-                "name": "径"
+                "name": "径"
             },
             "category-rail": {
                 "name": "铁轨"
                 "name": "道路"
             },
             "category-route": {
-                "name": "路线"
+                "name": "线路"
             },
             "category-water-area": {
                 "name": "水"
             "admin_level": {
                 "label": "行政级别"
             },
+            "aerialway": {
+                "label": "类型"
+            },
+            "aerialway/capacity": {
+                "label": "容量(每小时)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "持续时间(分钟)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/occupancy": {
+                "placeholder": "2, 4, 8..."
+            },
             "aeroway": {
                 "label": "类型"
             },
                 "label": "类型"
             },
             "atm": {
-                "label": "ATM"
+                "label": "自动提款机(ATM)"
             },
             "backrest": {
                 "label": "长椅"
                 "label": "类型"
             },
             "cuisine": {
-                "label": "美食"
+                "label": "菜肴"
             },
             "denomination": {
                 "label": "教派"
                 "label": "意思"
             },
             "description": {
-                "label": "描述"
+                "label": "说明"
+            },
+            "electrified": {
+                "label": "电气化"
             },
             "elevation": {
                 "label": "海拔"
             "fixme": {
                 "label": "修复我"
             },
+            "gauge": {
+                "label": "轨距"
+            },
             "generator/method": {
                 "label": "模式"
             },
             "generator/type": {
                 "label": "类型"
             },
+            "handicap": {
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "类型"
             },
             "incline": {
                 "label": "斜度"
             },
+            "information": {
+                "label": "类型"
+            },
             "internet_access": {
                 "label": "互联网接入",
                 "options": {
-                    "wlan": "无线网络",
+                    "wlan": "Wi-Fi",
                     "wired": "有线网络",
                     "terminal": "终端"
                 }
                 "placeholder": "1, 2, 3..."
             },
             "layer": {
-                "label": "层"
+                "label": "å\9b¾å±\82"
             },
             "leisure": {
                 "label": "类型"
                 "label": "类型"
             },
             "maxspeed": {
-                "label": "é\99\90é\80\9f",
+                "label": "é\80\9f度é\99\90å\88",
                 "placeholder": "40, 50, 60..."
             },
             "name": {
                 "label": "名称",
-                "placeholder": "常用名称(如有)"
+                "placeholder": "常ç\94¨å\90\8d称ï¼\88å¦\82æ\9e\9cæ\9c\89ï¼\89"
             },
             "natural": {
                 "label": "自然"
                 "label": "类型"
             },
             "oneway": {
-                "label": "单"
+                "label": "单行线"
             },
             "oneway_yes": {
-                "label": "单"
+                "label": "单行线"
             },
             "opening_hours": {
-                "label": "时间"
+                "label": "开放时间"
             },
             "operator": {
                 "label": "经营者"
                 "label": "电话",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "困难"
+            },
+            "piste/type": {
+                "label": "类型"
+            },
             "place": {
                 "label": "类型"
             },
                     "cutting": "开凿"
                 }
             },
+            "studio_type": {
+                "label": "类型"
+            },
             "supervised": {
                 "label": "监督"
             },
             "tree_type": {
                 "label": "类型"
             },
+            "tunnel": {
+                "label": "隧道"
+            },
             "vending": {
                 "label": "商品类型"
             },
                 "terms": "地址,址"
             },
             "aeroway": {
-                "name": "机场相关道路",
+                "name": "机场路径",
                 "terms": "机场"
             },
             "aeroway/aerodrome": {
                 "name": "机场",
-                "terms": "机场"
+                "terms": "机场,飞机场,飞机"
             },
             "aeroway/apron": {
                 "name": "停机坪",
                 "terms": "停机坪"
             },
             "aeroway/gate": {
-                "name": "机场口",
+                "name": "机场登机口",
                 "terms": "机场闸口"
             },
             "aeroway/hangar": {
-                "name": "机库",
+                "name": "机库",
                 "terms": "机库"
             },
             "aeroway/helipad": {
                 "terms": "长椅,长凳"
             },
             "amenity/bicycle_parking": {
-                "name": "自行车停处",
-                "terms": "自行车停放处,单车停放车"
+                "name": "自行车停处",
+                "terms": "自行车停放处,单车停放处,单车,单车停车处,停车,停放,自行车"
             },
             "amenity/bicycle_rental": {
-                "name": "自行车租赁处",
-                "terms": "自行车租赁处,租单车"
+                "name": "自行车出租点",
+                "terms": "自行车租赁处,单车,出租,租赁,自行车"
             },
             "amenity/boat_rental": {
                 "name": "船舶租赁处",
                 "terms": "船舶租赁处"
             },
             "amenity/cafe": {
-                "name": "咖啡",
-                "terms": "咖啡,咖啡厅,茶座"
+                "name": "咖啡",
+                "terms": "咖啡厅,茶座,小餐馆,咖啡,小餐厅"
             },
             "amenity/car_rental": {
-                "name": "汽车租赁",
-                "terms": "汽车租赁处,租车店"
+                "name": "汽车租赁",
+                "terms": "汽车租赁处,租车店,汽车租赁,租赁,出租,租"
             },
             "amenity/car_sharing": {
-                "name": "公用车处",
-                "terms": "公用车处"
+                "name": "汽车共享",
+                "terms": "汽车共享"
             },
             "amenity/car_wash": {
-                "name": "洗车",
+                "name": "洗车",
                 "terms": "洗车店,洗车"
             },
             "amenity/childcare": {
                 "name": "电影院",
                 "terms": "电影院,电影,戏院"
             },
+            "amenity/clock": {
+                "name": "时钟",
+                "terms": "时钟,钟表,钟"
+            },
             "amenity/college": {
                 "name": "学院",
                 "terms": "学院,书院,专科学院"
                 "name": "法院",
                 "terms": "法院,法庭"
             },
+            "amenity/dentist": {
+                "name": "牙科",
+                "terms": "牙医,牙"
+            },
+            "amenity/doctor": {
+                "name": "医生办公室",
+                "terms": "医生"
+            },
             "amenity/drinking_water": {
                 "name": "饮水处",
                 "terms": "饮水处,饮水处,饮水"
             },
             "amenity/parking": {
                 "name": "停车场",
-                "terms": "停车"
+                "terms": "停车"
             },
             "amenity/pharmacy": {
-                "name": "药",
+                "name": "药",
                 "terms": "药房,药店"
             },
             "amenity/place_of_worship": {
                 "terms": "礼拜场所,宗教礼拜处"
             },
             "amenity/place_of_worship/buddhist": {
-                "name": "寺",
+                "name": "寺",
                 "terms": "寺庙,佛堂,和尚寺,尼姑庵"
             },
             "amenity/place_of_worship/christian": {
                 "terms": "警察局,警局,警署,派出所"
             },
             "amenity/post_box": {
-                "name": "箱",
+                "name": "箱",
                 "terms": "邮箱,邮筒"
             },
             "amenity/post_office": {
                 "terms": "学校,小学,中学"
             },
             "amenity/shelter": {
-                "name": "避难所",
-                "terms": "避难,避难所"
+                "name": "",
+                "terms": "棚,棚屋"
             },
             "amenity/swimming_pool": {
                 "name": "游泳池",
                 "name": "售卖机",
                 "terms": "售卖机"
             },
+            "amenity/veterinary": {
+                "name": "兽医",
+                "terms": "兽医"
+            },
             "amenity/waste_basket": {
-                "name": "垃圾",
+                "name": "垃圾",
                 "terms": "垃圾箱,垃圾桶"
             },
             "area": {
                 "terms": "城墙"
             },
             "barrier/cycle_barrier": {
-                "name": "单车减速栏",
-                "terms": "单车减速栏"
+                "name": "自行车路障",
+                "terms": "自行车,单车,路障"
             },
             "barrier/ditch": {
                 "name": "沟",
                 "terms": "挡土墙"
             },
             "barrier/stile": {
-                "name": "梯梃",
+                "name": "跨越围栏的台阶",
                 "terms": "梯梃"
             },
             "barrier/toll_booth": {
                 "name": "住宅建筑物",
                 "terms": "住宅建筑物"
             },
+            "craft/tailor": {
+                "name": "裁缝",
+                "terms": "裁缝"
+            },
             "embankment": {
                 "name": "堤坝",
                 "terms": "堤,堤坝,堤岸"
                 "terms": "路口"
             },
             "footway/sidewalk": {
-                "name": "行人路",
-                "terms": "行人路"
+                "name": "人行道",
+                "terms": "人行道,便道,走道"
+            },
+            "golf/hole": {
+                "name": "高尔夫球洞"
+            },
+            "golf/tee": {
+                "name": "开球区",
+                "terms": "开球区,发球台"
             },
             "highway": {
-                "name": "路",
+                "name": "路",
                 "terms": "公路"
             },
             "highway/bridleway": {
             },
             "highway/cycleway": {
                 "name": "自行车道",
-                "terms": "自行车"
+                "terms": "自行车,单车"
             },
             "highway/footway": {
-                "name": "步行径",
+                "name": "人行道",
                 "terms": "步行径"
             },
             "highway/living_street": {
-                "name": "居住街道",
+                "name": "生活街",
                 "terms": "居住街道"
             },
             "highway/mini_roundabout": {
                 "terms": "高速公路匝道"
             },
             "highway/path": {
-                "name": "路径",
+                "name": "小道",
                 "terms": "路径"
             },
             "highway/pedestrian": {
-                "name": "行人专用路",
+                "name": "步行街",
                 "terms": "行人专用路"
             },
             "highway/primary": {
                 "name": "住宅区道路",
                 "terms": "住宅区道路"
             },
+            "highway/rest_area": {
+                "name": "休息区",
+                "terms": "休息区"
+            },
             "highway/road": {
                 "name": "未知种类道路",
                 "terms": "未知种类道路"
                 "terms": "车道"
             },
             "highway/service/emergency_access": {
-                "name": "紧急通道",
-                "terms": "紧急通道"
+                "name": "紧急求救点",
+                "terms": "紧急求救,紧急,紧急电话"
             },
             "highway/service/parking_aisle": {
                 "name": "停车场通道",
                 "terms": "停车场通道"
             },
+            "highway/services": {
+                "name": "服务区",
+                "terms": "服务区"
+            },
             "highway/steps": {
                 "name": "楼梯",
-                "terms": "楼梯"
+                "terms": "楼梯,台阶"
             },
             "highway/stop": {
                 "name": "停车标志",
                 "terms": "三级道路匝道"
             },
             "highway/track": {
-                "name": "未铺设路面的车径",
+                "name": "小路",
                 "terms": "未铺设路面的车径"
             },
             "highway/traffic_signals": {
-                "name": "红绿灯",
+                "name": "交通信号灯",
                 "terms": "红绿灯"
             },
             "highway/trunk": {
-                "name": "干线道路",
+                "name": "干",
                 "terms": "干线道路"
             },
             "highway/trunk_link": {
                 "terms": "历史遗迹,史迹"
             },
             "historic/archaeological_site": {
-                "name": "考古遗址",
+                "name": "遗址",
                 "terms": "考古遗址"
             },
             "historic/boundary_stone": {
-                "name": "界",
+                "name": "界",
                 "terms": "界桩"
             },
             "historic/castle": {
                 "terms": "城堡"
             },
             "historic/memorial": {
-                "name": "纪念",
-                "terms": "纪念"
+                "name": "纪念",
+                "terms": "纪念"
             },
             "historic/monument": {
                 "name": "纪念碑",
                 "terms": "纪念碑,古迹"
             },
             "historic/ruins": {
-                "name": "废墟",
+                "name": "遗迹",
                 "terms": "废墟"
             },
             "historic/wayside_cross": {
-                "name": "路十字架",
+                "name": "路十字架",
                 "terms": "路边十字架"
             },
             "historic/wayside_shrine": {
-                "name": "路边神社",
+                "name": "路旁神龛",
                 "terms": "路边神社"
             },
             "landuse": {
             },
             "landuse/farmland": {
                 "name": "农田",
-                "terms": "农田,田地"
+                "terms": "耕地,田地,饲养场"
             },
             "landuse/farmyard": {
                 "name": "农庄",
                 "terms": "工业区"
             },
             "landuse/meadow": {
-                "name": "牧场",
+                "name": "草地",
                 "terms": "牧场"
             },
             "landuse/orchard": {
                 "terms": "公园"
             },
             "leisure/pitch": {
-                "name": "运动场",
+                "name": "体育场",
                 "terms": "运动场,运动场所"
             },
             "leisure/pitch/american_football": {
                 "terms": "排球场"
             },
             "leisure/playground": {
-                "name": "游乐场",
+                "name": "儿童游乐场",
                 "terms": "游乐场"
             },
             "leisure/slipway": {
                 "terms": "堤,堤坝,堤岸"
             },
             "man_made/flagpole": {
-                "name": "旗竿",
+                "name": "旗",
                 "terms": "旗竿"
             },
             "man_made/lighthouse": {
                 "terms": "供水厂"
             },
             "military/airfield": {
-                "name": "机场",
+                "name": "军用机场",
                 "terms": "机场,飞机场"
             },
             "military/barracks": {
                 "terms": "地堡,暗堡"
             },
             "military/range": {
-                "name": "军事范围",
-                "terms": "军事范围"
+                "name": "军事靶场",
+                "terms": "靶场,射击场,军事射击场"
             },
             "natural": {
                 "name": "自然",
                 "terms": "海滩"
             },
             "natural/cliff": {
-                "name": "悬崖",
+                "name": "峭壁",
                 "terms": "悬崖"
             },
             "natural/coastline": {
                 "terms": "研究所"
             },
             "office/telecommunication": {
-                "name": "ç\94µä¿¡å\85¬å\8f¸",
+                "name": "ç\94µä¿¡å\8a\9eå\85¬å®¤",
                 "terms": "电信公司"
             },
             "office/therapist": {
                 "terms": "点"
             },
             "power": {
-                "name": "发电厂",
+                "name": "电力",
                 "terms": "发电厂"
             },
             "power/generator": {
                 "terms": "高压电塔"
             },
             "power/transformer": {
-                "name": "变电",
+                "name": "变电",
                 "terms": "变电所"
             },
             "public_transport/platform": {
-                "name": "台",
-                "terms": "平台"
+                "name": "台",
+                "terms": "平台,月台"
             },
             "public_transport/stop_position": {
-                "name": "停止位置",
+                "name": "停车处",
                 "terms": "停止位置"
             },
             "railway": {
                 "terms": "铁路"
             },
             "railway/abandoned": {
-                "name": "åº\9få¼\83ç\9a\84铁路",
+                "name": "å·²æ\8b\86é\99¤铁路",
                 "terms": "废弃的铁路"
             },
             "railway/disused": {
-                "name": "废弃铁路",
+                "name": "废弃铁路",
                 "terms": "废弃的铁路"
             },
+            "railway/funicular": {
+                "name": "缆车",
+                "terms": "缆车"
+            },
             "railway/halt": {
                 "name": "小火车站",
                 "terms": "小火车站"
                 "name": "单轨铁路",
                 "terms": "单轨铁路"
             },
+            "railway/narrow_gauge": {
+                "name": "窄轨铁路",
+                "terms": "窄轨铁路,铁路"
+            },
             "railway/platform": {
                 "name": "站台",
                 "terms": "站台"
                 "terms": "地铁"
             },
             "railway/subway_entrance": {
-                "name": "地铁口",
+                "name": "å\9c°é\93\81å\85¥å\8f£",
                 "terms": "地铁口"
             },
             "railway/tram": {
                 "terms": "商店"
             },
             "shop/alcohol": {
-                "name": "酒",
+                "name": "酒水店",
                 "terms": "酒庄"
             },
             "shop/bakery": {
                 "terms": "面包店"
             },
             "shop/beauty": {
-                "name": "美容",
+                "name": "美容",
                 "terms": "美容院"
             },
             "shop/beverages": {
-                "name": "饮店",
+                "name": "饮店",
                 "terms": "饮品店"
             },
             "shop/bicycle": {
                 "name": "自行车店",
-                "terms": "自行车"
+                "terms": "自行车,单车"
             },
             "shop/books": {
                 "name": "书店",
                 "terms": "精品店"
             },
             "shop/butcher": {
-                "name": "肉",
+                "name": "肉",
                 "terms": "肉铺"
             },
             "shop/car": {
-                "name": "车行",
+                "name": "汽车店",
                 "terms": "车行"
             },
             "shop/car_parts": {
-                "name": "汽车é\85\8d件店",
+                "name": "汽车é\9b¶é\83¨ä»¶å\95\86店",
                 "terms": "汽车配件店"
             },
             "shop/car_repair": {
                 "terms": "汽车修理店"
             },
             "shop/chemist": {
-                "name": "药房",
+                "name": "日化用品店",
                 "terms": "药房"
             },
             "shop/clothes": {
                 "terms": "电脑店"
             },
             "shop/confectionery": {
-                "name": "ç\94\9cç\82¹店",
+                "name": "ç³\96æ\9e\9c店",
                 "terms": "甜点店"
             },
             "shop/convenience": {
                 "terms": "熟食店"
             },
             "shop/department_store": {
-                "name": "ç\99¾è´§åº\97",
+                "name": "ç\99¾è´§å\95\86å\9cº",
                 "terms": "百货店"
             },
             "shop/doityourself": {
-                "name": "DIYå\95\86åº\97",
+                "name": "DIY店",
                 "terms": "DIY商店"
             },
             "shop/dry_cleaning": {
                 "terms": "干洗店"
             },
             "shop/electronics": {
-                "name": "ç\94µå\99¨店",
+                "name": "ç\94µå­\90产å\93\81店",
                 "terms": "电器店"
             },
             "shop/farm": {
                 "terms": "家具店"
             },
             "shop/garden_centre": {
-                "name": "店",
+                "name": "园艺品店",
                 "terms": "花店"
             },
             "shop/gift": {
                 "terms": "手机店"
             },
             "shop/motorcycle": {
-                "name": "摩托车",
-                "terms": "摩托车行"
+                "name": "摩托车",
+                "terms": "摩托车行,摩托车"
             },
             "shop/music": {
                 "name": "音乐店",
                 "terms": "文具店"
             },
             "shop/supermarket": {
-                "name": "超级市场",
+                "name": "超",
                 "terms": "超级市场"
             },
             "shop/toys": {
                 "terms": "旅游名胜"
             },
             "tourism/camp_site": {
-                "name": "露营区",
+                "name": "宿营地",
                 "terms": "露营区"
             },
             "tourism/caravan_site": {
                 "terms": "木屋"
             },
             "tourism/guest_house": {
-                "name": "馆",
+                "name": "馆",
                 "terms": "宾馆"
             },
             "tourism/hostel": {
                 "terms": "酒店"
             },
             "tourism/information": {
-                "name": "资讯处",
-                "terms": "资讯处"
+                "name": "信息",
+                "terms": "问讯处,问询处,信息中心,游客中心"
             },
             "tourism/motel": {
                 "name": "汽车旅馆",
                 "terms": "博物馆"
             },
             "tourism/picnic_site": {
-                "name": "é\83\8a游å\9c°ç\82¹",
+                "name": "é\87\8eé¤\90å\9c°",
                 "terms": "郊游地点"
             },
             "tourism/theme_park": {
                 "terms": "主题公园"
             },
             "tourism/viewpoint": {
-                "name": "景点",
+                "name": "景点",
                 "terms": "景点"
             },
             "tourism/zoo": {
                 "terms": "边界"
             },
             "type/boundary/administrative": {
-                "name": "行政边界",
+                "name": "行政边界",
                 "terms": "行政边界"
             },
             "type/multipolygon": {
                 "terms": "限制"
             },
             "type/route": {
-                "name": "路线",
-                "terms": "路线"
+                "name": "线路",
+                "terms": "路线,路径"
             },
             "type/route/bicycle": {
-                "name": "单车路线",
-                "terms": "单车路线"
+                "name": "自行车线路",
+                "terms": "单车线路,自行车,单车,路线,线路"
             },
             "type/route/bus": {
-                "name": "公共汽车路线",
-                "terms": "公共汽车路线"
+                "name": "公共汽车线路",
+                "terms": "公交线路,路线,线路,公交路线,公共汽车路线"
             },
             "type/route/detour": {
-                "name": "巡游路线",
-                "terms": "巡游路线"
+                "name": "绕行线路",
+                "terms": "迂回线路,绕道线路,绕路线路,路线,线路"
             },
             "type/route/ferry": {
                 "name": "渡轮航线",
                 "terms": "渡轮航线"
             },
             "type/route/foot": {
-                "name": "行人路线",
-                "terms": "行人路线"
+                "name": "步行线路",
+                "terms": "步行路线,路线,线路"
             },
             "type/route/hiking": {
-                "name": "行山路线",
-                "terms": "è¡\8cå±±路线"
+                "name": "徒步线路",
+                "terms": "è¿\9c足线路,路线,线路,å¾\92æ­¥,è¿\9c足,è¿\9c足路线,å¾\92æ­¥路线"
             },
             "type/route/pipeline": {
-                "name": "供水路线",
-                "terms": "供水路线"
+                "name": "管道线路",
+                "terms": "管道路线,管线,路线,线路"
             },
             "type/route/power": {
-                "name": "供电路线",
-                "terms": "供电路线"
+                "name": "电力线路",
+                "terms": "供电路线,电力路线,供电线路,路线,线路"
             },
             "type/route/road": {
-                "name": "行车路线",
-                "terms": "行车路线"
+                "name": "驾驶线路",
+                "terms": "行车路线,行车线路,驾驶路线,路线,线路"
             },
             "type/route/train": {
-                "name": "铁路路线",
-                "terms": "铁路路线"
+                "name": "列车线路",
+                "terms": "列车路线,火车,铁路,路线,线路"
             },
             "type/route/tram": {
-                "name": "电车路线",
-                "terms": "电车路线"
+                "name": "电车线路",
+                "terms": "电车路线,路线,线路"
             },
             "type/route_master": {
-                "name": "线路总管",
-                "terms": "线路总管"
+                "name": "线路主线",
+                "terms": "线路干线,主线,干线,线路,路线"
             },
             "vertex": {
                 "name": "其它",
                 "terms": "水坝"
             },
             "waterway/ditch": {
-                "name": "沟",
+                "name": "沟",
                 "terms": "沟渠"
             },
             "waterway/drain": {
-                "name": "下水道",
+                "name": "",
                 "terms": "下水道"
             },
             "waterway/river": {
                 "terms": "溪流"
             },
             "waterway/weir": {
-                "name": "å ¤å\9d\9d",
+                "name": "å °",
                 "terms": "堤坝"
             }
         }
index 0998612dc858e6f942f4e2a7a37654c4c0bc756d..43423e93545d41c7b6a74207b9d6182be1729273 100644 (file)
         "untagged_area": "冇籤嘅範圍",
         "many_deletions": "你要刪走物件{n}個。你真係想咁做?咁人人用開嘅公家街圖入便,都會刪走埋。",
         "tag_suggests_area": "{tag}籤話條綫係範圍,實情佢唔係。",
+        "untagged_tooltip": "揀個地貌,形容到爾一{geometry}。",
         "deprecated_tags": "廢籤:{tags}"
     },
     "zoom": {
             "category-building": {
                 "name": "屋宇"
             },
+            "category-golf": {
+                "name": "哥夫球"
+            },
             "category-landuse": {
                 "name": "用地"
             },
             "building_area": {
                 "label": "屋宇"
             },
+            "cans": {
+                "label": "收罐"
+            },
             "capacity": {
                 "label": "容納",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "逆時針"
                 }
             },
+            "clothes": {
+                "label": "收衫"
+            },
             "collection_times": {
                 "label": "收集時間"
             },
             "country": {
                 "label": "國"
             },
+            "covered": {
+                "label": "有蓋"
+            },
             "crossing": {
                 "label": "類"
             },
             "generator/type": {
                 "label": "類"
             },
+            "glass": {
+                "label": "收玻璃"
+            },
+            "golf_hole": {
+                "label": "參攷",
+                "placeholder": "洞數(一到十八)"
+            },
+            "handicap": {
+                "label": "差點",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "類"
             },
             "incline": {
                 "label": "斜"
             },
+            "information": {
+                "label": "類"
+            },
             "internet_access": {
                 "label": "用到互聯網",
                 "options": {
             "operator": {
                 "label": "承辦商"
             },
+            "paper": {
+                "label": "收紙"
+            },
+            "par": {
+                "label": "標準桿",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "泊車轉乖"
             },
                 "name": "郊野訪客處",
                 "terms": "Ranger Station,郊野訪客處,野郊訪客處"
             },
+            "amenity/recycling": {
+                "name": "囘收桶",
+                "terms": "Recycling,囘收桶,囘收箱,回收桶,回收箱"
+            },
             "amenity/restaurant": {
                 "name": "餐廳",
                 "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
                 "name": "行人路",
                 "terms": "Sidewalk,行人路"
             },
+            "golf/bunker": {
+                "name": "沙坑",
+                "terms": "Sand Trap,沙坑"
+            },
+            "golf/fairway": {
+                "name": "球道",
+                "terms": "Fairway,球道"
+            },
+            "golf/green": {
+                "name": "菓嶺",
+                "terms": "Putting Green,果嶺,菓嶺"
+            },
+            "golf/hole": {
+                "name": "歌夫球洞",
+                "terms": "Golf Hole,歌夫球洞"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "側面水障區",
+                "terms": "Lateral Water Hazard,側面水障區"
+            },
+            "golf/rough": {
+                "name": "深草區",
+                "terms": "Rough,深草區"
+            },
+            "golf/tee": {
+                "name": "發球區",
+                "terms": "Tee Box,發球區,開球區"
+            },
+            "golf/water_hazard": {
+                "name": "水障區",
+                "terms": "Water Hazard,水障區"
+            },
             "highway": {
                 "name": "公路",
                 "terms": "Highway,公路"