Merge remote-tracking branch 'upstream/master' into vagrant

diff --git a/Gemfile b/Gemfile
index 084dd239fbf4138441292b7015661bdc665ebe9f..d98a2a1fcc8f47975b9aa6c3916f5700a6c83802 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -86,3 +86,9 @@ group :test do
   gem 'timecop'
   gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]
 end
+
+# Needed in development as well so rake can see konacha tasks
+group :development, :test do
+  gem 'konacha'
+  gem 'poltergeist'
+end

diff --git a/Gemfile.lock b/Gemfile.lock
index 130b57b5bc87eed37a07bbdbaef9892d3e2dfb93..d477fcfca672953b3b2b25613618b493fc9cc057 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,11 +29,18 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    atomic (1.1.14)
+    atomic (1.1.15)
     bigdecimal (1.1.0)
     builder (3.1.4)
+    capybara (2.2.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
+    cliver (0.3.2)
     cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.1)
@@ -43,6 +50,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
+    colorize (0.6.0)
     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
     dalli (2.7.0)
@@ -70,6 +78,12 @@ GEM
     jwt (0.1.11)
       multi_json (>= 1.5)
     kgio (2.9.2)
+    konacha (3.1.0)
+      actionpack (>= 3.1, < 5)
+      capybara
+      colorize
+      railties (>= 3.1, < 5)
+      sprockets
     libxml-ruby (2.7.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -98,12 +112,17 @@ GEM
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
-    paperclip (4.1.0)
+    paperclip (4.1.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     pg (0.17.1)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyglot (0.3.4)
     psych (2.0.4)
     r2 (0.2.2)
@@ -142,7 +161,7 @@ GEM
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
     soap4r-ruby1.9 (2.0.5)
-    sprockets (2.10.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -152,8 +171,8 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     timecop (0.7.1)
     treetop (1.4.15)
@@ -165,6 +184,9 @@ GEM
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)
     vendorer (0.1.14)
+    websocket-driver (0.3.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -186,6 +208,7 @@ DEPENDENCIES
   json
   jsonify-rails
   kgio
+  konacha
   libxml-ruby (>= 2.0.5)
   minitest (~> 4.7.0)
   oauth-plugin (>= 0.5.1)
@@ -193,6 +216,7 @@ DEPENDENCIES
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)
   paperclip (~> 4.0)
   pg
+  poltergeist
   psych
   r2
   rack-cors

diff --git a/Vendorfile b/Vendorfile
index 7d7e7a66acaf4ffb2d2cbc133243f6921ee355a3..0cca4055cba08b5533eac5ae98483322cdd77fa1 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -11,13 +11,13 @@ folder 'vendor/assets' do
   end
 
   folder 'leaflet' do
-    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.1/leaflet-src.js'
-    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.1/leaflet.css'
+    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet-src.js'
+    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css'
 
     [ 'layers.png', 'layers-2x.png',
       'marker-icon.png', 'marker-icon-2x.png',
       'marker-shadow.png' ].each do |image|
-      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.1/images/#{image}"
+      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.2/images/#{image}"
     end
 
     from 'git://github.com/kajic/leaflet-locationfilter.git' do

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5d18f1da295dc947780707dbb967269e372e8154..6ac398fc591687410467ee4cf15c7be9f3bd5c3a 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,10 +20,6 @@
 
 var querystring = require('querystring-component');
 
-function zoomPrecision(zoom) {
-    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-}
-
 function remoteEditHandler(bbox, object) {
   var loaded = false,
       query = {
@@ -101,12 +97,6 @@ function updateLinks(loc, zoom, layers, object) {
       I18n.t('javascripts.site.edit_disabled_tooltip') : '');
 }
 
-// generate a cookie-safe string of map state
-function cookieContent(map) {
-  var center = map.getCenter().wrap();
-  return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
-}
-
 function escapeHTML(string) {
   var htmlEscapes = {
     '&': '&',

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 55e612f17668f6e3da055b2fdcf003b3a03c9285..dc3c932773066ce56a518a9b1c921659cf5ee7e8 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -151,7 +151,7 @@ $(document).ready(function () {
       map._object);
 
     $.removeCookie("_osm_location");
-    $.cookie("_osm_location", cookieContent(map), { expires: expiry, path: "/" });
+    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 
   if ($.cookie('_osm_welcome') == 'hide') {
@@ -333,7 +333,7 @@ $(document).ready(function () {
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
-    var precision = zoomPrecision(map.getZoom());
+    var precision = OSM.zoomPrecision(map.getZoom());
     OSM.router.route("/search?query=" + encodeURIComponent(
       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index fd658c53236922e1125ce55cdc6af2901acd8651..6e6867e5b5a15f5139f8b7ac5cac1d3ea3fa7af4 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -36,7 +36,7 @@ OSM.Export = function(map) {
   }
 
   function setBounds(bounds) {
-    var precision = zoomPrecision(map.getZoom());
+    var precision = OSM.zoomPrecision(map.getZoom());
     $("#minlon").val(bounds.getWest().toFixed(precision));
     $("#minlat").val(bounds.getSouth().toFixed(precision));
     $("#maxlon").val(bounds.getEast().toFixed(precision));

diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index 7ae330d9bfcd50b7b1c0819fd15f6256222ef753..35370ae996108be6058ecc5b8cb8f8149d53bf49 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -91,7 +91,7 @@ L.OSM.Map = L.Map.extend({
   },
 
   getUrl: function(marker) {
-    var precision = zoomPrecision(this.getZoom()),
+    var precision = OSM.zoomPrecision(this.getZoom()),
         params = {};
 
     if (marker && this.hasLayer(marker)) {

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 922bd2639d031fe93135d7c586c0a270df1a3bfc..033b2de8122e991513ab9f431ba8a504b4b2c4aa 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -153,7 +153,7 @@ OSM = {
     center = center.wrap();
     layers = layers.replace('M', '');
 
-    var precision = zoomPrecision(zoom),
+    var precision = OSM.zoomPrecision(zoom),
       hash = '#map=' + zoom +
         '/' + center.lat.toFixed(precision) +
         '/' + center.lng.toFixed(precision);
@@ -163,5 +163,16 @@ OSM = {
     }
 
     return hash;
+  },
+
+  zoomPrecision: function(zoom) {
+    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+  },
+
+  locationCookie: function(map) {
+    var center = map.getCenter().wrap(),
+      zoom = map.getZoom(),
+      precision = OSM.zoomPrecision(zoom);
+    return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join('|');
   }
 };

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 6a0d38dd5d9dcd9ccce4ff4d34637bec30d38b3d..fb4aa030036e4b145028785a35a9b12f9f45b60f 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -36,7 +36,7 @@ $(document).ready(function () {
     map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
         var zoom = map.getZoom(),
-            precision = zoomPrecision(zoom),
+            precision = OSM.zoomPrecision(zoom),
             location = e.latlng.wrap();
 
         $('#homerow').removeClass();

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5d61e8c6306caca559fe6c95c4eef180dbf826e3..5266bf633ecfa3c72d94b07c78846d13eee330db 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -20,13 +20,13 @@ module ApplicationHelper
   def style_rules
     css = ""
 
-    css << ".hidden { display: none !important }";
-    css << ".hide_unless_logged_in { display: none !important }" unless @user;
-    css << ".hide_if_logged_in { display: none !important }" if @user;
-    css << ".hide_if_user_#{@user.id} { display: none !important }" if @user;
-    css << ".show_if_user_#{@user.id} { display: inline !important }" if @user;
-    css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?;
-    css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?;
+    css << ".hidden { display: none !important }"
+    css << ".hide_unless_logged_in { display: none !important }" unless @user
+    css << ".hide_if_logged_in { display: none !important }" if @user
+    css << ".hide_if_user_#{@user.id} { display: none !important }" if @user
+    css << ".show_if_user_#{@user.id} { display: inline !important }" if @user
+    css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?
+    css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?
 
     return content_tag(:style, css, :type => "text/css")
   end
@@ -57,10 +57,6 @@ module ApplicationHelper
     content_tag(tag, capture(&block), :class => "hide_unless_administrator")
   end
 
-  def scale_to_zoom(scale)
-    Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0)
-  end
-
   def richtext_area(object_name, method, options = {})
     id = "#{object_name.to_s}_#{method.to_s}"
     format = options.delete(:format) || "markdown"

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index cf13c27958943a6438b0fdcf99a947416667709a..b192a63d558ee4c4ba8bd7e06dc815536168a1fa 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -24,11 +24,16 @@ module BrowseHelper
   end
 
   def link_class(type, object)
+    classes = [ type ]
+
     if object.redacted?
-      type + " deleted"
+      classes << "deleted"
     else
-      type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')
+      classes += icon_tags(object).flatten.map { |t| h(t) }
+      classes << "deleted" unless object.visible?
     end
+
+    classes.join(" ")
   end
 
   def link_title(object)
@@ -114,16 +119,25 @@ private
         lang = 'en'
       end
     elsif key =~ /^wikipedia:(\S+)$/
-      # Language is in the key, so assume value is a simple title
+      # Language is in the key, so assume value is the title
       lang = $1
     else
       # Not a wikipedia key!
       return nil
     end
 
+    if value =~ /^([^#]*)(#.*)/ then
+      # Contains a reference to a section of the wikipedia article
+      # Must break it up to correctly build the url
+      value = $1
+      section = $2
+    else
+      section = ""
+    end
+
     return {
-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
-      :title => value
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}",
+      :title => value + section
     }
   end
 end

diff --git a/app/models/node.rb b/app/models/node.rb
index 12ffa20917c840c7eb172687a31265419a90cfde..09f494b7cc54df554584e740d366d4287eb1ad3c 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -21,7 +21,7 @@ class Node < ActiveRecord::Base
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation
 
   validates_presence_of :id, :on => :update
   validates_presence_of :timestamp,:version,  :changeset_id

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 4e423504939d294eda3a3a04a82276b81e34f72d..008f365c4a248d72b307c96d2725536a14c952d3 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -15,7 +15,7 @@ class Relation < ActiveRecord::Base
   has_many :relation_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation
 
   validates_presence_of :id, :on => :update
   validates_presence_of :timestamp,:version,  :changeset_id 

diff --git a/app/models/session.rb b/app/models/session.rb
deleted file mode 100644 (file)
index 619a7a7..0000000
--- a/app/models/session.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Session < ActiveRecord::Base
-  def [](key)
-    @data = Marshal.load(Base64.decode64(self.data)) unless @data
-
-    return @data[key]
-  end
-end

diff --git a/app/models/way.rb b/app/models/way.rb
index a9fdd88eeb1ca7f46714d42c3ec7cf8e61fe1344..1da048c96b00b39c3c2bd91028949bb531c9efa2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -17,7 +17,7 @@ class Way < ActiveRecord::Base
   has_many :way_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation
 
   validates_presence_of :id, :on => :update
   validates_presence_of :changeset_id,:version,  :timestamp

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 732e57d31505f20f6382c40c7fe238c6fe4e8ea1..ed548e21c78c8671918b7f5223a2a21ceb597030 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,7 +1,7 @@
-<%= form_tag search_path, :class => "search_form" do %>
+<form method="GET" action="<%= search_path %>" class="search_form">
   <%= submit_tag t('site.search.submit_text') %>
   <div class='query_wrapper'>
     <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
     <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
   </div>
-<% end %>
+</form>

diff --git a/config/initializers/konacha.rb b/config/initializers/konacha.rb
new file mode 100644 (file)
index 0000000..2924efa
--- /dev/null
+++ b/config/initializers/konacha.rb
@@ -0,0 +1,5 @@
+Konacha.configure do |config|
+  require 'capybara/poltergeist'
+  config.spec_dir = "test/javascripts"
+  config.driver   = :poltergeist
+end if defined?(Konacha)

diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index 8b6b774e723dc44956aefd80d6bc3ce14eb4015c..3e0f48acd6e7a91371dd3d1723f500c852db96fe 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -2,147 +2,350 @@
 # PROGRAM DO NOT MANUALLY EDIT IT
 
 ---
-cz:
+az:
+  tag:
+    craft=locksmith: Az:Tag:craft=locksmith
+    highway=speed_camera: Az:Tag:highway=speed camera
+bg:
   key:
-    historic: Cz:Key:historic
-    railway: Cz:Key:railway
-    tracktype: Cz:Key:tracktype
+    lanes: Bg:Key:lanes
+  tag:
+    railway=crossing: Bg:Tag:railway=crossing
+    railway=level_crossing: Bg:Tag:railway=level crossing
+ca:
   tag:
-    route=trolleybus: Cz:Tag:route=trolleybus
+    leisure=swimming_pool: Ca:Tag:leisure=swimming pool
 da:
   key:
-    access: Da:Key:access
     fee: Da:Key:fee
     lit: Da:Key:lit
     maxheight: Da:Key:maxheight
+    maxspeed: Da:Key:maxspeed
   tag:
-    highway=tertiary: Da:Tag:highway=tertiary
-    highway=track: Da:Tag:highway=track
-    route=ferry: Da:Tag:route=ferry
+    amenity=place_of_worship: Da:Tag:amenity=place of worship
 de:
   key:
+    AlpinRes_ID: DE:Key:AlpinRes ID
     abutters: DE:Key:abutters
     access: DE:Key:access
     addr: DE:Key:addr
     aerialway: DE:Key:aerialway
     aeroway: DE:Key:aeroway
     amenity: DE:Key:amenity
+    area: DE:Key:area
+    asb: DE:Key:asb
     barrier: DE:Key:barrier
     basin: DE:Key:basin
-    bridge: DE:Key:bridge
-    building: DE:Key:building
+    beds: DE:Key:beds
+    bicycle: DE:Key:bicycle
+    bicycle_parking: DE:Key:bicycle parking
+    bicycle_road: DE:Key:bicycle road
+    biosphärenwirt: DE:Key:biosphärenwirt
+    bollard: DE:Key:bollard
+    brewery: DE:Key:brewery
+    building:condition: DE:Key:building:condition
+    building:material: DE:Key:building:material
+    capacity: DE:Key:capacity
+    clothes: DE:Key:clothes
     comment: DE:Key:comment
+    construction: DE:Key:construction
+    contact: DE:Key:contact
+    content: DE:Key:content
+    country: DE:Key:country
+    covered: DE:Key:covered
+    created_by: DE:Key:created by
     crossing: DE:Key:crossing
+    cuisine: DE:Key:cuisine
+    currency: DE:Key:currency
+    cutting: DE:Key:cutting
     cycleway: DE:Key:cycleway
+    de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
+    de:regionalschluessel: DE:Key:de:regionalschluessel
     denomination: DE:Key:denomination
+    denotation: DE:Key:denotation
     description: DE:Key:description
+    designation: DE:Key:designation
     destination: DE:Key:destination
-    disused: DE:Key:disused
+    diaper: DE:Key:diaper
+    direction: DE:Key:direction
     drink: DE:Key:drink
+    drive_through: DE:Key:drive through
+    ele: DE:Key:ele
+    electrified: DE:Key:electrified
     embankment: DE:Key:embankment
     emergency: DE:Key:emergency
+    entrance: DE:Key:entrance
+    fee: DE:Key:fee
+    fetish: DE:Key:fetish
     fixme: DE:Key:fixme
+    foot: DE:Key:foot
+    footway: DE:Key:footway
+    ford: DE:Key:ford
+    generator:method: DE:Key:generator:method
+    generator:output: DE:Key:generator:output
+    generator:source: DE:Key:generator:source
     geological: DE:Key:geological
+    hazard: DE:Key:hazard
     hazmat: DE:Key:hazmat
+    height: DE:Key:height
     highway: DE:Key:highway
     historic: DE:Key:historic
+    horse: DE:Key:horse
+    ice_road: DE:Key:ice road
+    importance: DE:Key:importance
     incline: DE:Key:incline
+    informal: DE:Key:informal
+    information: DE:Key:information
+    intermittent: DE:Key:intermittent
+    internet_access: DE:Key:internet access
+    junction: DE:Key:junction
     landuse: DE:Key:landuse
     lanes: DE:Key:lanes
     layer: DE:Key:layer
     leisure: DE:Key:leisure
+    level: DE:Key:level
     lit: DE:Key:lit
+    lock: DE:Key:lock
     man_made: DE:Key:man made
+    manhole: DE:Key:manhole
     maxheight: DE:Key:maxheight
     maxspeed: DE:Key:maxspeed
+    maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
+    maxwidth: DE:Key:maxwidth
     military: DE:Key:military
+    minspeed: DE:Key:minspeed
+    motorroad: DE:Key:motorroad
     mtb:scale: DE:Key:mtb:scale
     name: DE:Key:name
     natural: DE:Key:natural
+    network: DE:Key:network
     noexit: DE:Key:noexit
     note: DE:Key:note
-    oneway: DE:Key:oneway
+    office: DE:Key:office
+    onkz: DE:Key:onkz
     opening_hours: DE:Key:opening hours
     operator: DE:Key:operator
+    osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
+    overtaking: DE:Key:overtaking
+    parking:lane: DE:Key:parking:lane
+    phone: DE:Key:phone
+    piste:difficulty: DE:Key:piste:difficulty
+    piste:type: DE:Key:piste:type
     place: DE:Key:place
+    playground: DE:Key:playground
+    population: DE:Key:population
     power: DE:Key:power
-    power_rating: DE:Key:power rating
+    priority: DE:Key:priority
+    priority_road: DE:Key:priority road
+    proposed: DE:Key:proposed
+    public_transport: DE:Key:public transport
     railway: DE:Key:railway
+    recycling_type: DE:Key:recycling type
+    ref: DE:Key:ref
+    ref:bufa: DE:Key:ref:bufa
+    ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
+    religion: DE:Key:religion
+    resource: DE:Key:resource
+    roof:material: DE:Key:roof:material
+    rooms: DE:Key:rooms
     route: DE:Key:route
+    ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
     seamark: DE:Key:seamark
+    seamark:fixme: DE:Key:seamark:fixme
+    seamark:type: DE:Key:seamark:type
+    segregated: DE:Key:segregated
     service: DE:Key:service
+    shelter_type: DE:Key:shelter type
     shop: DE:Key:shop
+    sidewalk: DE:Key:sidewalk
     smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
+    social_facility: DE:Key:social facility
+    source: DE:Key:source
+    source:maxspeed: DE:Key:source:maxspeed
+    speisebezirk: DE:Key:speisebezirk
     sport: DE:Key:sport
+    start_date: DE:Key:start date
     step_count: DE:Key:step count
     surface: DE:Key:surface
+    symbol: DE:Key:symbol
+    tactile_paving: DE:Key:tactile paving
+    toll: DE:Key:toll
     tourism: DE:Key:tourism
     tracktype: DE:Key:tracktype
+    traffic_calming: DE:Key:traffic calming
+    traffic_sign: DE:Key:traffic sign
     trail_visibility: DE:Key:trail visibility
-    tunnel: DE:Key:tunnel
+    turn: DE:Key:turn
+    type: DE:Key:type
+    usage: DE:Key:usage
+    verbindung: DE:Key:verbindung
     voltage: DE:Key:voltage
     waterway: DE:Key:waterway
     wheelchair: DE:Key:wheelchair
+    width: DE:Key:width
+    wiki:symbol: DE:Key:wiki:symbol
+    wikipedia: DE:Key:wikipedia
     wires: DE:Key:wires
     wood: DE:Key:wood
+    zone:maxspeed: DE:Key:zone:maxspeed
   tag:
+    abandoned=village: DE:Tag:abandoned=village
+    abandoned=yes: DE:Tag:abandoned=yes
+    access=designated: DE:Tag:access=designated
+    access=private: DE:Tag:access=private
+    aerialway=cable_car: DE:Tag:aerialway=cable car
+    aeroway=helipad: DE:Tag:aeroway=helipad
+    amenity=administration: DE:Tag:amenity=administration
+    amenity=animal_boarding: DE:Tag:amenity=animal boarding
+    amenity=animal_shelter: DE:Tag:amenity=animal shelter
+    amenity=arts_centre: DE:Tag:amenity=arts centre
     amenity=atm: DE:Tag:amenity=atm
     amenity=baby_hatch: DE:Tag:amenity=baby hatch
     amenity=bank: DE:Tag:amenity=bank
+    amenity=bar: DE:Tag:amenity=bar
+    amenity=bbq: DE:Tag:amenity=bbq
     amenity=bench: DE:Tag:amenity=bench
+    amenity=bicycle_parking: DE:Tag:amenity=bicycle parking
     amenity=bicycle_rental: DE:Tag:amenity=bicycle rental
     amenity=biergarten: DE:Tag:amenity=biergarten
+    amenity=brothel: DE:Tag:amenity=brothel
+    amenity=bureau_de_change: DE:Tag:amenity=bureau de change
     amenity=bus_station: DE:Tag:amenity=bus station
+    amenity=cafe: DE:Tag:amenity=cafe
+    amenity=car_rental: DE:Tag:amenity=car rental
+    amenity=car_sharing: DE:Tag:amenity=car sharing
+    amenity=car_wash: DE:Tag:amenity=car wash
+    amenity=charging_station: DE:Tag:amenity=charging station
+    amenity=cinema: DE:Tag:amenity=cinema
     amenity=clock: DE:Tag:amenity=clock
     amenity=compressed_air: DE:Tag:amenity=compressed air
+    amenity=courthouse: DE:Tag:amenity=courthouse
+    amenity=crematorium: DE:Tag:amenity=crematorium
+    amenity=customs: DE:Tag:amenity=customs
     amenity=drinking_water: DE:Tag:amenity=drinking water
+    amenity=driving_school: DE:Tag:amenity=driving school
+    amenity=embassy: DE:Tag:amenity=embassy
     amenity=emergency_phone: DE:Tag:amenity=emergency phone
+    amenity=fast_food: DE:Tag:amenity=fast food
+    amenity=ferry_terminal: DE:Tag:amenity=ferry terminal
+    amenity=fire_station: DE:Tag:amenity=fire station
+    amenity=fountain: DE:Tag:amenity=fountain
     amenity=fuel: DE:Tag:amenity=fuel
+    amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
     amenity=hospital: DE:Tag:amenity=hospital
     amenity=hunting_stand: DE:Tag:amenity=hunting stand
+    amenity=ice_cream: DE:Tag:amenity=ice cream
+    amenity=kindergarten: DE:Tag:amenity=kindergarten
+    amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure
+    amenity=library: DE:Tag:amenity=library
+    amenity=marketplace: DE:Tag:amenity=marketplace
+    amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
     amenity=parking: DE:Tag:amenity=parking
+    amenity=parking_entrance: DE:Tag:amenity=parking entrance
+    amenity=parking_space: DE:Tag:amenity=parking space
     amenity=pharmacy: DE:Tag:amenity=pharmacy
     amenity=place_of_worship: DE:Tag:amenity=place of worship
+    amenity=police: DE:Tag:amenity=police
     amenity=post_box: DE:Tag:amenity=post box
+    amenity=post_office: DE:Tag:amenity=post office
+    amenity=prison: DE:Tag:amenity=prison
     amenity=pub: DE:Tag:amenity=pub
     amenity=recycling: DE:Tag:amenity=recycling
     amenity=register_office: DE:Tag:amenity=register office
     amenity=restaurant: DE:Tag:amenity=restaurant
     amenity=school: DE:Tag:amenity=school
+    amenity=shelter: DE:Tag:amenity=shelter
+    amenity=social_facility: DE:Tag:amenity=social facility
+    amenity=studio: DE:Tag:amenity=studio
+    amenity=taxi: DE:Tag:amenity=taxi
     amenity=telephone: DE:Tag:amenity=telephone
+    amenity=theatre: DE:Tag:amenity=theatre
     amenity=toilets: DE:Tag:amenity=toilets
+    amenity=townhall: DE:Tag:amenity=townhall
+    amenity=university: DE:Tag:amenity=university
     amenity=vending_machine: DE:Tag:amenity=vending machine
+    amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=waste_basket: DE:Tag:amenity=waste basket
+    atm=yes: DE:Tag:atm=yes
+    barrier=bollard: DE:Tag:barrier=bollard
+    barrier=cattle_grid: DE:Tag:barrier=cattle grid
     barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
+    barrier=fence: DE:Tag:barrier=fence
+    barrier=gate: DE:Tag:barrier=gate
+    barrier=hedge: DE:Tag:barrier=hedge
+    barrier=hedge_bank: DE:Tag:barrier=hedge bank
+    barrier=kissing_gate: DE:Tag:barrier=kissing gate
     barrier=lift_gate: DE:Tag:barrier=lift gate
+    barrier=retaining_wall: DE:Tag:barrier=retaining wall
+    barrier=sally_port: DE:Tag:barrier=sally port
+    barrier=toll_booth: DE:Tag:barrier=toll booth
+    barrier=wall: DE:Tag:barrier=wall
+    biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
+    boundary=national_park: DE:Tag:boundary=national park
+    boundary=protected_area: DE:Tag:boundary=protected area
     boundary=water_protection_area: DE:Tag:boundary=water protection area
-    club-mate=yes: DE:Tag:club-mate=yes
+    building=barn: DE:Tag:building=barn
+    building=entrance: DE:Tag:building=entrance
+    building=garage: DE:Tag:building=garage
+    building=garages: DE:Tag:building=garages
+    building=industrial: DE:Tag:building=industrial
+    building=roof: DE:Tag:building=roof
+    building=school: DE:Tag:building=school
+    building=stable: DE:Tag:building=stable
+    craft=car_repair: DE:Tag:craft=car repair
+    craft=hvac: DE:Tag:craft=hvac
+    craft=information_electronics: DE:Tag:craft=information electronics
+    craft=optician: DE:Tag:craft=optician
+    craft=painter: DE:Tag:craft=painter
+    craft=paperhanger: DE:Tag:craft=paperhanger
+    craft=plumber: DE:Tag:craft=plumber
+    craft=scaffolder: DE:Tag:craft=scaffolder
+    craft=stonemason: DE:Tag:craft=stonemason
+    emergency=ambulance_station: DE:Tag:emergency=ambulance station
+    emergency=defibrillator: DE:Tag:emergency=defibrillator
     emergency=fire_hydrant: DE:Tag:emergency=fire hydrant
+    emergency=fire_water_pond: DE:Tag:emergency=fire water pond
+    emergency=life_ring: DE:Tag:emergency=life ring
+    emergency=phone: DE:Tag:emergency=phone
+    emergency=siren: DE:Tag:emergency=siren
+    emergency=suction_point: DE:Tag:emergency=suction point
+    footway=sidewalk: DE:Tag:footway=sidewalk
+    generator:source=solar: DE:Tag:generator:source=solar
+    generator:source=wind: DE:Tag:generator:source=wind
+    highway=bridleway: DE:Tag:highway=bridleway
     highway=bus_stop: DE:Tag:highway=bus stop
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
+    highway=elevator: DE:Tag:highway=elevator
     highway=emergency_access_point: DE:Tag:highway=emergency access point
     highway=footway: DE:Tag:highway=footway
+    highway=give_way: DE:Tag:highway=give way
     highway=living_street: DE:Tag:highway=living street
     highway=mini_roundabout: DE:Tag:highway=mini roundabout
     highway=motorway: DE:Tag:highway=motorway
+    highway=motorway_junction: DE:Tag:highway=motorway junction
     highway=motorway_link: DE:Tag:highway=motorway link
     highway=path: DE:Tag:highway=path
     highway=pedestrian: DE:Tag:highway=pedestrian
+    highway=platform: DE:Tag:highway=platform
     highway=primary: DE:Tag:highway=primary
+    highway=raceway: DE:Tag:highway=raceway
     highway=residential: DE:Tag:highway=residential
+    highway=rest_area: DE:Tag:highway=rest area
     highway=road: DE:Tag:highway=road
     highway=secondary: DE:Tag:highway=secondary
     highway=service: DE:Tag:highway=service
     highway=services: DE:Tag:highway=services
+    highway=speed_camera: DE:Tag:highway=speed camera
     highway=steps: DE:Tag:highway=steps
+    highway=street_lamp: DE:Tag:highway=street lamp
     highway=tertiary: DE:Tag:highway=tertiary
     highway=track: DE:Tag:highway=track
     highway=traffic_signals: DE:Tag:highway=traffic signals
@@ -150,164 +353,513 @@ de:
     highway=trunk_link: DE:Tag:highway=trunk link
     highway=turning_circle: DE:Tag:highway=turning circle
     highway=unclassified: DE:Tag:highway=unclassified
+    historic=aircraft: DE:Tag:historic=aircraft
     historic=archaeological_site: DE:Tag:historic=archaeological site
+    historic=boundary_stone: DE:Tag:historic=boundary stone
     historic=castle: DE:Tag:historic=castle
+    historic=city_gate: DE:Tag:historic=city gate
+    historic=citywalls: DE:Tag:historic=citywalls
+    historic=fort: DE:Tag:historic=fort
+    historic=gallows: DE:Tag:historic=gallows
     historic=manor: DE:Tag:historic=manor
+    historic=memorial: DE:Tag:historic=memorial
+    historic=milestone: DE:Tag:historic=milestone
+    historic=mine: DE:Tag:historic=mine
     historic=monastery: DE:Tag:historic=monastery
+    historic=monument: DE:Tag:historic=monument
+    historic=pillory: DE:Tag:historic=pillory
+    historic=ship: DE:Tag:historic=ship
+    historic=stone: DE:Tag:historic=stone
+    historic=wayside_cross: DE:Tag:historic=wayside cross
+    historic=wayside_shrine: DE:Tag:historic=wayside shrine
+    historic=wreck: DE:Tag:historic=wreck
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
+    landuse=basin: DE:Tag:landuse=basin
+    landuse=brownfield: DE:Tag:landuse=brownfield
     landuse=cemetery: DE:Tag:landuse=cemetery
+    landuse=commercial: DE:Tag:landuse=commercial
+    landuse=farm: DE:Tag:landuse=farm
     landuse=farmland: DE:Tag:landuse=farmland
     landuse=farmyard: DE:Tag:landuse=farmyard
     landuse=forest: DE:Tag:landuse=forest
+    landuse=garages: DE:Tag:landuse=garages
+    landuse=grass: DE:Tag:landuse=grass
+    landuse=greenfield: DE:Tag:landuse=greenfield
+    landuse=industrial: DE:Tag:landuse=industrial
+    landuse=landfill: DE:Tag:landuse=landfill
     landuse=meadow: DE:Tag:landuse=meadow
+    landuse=military: DE:Tag:landuse=military
     landuse=orchard: DE:Tag:landuse=orchard
+    landuse=plant_nursery: DE:Tag:landuse=plant nursery
     landuse=quarry: DE:Tag:landuse=quarry
+    landuse=railway: DE:Tag:landuse=railway
+    landuse=recreation_ground: DE:Tag:landuse=recreation ground
+    landuse=reservoir: DE:Tag:landuse=reservoir
     landuse=residential: DE:Tag:landuse=residential
+    landuse=retail: DE:Tag:landuse=retail
     landuse=village_green: DE:Tag:landuse=village green
+    landuse=vineyard: DE:Tag:landuse=vineyard
+    leisure=beach_resort: DE:Tag:leisure=beach resort
     leisure=dog_park: DE:Tag:leisure=dog park
     leisure=garden: DE:Tag:leisure=garden
+    leisure=golf_course: DE:Tag:leisure=golf course
+    leisure=ice_rink: DE:Tag:leisure=ice rink
+    leisure=marina: DE:Tag:leisure=marina
+    leisure=miniature_golf: DE:Tag:leisure=miniature golf
+    leisure=nature_reserve: DE:Tag:leisure=nature reserve
+    leisure=park: DE:Tag:leisure=park
+    leisure=pitch: DE:Tag:leisure=pitch
     leisure=playground: DE:Tag:leisure=playground
     leisure=slipway: DE:Tag:leisure=slipway
+    leisure=sports_centre: DE:Tag:leisure=sports centre
+    leisure=stadium: DE:Tag:leisure=stadium
+    leisure=swimming_pool: DE:Tag:leisure=swimming pool
+    leisure=track: DE:Tag:leisure=track
+    leisure=water_park: DE:Tag:leisure=water park
+    level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
+    man_made=adit: DE:Tag:man made=adit
+    man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=crane: DE:Tag:man made=crane
+    man_made=cutline: DE:Tag:man made=cutline
+    man_made=dyke: DE:Tag:man made=dyke
+    man_made=embankment: DE:Tag:man made=embankment
+    man_made=gasometer: DE:Tag:man made=gasometer
+    man_made=groyne: DE:Tag:man made=groyne
+    man_made=lighthouse: DE:Tag:man made=lighthouse
+    man_made=mast: DE:Tag:man made=mast
     man_made=mineshaft: DE:Tag:man made=mineshaft
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
+    man_made=reservoir_covered: DE:Tag:man made=reservoir covered
+    man_made=surveillance: DE:Tag:man made=surveillance
     man_made=survey_point: DE:Tag:man made=survey point
+    man_made=tower: DE:Tag:man made=tower
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
+    man_made=water_tower: DE:Tag:man made=water tower
+    man_made=water_works: DE:Tag:man made=water works
+    man_made=watermill: DE:Tag:man made=watermill
+    man_made=windmill: DE:Tag:man made=windmill
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=bunker: DE:Tag:military=bunker
+    natural=arete: DE:Tag:natural=arete
+    natural=bare_rock: DE:Tag:natural=bare rock
+    natural=bay: DE:Tag:natural=bay
+    natural=beach: DE:Tag:natural=beach
+    natural=cliff: DE:Tag:natural=cliff
+    natural=glacier: DE:Tag:natural=glacier
+    natural=grassland: DE:Tag:natural=grassland
+    natural=heath: DE:Tag:natural=heath
+    natural=ridge: DE:Tag:natural=ridge
+    natural=scree: DE:Tag:natural=scree
+    natural=scrub: DE:Tag:natural=scrub
+    natural=sinkhole: DE:Tag:natural=sinkhole
+    natural=spring: DE:Tag:natural=spring
     natural=stone: DE:Tag:natural=stone
     natural=tree: DE:Tag:natural=tree
+    natural=tree_row: DE:Tag:natural=tree row
+    natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
     natural=wood: DE:Tag:natural=wood
+    office=lawyer: DE:Tag:office=lawyer
+    office=political_party: DE:Tag:office=political party
     pipeline=marker: DE:Tag:pipeline=marker
+    place=archipelago: DE:Tag:place=archipelago
+    place=city: DE:Tag:place=city
+    place=hamlet: DE:Tag:place=hamlet
+    place=island: DE:Tag:place=island
+    place=isolated_dwelling: DE:Tag:place=isolated dwelling
+    place=locality: DE:Tag:place=locality
+    place=neighbourhood: DE:Tag:place=neighbourhood
+    place=suburb: DE:Tag:place=suburb
+    place=town: DE:Tag:place=town
+    place=village: DE:Tag:place=village
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=generator: DE:Tag:power=generator
     power=line: DE:Tag:power=line
     power=minor_line: DE:Tag:power=minor line
     power=pole: DE:Tag:power=pole
+    power=station: DE:Tag:power=station
     power=sub_station: DE:Tag:power=sub station
+    power=substation: DE:Tag:power=substation
     power=tower: DE:Tag:power=tower
+    public_transport=platform: DE:Tag:public transport=platform
+    public_transport=stop_area: DE:Tag:public transport=stop area
+    public_transport=stop_position: DE:Tag:public transport=stop position
+    railway=abandoned: DE:Tag:railway=abandoned
     railway=crossing: DE:Tag:railway=crossing
+    railway=disused: DE:Tag:railway=disused
     railway=halt: DE:Tag:railway=halt
+    railway=level_crossing: DE:Tag:railway=level crossing
     railway=monorail: DE:Tag:railway=monorail
     railway=platform: DE:Tag:railway=platform
+    railway=rail: DE:Tag:railway=rail
     railway=station: DE:Tag:railway=station
     railway=tram: DE:Tag:railway=tram
     railway=tram_stop: DE:Tag:railway=tram stop
     railway=turntable: DE:Tag:railway=turntable
     route=ferry: DE:Tag:route=ferry
+    route=ski: DE:Tag:route=ski
+    service=driveway: DE:Tag:service=driveway
     service=parking_aisle: DE:Tag:service=parking aisle
+    shelter_type=lean_to: DE:Tag:shelter type=lean to
+    shop=baby_goods: DE:Tag:shop=baby goods
+    shop=bag: DE:Tag:shop=bag
     shop=bakery: DE:Tag:shop=bakery
+    shop=beverages: DE:Tag:shop=beverages
+    shop=bicycle: DE:Tag:shop=bicycle
+    shop=books: DE:Tag:shop=books
+    shop=butcher: DE:Tag:shop=butcher
+    shop=car: DE:Tag:shop=car
+    shop=car_parts: DE:Tag:shop=car parts
+    shop=car_repair: DE:Tag:shop=car repair
+    shop=charity: DE:Tag:shop=charity
+    shop=chemist: DE:Tag:shop=chemist
+    shop=clothes: DE:Tag:shop=clothes
+    shop=computer: DE:Tag:shop=computer
+    shop=convenience: DE:Tag:shop=convenience
+    shop=copyshop: DE:Tag:shop=copyshop
+    shop=deli: DE:Tag:shop=deli
+    shop=doityourself: DE:Tag:shop=doityourself
+    shop=dry_cleaning: DE:Tag:shop=dry cleaning
+    shop=electronics: DE:Tag:shop=electronics
+    shop=fabric: DE:Tag:shop=fabric
+    shop=florist: DE:Tag:shop=florist
+    shop=funeral_directors: DE:Tag:shop=funeral directors
+    shop=garden_centre: DE:Tag:shop=garden centre
     shop=general: DE:Tag:shop=general
+    shop=hairdresser: DE:Tag:shop=hairdresser
+    shop=hardware: DE:Tag:shop=hardware
+    shop=houseware: DE:Tag:shop=houseware
+    shop=kiosk: DE:Tag:shop=kiosk
+    shop=kitchen: DE:Tag:shop=kitchen
+    shop=laundry: DE:Tag:shop=laundry
+    shop=mall: DE:Tag:shop=mall
+    shop=medical_supply: DE:Tag:shop=medical supply
+    shop=newsagent: DE:Tag:shop=newsagent
+    shop=outdoor: DE:Tag:shop=outdoor
+    shop=photo: DE:Tag:shop=photo
+    shop=shoes: DE:Tag:shop=shoes
+    shop=spare_parts: DE:Tag:shop=spare parts
+    shop=stationery: DE:Tag:shop=stationery
+    shop=supermarket: DE:Tag:shop=supermarket
+    shop=toys: DE:Tag:shop=toys
+    shop=vacant: DE:Tag:shop=vacant
+    shop=variety_store: DE:Tag:shop=variety store
+    shop=window_blind: DE:Tag:shop=window blind
+    source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
+    sport=9pin: DE:Tag:sport=9pin
+    sport=climbing: DE:Tag:sport=climbing
+    sport=free_flying: DE:Tag:sport=free flying
+    sport=golf: DE:Tag:sport=golf
+    sport=scuba_diving: DE:Tag:sport=scuba diving
+    sport=soccer: DE:Tag:sport=soccer
+    summit:cross=yes: DE:Tag:summit:cross=yes
+    tourism=alpine_hut: DE:Tag:tourism=alpine hut
+    tourism=aquarium: DE:Tag:tourism=aquarium
+    tourism=artwork: DE:Tag:tourism=artwork
     tourism=camp_site: DE:Tag:tourism=camp site
     tourism=caravan_site: DE:Tag:tourism=caravan site
+    tourism=chalet: DE:Tag:tourism=chalet
+    tourism=gallery: DE:Tag:tourism=gallery
+    tourism=guest_house: DE:Tag:tourism=guest house
+    tourism=hostel: DE:Tag:tourism=hostel
+    tourism=hotel: DE:Tag:tourism=hotel
+    tourism=information: DE:Tag:tourism=information
+    tourism=motel: DE:Tag:tourism=motel
+    tourism=museum: DE:Tag:tourism=museum
     tourism=picnic_site: DE:Tag:tourism=picnic site
+    tourism=viewpoint: DE:Tag:tourism=viewpoint
+    tourism=zoo: DE:Tag:tourism=zoo
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    waterway=canal: DE:Tag:waterway=canal
+    waterway=dam: DE:Tag:waterway=dam
+    waterway=ditch: DE:Tag:waterway=ditch
     waterway=dock: DE:Tag:waterway=dock
+    waterway=drain: DE:Tag:waterway=drain
+    waterway=fish_pass: DE:Tag:waterway=fish pass
     waterway=lock_gate: DE:Tag:waterway=lock gate
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=stream: DE:Tag:waterway=stream
+    waterway=weir: DE:Tag:waterway=weir
 en:
   key:
-    Demolished: Key:Demolished
+    3dr:type: Key:3dr:type
+    AND_nosr_r: Key:AND nosr r
+    CEMT: Key:CEMT
+    DGPS_correction: Key:DGPS correction
+    IBGE:tipo: Key:IBGE:tipo
+    NHS: Key:NHS
+    RLIS:bicycle: Key:RLIS:bicycle
+    RLIS:reviewed: Key:RLIS:reviewed
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
     TMC:NextLocationCode: Key:TMC:NextLocationCode
     TMC:PrevLocationCode: Key:TMC:PrevLocationCode
+    abandoned: Key:abandoned
     abutters: Key:abutters
     access: Key:access
+    access:lhv: Key:access:lhv
+    access:roadtrain: Key:access:roadtrain
+    access:roadtrain:trailers: Key:access:roadtrain:trailers
     addr: Key:addr
     addr:conscriptionnumber: Key:addr:conscriptionnumber
+    addr:flats: Key:addr:flats
+    addr:place: Key:addr:place
     addr:provisionalnumber: Key:addr:provisionalnumber
     addr:streetnumber: Key:addr:streetnumber
+    addr:suburb: Key:addr:suburb
+    adr_les: Key:adr les
     aerialway: Key:aerialway
     aeroway: Key:aeroway
+    airmark: Key:airmark
     amenity: Key:amenity
     architect: Key:architect
     area: Key:area
+    artwork_type: Key:artwork type
+    ascent: Key:ascent
+    asset_ref: Key:asset ref
     atv: Key:atv
+    automatic_door: Key:automatic door
+    backrest: Key:backrest
+    bar: Key:bar
     barrier: Key:barrier
+    barrier:personnel: Key:barrier:personnel
     basin: Key:basin
     beacon: Key:beacon
+    beds: Key:beds
+    bench: Key:bench
     bicycle: Key:bicycle
+    bicycle_parking: Key:bicycle parking
+    bicycle_road: Key:bicycle road
+    bin: Key:bin
+    board_type: Key:board type
     boat: Key:boat
+    bollard: Key:bollard
+    books: Key:books
     border_type: Key:border type
     boundary: Key:boundary
+    brand: Key:brand
+    brewery: Key:brewery
     bridge: Key:bridge
     building: Key:building
+    building:condition: Key:building:condition
+    building:cullis:height: Key:building:cullis:height
+    building:fireproof: Key:building:fireproof
+    building:levels: Key:building:levels
+    building:levels:underground: Key:building:levels:underground
+    building:material: Key:building:material
+    building:min_level: Key:building:min level
+    building:obm: Key:building:obm
+    building:part: Key:building:part
     bunker_type: Key:bunker type
     buoy: Key:buoy
+    busway: Key:busway
+    button_operated: Key:button operated
+    cables: Key:cables
     capacity: Key:capacity
+    carriageway_ref: Key:carriageway ref
+    castle_type: Key:castle type
+    castle_type:de: Key:castle type:de
+    centralkey: Key:centralkey
+    centre_turn_lane: Key:centre turn lane
     cep: Key:cep
+    check_date: Key:check date
+    checkpoint: Key:checkpoint
+    circuits: Key:circuits
+    circumference: Key:circumference
     clothes: Key:clothes
+    club: Key:club
+    coastline:survey_quality: Key:coastline:survey quality
     collection_times: Key:collection times
+    colour: Key:colour
     comment: Key:comment
+    common_good_land: Key:common good land
     construction: Key:construction
+    construction_end_expected: Key:construction end expected
     contact: Key:contact
+    content: Key:content
+    conveying: Key:conveying
+    country: Key:country
     covered: Key:covered
+    craft: Key:craft
     created_by: Key:created by
+    crop: Key:crop
     crossing: Key:crossing
     cuisine: Key:cuisine
+    cultivation_method: Key:cultivation method
+    currency: Key:currency
     cutting: Key:cutting
+    cyclability: Key:cyclability
+    cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
+    cycleway:buffer: Key:cycleway:buffer
+    de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
+    de:regionalschluessel: Key:de:regionalschluessel
+    deanery: Key:deanery
+    delivery: Key:delivery
     denomination: Key:denomination
+    denotation: Key:denotation
     depth: Key:depth
+    descent: Key:descent
     description: Key:description
+    description:restrictions: Key:description:restrictions
     designation: Key:designation
     destination: Key:destination
+    diaper: Key:diaper
+    diet: Key:diet
+    diocese: Key:diocese
     direction: Key:direction
+    dirtbike:scale: Key:dirtbike:scale
     disabled: Key:disabled
     dispensing: Key:dispensing
+    distance: Key:distance
     disused: Key:disused
+    door: Key:door
     drink: Key:drink
+    drinking_water: Key:drinking water
+    drive_in: Key:drive in
+    drive_through: Key:drive through
+    driving_side: Key:driving side
+    duration: Key:duration
     easy_overtaking: Key:easy overtaking
     ele: Key:ele
     electrified: Key:electrified
+    email: Key:email
     embankment: Key:embankment
     emergency: Key:emergency
     end_date: Key:end date
     enforcement: Key:enforcement
+    entrance: Key:entrance
+    escalator: Key:escalator
+    esperanto: Key:esperanto
+    european_cultural_path: Key:european cultural path
+    exit: Key:exit
+    exit_to: Key:exit to
+    expressway: Key:expressway
+    fair_trade: Key:fair trade
     fee: Key:fee
+    female: Key:female
     fence_type: Key:fence type
     fenced: Key:fenced
+    ferry: Key:ferry
+    fetish: Key:fetish
+    fishing: Key:fishing
     fixme: Key:fixme
     flood_prone: Key:flood prone
+    floor:material: Key:floor:material
     fog_signal: Key:fog signal
     foot: Key:foot
+    footway: Key:footway
     ford: Key:ford
+    fork: Key:fork
+    format: Key:format
+    frequency: Key:frequency
+    fruit: Key:fruit
+    fuel: Key:fuel
     fuel:discount: Key:fuel:discount
+    furniture: Key:furniture
+    gambling: Key:gambling
     gauge: Key:gauge
+    generator:method: Key:generator:method
+    generator:output: Key:generator:output
+    generator:output:electricity: Key:generator:output:electricity
+    generator:output:hot_air: Key:generator:output:hot air
+    generator:output:hot_water: Key:generator:output:hot water
+    generator:output:steam: Key:generator:output:steam
+    generator:plant: Key:generator:plant
+    generator:source: Key:generator:source
+    generator:type: Key:generator:type
+    genus: Key:genus
+    geocodigo: Key:geocodigo
     geological: Key:geological
+    gnis:feature_id: Key:gnis:feature id
+    golf: Key:golf
+    group_only: Key:group only
+    guidepost: Key:guidepost
+    habitat: Key:habitat
+    handrail: Key:handrail
+    harbour: Key:harbour
+    harbour:access:swell: Key:harbour:access:swell
+    harbour:access:tide: Key:harbour:access:tide
+    harbour:category: Key:harbour:category
+    harbour:main: Key:harbour:main
+    hazard_intensity: Key:hazard intensity
+    hazard_occurrence: Key:hazard occurrence
+    hazard_prone: Key:hazard prone
+    hazard_return_period: Key:hazard return period
+    hazard_type: Key:hazard type
     hazmat: Key:hazmat
     healthcare: Key:healthcare
     height: Key:height
     highway: Key:highway
+    hiking: Key:hiking
     historic: Key:historic
+    historic:civilization: Key:historic:civilization
+    history: Key:history
     horse: Key:horse
+    hov: Key:hov
+    iata: Key:iata
+    ice_road: Key:ice road
+    image: Key:image
+    importance: Key:importance
     incline: Key:incline
+    informal: Key:informal
     information: Key:information
+    inline_skates: Key:inline skates
+    inscription: Key:inscription
+    intermittent: Key:intermittent
     internet_access: Key:internet access
     is_in: Key:is in
+    jel: Key:jel
     junction: Key:junction
+    junction_number: Key:junction number
+    kerb: Key:kerb
+    kms: Key:kms
+    kms:county_name: Key:kms:county name
+    kms:county_no: Key:kms:county no
+    kms:house_no: Key:kms:house no
+    kms:last_updated: Key:kms:last updated
+    kms:municipality_name: Key:kms:municipality name
+    kms:municipality_no: Key:kms:municipality no
+    kms:street_name: Key:kms:street name
+    kms:street_no: Key:kms:street no
+    kms:zip_code: Key:kms:zip code
+    kms:zip_name: Key:kms:zip name
+    kp: Key:kp
+    label: Key:label
     landmark: Key:landmark
     landuse: Key:landuse
+    lane_hint: Key:lane hint
     lanes: Key:lanes
+    lanes:psv: Key:lanes:psv
     layer: Key:layer
     lcn_ref: Key:lcn ref
     leisure: Key:leisure
     length: Key:length
+    level: Key:level
     light: Key:light
+    lines: Key:lines
+    listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
+    local_ref: Key:local ref
+    location: Key:location
     lock: Key:lock
+    lock_name: Key:lock name
+    maintained: Key:maintained
+    maintenance: Key:maintenance
+    male: Key:male
     man_made: Key:man made
     managed: Key:managed
     manhole: Key:manhole
+    massage: Key:massage
+    material: Key:material
+    max_age: Key:max age
     maxage: Key:maxage
     maxairdraft: Key:maxairdraft
     maxaxleload: Key:maxaxleload
@@ -318,18 +870,31 @@ en:
     maxheight:physical: Key:maxheight:physical
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
+    maxspeed:type: Key:maxspeed:type
     maxstay: Key:maxstay
     maxweight: Key:maxweight
     maxwidth: Key:maxwidth
     military: Key:military
+    min_age: Key:min age
+    min_height: Key:min height
     minage: Key:minage
     minspeed: Key:minspeed
+    mofa: Key:mofa
+    monitoring:air_quality: Key:monitoring:air quality
+    monitoring:galileo: Key:monitoring:galileo
     monitoring:glonass: Key:monitoring:glonass
     monitoring:gps: Key:monitoring:gps
+    monitoring:noise: Key:monitoring:noise
+    monitoring:seismic_activity: Key:monitoring:seismic activity
+    monitoring:tide_gauge: Key:monitoring:tide gauge
+    monitoring:water_level: Key:monitoring:water level
+    monitoring:weather: Key:monitoring:weather
     mooring: Key:mooring
+    motorboat: Key:motorboat
     motorcar: Key:motorcar
     motorcycle: Key:motorcycle
     motorroad: Key:motorroad
+    motorway: Key:motorway
     mountain_pass: Key:mountain pass
     mtb:description: Key:mtb:description
     mtb:scale: Key:mtb:scale
@@ -337,104 +902,364 @@ en:
     name:cy: Key:name:cy
     narrow: Key:narrow
     natural: Key:natural
+    navibot:categorize: Key:navibot:categorize
+    navibot:connect: Key:navibot:connect
+    ncat: Key:ncat
+    ncn_milepost: Key:ncn milepost
     ncn_ref: Key:ncn ref
+    network: Key:network
     noexit: Key:noexit
     noname: Key:noname
+    not_served_by: Key:not served by
     note: Key:note
+    note:deplacer4mE: Key:note:deplacer4mE
+    notes: Key:notes
     office: Key:office
+    offshore: Key:offshore
+    ois:fixme: Key:ois:fixme
+    old_ref_legislative: Key:old ref legislative
     oneway: Key:oneway
+    opening_date: Key:opening date
     opening_hours: Key:opening hours
+    openplaques:id: Key:openplaques:id
+    openplaques_plaque: Key:openplaques plaque
+    opensource: Key:opensource
     operator: Key:operator
+    operator:type: Key:operator:type
+    organic: Key:organic
+    origin: Key:origin
+    osak:identifier: Key:osak:identifier
+    osak:municipality_no: Key:osak:municipality no
+    osak:revision: Key:osak:revision
+    osak:street_name: Key:osak:street name
+    osak:street_no: Key:osak:street no
+    osak:subdivision: Key:osak:subdivision
     osmarender:nameDirection: Key:osmarender:nameDirection
     osmarender:render: Key:osmarender:render
     osmarender:renderName: Key:osmarender:renderName
     osmarender:renderRef: Key:osmarender:renderRef
     osmc:symbol: Key:osmc:symbol
     overtaking: Key:overtaking
+    owner: Key:owner
+    ownership: Key:ownership
     parking: Key:parking
+    parking:lane: Key:parking:lane
     passing_places: Key:passing places
     paved:date: Key:paved:date
+    payment: Key:payment
+    phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
+    pilotage: Key:pilotage
+    pipeline: Key:pipeline
+    piste:difficulty: Key:piste:difficulty
+    piste:grooming: Key:piste:grooming
+    piste:type: Key:piste:type
+    pk: Key:pk
     place: Key:place
+    place:fr: Key:place:fr
+    place_name: Key:place name
+    placement: Key:placement
+    planned: Key:planned
+    plant:output: Key:plant:output
+    plant_community: Key:plant community
+    platforms: Key:platforms
+    playground: Key:playground
+    police: Key:police
     population: Key:population
+    post_office:type: Key:post office:type
     postal_code: Key:postal code
     power: Key:power
-    power_rating: Key:power rating
-    power_source: Key:power source
+    power_output: Key:power output
+    power_supply: Key:power supply
+    priority: Key:priority
+    priority_road: Key:priority road
+    produce: Key:produce
+    product: Key:product
     proposed: Key:proposed
+    protect_class: Key:protect class
+    protect_id: Key:protect id
+    protection_title: Key:protection title
+    prow_ref: Key:prow ref
     psv: Key:psv
+    public_transport: Key:public transport
+    pump: Key:pump
+    pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
+    rack: Key:rack
+    radar_conspicious: Key:radar conspicious
+    radar_reflector: Key:radar reflector
+    radar_transponder: Key:radar transponder
+    radar_transponder:signal_group: Key:radar transponder:signal group
+    radio_transponder: Key:radio transponder
+    radio_transponder:AIS: Key:radio transponder:AIS
+    radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railway: Key:railway
     ramp: Key:ramp
+    ramsar: Key:ramsar
     rcn_ref: Key:rcn ref
+    real_ale: Key:real ale
+    real_cider: Key:real cider
+    recycling_type: Key:recycling type
+    reef: Key:reef
     ref: Key:ref
+    ref:ERDF:gdo: Key:ref:ERDF:gdo
+    ref:FR:42C: Key:ref:FR:42C
+    ref:FR:CEF: Key:ref:FR:CEF
+    ref:FR:FINESS: Key:ref:FR:FINESS
+    ref:FR:SIRET: Key:ref:FR:SIRET
+    ref:INSEE: Key:ref:INSEE
+    ref:ISTAT: Key:ref:ISTAT
+    ref:UAI: Key:ref:UAI
+    ref:at:gkz: Key:ref:at:gkz
+    ref:at:okz: Key:ref:at:okz
+    ref:bam.brno.cz: Key:ref:bam.brno.cz
+    ref:bufa: Key:ref:bufa
+    ref:colour: Key:ref:colour
     ref:isil: Key:ref:isil
+    ref:mhs: Key:ref:mhs
+    ref:mobil-parken.de: Key:ref:mobil-parken.de
+    ref:ortsnetz: Key:ref:ortsnetz
+    ref:sandre: Key:ref:sandre
+    ref:taskey: Key:ref:taskey
+    ref:vatin: Key:ref:vatin
+    ref:vorwahl: Key:ref:vorwahl
+    ref:wawa: Key:ref:wawa
+    reference_point: Key:reference point
     religion: Key:religion
+    removed: Key:removed
+    repair: Key:repair
+    reservation: Key:reservation
     resource: Key:resource
+    retreat: Key:retreat
+    retroreflecting: Key:retroreflecting
+    roof:material: Key:roof:material
+    room: Key:room
+    rooms: Key:rooms
+    roundtrip: Key:roundtrip
     route: Key:route
+    route_master: Key:route master
+    route_ref: Key:route ref
+    royal_cypher: Key:royal cypher
+    rtc_rate: Key:rtc rate
+    rugby: Key:rugby
+    ruins: Key:ruins
+    rwn_ref: Key:rwn ref
     sac_scale: Key:sac scale
     sagns_id: Key:sagns id
+    scenic: Key:scenic
+    school: Key:school
     seabed_surface: Key:seabed surface
     seamark: Key:seamark
+    seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
+    seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
+    seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour
+      pattern
+    seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape
+    seamark:bridge:category: Key:seamark:bridge:category
+    seamark:bridge:clearance_height: Key:seamark:bridge:clearance height
+    seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed
+    seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open
+    seamark:bridge:clearance_width: Key:seamark:bridge:clearance width
+    seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity
+    seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity
+    seamark:cable_overhead:category: Key:seamark:cable overhead:category
+    seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical
+      clearance safe
+    seamark:cable_submarine:category: Key:seamark:cable submarine:category
+    seamark:conspicuity: Key:seamark:conspicuity
+    seamark:distance_mark:category: Key:seamark:distance mark:category
+    seamark:distance_mark:distance: Key:seamark:distance mark:distance
+    seamark:distance_mark:units: Key:seamark:distance mark:units
+    seamark:fixme: Key:seamark:fixme
+    seamark:fog_signal: Key:seamark:fog signal
+    seamark:fog_signal:category: Key:seamark:fog signal:category
+    seamark:fog_signal:group: Key:seamark:fog signal:group
+    seamark:fog_signal:period: Key:seamark:fog signal:period
+    seamark:fog_signal:range: Key:seamark:fog signal:range
+    seamark:fog_signal:sequence: Key:seamark:fog signal:sequence
+    seamark:fog_signal:status: Key:seamark:fog signal:status
+    seamark:landmark:category: Key:seamark:landmark:category
+    seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity
+    seamark:landmark:function: Key:seamark:landmark:function
+    seamark:light:exhibition: Key:seamark:light:exhibition
+    seamark:light:status: Key:seamark:light:status
+    seamark:light:visibility: Key:seamark:light:visibility
+    seamark:light_vessel:colour: Key:seamark:light vessel:colour
+    seamark:obstruction:category: Key:seamark:obstruction:category
+    seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
+    seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
+    seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name
+    seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product
+    seamark:platform:category: Key:seamark:platform:category
+    seamark:radar_reflector: Key:seamark:radar reflector
+    seamark:radar_station:category: Key:seamark:radar station:category
+    seamark:radar_station:channel: Key:seamark:radar station:channel
+    seamark:radar_transponder:category: Key:seamark:radar transponder:category
+    seamark:radar_transponder:group: Key:seamark:radar transponder:group
+    seamark:radar_transponder:period: Key:seamark:radar transponder:period
+    seamark:radar_transponder:range: Key:seamark:radar transponder:range
+    seamark:radar_transponder:sector_end: Key:seamark:radar transponder:sector end
+    seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start
+    seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence
+    seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength
+    seamark:radio_station:group: Key:seamark:radio station:group
+    seamark:reflectivity: Key:seamark:reflectivity
+    seamark:restricted_area:category: Key:seamark:restricted area:category
+    seamark:restricted_area:name: Key:seamark:restricted area:name
+    seamark:restricted_area:restriction: Key:seamark:restricted area:restriction
+    seamark:sea_area:category: Key:seamark:sea area:category
+    seamark:seabed_area:surface: Key:seamark:seabed area:surface
+    seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
+    seamark:small_craft_facility:category: Key:seamark:small craft facility:category
+    seamark:small_craft_facility:name: Key:seamark:small craft facility:name
+    seasonal: Key:seasonal
     seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
+    second_hand: Key:second hand
+    segregated: Key:segregated
     service: Key:service
+    service_times: Key:service times
+    shade: Key:shade
+    shelter: Key:shelter
+    shelter_type: Key:shelter type
     shop: Key:shop
+    side_road: Key:side road
+    sidewalk: Key:sidewalk
+    sign: Key:sign
+    signal_station: Key:signal station
+    site_type: Key:site type
     ski: Key:ski
+    ski_tour_difficulty: Key:ski tour difficulty
     smoothness: Key:smoothness
+    snowmobile: Key:snowmobile
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
+    social_facility: Key:social facility
+    sorting_name: Key:sorting name
     source: Key:source
+    source:addr: Key:source:addr
+    source:date: Key:source:date
+    source:loc: Key:source:loc
+    source:maxspeed: Key:source:maxspeed
+    species: Key:species
+    speech_output: Key:speech output
+    speisebezirk: Key:speisebezirk
     sport: Key:sport
     stars: Key:stars
     start_date: Key:start date
+    station: Key:station
+    status: Key:status
     step_count: Key:step count
     stop: Key:stop
+    storage_area: Key:storage area
+    stranded: Key:stranded
+    stream: Key:stream
     sub_sea: Key:sub sea
-    sulky: Key:sulky
     surface: Key:surface
+    surveillance: Key:surveillance
+    surveillance:type: Key:surveillance:type
+    surveillance:zone: Key:surveillance:zone
+    sustrans_ref: Key:sustrans ref
+    symbol: Key:symbol
     tactile_paving: Key:tactile paving
+    takeaway: Key:takeaway
+    taxon: Key:taxon
+    technology: Key:technology
+    tidal: Key:tidal
+    tiger: Key:tiger
     timezone: Key:timezone
+    toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
+    topmark: Key:topmark
+    touring: Key:touring
     tourism: Key:tourism
+    tourist_bus: Key:tourist bus
+    tracks: Key:tracks
     tracktype: Key:tracktype
     traffic:hourly: Key:traffic:hourly
     traffic_calming: Key:traffic calming
     traffic_sign: Key:traffic sign
+    traffic_signals: Key:traffic signals
+    traffic_signals:arrow: Key:traffic signals:arrow
+    traffic_signals:direction: Key:traffic signals:direction
+    traffic_signals:floor_vibration: Key:traffic signals:floor vibration
+    traffic_signals:minimap: Key:traffic signals:minimap
+    traffic_signals:sound: Key:traffic signals:sound
+    traffic_signals:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
+    trees: Key:trees
     trolley_wire: Key:trolley wire
     tunnel: Key:tunnel
+    turn: Key:turn
+    turning_radius: Key:turning radius
+    twitter: Key:twitter
     type: Key:type
+    uic_name: Key:uic name
+    uic_ref: Key:uic ref
+    unisex: Key:unisex
+    url: Key:url
+    url:restrictions: Key:url:restrictions
+    usage: Key:usage
+    validate:no_name: Key:validate:no name
+    validate:no_ref: Key:validate:no ref
     voltage: Key:voltage
+    waste: Key:waste
+    water: Key:water
     waterway: Key:waterway
     website: Key:website
     wheelchair: Key:wheelchair
+    wholesale: Key:wholesale
     width: Key:width
+    wiki:symbol: Key:wiki:symbol
     wikipedia: Key:wikipedia
+    winter_road: Key:winter road
     wires: Key:wires
     woeid: Key:woeid
     wood: Key:wood
+    xmas:feature: Key:xmas:feature
+    zone:maxspeed: Key:zone:maxspeed
+    zone:traffic: Key:zone:traffic
     zoo: Key:zoo
   tag:
     4wd_only=yes: Tag:4wd only=yes
-    abandoned=yes: Tag:abandoned=yes
+    FIXME=Position_estimated: Tag:FIXME=Position estimated
     access=designated: Tag:access=designated
+    access=exclusion_zone: Tag:access=exclusion zone
+    access=license: Tag:access=license
     access=official: Tag:access=official
+    access=private: Tag:access=private
+    admin_level=aboriginal_land: Tag:admin level=aboriginal land
     aerialway=cable_car: Tag:aerialway=cable car
+    aerialway=canopy: Tag:aerialway=canopy
     aerialway=chair_lift: Tag:aerialway=chair lift
     aerialway=drag_lift: Tag:aerialway=drag lift
     aerialway=gondola: Tag:aerialway=gondola
+    aerialway=goods: Tag:aerialway=goods
+    aerialway=j-bar: Tag:aerialway=j-bar
+    aerialway=magic_carpet: Tag:aerialway=magic carpet
     aerialway=mixed_lift: Tag:aerialway=mixed lift
+    aerialway=platter: Tag:aerialway=platter
     aerialway=pylon: Tag:aerialway=pylon
+    aerialway=rope_tow: Tag:aerialway=rope tow
     aerialway=station: Tag:aerialway=station
+    aerialway=t-bar: Tag:aerialway=t-bar
     aeroway=aerodrome: Tag:aeroway=aerodrome
+    aeroway=airport: Tag:aeroway=airport
     aeroway=apron: Tag:aeroway=apron
-    aeroway=control_tower: Tag:aeroway=control tower
     aeroway=gate: Tag:aeroway=gate
+    aeroway=hangar: Tag:aeroway=hangar
     aeroway=helipad: Tag:aeroway=helipad
     aeroway=navigationaid: Tag:aeroway=navigationaid
+    aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
     aeroway=taxiway: Tag:aeroway=taxiway
     aeroway=terminal: Tag:aeroway=terminal
     aeroway=windsock: Tag:aeroway=windsock
+    airmark=beacon: Tag:airmark=beacon
+    ale_supply=limited: Tag:ale supply=limited
+    allotments=plot: Tag:allotments=plot
+    amenity=Kneippbecken: Tag:amenity=Kneippbecken
+    amenity=animal_boarding: Tag:amenity=animal boarding
+    amenity=animal_breeding: Tag:amenity=animal breeding
+    amenity=animal_shelter: Tag:amenity=animal shelter
     amenity=architect_office: Tag:amenity=architect office
     amenity=arts_centre: Tag:amenity=arts centre
     amenity=atm: Tag:amenity=atm
@@ -446,7 +1271,9 @@ en:
     amenity=bench: Tag:amenity=bench
     amenity=bicycle_parking: Tag:amenity=bicycle parking
     amenity=bicycle_rental: Tag:amenity=bicycle rental
+    amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
+    amenity=bikeshed: Tag:amenity=bikeshed
     amenity=boat_storage: Tag:amenity=boat storage
     amenity=brothel: Tag:amenity=brothel
     amenity=bureau_de_change: Tag:amenity=bureau de change
@@ -454,52 +1281,93 @@ en:
     amenity=cafe: Tag:amenity=cafe
     amenity=car_rental: Tag:amenity=car rental
     amenity=car_sharing: Tag:amenity=car sharing
+    amenity=car_wash: Tag:amenity=car wash
     amenity=casino: Tag:amenity=casino
+    amenity=charging_station: Tag:amenity=charging station
     amenity=cinema: Tag:amenity=cinema
+    amenity=clinic: Tag:amenity=clinic
     amenity=clock: Tag:amenity=clock
     amenity=coast_guard: Tag:amenity=coast guard
+    amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=courthouse: Tag:amenity=courthouse
+    amenity=coworking_space: Tag:amenity=coworking space
     amenity=crematorium: Tag:amenity=crematorium
+    amenity=crucifix: Tag:amenity=crucifix
+    amenity=crypt: Tag:amenity=crypt
+    amenity=customs: Tag:amenity=customs
+    amenity=dead_pub: Tag:amenity=dead pub
     amenity=dentist: Tag:amenity=dentist
     amenity=doctors: Tag:amenity=doctors
+    amenity=dojo: Tag:amenity=dojo
     amenity=drinking_water: Tag:amenity=drinking water
+    amenity=driving_school: Tag:amenity=driving school
     amenity=embassy: Tag:amenity=embassy
+    amenity=ev_charging: Tag:amenity=ev charging
     amenity=fast_food: Tag:amenity=fast food
     amenity=ferry_terminal: Tag:amenity=ferry terminal
+    amenity=festival_grounds: Tag:amenity=festival grounds
+    amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
     amenity=food_court: Tag:amenity=food court
     amenity=fountain: Tag:amenity=fountain
     amenity=fuel: Tag:amenity=fuel
+    amenity=gambling: Tag:amenity=gambling
+    amenity=game_feeding: Tag:amenity=game feeding
     amenity=grave_yard: Tag:amenity=grave yard
     amenity=grit_bin: Tag:amenity=grit bin
+    amenity=harbourmaster: Tag:amenity=harbourmaster
     amenity=hospital: Tag:amenity=hospital
     amenity=hunting_stand: Tag:amenity=hunting stand
+    amenity=ice_cream: Tag:amenity=ice cream
+    amenity=jobcentre: Tag:amenity=jobcentre
     amenity=kindergarten: Tag:amenity=kindergarten
+    amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
     amenity=library: Tag:amenity=library
     amenity=life_ring: Tag:amenity=life ring
+    amenity=lifeboat_station: Tag:amenity=lifeboat station
+    amenity=love_hotel: Tag:amenity=love hotel
     amenity=marketplace: Tag:amenity=marketplace
     amenity=milk_dispenser: Tag:amenity=milk dispenser
+    amenity=mobile_library: Tag:amenity=mobile library
+    amenity=motorcycle_parking: Tag:amenity=motorcycle parking
+    amenity=music_venue: Tag:amenity=music venue
     amenity=nightclub: Tag:amenity=nightclub
     amenity=nursing_home: Tag:amenity=nursing home
     amenity=parking: Tag:amenity=parking
+    amenity=parking_entrance: Tag:amenity=parking entrance
+    amenity=parking_space: Tag:amenity=parking space
     amenity=pharmacy: Tag:amenity=pharmacy
+    amenity=photo_booth: Tag:amenity=photo booth
     amenity=place_of_worship: Tag:amenity=place of worship
+    amenity=planetarium: Tag:amenity=planetarium
     amenity=police: Tag:amenity=police
     amenity=post_box: Tag:amenity=post box
     amenity=post_office: Tag:amenity=post office
     amenity=prison: Tag:amenity=prison
     amenity=pub: Tag:amenity=pub
+    amenity=public_bath: Tag:amenity=public bath
     amenity=public_building: Tag:amenity=public building
+    amenity=ranger_station: Tag:amenity=ranger station
     amenity=recycling: Tag:amenity=recycling
     amenity=register_office: Tag:amenity=register office
+    amenity=rescue_box: Tag:amenity=rescue box
     amenity=restaurant: Tag:amenity=restaurant
+    amenity=retirement_home: Tag:amenity=retirement home
     amenity=sauna: Tag:amenity=sauna
     amenity=school: Tag:amenity=school
+    amenity=security_booth: Tag:amenity=security booth
+    amenity=shelter: Tag:amenity=shelter
+    amenity=shower: Tag:amenity=shower
+    amenity=social_centre: Tag:amenity=social centre
+    amenity=social_facility: Tag:amenity=social facility
+    amenity=spa: Tag:amenity=spa
     amenity=stripclub: Tag:amenity=stripclub
     amenity=studio: Tag:amenity=studio
+    amenity=swimming_pool: Tag:amenity=swimming pool
+    amenity=swingerclub: Tag:amenity=swingerclub
     amenity=taxi: Tag:amenity=taxi
     amenity=telephone: Tag:amenity=telephone
     amenity=theatre: Tag:amenity=theatre
@@ -511,68 +1379,278 @@ en:
     amenity=waste_basket: Tag:amenity=waste basket
     amenity=waste_disposal: Tag:amenity=waste disposal
     amenity=waste_transfer_station: Tag:amenity=waste transfer station
+    amenity=water_point: Tag:amenity=water point
     amenity=watering_place: Tag:amenity=watering place
-    atm=no: Tag:atm=no
+    amenity=weighbridge: Tag:amenity=weighbridge
     atm=yes: Tag:atm=yes
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
+    barrier=border_control: Tag:barrier=border control
+    barrier=bus_trap: Tag:barrier=bus trap
     barrier=cattle_grid: Tag:barrier=cattle grid
+    barrier=chain: Tag:barrier=chain
     barrier=city_wall: Tag:barrier=city wall
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=ditch: Tag:barrier=ditch
+    barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
     barrier=gate: Tag:barrier=gate
+    barrier=guard_rail: Tag:barrier=guard rail
     barrier=hedge: Tag:barrier=hedge
     barrier=horse_stile: Tag:barrier=horse stile
     barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
+    barrier=kent_carriage_gate: Tag:barrier=kent carriage gate
+    barrier=kerb: Tag:barrier=kerb
     barrier=kissing_gate: Tag:barrier=kissing gate
     barrier=lift_gate: Tag:barrier=lift gate
+    barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier
+    barrier=ohm:military:wireObstacle: Tag:barrier=ohm:military:wireObstacle
     barrier=retaining_wall: Tag:barrier=retaining wall
     barrier=sally_port: Tag:barrier=sally port
     barrier=stile: Tag:barrier=stile
+    barrier=sump_buster: Tag:barrier=sump buster
+    barrier=swing_gate: Tag:barrier=swing gate
     barrier=toll_booth: Tag:barrier=toll booth
     barrier=turnstile: Tag:barrier=turnstile
     barrier=wall: Tag:barrier=wall
+    border_type=fishery: Tag:border type=fishery
+    border_type=harbour_limits: Tag:border type=harbour limits
+    boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
     boundary=civil: Tag:boundary=civil
+    boundary=historic: Tag:boundary=historic
+    boundary=local_authority: Tag:boundary=local authority
     boundary=maritime: Tag:boundary=maritime
     boundary=national: Tag:boundary=national
     boundary=national_park: Tag:boundary=national park
     boundary=political: Tag:boundary=political
+    boundary=postal_code: Tag:boundary=postal code
     boundary=protected_area: Tag:boundary=protected area
+    boundary=regional_park: Tag:boundary=regional park
+    boundary=vice_county: Tag:boundary=vice county
+    bridge=bascule: Tag:bridge=bascule
+    bridge=beam: Tag:bridge=beam
+    bridge=drawbridge: Tag:bridge=drawbridge
+    bridge=lift: Tag:bridge=lift
+    bridge=opening: Tag:bridge=opening
+    bridge=pontoon: Tag:bridge=pontoon
+    bridge=suspension: Tag:bridge=suspension
+    bridge=transporter: Tag:bridge=transporter
+    bridge=viaduct: Tag:bridge=viaduct
+    building=apartments: Tag:building=apartments
+    building=barn: Tag:building=barn
+    building=bridge: Tag:building=bridge
+    building=bunker: Tag:building=bunker
+    building=cabin: Tag:building=cabin
+    building=cathedral: Tag:building=cathedral
+    building=chapel: Tag:building=chapel
+    building=church: Tag:building=church
+    building=civic: Tag:building=civic
+    building=commercial: Tag:building=commercial
+    building=construction: Tag:building=construction
+    building=cowshed: Tag:building=cowshed
+    building=detached: Tag:building=detached
     building=dormitory: Tag:building=dormitory
     building=entrance: Tag:building=entrance
-    building=parliament: Tag:building=parliament
+    building=farm: Tag:building=farm
+    building=farm_auxiliary: Tag:building=farm auxiliary
+    building=garage: Tag:building=garage
+    building=garages: Tag:building=garages
+    building=greenhouse: Tag:building=greenhouse
+    building=ground_station: Tag:building=ground station
+    building=hangar: Tag:building=hangar
+    building=hospital: Tag:building=hospital
+    building=hotel: Tag:building=hotel
+    building=house: Tag:building=house
+    building=houseboat: Tag:building=houseboat
+    building=hut: Tag:building=hut
+    building=industrial: Tag:building=industrial
+    building=manufacture: Tag:building=manufacture
+    building=mosque: Tag:building=mosque
+    building=office: Tag:building=office
+    building=public: Tag:building=public
+    building=residential: Tag:building=residential
+    building=retail: Tag:building=retail
+    building=roof: Tag:building=roof
+    building=school: Tag:building=school
+    building=shed: Tag:building=shed
+    building=stable: Tag:building=stable
+    building=static_caravan: Tag:building=static caravan
+    building=sty: Tag:building=sty
+    building=supermarket: Tag:building=supermarket
+    building=terrace: Tag:building=terrace
+    building=train_station: Tag:building=train station
+    building=transformer_tower: Tag:building=transformer tower
+    building=transportation: Tag:building=transportation
+    building=university: Tag:building=university
+    building=warehouse: Tag:building=warehouse
     bunker_type=munitions: Tag:bunker type=munitions
     bunker_type=pillbox: Tag:bunker type=pillbox
+    busway=lane: Tag:busway=lane
+    busway=opposite_lane: Tag:busway=opposite lane
+    cafe=time-cafe: Tag:cafe=time-cafe
     clothes=sports: Tag:clothes=sports
-    club-mate=yes: Tag:club-mate=yes
+    coastline:survey_quality=complete: Tag:coastline:survey quality=complete
+    coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
+    craft=agricultural_engines: Tag:craft=agricultural engines
+    craft=basket_maker: Tag:craft=basket maker
+    craft=beekeeper: Tag:craft=beekeeper
+    craft=blacksmith: Tag:craft=blacksmith
+    craft=boatbuilder: Tag:craft=boatbuilder
+    craft=bookbinder: Tag:craft=bookbinder
+    craft=brewery: Tag:craft=brewery
+    craft=car_repair: Tag:craft=car repair
+    craft=carpenter: Tag:craft=carpenter
+    craft=carpet_layer: Tag:craft=carpet layer
+    craft=caterer: Tag:craft=caterer
+    craft=clockmaker: Tag:craft=clockmaker
+    craft=confectionery: Tag:craft=confectionery
+    craft=dressmaker: Tag:craft=dressmaker
+    craft=electrician: Tag:craft=electrician
+    craft=falles: Tag:craft=falles
+    craft=gardener: Tag:craft=gardener
+    craft=glaziery: Tag:craft=glaziery
+    craft=handicraft: Tag:craft=handicraft
+    craft=hvac: Tag:craft=hvac
+    craft=information_electronics: Tag:craft=information electronics
+    craft=insulation: Tag:craft=insulation
+    craft=jeweller: Tag:craft=jeweller
+    craft=key_cutter: Tag:craft=key cutter
+    craft=locksmith: Tag:craft=locksmith
+    craft=metal_construction: Tag:craft=metal construction
+    craft=optician: Tag:craft=optician
+    craft=painter: Tag:craft=painter
+    craft=parquet_layer: Tag:craft=parquet layer
+    craft=photographer: Tag:craft=photographer
+    craft=photographic_laboratory: Tag:craft=photographic laboratory
+    craft=plasterer: Tag:craft=plasterer
+    craft=plumber: Tag:craft=plumber
+    craft=pottery: Tag:craft=pottery
+    craft=rigger: Tag:craft=rigger
+    craft=roofer: Tag:craft=roofer
+    craft=saddler: Tag:craft=saddler
+    craft=sailmaker: Tag:craft=sailmaker
+    craft=sawmill: Tag:craft=sawmill
+    craft=scaffolder: Tag:craft=scaffolder
+    craft=sculptor: Tag:craft=sculptor
+    craft=shoemaker: Tag:craft=shoemaker
+    craft=stand_builder: Tag:craft=stand builder
+    craft=stonemason: Tag:craft=stonemason
+    craft=sun_protection: Tag:craft=sun protection
+    craft=sweep: Tag:craft=sweep
+    craft=tailor: Tag:craft=tailor
+    craft=tiler: Tag:craft=tiler
+    craft=tinsmith: Tag:craft=tinsmith
+    craft=upholsterer: Tag:craft=upholsterer
+    craft=watchmaker: Tag:craft=watchmaker
+    craft=window_construction: Tag:craft=window construction
+    crop=asparagus: Tag:crop=asparagus
+    crop=bananas: Tag:crop=bananas
+    crop=barley: Tag:crop=barley
+    crop=coffee: Tag:crop=coffee
+    crop=corn: Tag:crop=corn
+    crop=flowers: Tag:crop=flowers
+    crop=grape: Tag:crop=grape
+    crop=grass: Tag:crop=grass
+    crop=hay: Tag:crop=hay
+    crop=maize: Tag:crop=maize
+    crop=oats: Tag:crop=oats
+    crop=rape: Tag:crop=rape
+    crop=rice: Tag:crop=rice
+    crop=rye: Tag:crop=rye
+    crop=strawberry: Tag:crop=strawberry
+    crop=sugar: Tag:crop=sugar
+    crop=tea: Tag:crop=tea
+    crop=wheat: Tag:crop=wheat
+    cuisine=brazilian: Tag:cuisine=brazilian
+    cuisine=coffee_shop: Tag:cuisine=coffee shop
+    cycleway=asl: Tag:cycleway=asl
     cycleway=bike_box: Tag:cycleway=bike box
+    cycleway=share_busway: Tag:cycleway=share busway
     denomination=mormon: Tag:denomination=mormon
+    denomination=reformed: Tag:denomination=reformed
+    denotation=landmark: Tag:denotation=landmark
     emergency=ambulance_station: Tag:emergency=ambulance station
+    emergency=coast_guard: Tag:emergency=coast guard
+    emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=fire_detection_system: Tag:emergency=fire detection system
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
     emergency=fire_hose: Tag:emergency=fire hose
     emergency=fire_hydrant: Tag:emergency=fire hydrant
+    emergency=fire_water_pond: Tag:emergency=fire water pond
+    emergency=life_ring: Tag:emergency=life ring
+    emergency=lifeboat_station: Tag:emergency=lifeboat station
+    emergency=marine_refuge: Tag:emergency=marine refuge
     emergency=phone: Tag:emergency=phone
     emergency=ses_station: Tag:emergency=ses station
     emergency=siren: Tag:emergency=siren
+    emergency=suction_point: Tag:emergency=suction point
+    emergency=water_rescue_station: Tag:emergency=water rescue station
+    emergency=water_tank: Tag:emergency=water tank
+    emergency_service=technical: Tag:emergency service=technical
+    esperanto=esperanto: Tag:esperanto=esperanto
+    estuary=yes: Tag:estuary=yes
+    fast_food=cafeteria: Tag:fast food=cafeteria
+    footway=crossing: Tag:footway=crossing
+    footway=sidewalk: Tag:footway=sidewalk
+    generator:method=fission: Tag:generator:method=fission
+    generator:method=fusion: Tag:generator:method=fusion
+    generator:plant=intermediate: Tag:generator:plant=intermediate
+    generator:plant=output: Tag:generator:plant=output
+    generator:source=hydro: Tag:generator:source=hydro
+    generator:source=nuclear: Tag:generator:source=nuclear
+    generator:source=solar: Tag:generator:source=solar
+    generator:source=wind: Tag:generator:source=wind
+    geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    harbour:category=RoRo: Tag:harbour:category=RoRo
+    harbour:category=bulk: Tag:harbour:category=bulk
+    harbour:category=container: Tag:harbour:category=container
+    harbour:category=ferry: Tag:harbour:category=ferry
+    harbour:category=fishing: Tag:harbour:category=fishing
+    harbour:category=general: Tag:harbour:category=general
+    harbour:category=industrial: Tag:harbour:category=industrial
+    harbour:category=marina: Tag:harbour:category=marina
+    harbour:category=military: Tag:harbour:category=military
+    harbour:category=oil_platform: Tag:harbour:category=oil platform
+    harbour:category=passenger: Tag:harbour:category=passenger
+    harbour:category=seaport: Tag:harbour:category=seaport
+    harbour:category=shipyard: Tag:harbour:category=shipyard
+    harbour:category=tanker: Tag:harbour:category=tanker
+    harbour:category=tourism: Tag:harbour:category=tourism
+    harbour:category=yacht: Tag:harbour:category=yacht
+    harbour=dolphin: Tag:harbour=dolphin
+    harbour=drinking_water: Tag:harbour=drinking water
+    harbour=harbour_master: Tag:harbour=harbour master
+    harbour=jetty: Tag:harbour=jetty
+    harbour=slipway: Tag:harbour=slipway
+    harbour=yes: Tag:harbour=yes
+    hazard_prone=yes: Tag:hazard prone=yes
+    hazard_type=avalanche: Tag:hazard type=avalanche
+    hazard_type=flood: Tag:hazard type=flood
+    hazard_type=landslide: Tag:hazard type=landslide
     highway=bridleway: Tag:highway=bridleway
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
     highway=byway: Tag:highway=byway
     highway=crossing: Tag:highway=crossing
     highway=cycleway: Tag:highway=cycleway
+    highway=elevator: Tag:highway=elevator
     highway=emergency_access_point: Tag:highway=emergency access point
+    highway=escape: Tag:highway=escape
     highway=footway: Tag:highway=footway
     highway=ford: Tag:highway=ford
     highway=give_way: Tag:highway=give way
+    highway=incline: Tag:highway=incline
+    highway=lane: Tag:highway=lane
     highway=living_street: Tag:highway=living street
+    highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
     highway=motorway: Tag:highway=motorway
     highway=motorway_junction: Tag:highway=motorway junction
     highway=motorway_link: Tag:highway=motorway link
+    highway=ohm:military:Trench: Tag:highway=ohm:military:Trench
     highway=passing_place: Tag:highway=passing place
     highway=path: Tag:highway=path
     highway=pedestrian: Tag:highway=pedestrian
@@ -592,35 +1670,87 @@ en:
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
     highway=track: Tag:highway=track
+    highway=traffic_mirror: Tag:highway=traffic mirror
     highway=traffic_signals: Tag:highway=traffic signals
     highway=trail: Tag:highway=trail
     highway=trunk: Tag:highway=trunk
     highway=turning_circle: Tag:highway=turning circle
+    highway=turning_loop: Tag:highway=turning loop
     highway=unclassified: Tag:highway=unclassified
+    highway=unsurfaced: Tag:highway=unsurfaced
+    highway=via_ferrata: Tag:highway=via ferrata
+    historic=aircraft: Tag:historic=aircraft
     historic=archaeological_site: Tag:historic=archaeological site
     historic=battlefield: Tag:historic=battlefield
+    historic=boundary_stone: Tag:historic=boundary stone
+    historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
+    historic=city_gate: Tag:historic=city gate
+    historic=citywalls: Tag:historic=citywalls
+    historic=farm: Tag:historic=farm
+    historic=fort: Tag:historic=fort
+    historic=gallows: Tag:historic=gallows
     historic=manor: Tag:historic=manor
     historic=memorial: Tag:historic=memorial
+    historic=milestone: Tag:historic=milestone
+    historic=mine: Tag:historic=mine
     historic=monastery: Tag:historic=monastery
     historic=monument: Tag:historic=monument
+    historic=pa: Tag:historic=pa
     historic=paleontological_site: Tag:historic=paleontological site
+    historic=pillory: Tag:historic=pillory
     historic=ruins: Tag:historic=ruins
+    historic=rune_stone: Tag:historic=rune stone
+    historic=ship: Tag:historic=ship
+    historic=stone: Tag:historic=stone
+    historic=tree_shrine: Tag:historic=tree shrine
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
     hunting=raised_hide: Tag:hunting=raised hide
+    industrial=auto_wrecker: Tag:industrial=auto wrecker
+    industrial=well_cluster: Tag:industrial=well cluster
     information=guidepost: Tag:information=guidepost
+    information=tactile_model: Tag:information=tactile model
+    junction=crossing: Tag:junction=crossing
+    junction=filter: Tag:junction=filter
     junction=roundabout: Tag:junction=roundabout
+    landform=esker: Tag:landform=esker
+    landform=raised_beach: Tag:landform=raised beach
+    landmark=beacon: Tag:landmark=beacon
+    landmark=cairn: Tag:landmark=cairn
+    landmark=cemetery: Tag:landmark=cemetery
+    landmark=chimney: Tag:landmark=chimney
+    landmark=cross: Tag:landmark=cross
+    landmark=dish_aerial: Tag:landmark=dish aerial
+    landmark=flare_stack: Tag:landmark=flare stack
+    landmark=large_rock: Tag:landmark=large rock
+    landmark=mast: Tag:landmark=mast
+    landmark=memorial_plaque: Tag:landmark=memorial plaque
+    landmark=monument: Tag:landmark=monument
+    landmark=obelisk: Tag:landmark=obelisk
+    landmark=pillar: Tag:landmark=pillar
+    landmark=radar_scanner: Tag:landmark=radar scanner
+    landmark=rock_pinnacle: Tag:landmark=rock pinnacle
+    landmark=spire: Tag:landmark=spire
+    landmark=tower: Tag:landmark=tower
+    landmark=windmill: Tag:landmark=windmill
+    landmark=windmotor: Tag:landmark=windmotor
+    landmark=windsock: Tag:landmark=windsock
+    landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
+    landuse=aquaculture: Tag:landuse=aquaculture
     landuse=basin: Tag:landuse=basin
     landuse=brownfield: Tag:landuse=brownfield
     landuse=cemetery: Tag:landuse=cemetery
+    landuse=churchyard: Tag:landuse=churchyard
     landuse=commercial: Tag:landuse=commercial
     landuse=construction: Tag:landuse=construction
+    landuse=depot: Tag:landuse=depot
     landuse=farm: Tag:landuse=farm
-    landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
+    landuse=field: Tag:landuse=field
+    landuse=fishfarm: Tag:landuse=fishfarm
     landuse=forest: Tag:landuse=forest
     landuse=garages: Tag:landuse=garages
     landuse=grass: Tag:landuse=grass
@@ -630,9 +1760,13 @@ en:
     landuse=landfill: Tag:landuse=landfill
     landuse=meadow: Tag:landuse=meadow
     landuse=military: Tag:landuse=military
+    landuse=observatory: Tag:landuse=observatory
     landuse=orchard: Tag:landuse=orchard
     landuse=peat_cutting: Tag:landuse=peat cutting
+    landuse=plant_nursery: Tag:landuse=plant nursery
+    landuse=plantation: Tag:landuse=plantation
     landuse=pond: Tag:landuse=pond
+    landuse=prison: Tag:landuse=prison
     landuse=quarry: Tag:landuse=quarry
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
@@ -641,55 +1775,99 @@ en:
     landuse=retail: Tag:landuse=retail
     landuse=salt_pond: Tag:landuse=salt pond
     landuse=street: Tag:landuse=street
+    landuse=traffic_island: Tag:landuse=traffic island
+    landuse=utility: Tag:landuse=utility
     landuse=village_green: Tag:landuse=village green
     landuse=vineyard: Tag:landuse=vineyard
+    landuse=well: Tag:landuse=well
+    landuse=wellsite: Tag:landuse=wellsite
+    lane=buffered: Tag:lane=buffered
+    leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: Tag:leisure=amusement arcade
+    leisure=bathing_place: Tag:leisure=bathing place
+    leisure=bbq: Tag:leisure=bbq
     leisure=beach_resort: Tag:leisure=beach resort
+    leisure=bird_hide: Tag:leisure=bird hide
     leisure=common: Tag:leisure=common
     leisure=dance: Tag:leisure=dance
     leisure=dog_park: Tag:leisure=dog park
+    leisure=firepit: Tag:leisure=firepit
     leisure=fishing: Tag:leisure=fishing
+    leisure=fitness_station: Tag:leisure=fitness station
     leisure=garden: Tag:leisure=garden
     leisure=golf_course: Tag:leisure=golf course
     leisure=hackerspace: Tag:leisure=hackerspace
     leisure=ice_rink: Tag:leisure=ice rink
+    leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
     leisure=miniature_golf: Tag:leisure=miniature golf
     leisure=nature_reserve: Tag:leisure=nature reserve
     leisure=paddling_pool: Tag:leisure=paddling pool
     leisure=park: Tag:leisure=park
+    leisure=picnic: Tag:leisure=picnic
+    leisure=picnic_site: Tag:leisure=picnic site
     leisure=picnic_table: Tag:leisure=picnic table
     leisure=pitch: Tag:leisure=pitch
     leisure=playground: Tag:leisure=playground
+    leisure=red_light_district: Tag:leisure=red light district
+    leisure=sailing_club: Tag:leisure=sailing club
     leisure=ski_playground: Tag:leisure=ski playground
     leisure=slipway: Tag:leisure=slipway
     leisure=sports_centre: Tag:leisure=sports centre
+    leisure=stadium: Tag:leisure=stadium
+    leisure=swimming_pool: Tag:leisure=swimming pool
     leisure=track: Tag:leisure=track
     leisure=video_arcade: Tag:leisure=video arcade
     leisure=water_park: Tag:leisure=water park
+    leisure=wildlife_hide: Tag:leisure=wildlife hide
+    level_crossing=uncontrolled: Tag:level crossing=uncontrolled
+    lines=phone: Tag:lines=phone
     man_made=adit: Tag:man made=adit
+    man_made=antenna: Tag:man made=antenna
     man_made=archimedes_screw: Tag:man made=archimedes screw
     man_made=beacon: Tag:man made=beacon
+    man_made=breakwater: Tag:man made=breakwater
+    man_made=bridge: Tag:man made=bridge
+    man_made=bunker_silo: Tag:man made=bunker silo
+    man_made=cairn: Tag:man made=cairn
     man_made=chimney: Tag:man made=chimney
+    man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
     man_made=crane: Tag:man made=crane
+    man_made=cross: Tag:man made=cross
     man_made=cutline: Tag:man made=cutline
     man_made=dyke: Tag:man made=dyke
-    man_made=fish_passage: Tag:man made=fish passage
+    man_made=embankment: Tag:man made=embankment
+    man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
+    man_made=floating_storage: Tag:man made=floating storage
+    man_made=gasometer: Tag:man made=gasometer
+    man_made=goods_conveyor: Tag:man made=goods conveyor
     man_made=ground_station: Tag:man made=ground station
     man_made=groyne: Tag:man made=groyne
     man_made=jetty: Tag:man made=jetty
+    man_made=kiln: Tag:man made=kiln
     man_made=lighthouse: Tag:man made=lighthouse
+    man_made=mast: Tag:man made=mast
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
+    man_made=offshore_platform: Tag:man made=offshore platform
+    man_made=oil_well: Tag:man made=oil well
+    man_made=petroleum_well: Tag:man made=petroleum well
     man_made=pier: Tag:man made=pier
+    man_made=pillar: Tag:man made=pillar
     man_made=pipeline: Tag:man made=pipeline
     man_made=pumping_rig: Tag:man made=pumping rig
     man_made=reservoir_covered: Tag:man made=reservoir covered
+    man_made=school_sentry: Tag:man made=school sentry
+    man_made=silo: Tag:man made=silo
+    man_made=snow_fence: Tag:man made=snow fence
     man_made=storage_tank: Tag:man made=storage tank
+    man_made=submarine_cable: Tag:man made=submarine cable
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
     man_made=tower: Tag:man made=tower
+    man_made=utility_pole: Tag:man made=utility pole
     man_made=wastewater_plant: Tag:man made=wastewater plant
     man_made=water_tower: Tag:man made=water tower
     man_made=water_well: Tag:man made=water well
@@ -697,51 +1875,107 @@ en:
     man_made=watermill: Tag:man made=watermill
     man_made=well: Tag:man made=well
     man_made=wildlife_crossing: Tag:man made=wildlife crossing
+    man_made=wildlife_opening: Tag:man made=wildlife opening
     man_made=windmill: Tag:man made=windmill
     man_made=windpump: Tag:man made=windpump
     man_made=works: Tag:man made=works
+    medical=witchdoctor: Tag:medical=witchdoctor
     microbrewery=yes: Tag:microbrewery=yes
     military=airfield: Tag:military=airfield
+    military=barracks: Tag:military=barracks
     military=bunker: Tag:military=bunker
+    military=checkpoint: Tag:military=checkpoint
+    military=danger_area: Tag:military=danger area
+    military=exclusion_zone: Tag:military=exclusion zone
     military=naval_base: Tag:military=naval base
+    military=obstacle_course: Tag:military=obstacle course
+    military=range: Tag:military=range
+    military=training_area: Tag:military=training area
+    mooring=commercial: Tag:mooring=commercial
+    mooring=cruise: Tag:mooring=cruise
+    mooring=declaration: Tag:mooring=declaration
+    mooring=ferry: Tag:mooring=ferry
+    mooring=guest: Tag:mooring=guest
+    mooring=monobuoy: Tag:mooring=monobuoy
+    mooring=ring: Tag:mooring=ring
+    mooring=sbm: Tag:mooring=sbm
+    mooring=spm: Tag:mooring=spm
+    mooring=visitor: Tag:mooring=visitor
+    mooring=yes: Tag:mooring=yes
+    natural=arete: Tag:natural=arete
+    natural=avalanche_dam: Tag:natural=avalanche dam
+    natural=bare_rock: Tag:natural=bare rock
     natural=bay: Tag:natural=bay
     natural=beach: Tag:natural=beach
+    natural=bedrock: Tag:natural=bedrock
+    natural=breaker: Tag:natural=breaker
+    natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
     natural=cliff: Tag:natural=cliff
     natural=coastline: Tag:natural=coastline
+    natural=continental_shelf: Tag:natural=continental shelf
+    natural=desert: Tag:natural=desert
     natural=dune: Tag:natural=dune
+    natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
     natural=glacier: Tag:natural=glacier
+    natural=grassland: Tag:natural=grassland
     natural=heath: Tag:natural=heath
     natural=lake: Tag:natural=lake
     natural=land: Tag:natural=land
+    natural=landform: Tag:natural=landform
+    natural=lava: Tag:natural=lava
+    natural=moor: Tag:natural=moor
+    natural=moraine: Tag:natural=moraine
+    natural=mud: Tag:natural=mud
     natural=peak: Tag:natural=peak
+    natural=reef: Tag:natural=reef
+    natural=ridge: Tag:natural=ridge
     natural=rock: Tag:natural=rock
+    natural=saddle: Tag:natural=saddle
+    natural=sand: Tag:natural=sand
     natural=scree: Tag:natural=scree
     natural=scrub: Tag:natural=scrub
+    natural=shoal: Tag:natural=shoal
+    natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
+    natural=tidal: Tag:natural=tidal
     natural=tree: Tag:natural=tree
+    natural=tree_row: Tag:natural=tree row
+    natural=tundra: Tag:natural=tundra
     natural=volcano: Tag:natural=volcano
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
+    odbl=clean: Tag:odbl=clean
     office=accountant: Tag:office=accountant
+    office=administrative: Tag:office=administrative
     office=architect: Tag:office=architect
+    office=camping: Tag:office=camping
     office=company: Tag:office=company
+    office=educational_institution: Tag:office=educational institution
     office=employment_agency: Tag:office=employment agency
     office=estate_agent: Tag:office=estate agent
+    office=foundation: Tag:office=foundation
     office=government: Tag:office=government
     office=insurance: Tag:office=insurance
+    office=it: Tag:office=it
     office=lawyer: Tag:office=lawyer
     office=newspaper: Tag:office=newspaper
     office=ngo: Tag:office=ngo
+    office=political_party: Tag:office=political party
     office=quango: Tag:office=quango
     office=research: Tag:office=research
+    office=surveyor: Tag:office=surveyor
     office=telecommunication: Tag:office=telecommunication
     office=travel_agent: Tag:office=travel agent
+    pilotage=boarding_point: Tag:pilotage=boarding point
+    pilotage=office: Tag:pilotage=office
     pipeline=marker: Tag:pipeline=marker
     pipeline=valve: Tag:pipeline=valve
+    place=allotments: Tag:place=allotments
+    place=archipelago: Tag:place=archipelago
     place=city: Tag:place=city
     place=continent: Tag:place=continent
     place=country: Tag:place=country
@@ -752,78 +1986,409 @@ en:
     place=islet: Tag:place=islet
     place=isolated_dwelling: Tag:place=isolated dwelling
     place=locality: Tag:place=locality
+    place=neighbourhood: Tag:place=neighbourhood
+    place=ocean: Tag:place=ocean
     place=region: Tag:place=region
+    place=sea: Tag:place=sea
     place=state: Tag:place=state
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
+    placement=right_of:1: Tag:placement=right of:1
+    placement=transition: Tag:placement=transition
+    power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
     power=generator: Tag:power=generator
+    power=heliostat: Tag:power=heliostat
     power=line: Tag:power=line
     power=minor_line: Tag:power=minor line
+    power=plant: Tag:power=plant
     power=pole: Tag:power=pole
     power=station: Tag:power=station
     power=sub_station: Tag:power=sub station
+    power=substation: Tag:power=substation
     power=tower: Tag:power=tower
+    power=transformer: Tag:power=transformer
+    power=underground_cable: Tag:power=underground cable
     public_transport=pay_scale_area: Tag:public transport=pay scale area
+    public_transport=platform: Tag:public transport=platform
+    public_transport=station: Tag:public transport=station
+    public_transport=stop_area: Tag:public transport=stop area
+    public_transport=stop_position: Tag:public transport=stop position
+    pump=manual: Tag:pump=manual
+    pump=no: Tag:pump=no
+    pump=powered: Tag:pump=powered
+    radar_transponder=ramark: Tag:radar transponder=ramark
+    radio_transponder:category=aeronautical: Tag:radio transponder:category=aeronautical
+    radio_transponder:category=circular: Tag:radio transponder:category=circular
+    radio_transponder:category=coast_radio: Tag:radio transponder:category=coast radio
+    radio_transponder:category=consol: Tag:radio transponder:category=consol
+    radio_transponder:category=direction_finding: Tag:radio transponder:category=direction
+      finding
+    radio_transponder:category=directional: Tag:radio transponder:category=directional
+    radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
+      pattern
     railway=PRT: Tag:railway=PRT
+    railway=abandoned: Tag:railway=abandoned
+    railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
+    railway=derail: Tag:railway=derail
+    railway=disused: Tag:railway=disused
+    railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
     railway=level_crossing: Tag:railway=level crossing
+    railway=light_rail: Tag:railway=light rail
+    railway=milestone: Tag:railway=milestone
     railway=miniature: Tag:railway=miniature
     railway=monorail: Tag:railway=monorail
+    railway=narrow_gauge: Tag:railway=narrow gauge
     railway=platform: Tag:railway=platform
+    railway=preserved: Tag:railway=preserved
     railway=rail: Tag:railway=rail
+    railway=roundhouse: Tag:railway=roundhouse
     railway=station: Tag:railway=station
     railway=stop: Tag:railway=stop
     railway=subway: Tag:railway=subway
     railway=subway_entrance: Tag:railway=subway entrance
+    railway=switch: Tag:railway=switch
     railway=tram: Tag:railway=tram
     railway=tram_stop: Tag:railway=tram stop
     railway=turntable: Tag:railway=turntable
     religion=pagan: Tag:religion=pagan
+    resource=aggregate: Tag:resource=aggregate
+    resource=gravel: Tag:resource=gravel
+    resource=sand: Tag:resource=sand
     route=bus: Tag:route=bus
     route=canal: Tag:route=canal
     route=detour: Tag:route=detour
     route=ferry: Tag:route=ferry
+    route=fitness_trail: Tag:route=fitness trail
+    route=monorail: Tag:route=monorail
+    route=pipeline: Tag:route=pipeline
     route=railway: Tag:route=railway
     route=road: Tag:route=road
     route=share_taxi: Tag:route=share taxi
     route=ski: Tag:route=ski
+    route=subway: Tag:route=subway
     route=train: Tag:route=train
     route=tram: Tag:route=tram
     route=trolleybus: Tag:route=trolleybus
+    sea_mark=day_beacon: Tag:sea mark=day beacon
+    seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
+      pattern=horizontal
+    seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower
+    seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated
+      danger:colour=black;red;black
+    seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated
+      danger:colour pattern=horizontal
+    seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower
+    seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green
+    seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green
+    seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
+    seamark:beacon_lateral:colour=red: Tag:seamark:beacon lateral:colour=red
+    seamark:beacon_lateral:colour=red;green;red: Tag:seamark:beacon lateral:colour=red;green;red
+    seamark:beacon_lateral:colour=red;white;red;white: Tag:seamark:beacon lateral:colour=red;white;red;white
+    seamark:beacon_lateral:colour_pattern=horizontal: Tag:seamark:beacon lateral:colour
+      pattern=horizontal
+    seamark:beacon_lateral:shape=perch: Tag:seamark:beacon lateral:shape=perch
+    seamark:beacon_lateral:shape=pole: Tag:seamark:beacon lateral:shape=pole
+    seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower
+    seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy
+    seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white
+    seamark:beacon_safe_water:colour_pattern=vertical: Tag:seamark:beacon safe water:colour
+      pattern=vertical
+    seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower
+    seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable
+    seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice
+    seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing
+    seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning
+    seamark:beacon_special_purpose:colour=black: Tag:seamark:beacon special purpose:colour=black
+    seamark:beacon_special_purpose:colour=blue: Tag:seamark:beacon special purpose:colour=blue
+    seamark:beacon_special_purpose:colour=green: Tag:seamark:beacon special purpose:colour=green
+    seamark:beacon_special_purpose:colour=grey: Tag:seamark:beacon special purpose:colour=grey
+    seamark:beacon_special_purpose:colour=orange: Tag:seamark:beacon special purpose:colour=orange
+    seamark:beacon_special_purpose:colour=red: Tag:seamark:beacon special purpose:colour=red
+    seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white
+    seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow
+    seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn
+    seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole
+    seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower
+    seamark:buoy_cardinal:colour_pattern=horizontal: Tag:seamark:buoy cardinal:colour
+      pattern=horizontal
+    seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can
+    seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical
+    seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar
+    seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar
+    seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical
+    seamark:buoy_isolated_danger:colour=black;red;black: Tag:seamark:buoy isolated
+      danger:colour=black;red;black
+    seamark:buoy_isolated_danger:colour_pattern=horizontal: Tag:seamark:buoy isolated
+      danger:colour pattern=horizontal
+    seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can
+    seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical
+    seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar
+    seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar
+    seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical
+    seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green
+    seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green
+    seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
+    seamark:buoy_lateral:colour=red: Tag:seamark:buoy lateral:colour=red
+    seamark:buoy_lateral:colour=red;green;red: Tag:seamark:buoy lateral:colour=red;green;red
+    seamark:buoy_lateral:colour=red;white;red;white: Tag:seamark:buoy lateral:colour=red;white;red;white
+    seamark:buoy_lateral:colour_pattern=horizontal: Tag:seamark:buoy lateral:colour
+      pattern=horizontal
+    seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can
+    seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical
+    seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar
+    seamark:buoy_lateral:shape=spar: Tag:seamark:buoy lateral:shape=spar
+    seamark:buoy_lateral:shape=spherical: Tag:seamark:buoy lateral:shape=spherical
+    seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white
+    seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour
+      pattern=vertical
+    seamark:buoy_safe_water:shape=can: Tag:seamark:buoy safe water:shape=can
+    seamark:buoy_safe_water:shape=conical: Tag:seamark:buoy safe water:shape=conical
+    seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar
+    seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar
+    seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical
+    seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas
+    seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing
+    seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black
+    seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue
+    seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green
+    seamark:buoy_special_purpose:colour=orange: Tag:seamark:buoy special purpose:colour=orange
+    seamark:buoy_special_purpose:colour=red: Tag:seamark:buoy special purpose:colour=red
+    seamark:buoy_special_purpose:colour=white: Tag:seamark:buoy special purpose:colour=white
+    seamark:buoy_special_purpose:colour=yellow: Tag:seamark:buoy special purpose:colour=yellow
+    seamark:buoy_special_purpose:colour_pattern=diagonal: Tag:seamark:buoy special
+      purpose:colour pattern=diagonal
+    seamark:buoy_special_purpose:colour_pattern=horizontal: Tag:seamark:buoy special
+      purpose:colour pattern=horizontal
+    seamark:buoy_special_purpose:colour_pattern=vertical: Tag:seamark:buoy special
+      purpose:colour pattern=vertical
+    seamark:buoy_special_purpose:shape=barrel: Tag:seamark:buoy special purpose:shape=barrel
+    seamark:buoy_special_purpose:shape=can: Tag:seamark:buoy special purpose:shape=can
+    seamark:buoy_special_purpose:shape=conical: Tag:seamark:buoy special purpose:shape=conical
+    seamark:buoy_special_purpose:shape=pillar: Tag:seamark:buoy special purpose:shape=pillar
+    seamark:buoy_special_purpose:shape=spar: Tag:seamark:buoy special purpose:shape=spar
+    seamark:buoy_special_purpose:shape=spherical: Tag:seamark:buoy special purpose:shape=spherical
+    seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
+    seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
+    seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
+    seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous
+    seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
+    seamark:distance_mark:category=not_installed: Tag:seamark:distance mark:category=not
+      installed
+    seamark:fog_signal:category=bell: Tag:seamark:fog signal:category=bell
+    seamark:fog_signal:category=diaphone: Tag:seamark:fog signal:category=diaphone
+    seamark:fog_signal:category=explosive: Tag:seamark:fog signal:category=explosive
+    seamark:fog_signal:category=gong: Tag:seamark:fog signal:category=gong
+    seamark:fog_signal:category=gun: Tag:seamark:fog signal:category=gun
+    seamark:fog_signal:category=horn: Tag:seamark:fog signal:category=horn
+    seamark:fog_signal:category=nautophone: Tag:seamark:fog signal:category=nautophone
+    seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren
+    seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
+    seamark:fog_signal:status=wave_activated: Tag:seamark:fog signal:status=wave activated
+    seamark:fog_signal=yes: Tag:seamark:fog signal=yes
+    seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn
+    seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
+    seamark:landmark:category=chimney: Tag:seamark:landmark:category=chimney
+    seamark:landmark:category=column: Tag:seamark:landmark:category=column
+    seamark:landmark:category=cross: Tag:seamark:landmark:category=cross
+    seamark:landmark:category=dish_aerial: Tag:seamark:landmark:category=dish aerial
+    seamark:landmark:category=dome: Tag:seamark:landmark:category=dome
+    seamark:landmark:category=flagstaff: Tag:seamark:landmark:category=flagstaff
+    seamark:landmark:category=flare_stack: Tag:seamark:landmark:category=flare stack
+    seamark:landmark:category=mast: Tag:seamark:landmark:category=mast
+    seamark:landmark:category=memorial: Tag:seamark:landmark:category=memorial
+    seamark:landmark:category=minaret: Tag:seamark:landmark:category=minaret
+    seamark:landmark:category=monument: Tag:seamark:landmark:category=monument
+    seamark:landmark:category=obelisk: Tag:seamark:landmark:category=obelisk
+    seamark:landmark:category=radar_scanner: Tag:seamark:landmark:category=radar scanner
+    seamark:landmark:category=spire: Tag:seamark:landmark:category=spire
+    seamark:landmark:category=statue: Tag:seamark:landmark:category=statue
+    seamark:landmark:category=tower: Tag:seamark:landmark:category=tower
+    seamark:landmark:category=water_tower: Tag:seamark:landmark:category=water tower
+    seamark:landmark:category=windmill: Tag:seamark:landmark:category=windmill
+    seamark:landmark:category=windmotor: Tag:seamark:landmark:category=windmotor
+    seamark:landmark:category=windsock: Tag:seamark:landmark:category=windsock
+    seamark:landmark:conspicuity=conspicuous: Tag:seamark:landmark:conspicuity=conspicuous
+    seamark:landmark:function=buddhist_temple: Tag:seamark:landmark:function=buddhist
+      temple
+    seamark:landmark:function=chapel: Tag:seamark:landmark:function=chapel
+    seamark:landmark:function=church: Tag:seamark:landmark:function=church
+    seamark:landmark:function=marabout: Tag:seamark:landmark:function=marabout
+    seamark:landmark:function=mosque: Tag:seamark:landmark:function=mosque
+    seamark:landmark:function=pagoda: Tag:seamark:landmark:function=pagoda
+    seamark:landmark:function=shinto_shrine: Tag:seamark:landmark:function=shinto
+      shrine
+    seamark:landmark:function=temple: Tag:seamark:landmark:function=temple
+    seamark:light:category=aero: Tag:seamark:light:category=aero
+    seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction
+    seamark:light:category=directional: Tag:seamark:light:category=directional
+    seamark:light:category=floodlight: Tag:seamark:light:category=floodlight
+    seamark:light:category=fog_detector: Tag:seamark:light:category=fog detector
+    seamark:light:category=front: Tag:seamark:light:category=front
+    seamark:light:category=lower: Tag:seamark:light:category=lower
+    seamark:light:category=moire: Tag:seamark:light:category=moire
+    seamark:light:category=rear: Tag:seamark:light:category=rear
+    seamark:light:category=striplight: Tag:seamark:light:category=striplight
+    seamark:light:category=subsidiary: Tag:seamark:light:category=subsidiary
+    seamark:light:category=upper: Tag:seamark:light:category=upper
+    seamark:light:exhibition=day: Tag:seamark:light:exhibition=day
+    seamark:light:exhibition=fog: Tag:seamark:light:exhibition=fog
+    seamark:light:exhibition=on_demand: Tag:seamark:light:exhibition=on demand
+    seamark:light:status=extinguished: Tag:seamark:light:status=extinguished
+    seamark:light:status=private: Tag:seamark:light:status=private
+    seamark:light:status=temporary: Tag:seamark:light:status=temporary
+    seamark:light:status=unreliable: Tag:seamark:light:status=unreliable
+    seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified
+    seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured
+    seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified
+    seamark:mooring:category=wall: Tag:seamark:mooring:category=wall
+    seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom
+    seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon
+    seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark
+    seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka
+    seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial
+      broadcast
+    seamark:radio_station:category=public_communication: Tag:seamark:radio station:category=public
+      communication
+    seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time
+      signal
+    seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological
+      reserve
+    seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul
+      ground
+    seamark:restricted_area:category=military: Tag:seamark:restricted area:category=military
+    seamark:restricted_area:category=nature_reserve: Tag:seamark:restricted area:category=nature
+      reserve
+    seamark:restricted_area:category=no_wake: Tag:seamark:restricted area:category=no
+      wake
+    seamark:restricted_area:category=noise_limit: Tag:seamark:restricted area:category=noise
+      limit
+    seamark:restricted_area:restriction=berthing_prohibited: Tag:seamark:restricted
+      area:restriction=berthing prohibited
+    seamark:restricted_area:restriction=berthing_restricted: Tag:seamark:restricted
+      area:restriction=berthing restricted
+    seamark:restricted_area:restriction=entry_prohibited: Tag:seamark:restricted area:restriction=entry
+      prohibited
+    seamark:restricted_area:restriction=no_anchoring: Tag:seamark:restricted area:restriction=no
+      anchoring
+    seamark:restricted_area:restriction=no_boating: Tag:seamark:restricted area:restriction=no
+      boating
+    seamark:restricted_area:restriction=no_diving: Tag:seamark:restricted area:restriction=no
+      diving
+    seamark:restricted_area:restriction=no_entry: Tag:seamark:restricted area:restriction=no
+      entry
+    seamark:restricted_area:restriction=no_fishing: Tag:seamark:restricted area:restriction=no
+      fishing
+    seamark:restricted_area:restriction=no_wake: Tag:seamark:restricted area:restriction=no
+      wake
+    seamark:restricted_area:restriction=overtaking_prohibited: Tag:seamark:restricted
+      area:restriction=overtaking prohibited
+    seamark:restricted_area:restriction=passing_or_overtaking_prohibited: Tag:seamark:restricted
+      area:restriction=passing or overtaking prohibited
+    seamark:restricted_area:restriction=restricted_fairway_depth: Tag:seamark:restricted
+      area:restriction=restricted fairway depth
+    seamark:restricted_area:restriction=restricted_speed: Tag:seamark:restricted area:restriction=restricted
+      speed
+    seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted
+      area:restriction=turning prohibited
+    seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat
+      hoist
+    seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard
+    seamark:small_craft_facility:category=chandler: Tag:seamark:small craft facility:category=chandler
+    seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity
+    seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel
+      station
+    seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette
+    seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out
+    seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers
+    seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway
+    seamark:small_craft_facility:category=toilets: Tag:seamark:small craft facility:category=toilets
+    seamark:small_craft_facility:category=visitor_berth: Tag:seamark:small craft facility:category=visitor
+      berth
+    seamark:small_craft_facility:category=water: Tag:seamark:small craft facility:category=water
+    seamark:topmark:colour=black: Tag:seamark:topmark:colour=black
+    seamark:topmark:colour=green: Tag:seamark:topmark:colour=green
+    seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey
+    seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange
+    seamark:topmark:colour=red: Tag:seamark:topmark:colour=red
+    seamark:topmark:colour=white: Tag:seamark:topmark:colour=white
+    seamark:topmark:colour=yellow: Tag:seamark:topmark:colour=yellow
+    seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones
+      base together
+    seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down
+    seamark:topmark:shape=2_cones_point_together: Tag:seamark:topmark:shape=2 cones
+      point together
+    seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up
+    seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres
+    seamark:topmark:shape=board: Tag:seamark:topmark:shape=board
+    seamark:topmark:shape=cone: Tag:seamark:topmark:shape=cone
+    seamark:topmark:shape=cone,_point_down: Tag:seamark:topmark:shape=cone, point
+      down
+    seamark:topmark:shape=cone,_point_up: Tag:seamark:topmark:shape=cone, point up
+    seamark:topmark:shape=cylinder: Tag:seamark:topmark:shape=cylinder
+    seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond
+    seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag
+    seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle
+    seamark:topmark:shape=rhombus: Tag:seamark:topmark:shape=rhombus
+    seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere
+    seamark:topmark:shape=square: Tag:seamark:topmark:shape=square
+    seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
+    seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
+    seamark=anchorage: Tag:seamark=anchorage
+    seamark=beacon: Tag:seamark=beacon
+    seamark=buoy: Tag:seamark=buoy
+    seamark=lighthouse: Tag:seamark=lighthouse
+    segregated=no: Tag:segregated=no
+    segregated=yes: Tag:segregated=yes
     service=alley: Tag:service=alley
     service=drive-through: Tag:service=drive-through
     service=driveway: Tag:service=driveway
     service=emergency_access: Tag:service=emergency access
     service=parking_aisle: Tag:service=parking aisle
+    service=parts: Tag:service=parts
     service=siding: Tag:service=siding
     service=spur: Tag:service=spur
     service=yard: Tag:service=yard
+    shelter_type=basic_hut: Tag:shelter type=basic hut
+    shelter_type=lean_to: Tag:shelter type=lean to
     shop=SpotColor: Tag:shop=SpotColor
     shop=alcohol: Tag:shop=alcohol
+    shop=anime: Tag:shop=anime
+    shop=antiques: Tag:shop=antiques
     shop=art: Tag:shop=art
+    shop=auto_parts: Tag:shop=auto parts
+    shop=baby_goods: Tag:shop=baby goods
     shop=bakery: Tag:shop=bakery
+    shop=bathroom_furnishing: Tag:shop=bathroom furnishing
     shop=beauty: Tag:shop=beauty
     shop=bed: Tag:shop=bed
+    shop=betting: Tag:shop=betting
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
+    shop=bookmaker: Tag:shop=bookmaker
     shop=books: Tag:shop=books
     shop=boutique: Tag:shop=boutique
     shop=butcher: Tag:shop=butcher
+    shop=canoe_hire: Tag:shop=canoe hire
     shop=car: Tag:shop=car
+    shop=car_bodyshop: Tag:shop=car bodyshop
+    shop=car_parts: Tag:shop=car parts
     shop=car_repair: Tag:shop=car repair
-    shop=cell_phones: Tag:shop=cell phones
+    shop=carpet: Tag:shop=carpet
+    shop=chandler: Tag:shop=chandler
     shop=charity: Tag:shop=charity
+    shop=cheese: Tag:shop=cheese
     shop=chemist: Tag:shop=chemist
     shop=clothes: Tag:shop=clothes
-    shop=communication: Tag:shop=communication
     shop=computer: Tag:shop=computer
     shop=confectionery: Tag:shop=confectionery
     shop=convenience: Tag:shop=convenience
     shop=copyshop: Tag:shop=copyshop
     shop=curtain: Tag:shop=curtain
+    shop=dairy: Tag:shop=dairy
     shop=deli: Tag:shop=deli
     shop=department_store: Tag:shop=department store
     shop=dive: Tag:shop=dive
@@ -831,86 +2396,162 @@ en:
     shop=dry_cleaning: Tag:shop=dry cleaning
     shop=electronics: Tag:shop=electronics
     shop=erotic: Tag:shop=erotic
+    shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
     shop=farm: Tag:shop=farm
+    shop=fashion: Tag:shop=fashion
+    shop=fish: Tag:shop=fish
+    shop=fishmonger: Tag:shop=fishmonger
     shop=florist: Tag:shop=florist
     shop=food: Tag:shop=food
     shop=frame: Tag:shop=frame
     shop=funeral_directors: Tag:shop=funeral directors
     shop=furnace: Tag:shop=furnace
     shop=furniture: Tag:shop=furniture
+    shop=gambling: Tag:shop=gambling
     shop=garden_centre: Tag:shop=garden centre
+    shop=gas: Tag:shop=gas
     shop=general: Tag:shop=general
     shop=gift: Tag:shop=gift
     shop=glaziery: Tag:shop=glaziery
     shop=greengrocer: Tag:shop=greengrocer
     shop=hairdresser: Tag:shop=hairdresser
+    shop=hairdresser_supply: Tag:shop=hairdresser supply
     shop=hardware: Tag:shop=hardware
     shop=hearing_aids: Tag:shop=hearing aids
+    shop=herbalist: Tag:shop=herbalist
     shop=hifi: Tag:shop=hifi
     shop=houseware: Tag:shop=houseware
+    shop=hunting: Tag:shop=hunting
     shop=ice_cream: Tag:shop=ice cream
+    shop=insurance: Tag:shop=insurance
+    shop=interior_decoration: Tag:shop=interior decoration
     shop=jewelry: Tag:shop=jewelry
     shop=kiosk: Tag:shop=kiosk
+    shop=kitchen: Tag:shop=kitchen
     shop=laundry: Tag:shop=laundry
+    shop=leather: Tag:shop=leather
     shop=locksmith: Tag:shop=locksmith
+    shop=lottery: Tag:shop=lottery
     shop=mall: Tag:shop=mall
     shop=massage: Tag:shop=massage
+    shop=medical_supply: Tag:shop=medical supply
+    shop=military_surplus: Tag:shop=military surplus
     shop=mobile_phone: Tag:shop=mobile phone
     shop=money_lender: Tag:shop=money lender
     shop=motorcycle: Tag:shop=motorcycle
     shop=motorcycle_repair: Tag:shop=motorcycle repair
+    shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=newsagent: Tag:shop=newsagent
+    shop=office_supplies: Tag:shop=office supplies
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
     shop=paint: Tag:shop=paint
+    shop=pastry: Tag:shop=pastry
     shop=pawnbroker: Tag:shop=pawnbroker
+    shop=perfumery: Tag:shop=perfumery
     shop=pet: Tag:shop=pet
+    shop=photo: Tag:shop=photo
+    shop=printing: Tag:shop=printing
+    shop=radiotechnics: Tag:shop=radiotechnics
+    shop=salon: Tag:shop=salon
+    shop=scuba_diving: Tag:shop=scuba diving
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
+    shop=ship_chandler: Tag:shop=ship chandler
     shop=shoes: Tag:shop=shoes
+    shop=shopping_centre: Tag:shop=shopping centre
     shop=sports: Tag:shop=sports
     shop=stationery: Tag:shop=stationery
     shop=supermarket: Tag:shop=supermarket
     shop=systembolaget: Tag:shop=systembolaget
     shop=tattoo: Tag:shop=tattoo
+    shop=tea: Tag:shop=tea
+    shop=ticket: Tag:shop=ticket
+    shop=tobacco: Tag:shop=tobacco
     shop=toys: Tag:shop=toys
     shop=trade: Tag:shop=trade
+    shop=travel_agency: Tag:shop=travel agency
+    shop=tyres: Tag:shop=tyres
+    shop=vacant: Tag:shop=vacant
     shop=vacuum_cleaner: Tag:shop=vacuum cleaner
     shop=variety_store: Tag:shop=variety store
     shop=video: Tag:shop=video
+    shop=video_games: Tag:shop=video games
+    shop=window_blind: Tag:shop=window blind
+    shop=windows: Tag:shop=windows
+    shop=wine: Tag:shop=wine
+    shop=winery: Tag:shop=winery
+    sign=no: Tag:sign=no
+    sign=yes: Tag:sign=yes
+    signal_station=bridge: Tag:signal station=bridge
+    signal_station=control: Tag:signal station=control
+    signal_station=danger: Tag:signal station=danger
+    signal_station=distress: Tag:signal station=distress
+    signal_station=firing: Tag:signal station=firing
+    signal_station=ice: Tag:signal station=ice
+    signal_station=international_port_traffic: Tag:signal station=international port
+      traffic
+    signal_station=lock: Tag:signal station=lock
+    signal_station=storm: Tag:signal station=storm
+    signal_station=stream: Tag:signal station=stream
+    signal_station=telegraph: Tag:signal station=telegraph
+    signal_station=tide: Tag:signal station=tide
+    signal_station=tide_gauge: Tag:signal station=tide gauge
+    signal_station=tide_scale: Tag:signal station=tide scale
+    signal_station=time: Tag:signal station=time
+    signal_station=traffic: Tag:signal station=traffic
+    signal_station=weather: Tag:signal station=weather
+    social_facility=assisted_living: Tag:social facility=assisted living
+    social_facility=food_bank: Tag:social facility=food bank
+    social_facility=group_home: Tag:social facility=group home
+    social_facility=outreach: Tag:social facility=outreach
+    social_facility=shelter: Tag:social facility=shelter
     source:ele=barometric: Tag:source:ele=barometric
+    source:maxspeed=implicit: Tag:source:maxspeed=implicit
+    source=Bymiljøetaten: Tag:source=Bymiljøetaten
+    source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
     source=GURS: Tag:source=GURS
-    source=IBGE: Tag:source=IBGE
+    source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery
     source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
+    source=NAIP: Tag:source=NAIP
     sport=10pin: Tag:sport=10pin
     sport=9pin: Tag:sport=9pin
+    sport=aikido: Tag:sport=aikido
     sport=american_football: Tag:sport=american football
     sport=archery: Tag:sport=archery
     sport=athletics: Tag:sport=athletics
     sport=australian_football: Tag:sport=australian football
     sport=badminton: Tag:sport=badminton
+    sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     sport=basketball: Tag:sport=basketball
     sport=beachvolleyball: Tag:sport=beachvolleyball
+    sport=billards: Tag:sport=billards
+    sport=bmx: Tag:sport=bmx
     sport=boules: Tag:sport=boules
     sport=bowls: Tag:sport=bowls
     sport=canadian_football: Tag:sport=canadian football
     sport=canoe: Tag:sport=canoe
     sport=chess: Tag:sport=chess
+    sport=cliff_diving: Tag:sport=cliff diving
     sport=climbing: Tag:sport=climbing
+    sport=climbing_adventure: Tag:sport=climbing adventure
+    sport=cockfighting: Tag:sport=cockfighting
     sport=cricket: Tag:sport=cricket
     sport=cricket_nets: Tag:sport=cricket nets
     sport=croquet: Tag:sport=croquet
     sport=cycling: Tag:sport=cycling
+    sport=darts: Tag:sport=darts
     sport=diving: Tag:sport=diving
     sport=dog_racing: Tag:sport=dog racing
     sport=equestrian: Tag:sport=equestrian
+    sport=free_flying: Tag:sport=free flying
     sport=gaelic_football: Tag:sport=gaelic football
     sport=gaelic_games: Tag:sport=gaelic games
     sport=golf: Tag:sport=golf
@@ -919,17 +2560,22 @@ en:
     sport=horse_racing: Tag:sport=horse racing
     sport=horseshoes: Tag:sport=horseshoes
     sport=ice_stock: Tag:sport=ice stock
+    sport=kitesurfing: Tag:sport=kitesurfing
     sport=korfball: Tag:sport=korfball
+    sport=model_aerodrome: Tag:sport=model aerodrome
     sport=motor: Tag:sport=motor
     sport=multi: Tag:sport=multi
+    sport=obstacle_course: Tag:sport=obstacle course
     sport=orienteering: Tag:sport=orienteering
     sport=paddle_tennis: Tag:sport=paddle tennis
     sport=paragliding: Tag:sport=paragliding
     sport=pelota: Tag:sport=pelota
     sport=racquet: Tag:sport=racquet
     sport=rowing: Tag:sport=rowing
+    sport=rugby: Tag:sport=rugby
     sport=rugby_league: Tag:sport=rugby league
     sport=rugby_union: Tag:sport=rugby union
+    sport=scuba_diving: Tag:sport=scuba diving
     sport=shooting: Tag:sport=shooting
     sport=skateboard: Tag:sport=skateboard
     sport=skating: Tag:sport=skating
@@ -937,6 +2583,7 @@ en:
     sport=soccer: Tag:sport=soccer
     sport=surfing: Tag:sport=surfing
     sport=swimming: Tag:sport=swimming
+    sport=table_soccer: Tag:sport=table soccer
     sport=table_tennis: Tag:sport=table tennis
     sport=team_handball: Tag:sport=team handball
     sport=tennis: Tag:sport=tennis
@@ -944,6 +2591,12 @@ en:
     sport=volleyball: Tag:sport=volleyball
     sport=water_ski: Tag:sport=water ski
     sub_sea=reef: Tag:sub sea=reef
+    summit:cross=yes: Tag:summit:cross=yes
+    surface=pebbles: Tag:surface=pebbles
+    tidal=mud: Tag:tidal=mud
+    tidal=pebbles: Tag:tidal=pebbles
+    tidal=rocks: Tag:tidal=rocks
+    tidal=sand: Tag:tidal=sand
     tourism=alpine_hut: Tag:tourism=alpine hut
     tourism=aquarium: Tag:tourism=aquarium
     tourism=artwork: Tag:tourism=artwork
@@ -951,6 +2604,7 @@ en:
     tourism=camp_site: Tag:tourism=camp site
     tourism=caravan_site: Tag:tourism=caravan site
     tourism=chalet: Tag:tourism=chalet
+    tourism=gallery: Tag:tourism=gallery
     tourism=guest_house: Tag:tourism=guest house
     tourism=hostel: Tag:tourism=hostel
     tourism=hotel: Tag:tourism=hotel
@@ -960,38 +2614,130 @@ en:
     tourism=picnic_site: Tag:tourism=picnic site
     tourism=theme_park: Tag:tourism=theme park
     tourism=viewpoint: Tag:tourism=viewpoint
+    tourism=wilderness_hut: Tag:tourism=wilderness hut
     tourism=zoo: Tag:tourism=zoo
+    tower:construction=dish: Tag:tower:construction=dish
+    tower:construction=dome: Tag:tower:construction=dome
+    tower:construction=freestanding: Tag:tower:construction=freestanding
+    tower:construction=lattice: Tag:tower:construction=lattice
+    tower:type=lattice: Tag:tower:type=lattice
+    traffic=local: Tag:traffic=local
+    traffic=national: Tag:traffic=national
+    traffic=regional: Tag:traffic=regional
+    traffic=suburban: Tag:traffic=suburban
+    traffic=urban: Tag:traffic=urban
+    traffic_calming=island: Tag:traffic calming=island
     tunnel=culvert: Tag:tunnel=culvert
-    type=site: Tag:type=site
+    type=autopass: Tag:type=autopass
+    type=benchmark: Tag:type=benchmark
+    type=fixed_point: Tag:type=fixed point
+    type=leading_light: Tag:type=leading light
+    type=leading_line: Tag:type=leading line
+    type=observation_spot: Tag:type=observation spot
+    type=public_transport: Tag:type=public transport
+    type=street: Tag:type=street
+    type=triangulation: Tag:type=triangulation
     vending=bicycle_tube: Tag:vending=bicycle tube
+    wall=dry_stone: Tag:wall=dry stone
+    wall=no: Tag:wall=no
+    wall=seawall: Tag:wall=seawall
+    wall=training_wall: Tag:wall=training wall
+    water=intermittent: Tag:water=intermittent
+    water=tidal: Tag:water=tidal
+    waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
+    waterway=brook: Tag:waterway=brook
     waterway=canal: Tag:waterway=canal
     waterway=dam: Tag:waterway=dam
+    waterway=deep_well: Tag:waterway=deep well
     waterway=derelict_canal: Tag:waterway=derelict canal
+    waterway=ditch: Tag:waterway=ditch
     waterway=dock: Tag:waterway=dock
     waterway=drain: Tag:waterway=drain
+    waterway=dredged_area: Tag:waterway=dredged area
+    waterway=fish_pass: Tag:waterway=fish pass
     waterway=lock_gate: Tag:waterway=lock gate
+    waterway=milestone: Tag:waterway=milestone
+    waterway=offshore_field: Tag:waterway=offshore field
+    waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
     waterway=seaway: Tag:waterway=seaway
     waterway=stream: Tag:waterway=stream
+    waterway=swept_area: Tag:waterway=swept area
     waterway=turning_point: Tag:waterway=turning point
+    waterway=wadi: Tag:waterway=wadi
     waterway=water_point: Tag:waterway=water point
     waterway=waterfall: Tag:waterway=waterfall
     waterway=weir: Tag:waterway=weir
+    wood=casuarina: Tag:wood=casuarina
+    wood=coniferous: Tag:wood=coniferous
+    wood=deciduous: Tag:wood=deciduous
+    wood=eucalypt: Tag:wood=eucalypt
+    wood=evergreen: Tag:wood=evergreen
+    wood=filao: Tag:wood=filao
+    wood=mixed: Tag:wood=mixed
+    wood=nipa_palm: Tag:wood=nipa palm
+    wood=palm: Tag:wood=palm
     zoo=petting_zoo: Tag:zoo=petting zoo
 es:
+  key:
+    amenity: ES:Key:amenity
+    highway: ES:Key:highway
+    proposed: ES:Key:proposed
+    stars: ES:Key:stars
+    traffic_calming: ES:Key:traffic calming
   tag:
+    aerialway=cable_car: ES:Tag:aerialway=cable car
+    amenity=atm: ES:Tag:amenity=atm
     amenity=bar: ES:Tag:amenity=bar
+    amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
+    amenity=fuel: ES:Tag:amenity=fuel
     amenity=recycling: ES:Tag:amenity=recycling
+    amenity=university: ES:Tag:amenity=university
+    emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     highway=bus_stop: ES:Tag:highway=bus stop
+    highway=escape: ES:Tag:highway=escape
+    highway=living_street: ES:Tag:highway=living street
+    highway=motorway_junction: ES:Tag:highway=motorway junction
+    highway=motorway_link: ES:Tag:highway=motorway link
+    highway=pedestrian: ES:Tag:highway=pedestrian
+    highway=residential: ES:Tag:highway=residential
+    highway=stop: ES:Tag:highway=stop
+    landuse=allotments: ES:Tag:landuse=allotments
+    landuse=industrial: ES:Tag:landuse=industrial
+    leisure=playground: ES:Tag:leisure=playground
+    leisure=water_park: ES:Tag:leisure=water park
+    natural=beach: ES:Tag:natural=beach
+    natural=glacier: ES:Tag:natural=glacier
+    natural=saddle: ES:Tag:natural=saddle
+    natural=tree: ES:Tag:natural=tree
+    natural=water: ES:Tag:natural=water
+    power=pole: ES:Tag:power=pole
+    power=tower: ES:Tag:power=tower
     railway=level_crossing: ES:Tag:railway=level crossing
+    shop=alcohol: ES:Tag:shop=alcohol
+    shop=computer: ES:Tag:shop=computer
+    shop=lottery: ES:Tag:shop=lottery
+    tourism=alpine_hut: ES:Tag:tourism=alpine hut
+    tourism=artwork: ES:Tag:tourism=artwork
+    tourism=camp_site: ES:Tag:tourism=camp site
 et:
   key:
+    addr: Et:Key:addr
+    backrest: Et:Key:backrest
     highway: Et:Key:highway
+  tag:
+    amenity=bench: Et:Tag:amenity=bench
+    amenity=cafe: Et:Tag:amenity=cafe
+    amenity=library: Et:Tag:amenity=library
+    amenity=taxi: Et:Tag:amenity=taxi
+    building=roof: Et:Tag:building=roof
 fi:
   key:
     amenity: Fi:Key:amenity
+    bicycle_parking: Fi:Key:bicycle parking
     bridge: Fi:Key:bridge
     crossing: Fi:Key:crossing
     description: Fi:Key:description
@@ -1004,15 +2750,23 @@ fi:
     leisure: Fi:Key:leisure
     man_made: Fi:Key:man made
     manhole: Fi:Key:manhole
+    maxspeed: Fi:Key:maxspeed
+    mtb:scale: Fi:Key:mtb:scale
+    name: Fi:Key:name
     narrow: Fi:Key:narrow
     natural: Fi:Key:natural
     note: Fi:Key:note
     operator: Fi:Key:operator
-    parking:lane:both: Fi:Key:parking:lane:both
+    parking:lane: Fi:Key:parking:lane
+    priority_road: Fi:Key:priority road
+    pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa
     shop: Fi:Key:shop
+    snowmobile: Fi:Key:snowmobile
+    snowplowing: Fi:Key:snowplowing
     surface: Fi:Key:surface
     tracktype: Fi:Key:tracktype
     traffic_calming: Fi:Key:traffic calming
+    traffic_sign: Fi:Key:traffic sign
     tunnel: Fi:Key:tunnel
     waterway: Fi:Key:waterway
     wheelchair: Fi:Key:wheelchair
@@ -1021,6 +2775,8 @@ fi:
     amenity=atm: Fi:Tag:amenity=atm
     amenity=baby_hatch: Fi:Tag:amenity=baby hatch
     amenity=bank: Fi:Tag:amenity=bank
+    amenity=bicycle_parking: Fi:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Fi:Tag:amenity=bicycle rental
     amenity=bureau_de_change: Fi:Tag:amenity=bureau de change
     amenity=car_rental: Fi:Tag:amenity=car rental
     amenity=car_sharing: Fi:Tag:amenity=car sharing
@@ -1041,11 +2797,17 @@ fi:
     amenity=theatre: Fi:Tag:amenity=theatre
     amenity=townhall: Fi:Tag:amenity=townhall
     amenity=veterinary: Fi:Tag:amenity=veterinary
+    building=garage: Fi:Tag:building=garage
+    building=garages: Fi:Tag:building=garages
+    highway=crossing: Fi:Tag:highway=crossing
+    highway=footway: Fi:Tag:highway=footway
     highway=secondary: Fi:Tag:highway=secondary
+    highway=speed_camera: Fi:Tag:highway=speed camera
     highway=steps: Fi:Tag:highway=steps
     highway=tertiary: Fi:Tag:highway=tertiary
     highway=track: Fi:Tag:highway=track
     highway=unclassified: Fi:Tag:highway=unclassified
+    leisure=dance: Fi:Tag:leisure=dance
     leisure=dog_park: Fi:Tag:leisure=dog park
     leisure=slipway: Fi:Tag:leisure=slipway
     man_made=wastewater_plant: Fi:Tag:man made=wastewater plant
@@ -1071,314 +2833,1297 @@ fi:
     waterway=stream: Fi:Tag:waterway=stream
 fr:
   key:
+    CEMT: FR:Key:CEMT
+    abutters: FR:Key:abutters
+    access: FR:Key:access
     addr: FR:Key:addr
+    advertising: FR:Key:advertising
+    aeroway: FR:Key:aeroway
     amenity: FR:Key:amenity
+    area: FR:Key:area
     barrier: FR:Key:barrier
+    basin: FR:Key:basin
+    bench: FR:Key:bench
+    bicycle: FR:Key:bicycle
+    bicycle_parking: FR:Key:bicycle parking
+    boat: FR:Key:boat
+    bollard: FR:Key:bollard
+    books: FR:Key:books
     boundary: FR:Key:boundary
     bridge: FR:Key:bridge
     building: FR:Key:building
+    capacity: FR:Key:capacity
+    clothes: FR:Key:clothes
     collection_times: FR:Key:collection times
+    colour: FR:Key:colour
+    comment: FR:Key:comment
+    construction: FR:Key:construction
+    contact: FR:Key:contact
+    covered: FR:Key:covered
+    craft: FR:Key:craft
+    crop: FR:Key:crop
+    crossing: FR:Key:crossing
+    cutting: FR:Key:cutting
     cycleway: FR:Key:cycleway
+    denomination: FR:Key:denomination
+    description: FR:Key:description
+    designation: FR:Key:designation
+    destination: FR:Key:destination
+    diet:*: FR:Key:diet:*
+    dispensing: FR:Key:dispensing
+    distance: FR:Key:distance
+    drink: FR:Key:drink
+    ele: FR:Key:ele
+    email: FR:Key:email
+    embankment: FR:Key:embankment
     enforcement: FR:Key:enforcement
+    entrance: FR:Key:entrance
+    fee: FR:Key:fee
+    fixme: FR:Key:fixme
+    flood_prone: FR:Key:flood prone
+    foot: FR:Key:foot
+    footway: FR:Key:footway
+    generator:method: FR:Key:generator:method
+    generator:output: FR:Key:generator:output
+    generator:output:electricity: FR:Key:generator:output:electricity
+    generator:output:hot_air: FR:Key:generator:output:hot air
+    generator:output:hot_water: FR:Key:generator:output:hot water
+    generator:output:steam: FR:Key:generator:output:steam
+    generator:source: FR:Key:generator:source
+    height: FR:Key:height
     highway: FR:Key:highway
+    historic: FR:Key:historic
+    incline: FR:Key:incline
+    information: FR:Key:information
+    intermittent: FR:Key:intermittent
+    junction: FR:Key:junction
     landuse: FR:Key:landuse
     lanes: FR:Key:lanes
     leisure: FR:Key:leisure
+    length: FR:Key:length
+    level: FR:Key:level
+    lit: FR:Key:lit
+    lock: FR:Key:lock
     man_made: FR:Key:man made
+    manufacturer: FR:Key:manufacturer
+    maxage: FR:Key:maxage
+    maxheight: FR:Key:maxheight
+    maxheight:physical: FR:Key:maxheight:physical
+    maxlength: FR:Key:maxlength
+    maxspeed: FR:Key:maxspeed
+    maxstay: FR:Key:maxstay
     maxweight: FR:Key:maxweight
+    maxwidth: FR:Key:maxwidth
+    military: FR:Key:military
+    minage: FR:Key:minage
+    mountain_pass: FR:Key:mountain pass
+    mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
     natural: FR:Key:natural
+    network: FR:Key:network
     noname: FR:Key:noname
+    note: FR:Key:note
+    office: FR:Key:office
+    oneway: FR:Key:oneway
     opening_hours: FR:Key:opening hours
     operator: FR:Key:operator
     parking: FR:Key:parking
+    parking:lane: FR:Key:parking:lane
+    paved:date: FR:Key:paved:date
+    phone: FR:Key:phone
     place: FR:Key:place
+    place:fr: FR:Key:place:fr
+    post_office:type: FR:Key:post office:type
     power: FR:Key:power
+    power_supply: FR:Key:power supply
+    priority: FR:Key:priority
+    proposed: FR:Key:proposed
+    psv: FR:Key:psv
+    public_transport: FR:Key:public transport
+    railway: FR:Key:railway
+    ref: FR:Key:ref
+    ref:CEF: FR:Key:ref:CEF
+    ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
+    ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:INSEE: FR:Key:ref:INSEE
+    ref:UAI: FR:Key:ref:UAI
+    ref:mhs: FR:Key:ref:mhs
+    ref:sandre: FR:Key:ref:sandre
+    religion: FR:Key:religion
+    resource: FR:Key:resource
     sac_scale: FR:Key:sac scale
+    second_hand: FR:Key:second hand
+    segregated: FR:Key:segregated
+    service: FR:Key:service
+    shelter_type: FR:Key:shelter type
     shop: FR:Key:shop
     smoothness: FR:Key:smoothness
+    social_facility: FR:Key:social facility
+    source: FR:Key:source
+    source:maxspeed: FR:Key:source:maxspeed
     sport: FR:Key:sport
     surface: FR:Key:surface
+    surveillance: FR:Key:surveillance
+    tactile_paving: FR:Key:tactile paving
+    takeaway: FR:Key:takeaway
+    timezone: FR:Key:timezone
+    toll: FR:Key:toll
+    tourism: FR:Key:tourism
     tracktype: FR:Key:tracktype
+    traffic_calming: FR:Key:traffic calming
+    traffic_sign: FR:Key:traffic sign
+    trail_visibility: FR:Key:trail visibility
+    tunnel: FR:Key:tunnel
+    turn: FR:Key:turn
+    turning_radius: FR:Key:turning radius
+    type: FR:Key:type
+    url: FR:Key:url
+    voltage: FR:Key:voltage
+    waste: FR:Key:waste
+    water: FR:Key:water
     waterway: FR:Key:waterway
+    website: FR:Key:website
+    wheelchair: FR:Key:wheelchair
+    width: FR:Key:width
+    wikipedia: FR:Key:wikipedia
   tag:
+    FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
+    abandoned=yes: FR:Tag:abandoned=yes
+    access=private: FR:Tag:access=private
+    aerialway=cable_car: FR:Tag:aerialway=cable car
+    aerialway=chair_lift: FR:Tag:aerialway=chair lift
+    aeroway=helipad: FR:Tag:aeroway=helipad
     aeroway=runway: FR:Tag:aeroway=runway
+    amenity=animal_boarding: FR:Tag:amenity=animal boarding
+    amenity=animal_breeding: FR:Tag:amenity=animal breeding
+    amenity=animal_shelter: FR:Tag:amenity=animal shelter
+    amenity=atm: FR:Tag:amenity=atm
+    amenity=bench: FR:Tag:amenity=bench
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
+    amenity=cafe: FR:Tag:amenity=cafe
+    amenity=car_rental: FR:Tag:amenity=car rental
+    amenity=car_sharing: FR:Tag:amenity=car sharing
     amenity=community_centre: FR:Tag:amenity=community centre
+    amenity=compressed_air: FR:Tag:amenity=compressed air
+    amenity=coworking_space: FR:Tag:amenity=coworking space
+    amenity=crematorium: FR:Tag:amenity=crematorium
+    amenity=crypt: FR:Tag:amenity=crypt
+    amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=fire_station: FR:Tag:amenity=fire station
+    amenity=fountain: FR:Tag:amenity=fountain
+    amenity=fuel: FR:Tag:amenity=fuel
+    amenity=grave_yard: FR:Tag:amenity=grave yard
+    amenity=hospital: FR:Tag:amenity=hospital
+    amenity=kindergarten: FR:Tag:amenity=kindergarten
     amenity=library: FR:Tag:amenity=library
+    amenity=marketplace: FR:Tag:amenity=marketplace
+    amenity=parking: FR:Tag:amenity=parking
+    amenity=parking_space: FR:Tag:amenity=parking space
     amenity=pharmacy: FR:Tag:amenity=pharmacy
+    amenity=photo_booth: FR:Tag:amenity=photo booth
+    amenity=place_of_worship: FR:Tag:amenity=place of worship
+    amenity=police: FR:Tag:amenity=police
     amenity=recycling: FR:Tag:amenity=recycling
+    amenity=restaurant: FR:Tag:amenity=restaurant
+    amenity=school: FR:Tag:amenity=school
+    amenity=shelter: FR:Tag:amenity=shelter
+    amenity=social_centre: FR:Tag:amenity=social centre
+    amenity=social_facility: FR:Tag:amenity=social facility
+    amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
+    amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
+    amenity=university: FR:Tag:amenity=university
+    amenity=veterinary: FR:Tag:amenity=veterinary
+    amenity=waste_basket: FR:Tag:amenity=waste basket
     barrier=bollard: FR:Tag:barrier=bollard
+    barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
     barrier=gate: FR:Tag:barrier=gate
+    barrier=hedge: FR:Tag:barrier=hedge
+    barrier=retaining_wall: FR:Tag:barrier=retaining wall
+    barrier=wall: FR:Tag:barrier=wall
+    building=house: FR:Tag:building=house
+    building=roof: FR:Tag:building=roof
+    craft=beekeeper: FR:Tag:craft=beekeeper
+    craft=car_repair: FR:Tag:craft=car repair
+    cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
+    disused=yes: FR:Tag:disused=yes
+    emergency=defibrillator: FR:Tag:emergency=defibrillator
+    emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
+    emergency=phone: FR:Tag:emergency=phone
+    footway=sidewalk: FR:Tag:footway=sidewalk
+    generator:method=combustion: FR:Tag:generator:method=combustion
+    generator:method=fission: FR:Tag:generator:method=fission
+    generator:method=fusion: FR:Tag:generator:method=fusion
+    generator:method=gasification: FR:Tag:generator:method=gasification
+    generator:method=photovoltaic: FR:Tag:generator:method=photovoltaic
+    generator:method=thermal: FR:Tag:generator:method=thermal
+    generator:source=biofuel: FR:Tag:generator:source=biofuel
+    generator:source=biogas: FR:Tag:generator:source=biogas
+    generator:source=biomass: FR:Tag:generator:source=biomass
+    generator:source=coal: FR:Tag:generator:source=coal
+    generator:source=gas: FR:Tag:generator:source=gas
+    generator:source=hydro: FR:Tag:generator:source=hydro
+    generator:source=nuclear: FR:Tag:generator:source=nuclear
+    generator:source=oil: FR:Tag:generator:source=oil
+    generator:source=solar: FR:Tag:generator:source=solar
+    generator:source=tidal: FR:Tag:generator:source=tidal
+    generator:source=wind: FR:Tag:generator:source=wind
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
     highway=crossing: FR:Tag:highway=crossing
     highway=cycleway: FR:Tag:highway=cycleway
+    highway=elevator: FR:Tag:highway=elevator
+    highway=emergency_access_point: FR:Tag:highway=emergency access point
+    highway=footway: FR:Tag:highway=footway
     highway=give_way: FR:Tag:highway=give way
+    highway=living_street: FR:Tag:highway=living street
+    highway=mini_roundabout: FR:Tag:highway=mini roundabout
     highway=motorway: FR:Tag:highway=motorway
     highway=motorway_link: FR:Tag:highway=motorway link
+    highway=path: FR:Tag:highway=path
+    highway=pedestrian: FR:Tag:highway=pedestrian
+    highway=primary: FR:Tag:highway=primary
+    highway=raceway: FR:Tag:highway=raceway
+    highway=residential: FR:Tag:highway=residential
+    highway=rest_area: FR:Tag:highway=rest area
+    highway=road: FR:Tag:highway=road
+    highway=secondary: FR:Tag:highway=secondary
+    highway=service: FR:Tag:highway=service
+    highway=services: FR:Tag:highway=services
+    highway=steps: FR:Tag:highway=steps
+    highway=stop: FR:Tag:highway=stop
+    highway=tertiary: FR:Tag:highway=tertiary
     highway=track: FR:Tag:highway=track
+    highway=trunk: FR:Tag:highway=trunk
+    highway=turning_circle: FR:Tag:highway=turning circle
+    highway=unclassified: FR:Tag:highway=unclassified
+    historic=battlefield: FR:Tag:historic=battlefield
+    historic=memorial: FR:Tag:historic=memorial
+    junction=roundabout: FR:Tag:junction=roundabout
+    landuse=allotments: FR:Tag:landuse=allotments
+    landuse=basin: FR:Tag:landuse=basin
+    landuse=cemetery: FR:Tag:landuse=cemetery
+    landuse=farm: FR:Tag:landuse=farm
+    landuse=farmland: FR:Tag:landuse=farmland
     landuse=farmyard: FR:Tag:landuse=farmyard
     landuse=forest: FR:Tag:landuse=forest
+    landuse=grass: FR:Tag:landuse=grass
+    landuse=orchard: FR:Tag:landuse=orchard
+    landuse=plant_nursery: FR:Tag:landuse=plant nursery
+    landuse=pond: FR:Tag:landuse=pond
+    landuse=residential: FR:Tag:landuse=residential
+    landuse=salt_pond: FR:Tag:landuse=salt pond
+    landuse=village_green: FR:Tag:landuse=village green
+    leisure=dog_park: FR:Tag:leisure=dog park
+    leisure=golf_course: FR:Tag:leisure=golf course
+    leisure=park: FR:Tag:leisure=park
+    leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
+    leisure=stadium: FR:Tag:leisure=stadium
+    leisure=swimming_pool: FR:Tag:leisure=swimming pool
+    leisure=track: FR:Tag:leisure=track
+    man_made=adit: FR:Tag:man made=adit
     man_made=cutline: FR:Tag:man made=cutline
+    man_made=pier: FR:Tag:man made=pier
     man_made=surveillance: FR:Tag:man made=surveillance
+    man_made=survey_point: FR:Tag:man made=survey point
+    man_made=tower: FR:Tag:man made=tower
+    man_made=wastewater_plant: FR:Tag:man made=wastewater plant
     man_made=water_works: FR:Tag:man made=water works
+    man_made=watermill: FR:Tag:man made=watermill
+    man_made=windmill: FR:Tag:man made=windmill
+    man_made=windpump: FR:Tag:man made=windpump
+    natural=cliff: FR:Tag:natural=cliff
+    natural=spring: FR:Tag:natural=spring
+    natural=stone: FR:Tag:natural=stone
     natural=tree: FR:Tag:natural=tree
+    natural=tree_row: FR:Tag:natural=tree row
     natural=water: FR:Tag:natural=water
+    natural=wetland: FR:Tag:natural=wetland
+    office=estate_agent: FR:Tag:office=estate agent
+    office=ngo: FR:Tag:office=ngo
     place=city: FR:Tag:place=city
     place=hamlet: FR:Tag:place=hamlet
+    place=isolated_dwelling: FR:Tag:place=isolated dwelling
     place=locality: FR:Tag:place=locality
+    place=neighbourhood: FR:Tag:place=neighbourhood
     place=town: FR:Tag:place=town
     place=village: FR:Tag:place=village
     power=generator: FR:Tag:power=generator
+    power=heliostat: FR:Tag:power=heliostat
     power=line: FR:Tag:power=line
+    power=minor_line: FR:Tag:power=minor line
+    power=pole: FR:Tag:power=pole
+    power=station: FR:Tag:power=station
+    power=sub_station: FR:Tag:power=sub station
     power=tower: FR:Tag:power=tower
+    power=transformer: FR:Tag:power=transformer
+    public_transport=platform: FR:Tag:public transport=platform
+    public_transport=station: FR:Tag:public transport=station
+    railway=level_crossing: FR:Tag:railway=level crossing
+    railway=rail: FR:Tag:railway=rail
     railway=station: FR:Tag:railway=station
     railway=subway_entrance: FR:Tag:railway=subway entrance
+    route=piste: FR:Tag:route=piste
+    service=alley: FR:Tag:service=alley
+    service=parking_aisle: FR:Tag:service=parking aisle
+    shelter_type=basic_hut: FR:Tag:shelter type=basic hut
+    shop=alcohol: FR:Tag:shop=alcohol
+    shop=anime: FR:Tag:shop=anime
+    shop=baby_goods: FR:Tag:shop=baby goods
     shop=bakery: FR:Tag:shop=bakery
+    shop=bathroom_furnishing: FR:Tag:shop=bathroom furnishing
+    shop=beauty: FR:Tag:shop=beauty
+    shop=bed: FR:Tag:shop=bed
+    shop=beverages: FR:Tag:shop=beverages
+    shop=bicycle: FR:Tag:shop=bicycle
+    shop=books: FR:Tag:shop=books
+    shop=boutique: FR:Tag:shop=boutique
+    shop=butcher: FR:Tag:shop=butcher
+    shop=car: FR:Tag:shop=car
+    shop=car_repair: FR:Tag:shop=car repair
+    shop=carpet: FR:Tag:shop=carpet
+    shop=charity: FR:Tag:shop=charity
+    shop=clothes: FR:Tag:shop=clothes
+    shop=confectionery: FR:Tag:shop=confectionery
+    shop=convenience: FR:Tag:shop=convenience
+    shop=copyshop: FR:Tag:shop=copyshop
+    shop=deli: FR:Tag:shop=deli
+    shop=dive: FR:Tag:shop=dive
+    shop=doityourself: FR:Tag:shop=doityourself
+    shop=farm: FR:Tag:shop=farm
+    shop=frame: FR:Tag:shop=frame
+    shop=funeral_directors: FR:Tag:shop=funeral directors
+    shop=furnace: FR:Tag:shop=furnace
+    shop=garden_centre: FR:Tag:shop=garden centre
+    shop=gift: FR:Tag:shop=gift
+    shop=hairdresser: FR:Tag:shop=hairdresser
+    shop=hunting: FR:Tag:shop=hunting
+    shop=kitchen: FR:Tag:shop=kitchen
+    shop=military_surplus: FR:Tag:shop=military surplus
+    shop=newsagent: FR:Tag:shop=newsagent
+    shop=photo: FR:Tag:shop=photo
+    shop=second_hand: FR:Tag:shop=second hand
     shop=supermarket: FR:Tag:shop=supermarket
+    shop=toys: FR:Tag:shop=toys
+    shop=trade: FR:Tag:shop=trade
+    shop=video: FR:Tag:shop=video
+    sport=free_flying: FR:Tag:sport=free flying
+    sport=shooting: FR:Tag:sport=shooting
+    tourism=alpine_hut: FR:Tag:tourism=alpine hut
+    tourism=artwork: FR:Tag:tourism=artwork
+    tourism=camp_site: FR:Tag:tourism=camp site
+    tourism=hostel: FR:Tag:tourism=hostel
+    tourism=hotel: FR:Tag:tourism=hotel
+    tourism=information: FR:Tag:tourism=information
+    tourism=viewpoint: FR:Tag:tourism=viewpoint
+    tunnel=culvert: FR:Tag:tunnel=culvert
+    type=associatedStreet: FR:Tag:type=associatedStreet
+    wall=no: FR:Tag:wall=no
+    waterway=boatyard: FR:Tag:waterway=boatyard
+    waterway=canal: FR:Tag:waterway=canal
+    waterway=lock_gate: FR:Tag:waterway=lock gate
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
-    waterway=weir: FR:Tag:waterway=weir
 hr:
   key:
+    amenity: Hr:Key:amenity
+    historic: Hr:Key:historic
+    leisure: Hr:Key:leisure
+    man_made: Hr:Key:man made
+    military: Hr:Key:military
+    natural: Hr:Key:natural
+    railway: Hr:Key:railway
+    shop: Hr:Key:shop
+    tourism: Hr:Key:tourism
     tracktype: Hr:Key:tracktype
   tag:
     amenity=atm: Hr:Tag:amenity=atm
+    amenity=bank: Hr:Tag:amenity=bank
+ht:
+  key:
+    intermittent: Ht:Key:intermittent
+    pump: Ht:Key:pump
+  tag:
+    landuse=residential: Ht:Tag:landuse=residential
 hu:
   key:
-    aeroway: HU:Key:aeroway
-    shop: HU:Key:shop
-    tourism: HU:Key:tourism
+    amenity: Hu:Key:amenity
+    building: Hu:Key:building
+    jel: Hu:Key:jel
+    office: Hu:Key:office
+    symbol: Hu:Key:symbol
+    wood: Hu:Key:wood
+  tag:
+    boundary=administrative: Hu:Tag:boundary=administrative
 it:
   key:
+    abutters: IT:Key:abutters
+    access: IT:Key:access
+    addr: IT:Key:addr
     aerialway: IT:Key:aerialway
     aeroway: IT:Key:aeroway
     amenity: IT:Key:amenity
     barrier: IT:Key:barrier
     basin: IT:Key:basin
+    bicycle_parking: IT:Key:bicycle parking
     boundary: IT:Key:boundary
     bridge: IT:Key:bridge
     building: IT:Key:building
+    cables: IT:Key:cables
+    circuits: IT:Key:circuits
     construction: IT:Key:construction
+    craft: IT:Key:craft
     cutting: IT:Key:cutting
     cycleway: IT:Key:cycleway
     denomination: IT:Key:denomination
+    ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
+    ford: IT:Key:ford
+    generator:output: IT:Key:generator:output
     geological: IT:Key:geological
     highway: IT:Key:highway
     historic: IT:Key:historic
     incline: IT:Key:incline
+    internet_access: IT:Key:internet access
     junction: IT:Key:junction
     landuse: IT:Key:landuse
+    lanes:psv: IT:Key:lanes:psv
     leisure: IT:Key:leisure
     lock: IT:Key:lock
     man_made: IT:Key:man made
+    maxaxleload: IT:Key:maxaxleload
     maxheight: IT:Key:maxheight
+    maxlength: IT:Key:maxlength
+    maxweight: IT:Key:maxweight
     maxwidth: IT:Key:maxwidth
     military: IT:Key:military
     mooring: IT:Key:mooring
+    mountain_pass: IT:Key:mountain pass
+    mtb:scale: IT:Key:mtb:scale
     name: IT:Key:name
     natural: IT:Key:natural
+    noexit: IT:Key:noexit
+    note: IT:Key:note
+    operator: IT:Key:operator
     osmc:symbol: IT:Key:osmc:symbol
+    parking:lane:both: IT:Key:parking:lane:both
     passing_places: IT:Key:passing places
     place: IT:Key:place
+    playground: IT:Key:playground
     power: IT:Key:power
     proposed: IT:Key:proposed
     railway: IT:Key:railway
     ref: IT:Key:ref
+    ref:vatin: IT:Key:ref:vatin
     religion: IT:Key:religion
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
     service: IT:Key:service
-    shop: IT:Key:shop
+    smoothness: IT:Key:smoothness
     sport: IT:Key:sport
     stop: IT:Key:stop
+    summit:cross: IT:Key:summit:cross
+    surveillance: IT:Key:surveillance
     tourism: IT:Key:tourism
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
     trail_visibility: IT:Key:trail visibility
     tunnel: IT:Key:tunnel
     type: IT:Key:type
+    voltage: IT:Key:voltage
     waterway: IT:Key:waterway
     wheelchair: IT:Key:wheelchair
     width: IT:Key:width
+    wires: IT:Key:wires
   tag:
+    amenity=animal_boarding: IT:Tag:amenity=animal boarding
+    amenity=animal_breeding: IT:Tag:amenity=animal breeding
+    amenity=animal_shelter: IT:Tag:amenity=animal shelter
+    amenity=bar: IT:Tag:amenity=bar
     amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
+    amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
     amenity=fountain: IT:Tag:amenity=fountain
     amenity=fuel: IT:Tag:amenity=fuel
     amenity=hospital: IT:Tag:amenity=hospital
+    amenity=hunting_stand: IT:Tag:amenity=hunting stand
+    amenity=ice_cream: IT:Tag:amenity=ice cream
     amenity=kindergarten: IT:Tag:amenity=kindergarten
+    amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
     amenity=parking: IT:Tag:amenity=parking
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
     amenity=post_office: IT:Tag:amenity=post office
+    amenity=recycling: IT:Tag:amenity=recycling
     amenity=school: IT:Tag:amenity=school
+    amenity=spa: IT:Tag:amenity=spa
     amenity=university: IT:Tag:amenity=university
     amenity=waste_basket: IT:Tag:amenity=waste basket
+    barrier=ditch: IT:Tag:barrier=ditch
+    barrier=fence: IT:Tag:barrier=fence
     barrier=toll_booth: IT:Tag:barrier=toll booth
+    footway=crossing: IT:Tag:footway=crossing
+    footway=sidewalk: IT:Tag:footway=sidewalk
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
     highway=cycleway: IT:Tag:highway=cycleway
+    highway=footway: IT:Tag:highway=footway
     highway=ford: IT:Tag:highway=ford
     highway=mini_roundabout: IT:Tag:highway=mini roundabout
     highway=motorway: IT:Tag:highway=motorway
     highway=motorway_link: IT:Tag:highway=motorway link
+    highway=path: IT:Tag:highway=path
     highway=pedestrian: IT:Tag:highway=pedestrian
     highway=primary: IT:Tag:highway=primary
     highway=primary_link: IT:Tag:highway=primary link
+    highway=residential: IT:Tag:highway=residential
+    highway=rest_area: IT:Tag:highway=rest area
+    highway=secondary: IT:Tag:highway=secondary
+    highway=services: IT:Tag:highway=services
+    highway=tertiary: IT:Tag:highway=tertiary
+    highway=track: IT:Tag:highway=track
     highway=trunk: IT:Tag:highway=trunk
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=paleontological_site: IT:Tag:historic=paleontological site
+    historic=wayside_shrine: IT:Tag:historic=wayside shrine
     junction=roundabout: IT:Tag:junction=roundabout
     landuse=construction: IT:Tag:landuse=construction
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
     leisure=marina: IT:Tag:leisure=marina
+    leisure=playground: IT:Tag:leisure=playground
+    leisure=swimming_pool: IT:Tag:leisure=swimming pool
+    man_made=mast: IT:Tag:man made=mast
+    natural=grassland: IT:Tag:natural=grassland
+    natural=scree: IT:Tag:natural=scree
+    natural=spring: IT:Tag:natural=spring
+    natural=wetland: IT:Tag:natural=wetland
+    place=village: IT:Tag:place=village
+    power=cable: IT:Tag:power=cable
+    power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet
+    power=generator: IT:Tag:power=generator
+    power=line: IT:Tag:power=line
+    power=plant: IT:Tag:power=plant
+    power=pole: IT:Tag:power=pole
+    power=substation: IT:Tag:power=substation
+    power=tower: IT:Tag:power=tower
+    power=transformer: IT:Tag:power=transformer
     railway=level_crossing: IT:Tag:railway=level crossing
+    route=bus: IT:Tag:route=bus
     shop=butcher: IT:Tag:shop=butcher
     shop=car: IT:Tag:shop=car
     shop=clothes: IT:Tag:shop=clothes
+    shop=confectionery: IT:Tag:shop=confectionery
     shop=florist: IT:Tag:shop=florist
+    shop=greengrocer: IT:Tag:shop=greengrocer
+    shop=hifi: IT:Tag:shop=hifi
+    shop=kiosk: IT:Tag:shop=kiosk
+    shop=mall: IT:Tag:shop=mall
     shop=newsagent: IT:Tag:shop=newsagent
+    shop=tobacco: IT:Tag:shop=tobacco
+    sport=surfing: IT:Tag:sport=surfing
     tourism=artwork: IT:Tag:tourism=artwork
+    waterway=stream: IT:Tag:waterway=stream
 ja:
   key:
-    abutters: JA:Key:abutters
     access: JA:Key:access
+    addr: JA:Key:addr
     aerialway: JA:Key:aerialway
-    aeroway: JA:Key:aeroway
-    amenity: JA:Key:amenity
-    barrier: JA:Key:barrier
-    boundary: JA:Key:boundary
+    area: JA:Key:area
+    books: JA:Key:books
+    brand: JA:Key:brand
     bridge: JA:Key:bridge
     building: JA:Key:building
+    building:material: JA:Key:building:material
+    building:part: JA:Key:building:part
+    building:parts: JA:Key:building:parts
+    capacity: JA:Key:capacity
+    clothes: JA:Key:clothes
+    contact: JA:Key:contact
     crossing: JA:Key:crossing
     cuisine: JA:Key:cuisine
     cycleway: JA:Key:cycleway
+    denomination: JA:Key:denomination
+    description: JA:Key:description
+    diet:*: JA:Key:diet:*
+    disused: JA:Key:disused
+    drive_in: JA:Key:drive in
+    drive_through: JA:Key:drive through
+    easy_overtaking: JA:Key:easy overtaking
     electrified: JA:Key:electrified
+    emergency: JA:Key:emergency
+    end_date: JA:Key:end date
+    fee: JA:Key:fee
     fixme: JA:Key:fixme
     foot: JA:Key:foot
-    highway: JA:Key:highway
-    historic: JA:Key:historic
+    footway: JA:Key:footway
+    furniture: JA:Key:furniture
+    geological: JA:Key:geological
+    hazard_type: JA:Key:hazard type
+    height: JA:Key:height
     incline: JA:Key:incline
-    information: JA:Key:information
-    internet_access: JA:Key:internet access
-    landuse: JA:Key:landuse
     lanes: JA:Key:lanes
-    leisure: JA:Key:leisure
-    man_made: JA:Key:man made
-    military: JA:Key:military
+    level: JA:Key:level
+    lit: JA:Key:lit
+    mountain_pass: JA:Key:mountain pass
     name: JA:Key:name
-    natural: JA:Key:natural
+    note: JA:Key:note
+    oneway: JA:Key:oneway
+    opening_hours: JA:Key:opening hours
     operator: JA:Key:operator
+    overtaking: JA:Key:overtaking
     phone: JA:Key:phone
     power: JA:Key:power
     power_source: JA:Key:power source
-    railway: JA:Key:railway
+    public_transport: JA:Key:public transport
     ref: JA:Key:ref
-    route: JA:Key:route
-    shop: JA:Key:shop
+    religion: JA:Key:religion
+    roof:material: JA:Key:roof:material
+    room: JA:Key:room
+    seamark:fixme: JA:Key:seamark:fixme
+    segregated: JA:Key:segregated
+    social_facility: JA:Key:social facility
+    sport: JA:Key:sport
+    start_date: JA:Key:start date
     step_count: JA:Key:step count
     surface: JA:Key:surface
     tactile_paving: JA:Key:tactile paving
-    tourism: JA:Key:tourism
+    takeaway: JA:Key:takeaway
     tracktype: JA:Key:tracktype
     type: JA:Key:type
-    waterway: JA:Key:waterway
+    url: JA:Key:url
+    website: JA:Key:website
     wheelchair: JA:Key:wheelchair
+    width: JA:Key:width
     wikipedia: JA:Key:wikipedia
+    winter_road: JA:Key:winter road
     wood: JA:Key:wood
   tag:
-    amenity=arts_centre: JA:Tag:amenity=arts centre
+    abandoned=yes: JA:Tag:abandoned=yes
+    access=designated: JA:Tag:access=designated
+    aeroway=apron: JA:Tag:aeroway=apron
+    aeroway=helipad: JA:Tag:aeroway=helipad
+    aeroway=runway: JA:Tag:aeroway=runway
+    aeroway=taxiway: JA:Tag:aeroway=taxiway
     amenity=baby_hatch: JA:Tag:amenity=baby hatch
+    amenity=bank: JA:Tag:amenity=bank
+    amenity=bbq: JA:Tag:amenity=bbq
+    amenity=bench: JA:Tag:amenity=bench
+    amenity=bicycle_parking: JA:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: JA:Tag:amenity=bicycle rental
+    amenity=biergarten: JA:Tag:amenity=biergarten
+    amenity=boat_storage: JA:Tag:amenity=boat storage
+    amenity=brothel: JA:Tag:amenity=brothel
+    amenity=bureau_de_change: JA:Tag:amenity=bureau de change
     amenity=bus_station: JA:Tag:amenity=bus station
-    amenity=cafe: JA:Tag:amenity=cafe
-    amenity=crematorium: JA:Tag:amenity=crematorium
-    amenity=drinking_water: JA:Tag:amenity=drinking water
-    amenity=fast_food: JA:Tag:amenity=fast food
+    amenity=car_rental: JA:Tag:amenity=car rental
+    amenity=car_wash: JA:Tag:amenity=car wash
+    amenity=clock: JA:Tag:amenity=clock
+    amenity=college: JA:Tag:amenity=college
+    amenity=courthouse: JA:Tag:amenity=courthouse
+    amenity=dentist: JA:Tag:amenity=dentist
+    amenity=embassy: JA:Tag:amenity=embassy
+    amenity=ferry_terminal: JA:Tag:amenity=ferry terminal
     amenity=fire_station: JA:Tag:amenity=fire station
+    amenity=food_court: JA:Tag:amenity=food court
+    amenity=fountain: JA:Tag:amenity=fountain
+    amenity=grave_yard: JA:Tag:amenity=grave yard
+    amenity=hunting_stand: JA:Tag:amenity=hunting stand
+    amenity=kindergarten: JA:Tag:amenity=kindergarten
+    amenity=library: JA:Tag:amenity=library
+    amenity=nightclub: JA:Tag:amenity=nightclub
+    amenity=nursing_home: JA:Tag:amenity=nursing home
     amenity=parking: JA:Tag:amenity=parking
-    amenity=place_of_worship: JA:Tag:amenity=place of worship
-    amenity=pub: JA:Tag:amenity=pub
+    amenity=parking_entrance: JA:Tag:amenity=parking entrance
+    amenity=parking_space: JA:Tag:amenity=parking space
+    amenity=pharmacy: JA:Tag:amenity=pharmacy
+    amenity=police: JA:Tag:amenity=police
+    amenity=post_box: JA:Tag:amenity=post box
+    amenity=post_office: JA:Tag:amenity=post office
+    amenity=recycling: JA:Tag:amenity=recycling
     amenity=restaurant: JA:Tag:amenity=restaurant
-    amenity=toilets: JA:Tag:amenity=toilets
-    amenity=vending_machine: JA:Tag:amenity=vending machine
-    amenity=veterinary: JA:Tag:amenity=veterinary
+    amenity=sauna: JA:Tag:amenity=sauna
+    amenity=shelter: JA:Tag:amenity=shelter
+    amenity=social_centre: JA:Tag:amenity=social centre
+    amenity=stripclub: JA:Tag:amenity=stripclub
+    amenity=studio: JA:Tag:amenity=studio
+    amenity=taxi: JA:Tag:amenity=taxi
+    amenity=university: JA:Tag:amenity=university
+    amenity=waste_basket: JA:Tag:amenity=waste basket
+    amenity=waste_disposal: JA:Tag:amenity=waste disposal
+    amenity=watering_place: JA:Tag:amenity=watering place
+    atm=yes: JA:Tag:atm=yes
+    barrier=bollard: JA:Tag:barrier=bollard
+    barrier=fence: JA:Tag:barrier=fence
     barrier=lift_gate: JA:Tag:barrier=lift gate
+    barrier=toll_booth: JA:Tag:barrier=toll booth
+    boundary=administrative: JA:Tag:boundary=administrative
+    boundary=national_park: JA:Tag:boundary=national park
+    boundary=protected_area: JA:Tag:boundary=protected area
+    bridge=viaduct: JA:Tag:bridge=viaduct
+    craft=brewery: JA:Tag:craft=brewery
+    emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
+    emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
     highway=crossing: JA:Tag:highway=crossing
-    highway=footway: JA:Tag:highway=footway
-    highway=pedestrian: JA:Tag:highway=pedestrian
+    highway=cycleway: JA:Tag:highway=cycleway
+    highway=motorway_link: JA:Tag:highway=motorway link
+    highway=path: JA:Tag:highway=path
     highway=residential: JA:Tag:highway=residential
-    highway=steps: JA:Tag:highway=steps
+    highway=rest_area: JA:Tag:highway=rest area
+    highway=road: JA:Tag:highway=road
+    highway=secondary: JA:Tag:highway=secondary
+    highway=services: JA:Tag:highway=services
+    highway=tertiary: JA:Tag:highway=tertiary
     highway=track: JA:Tag:highway=track
     highway=traffic_signals: JA:Tag:highway=traffic signals
+    highway=trunk: JA:Tag:highway=trunk
+    highway=unclassified: JA:Tag:highway=unclassified
     historic=archaeological_site: JA:Tag:historic=archaeological site
+    historic=battlefield: JA:Tag:historic=battlefield
+    historic=boundary_stone: JA:Tag:historic=boundary stone
+    historic=monument: JA:Tag:historic=monument
+    information=guidepost: JA:Tag:information=guidepost
+    landuse=allotments: JA:Tag:landuse=allotments
+    landuse=basin: JA:Tag:landuse=basin
+    landuse=brownfield: JA:Tag:landuse=brownfield
+    landuse=cemetery: JA:Tag:landuse=cemetery
+    landuse=commercial: JA:Tag:landuse=commercial
+    landuse=construction: JA:Tag:landuse=construction
+    landuse=farmyard: JA:Tag:landuse=farmyard
     landuse=forest: JA:Tag:landuse=forest
     landuse=garages: JA:Tag:landuse=garages
+    landuse=grass: JA:Tag:landuse=grass
+    landuse=greenfield: JA:Tag:landuse=greenfield
+    landuse=industrial: JA:Tag:landuse=industrial
+    landuse=landfill: JA:Tag:landuse=landfill
+    landuse=meadow: JA:Tag:landuse=meadow
+    landuse=military: JA:Tag:landuse=military
+    landuse=orchard: JA:Tag:landuse=orchard
+    landuse=plant_nursery: JA:Tag:landuse=plant nursery
+    landuse=quarry: JA:Tag:landuse=quarry
+    landuse=railway: JA:Tag:landuse=railway
+    landuse=recreation_ground: JA:Tag:landuse=recreation ground
+    landuse=reservoir: JA:Tag:landuse=reservoir
+    landuse=residential: JA:Tag:landuse=residential
+    landuse=retail: JA:Tag:landuse=retail
+    landuse=salt_pond: JA:Tag:landuse=salt pond
+    landuse=village_green: JA:Tag:landuse=village green
     landuse=wood: JA:Tag:landuse=wood
+    leisure=beach_resort: JA:Tag:leisure=beach resort
+    leisure=bird_hide: JA:Tag:leisure=bird hide
+    leisure=dance: JA:Tag:leisure=dance
     leisure=dog_park: JA:Tag:leisure=dog park
-    leisure=ice_rink: JA:Tag:leisure=ice rink
+    leisure=garden: JA:Tag:leisure=garden
+    leisure=golf_course: JA:Tag:leisure=golf course
+    leisure=marina: JA:Tag:leisure=marina
+    leisure=miniature_golf: JA:Tag:leisure=miniature golf
+    leisure=nature_reserve: JA:Tag:leisure=nature reserve
+    leisure=playground: JA:Tag:leisure=playground
+    leisure=slipway: JA:Tag:leisure=slipway
+    leisure=sports_centre: JA:Tag:leisure=sports centre
+    leisure=swimming_pool: JA:Tag:leisure=swimming pool
+    leisure=track: JA:Tag:leisure=track
+    man_made=adit: JA:Tag:man made=adit
+    man_made=breakwater: JA:Tag:man made=breakwater
+    man_made=crane: JA:Tag:man made=crane
+    man_made=cutline: JA:Tag:man made=cutline
+    man_made=flagpole: JA:Tag:man made=flagpole
+    man_made=groyne: JA:Tag:man made=groyne
+    man_made=kiln: JA:Tag:man made=kiln
     man_made=lighthouse: JA:Tag:man made=lighthouse
-    natural=coastline: JA:Tag:natural=coastline
+    man_made=mineshaft: JA:Tag:man made=mineshaft
+    man_made=pier: JA:Tag:man made=pier
+    man_made=tower: JA:Tag:man made=tower
+    man_made=water_well: JA:Tag:man made=water well
+    man_made=works: JA:Tag:man made=works
+    natural=heath: JA:Tag:natural=heath
+    natural=scree: JA:Tag:natural=scree
+    natural=tree_row: JA:Tag:natural=tree row
     natural=wood: JA:Tag:natural=wood
+    place=island: JA:Tag:place=island
+    place=islet: JA:Tag:place=islet
+    place=neighbourhood: JA:Tag:place=neighbourhood
+    place=suburb: JA:Tag:place=suburb
     power=generator: JA:Tag:power=generator
+    public_transport=platform: JA:Tag:public transport=platform
     railway=crossing: JA:Tag:railway=crossing
     railway=level_crossing: JA:Tag:railway=level crossing
     railway=rail: JA:Tag:railway=rail
-    railway=station: JA:Tag:railway=station
+    railway=tram: JA:Tag:railway=tram
+    route=road: JA:Tag:route=road
+    service=parking_aisle: JA:Tag:service=parking aisle
+    shop=alcohol: JA:Tag:shop=alcohol
+    shop=art: JA:Tag:shop=art
+    shop=bakery: JA:Tag:shop=bakery
+    shop=beauty: JA:Tag:shop=beauty
+    shop=bicycle: JA:Tag:shop=bicycle
+    shop=books: JA:Tag:shop=books
+    shop=boutique: JA:Tag:shop=boutique
+    shop=charity: JA:Tag:shop=charity
+    shop=chemist: JA:Tag:shop=chemist
+    shop=clothes: JA:Tag:shop=clothes
+    shop=confectionery: JA:Tag:shop=confectionery
+    shop=convenience: JA:Tag:shop=convenience
+    shop=deli: JA:Tag:shop=deli
+    shop=department_store: JA:Tag:shop=department store
     shop=doityourself: JA:Tag:shop=doityourself
-    shop=garden_centre: JA:Tag:shop=garden centre
-    shop=gift: JA:Tag:shop=gift
+    shop=florist: JA:Tag:shop=florist
+    shop=general: JA:Tag:shop=general
+    shop=hairdresser: JA:Tag:shop=hairdresser
     shop=motorcycle: JA:Tag:shop=motorcycle
-    shop=outdoor: JA:Tag:shop=outdoor
-    tourism=hostel: JA:Tag:tourism=hostel
+    shop=pet: JA:Tag:shop=pet
+    shop=second_hand: JA:Tag:shop=second hand
+    shop=supermarket: JA:Tag:shop=supermarket
+    shop=tobacco: JA:Tag:shop=tobacco
     tourism=hotel: JA:Tag:tourism=hotel
-    tourism=information: JA:Tag:tourism=information
-    tourism=viewpoint: JA:Tag:tourism=viewpoint
-    waterway=riverbank: JA:Tag:waterway=riverbank
+    tourism=museum: JA:Tag:tourism=museum
+    tourism=picnic_site: JA:Tag:tourism=picnic site
+    waterway=dam: JA:Tag:waterway=dam
+    waterway=ditch: JA:Tag:waterway=ditch
+    waterway=drain: JA:Tag:waterway=drain
     waterway=water_point: JA:Tag:waterway=water point
+    waterway=weir: JA:Tag:waterway=weir
+ko:
+  key:
+    ele: Ko:Key:ele
+    wikipedia: Ko:Key:wikipedia
+  tag:
+    craft=tailor: Ko:Tag:craft=tailor
+    shop=garden_centre: Ko:Tag:shop=garden centre
+    shop=gift: Ko:Tag:shop=gift
 nl:
   key:
-    cycleway: NL:Key:cycleway
+    AND_nosr_r: NL:Key:AND nosr r
+    crossing: NL:Key:crossing
+    scenic: NL:Key:scenic
+    wheelchair: NL:Key:wheelchair
   tag:
-    highway=motorway: NL:Tag:highway=motorway
-    landuse=industrial: NL:Tag:landuse=industrial
-    shop=car: NL:Tag:shop=car
-    zoo=petting_zoo: NL:Tag:zoo=petting zoo
+    amenity=post_office: NL:Tag:amenity=post office
+    highway=footway: NL:Tag:highway=footway
+    highway=path: NL:Tag:highway=path
+    man_made=windmill: NL:Tag:man made=windmill
 no:
   key:
     amenity: No:Key:amenity
     boundary: No:Key:boundary
+    building: No:Key:building
     fenced: No:Key:fenced
     maxheight:legal: No:Key:maxheight:legal
     maxheight:marine: No:Key:maxheight:marine
     maxheight:physical: No:Key:maxheight:physical
   tag:
     amenity=bank: No:Tag:amenity=bank
+    amenity=fuel: No:Tag:amenity=fuel
     amenity=marketplace: No:Tag:amenity=marketplace
     amenity=pharmacy: No:Tag:amenity=pharmacy
     amenity=place_of_worship: No:Tag:amenity=place of worship
     boundary=maritime: No:Tag:boundary=maritime
 pl:
   key:
+    abutters: Pl:Key:abutters
+    access: Pl:Key:access
+    addr: Pl:Key:addr
+    addr:flats: Pl:Key:addr:flats
+    addr:place: Pl:Key:addr:place
+    addr:suburb: Pl:Key:addr:suburb
+    aerialway: Pl:Key:aerialway
+    aeroway: Pl:Key:aeroway
+    amenity: Pl:Key:amenity
+    area: Pl:Key:area
+    automatic_door: Pl:Key:automatic door
+    backrest: Pl:Key:backrest
+    bar: Pl:Key:bar
+    barrier: Pl:Key:barrier
+    bench: Pl:Key:bench
+    bicycle: Pl:Key:bicycle
+    bicycle_parking: Pl:Key:bicycle parking
+    bicycle_road: Pl:Key:bicycle road
+    bollard: Pl:Key:bollard
+    border_type: Pl:Key:border type
+    boundary: Pl:Key:boundary
+    brand: Pl:Key:brand
+    bridge: Pl:Key:bridge
+    building: Pl:Key:building
+    building:cullis:height: Pl:Key:building:cullis:height
+    building:levels: Pl:Key:building:levels
+    building:material: Pl:Key:building:material
+    building:min_level: Pl:Key:building:min level
+    building:part: Pl:Key:building:part
+    bunker_type: Pl:Key:bunker type
+    busway: Pl:Key:busway
+    capacity: Pl:Key:capacity
+    circumference: Pl:Key:circumference
+    colour: Pl:Key:colour
+    comment: Pl:Key:comment
+    construction: Pl:Key:construction
+    contact: Pl:Key:contact
+    covered: Pl:Key:covered
+    crop: Pl:Key:crop
+    crossing: Pl:Key:crossing
+    cutting: Pl:Key:cutting
+    deanery: Pl:Key:deanery
+    denomination: Pl:Key:denomination
+    denotation: Pl:Key:denotation
+    designation: Pl:Key:designation
+    destination: Pl:Key:destination
+    diocese: Pl:Key:diocese
+    ele: Pl:Key:ele
+    embankment: Pl:Key:embankment
+    emergency: Pl:Key:emergency
+    entrance: Pl:Key:entrance
+    fee: Pl:Key:fee
+    fixme: Pl:Key:fixme
+    foot: Pl:Key:foot
+    footway: Pl:Key:footway
+    generator:output: Pl:Key:generator:output
     height: Pl:Key:height
+    highway: Pl:Key:highway
+    historic: Pl:Key:historic
+    information: Pl:Key:information
+    inscription: Pl:Key:inscription
+    intermittent: Pl:Key:intermittent
+    is_in: Pl:Key:is in
+    junction: Pl:Key:junction
+    kerb: Pl:Key:kerb
+    landuse: Pl:Key:landuse
+    lanes: Pl:Key:lanes
+    lanes:psv: Pl:Key:lanes:psv
+    leisure: Pl:Key:leisure
+    lit: Pl:Key:lit
+    location: Pl:Key:location
+    lock: Pl:Key:lock
+    lock_name: Pl:Key:lock name
+    man_made: Pl:Key:man made
+    manhole: Pl:Key:manhole
+    maxheight: Pl:Key:maxheight
+    maxspeed: Pl:Key:maxspeed
+    maxstay: Pl:Key:maxstay
+    mooring: Pl:Key:mooring
+    name: Pl:Key:name
+    natural: Pl:Key:natural
+    noexit: Pl:Key:noexit
+    note: Pl:Key:note
+    office: Pl:Key:office
     oneway: Pl:Key:oneway
+    opening_hours: Pl:Key:opening hours
+    operator: Pl:Key:operator
+    overtaking: Pl:Key:overtaking
+    owner: Pl:Key:owner
+    ownership: Pl:Key:ownership
+    parking: Pl:Key:parking
+    parking:lane: Pl:Key:parking:lane
+    place: Pl:Key:place
+    place_name: Pl:Key:place name
+    power: Pl:Key:power
+    psv: Pl:Key:psv
+    public_transport: Pl:Key:public transport
+    railway: Pl:Key:railway
+    railway:area: Pl:Key:railway:area
+    ramp: Pl:Key:ramp
+    recycling_type: Pl:Key:recycling type
+    religion: Pl:Key:religion
+    roof:material: Pl:Key:roof:material
+    route: Pl:Key:route
+    route_master: Pl:Key:route master
+    sac_scale: Pl:Key:sac scale
+    seamark:fixme: Pl:Key:seamark:fixme
+    service: Pl:Key:service
+    service_times: Pl:Key:service times
+    shop: Pl:Key:shop
+    sidewalk: Pl:Key:sidewalk
+    step_count: Pl:Key:step count
+    surface: Pl:Key:surface
+    surveillance: Pl:Key:surveillance
+    surveillance:type: Pl:Key:surveillance:type
+    surveillance:zone: Pl:Key:surveillance:zone
+    tomb: Pl:Key:tomb
+    tourism: Pl:Key:tourism
+    tracktype: Pl:Key:tracktype
+    traffic_calming: Pl:Key:traffic calming
+    turn: Pl:Key:turn
+    type: Pl:Key:type
+    url: Pl:Key:url
+    usage: Pl:Key:usage
+    voltage: Pl:Key:voltage
+    waterway: Pl:Key:waterway
+    website: Pl:Key:website
+    wheelchair: Pl:Key:wheelchair
+    wikipedia: Pl:Key:wikipedia
+    wood: Pl:Key:wood
+    zoo: Pl:Key:zoo
+  tag:
+    access=designated: Pl:Tag:access=designated
+    access=official: Pl:Tag:access=official
+    access=private: Pl:Tag:access=private
+    aeroway=hangar: Pl:Tag:aeroway=hangar
+    amenity=atm: Pl:Tag:amenity=atm
+    amenity=baby_hatch: Pl:Tag:amenity=baby hatch
+    amenity=bank: Pl:Tag:amenity=bank
+    amenity=bench: Pl:Tag:amenity=bench
+    amenity=bicycle_parking: Pl:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental
+    amenity=brothel: Pl:Tag:amenity=brothel
+    amenity=compressed_air: Pl:Tag:amenity=compressed air
+    amenity=crypt: Pl:Tag:amenity=crypt
+    amenity=doctors: Pl:Tag:amenity=doctors
+    amenity=drinking_water: Pl:Tag:amenity=drinking water
+    amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
+    amenity=fire_station: Pl:Tag:amenity=fire station
+    amenity=fuel: Pl:Tag:amenity=fuel
+    amenity=grave_yard: Pl:Tag:amenity=grave yard
+    amenity=parking: Pl:Tag:amenity=parking
+    amenity=parking_entrance: Pl:Tag:amenity=parking entrance
+    amenity=parking_space: Pl:Tag:amenity=parking space
+    amenity=pharmacy: Pl:Tag:amenity=pharmacy
+    amenity=place_of_worship: Pl:Tag:amenity=place of worship
+    amenity=post_box: Pl:Tag:amenity=post box
+    amenity=post_office: Pl:Tag:amenity=post office
+    amenity=recycling: Pl:Tag:amenity=recycling
+    amenity=school: Pl:Tag:amenity=school
+    amenity=taxi: Pl:Tag:amenity=taxi
+    amenity=vending_machine: Pl:Tag:amenity=vending machine
+    amenity=waste_disposal: Pl:Tag:amenity=waste disposal
+    atm=yes: Pl:Tag:atm=yes
+    barrier=block: Pl:Tag:barrier=block
+    barrier=bollard: Pl:Tag:barrier=bollard
+    barrier=bus_trap: Pl:Tag:barrier=bus trap
+    barrier=cattle_grid: Pl:Tag:barrier=cattle grid
+    barrier=chain: Pl:Tag:barrier=chain
+    barrier=city_wall: Pl:Tag:barrier=city wall
+    barrier=cycle_barrier: Pl:Tag:barrier=cycle barrier
+    barrier=ditch: Pl:Tag:barrier=ditch
+    barrier=entrance: Pl:Tag:barrier=entrance
+    barrier=fence: Pl:Tag:barrier=fence
+    barrier=gate: Pl:Tag:barrier=gate
+    barrier=guard_rail: Pl:Tag:barrier=guard rail
+    barrier=hedge: Pl:Tag:barrier=hedge
+    barrier=kerb: Pl:Tag:barrier=kerb
+    barrier=lift_gate: Pl:Tag:barrier=lift gate
+    barrier=retaining_wall: Pl:Tag:barrier=retaining wall
+    barrier=toll_booth: Pl:Tag:barrier=toll booth
+    barrier=turnstile: Pl:Tag:barrier=turnstile
+    barrier=wall: Pl:Tag:barrier=wall
+    boundary=administrative: Pl:Tag:boundary=administrative
+    boundary=religious_administration: Pl:Tag:boundary=religious administration
+    building=apartments: Pl:Tag:building=apartments
+    building=barn: Pl:Tag:building=barn
+    building=bridge: Pl:Tag:building=bridge
+    building=bunker: Pl:Tag:building=bunker
+    building=cabin: Pl:Tag:building=cabin
+    building=chapel: Pl:Tag:building=chapel
+    building=church: Pl:Tag:building=church
+    building=civic: Pl:Tag:building=civic
+    building=commercial: Pl:Tag:building=commercial
+    building=construction: Pl:Tag:building=construction
+    building=detached: Pl:Tag:building=detached
+    building=dormitory: Pl:Tag:building=dormitory
+    building=farm_auxiliary: Pl:Tag:building=farm auxiliary
+    building=garage: Pl:Tag:building=garage
+    building=garages: Pl:Tag:building=garages
+    building=greenhouse: Pl:Tag:building=greenhouse
+    building=hangar: Pl:Tag:building=hangar
+    building=hospital: Pl:Tag:building=hospital
+    building=hotel: Pl:Tag:building=hotel
+    building=house: Pl:Tag:building=house
+    building=hut: Pl:Tag:building=hut
+    building=industrial: Pl:Tag:building=industrial
+    building=manufacture: Pl:Tag:building=manufacture
+    building=office: Pl:Tag:building=office
+    building=public: Pl:Tag:building=public
+    building=residential: Pl:Tag:building=residential
+    building=retail: Pl:Tag:building=retail
+    building=roof: Pl:Tag:building=roof
+    building=school: Pl:Tag:building=school
+    building=shed: Pl:Tag:building=shed
+    building=supermarket: Pl:Tag:building=supermarket
+    building=terrace: Pl:Tag:building=terrace
+    building=train_station: Pl:Tag:building=train station
+    building=transportation: Pl:Tag:building=transportation
+    building=university: Pl:Tag:building=university
+    building=warehouse: Pl:Tag:building=warehouse
+    emergency=defibrillator: Pl:Tag:emergency=defibrillator
+    emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
+    emergency=fire_flapper: Pl:Tag:emergency=fire flapper
+    emergency=fire_hose: Pl:Tag:emergency=fire hose
+    emergency=fire_hydrant: Pl:Tag:emergency=fire hydrant
+    emergency=fire_water_pond: Pl:Tag:emergency=fire water pond
+    emergency=suction_point: Pl:Tag:emergency=suction point
+    emergency=water_tank: Pl:Tag:emergency=water tank
+    footway=crossing: Pl:Tag:footway=crossing
+    footway=sidewalk: Pl:Tag:footway=sidewalk
+    highway=bridleway: Pl:Tag:highway=bridleway
+    highway=bus_stop: Pl:Tag:highway=bus stop
+    highway=crossing: Pl:Tag:highway=crossing
+    highway=cycleway: Pl:Tag:highway=cycleway
+    highway=footway: Pl:Tag:highway=footway
+    highway=give_way: Pl:Tag:highway=give way
+    highway=living_street: Pl:Tag:highway=living street
+    highway=milestone: Pl:Tag:highway=milestone
+    highway=motorway: Pl:Tag:highway=motorway
+    highway=path: Pl:Tag:highway=path
+    highway=pedestrian: Pl:Tag:highway=pedestrian
+    highway=primary: Pl:Tag:highway=primary
+    highway=proposed: Pl:Tag:highway=proposed
+    highway=raceway: Pl:Tag:highway=raceway
+    highway=residential: Pl:Tag:highway=residential
+    highway=road: Pl:Tag:highway=road
+    highway=secondary: Pl:Tag:highway=secondary
+    highway=service: Pl:Tag:highway=service
+    highway=speed_camera: Pl:Tag:highway=speed camera
+    highway=street_lamp: Pl:Tag:highway=street lamp
+    highway=tertiary: Pl:Tag:highway=tertiary
+    highway=track: Pl:Tag:highway=track
+    highway=trunk: Pl:Tag:highway=trunk
+    highway=unclassified: Pl:Tag:highway=unclassified
+    historic=battlefield: Pl:Tag:historic=battlefield
+    historic=city_gate: Pl:Tag:historic=city gate
+    historic=memorial: Pl:Tag:historic=memorial
+    historic=monument: Pl:Tag:historic=monument
+    historic=ruins: Pl:Tag:historic=ruins
+    historic=tomb: Pl:Tag:historic=tomb
+    historic=wayside_shrine: Pl:Tag:historic=wayside shrine
+    information=guidepost: Pl:Tag:information=guidepost
+    junction=roundabout: Pl:Tag:junction=roundabout
+    landuse=allotments: Pl:Tag:landuse=allotments
+    landuse=brownfield: Pl:Tag:landuse=brownfield
+    landuse=cemetery: Pl:Tag:landuse=cemetery
+    landuse=farm: Pl:Tag:landuse=farm
+    landuse=farmyard: Pl:Tag:landuse=farmyard
+    landuse=forest: Pl:Tag:landuse=forest
+    landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
+    landuse=landfill: Pl:Tag:landuse=landfill
+    landuse=meadow: Pl:Tag:landuse=meadow
+    landuse=plant_nursery: Pl:Tag:landuse=plant nursery
+    landuse=quarry: Pl:Tag:landuse=quarry
+    landuse=railway: Pl:Tag:landuse=railway
+    landuse=religious: Pl:Tag:landuse=religious
+    leisure=firepit: Pl:Tag:leisure=firepit
+    leisure=fishing: Pl:Tag:leisure=fishing
+    man_made=cross: Pl:Tag:man made=cross
+    man_made=cutline: Pl:Tag:man made=cutline
+    man_made=dyke: Pl:Tag:man made=dyke
+    man_made=embankment: Pl:Tag:man made=embankment
+    man_made=surveillance: Pl:Tag:man made=surveillance
+    man_made=tower: Pl:Tag:man made=tower
+    man_made=watermill: Pl:Tag:man made=watermill
+    man_made=windmill: Pl:Tag:man made=windmill
+    mooring=ferry: Pl:Tag:mooring=ferry
+    natural=bay: Pl:Tag:natural=bay
+    natural=cave_entrance: Pl:Tag:natural=cave entrance
+    natural=grassland: Pl:Tag:natural=grassland
+    natural=heath: Pl:Tag:natural=heath
+    natural=scrub: Pl:Tag:natural=scrub
+    natural=sinkhole: Pl:Tag:natural=sinkhole
+    natural=tree: Pl:Tag:natural=tree
+    natural=tree_row: Pl:Tag:natural=tree row
+    natural=wetland: Pl:Tag:natural=wetland
+    natural=wood: Pl:Tag:natural=wood
+    place=city: Pl:Tag:place=city
+    place=farm: Pl:Tag:place=farm
+    place=hamlet: Pl:Tag:place=hamlet
+    place=isolated_dwelling: Pl:Tag:place=isolated dwelling
+    place=locality: Pl:Tag:place=locality
+    place=neighbourhood: Pl:Tag:place=neighbourhood
+    place=suburb: Pl:Tag:place=suburb
+    place=town: Pl:Tag:place=town
+    place=village: Pl:Tag:place=village
+    power=generator: Pl:Tag:power=generator
+    power=line: Pl:Tag:power=line
+    power=minor_line: Pl:Tag:power=minor line
+    power=pole: Pl:Tag:power=pole
+    power=sub_station: Pl:Tag:power=sub station
+    power=tower: Pl:Tag:power=tower
+    power=transformer: Pl:Tag:power=transformer
+    public_transport=platform: Pl:Tag:public transport=platform
+    public_transport=stop_area: Pl:Tag:public transport=stop area
+    public_transport=stop_position: Pl:Tag:public transport=stop position
+    railway=abandoned: Pl:Tag:railway=abandoned
+    railway=crossing: Pl:Tag:railway=crossing
+    railway=crossing_controller: Pl:Tag:railway=crossing controller
+    railway=level_crossing: Pl:Tag:railway=level crossing
+    service=alley: Pl:Tag:service=alley
+    service=drive-through: Pl:Tag:service=drive-through
+    service=driveway: Pl:Tag:service=driveway
+    service=emergency_access: Pl:Tag:service=emergency access
+    service=parking_aisle: Pl:Tag:service=parking aisle
+    service=parts: Pl:Tag:service=parts
+    service=siding: Pl:Tag:service=siding
+    service=spur: Pl:Tag:service=spur
+    service=yard: Pl:Tag:service=yard
+    shop=baby_goods: Pl:Tag:shop=baby goods
+    shop=bicycle: Pl:Tag:shop=bicycle
+    shop=funeral_directors: Pl:Tag:shop=funeral directors
+    sport=aikido: Pl:Tag:sport=aikido
+    tourism=artwork: Pl:Tag:tourism=artwork
+    tourism=camp_site: Pl:Tag:tourism=camp site
+    tourism=caravan_site: Pl:Tag:tourism=caravan site
+    tourism=chalet: Pl:Tag:tourism=chalet
+    tourism=guest_house: Pl:Tag:tourism=guest house
+    tourism=hostel: Pl:Tag:tourism=hostel
+    tourism=hotel: Pl:Tag:tourism=hotel
+    tourism=information: Pl:Tag:tourism=information
+    tourism=motel: Pl:Tag:tourism=motel
+    tourism=museum: Pl:Tag:tourism=museum
+    tourism=picnic_site: Pl:Tag:tourism=picnic site
+    tourism=theme_park: Pl:Tag:tourism=theme park
+    tourism=viewpoint: Pl:Tag:tourism=viewpoint
+    tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut
+    tourism=zoo: Pl:Tag:tourism=zoo
+    tunnel=culvert: Pl:Tag:tunnel=culvert
+    type=public_transport: Pl:Tag:type=public transport
+    waterway=boatyard: Pl:Tag:waterway=boatyard
+    waterway=canal: Pl:Tag:waterway=canal
+    waterway=dam: Pl:Tag:waterway=dam
+    waterway=ditch: Pl:Tag:waterway=ditch
+    waterway=drain: Pl:Tag:waterway=drain
+    waterway=fish_pass: Pl:Tag:waterway=fish pass
+    waterway=lock_gate: Pl:Tag:waterway=lock gate
+    waterway=river: Pl:Tag:waterway=river
+    waterway=riverbank: Pl:Tag:waterway=riverbank
+    waterway=stream: Pl:Tag:waterway=stream
+    waterway=weir: Pl:Tag:waterway=weir
+    wood=coniferous: Pl:Tag:wood=coniferous
+    wood=deciduous: Pl:Tag:wood=deciduous
+    wood=evergreen: Pl:Tag:wood=evergreen
+    wood=mixed: Pl:Tag:wood=mixed
+pt:
+  key:
+    postal_code: Pt:Key:postal code
+    sport: Pt:Key:sport
+  tag:
+    amenity=hospital: Pt:Tag:amenity=hospital
+    highway=primary: Pt:Tag:highway=primary
+    leisure=fishing: Pt:Tag:leisure=fishing
+    leisure=garden: Pt:Tag:leisure=garden
+    leisure=golf_course: Pt:Tag:leisure=golf course
+    leisure=marina: Pt:Tag:leisure=marina
+    leisure=nature_reserve: Pt:Tag:leisure=nature reserve
+    leisure=park: Pt:Tag:leisure=park
+    leisure=pitch: Pt:Tag:leisure=pitch
+    leisure=playground: Pt:Tag:leisure=playground
+    leisure=slipway: Pt:Tag:leisure=slipway
+    leisure=sports_centre: Pt:Tag:leisure=sports centre
+    leisure=stadium: Pt:Tag:leisure=stadium
+    leisure=track: Pt:Tag:leisure=track
+    leisure=water_park: Pt:Tag:leisure=water park
+    sport=golf: Pt:Tag:sport=golf
 pt-br:
   key:
+    IBGE:tipo: Pt-br:Key:IBGE:tipo
+    TMC: Pt-br:Key:TMC
     abutters: Pt-br:Key:abutters
     access: Pt-br:Key:access
     addr: Pt-br:Key:addr
+    aerialway: Pt-br:Key:aerialway
     aeroway: Pt-br:Key:aeroway
     amenity: Pt-br:Key:amenity
+    area: Pt-br:Key:area
     barrier: Pt-br:Key:barrier
     bicycle: Pt-br:Key:bicycle
     boat: Pt-br:Key:boat
@@ -1386,23 +4131,42 @@ pt-br:
     boundary: Pt-br:Key:boundary
     bridge: Pt-br:Key:bridge
     building: Pt-br:Key:building
+    cables: Pt-br:Key:cables
     cep: Pt-br:Key:cep
     construction: Pt-br:Key:construction
+    contact: Pt-br:Key:contact
+    craft: Pt-br:Key:craft
+    created_by: Pt-br:Key:created by
+    crossing: Pt-br:Key:crossing
+    cuisine: Pt-br:Key:cuisine
+    cutting: Pt-br:Key:cutting
     cycleway: Pt-br:Key:cycleway
     ele: Pt-br:Key:ele
+    electrified: Pt-br:Key:electrified
+    embankment: Pt-br:Key:embankment
     emergency: Pt-br:Key:emergency
     fenced: Pt-br:Key:fenced
     foot: Pt-br:Key:foot
+    frequency: Pt-br:Key:frequency
     geological: Pt-br:Key:geological
     hgv: Pt-br:Key:hgv
     highway: Pt-br:Key:highway
     historic: Pt-br:Key:historic
     horse: Pt-br:Key:horse
+    iata: Pt-br:Key:iata
+    icao: Pt-br:Key:icao
+    ice_road: Pt-br:Key:ice road
+    incline: Pt-br:Key:incline
+    intermittent: Pt-br:Key:intermittent
     internet_access: Pt-br:Key:internet access
+    is_in: Pt-br:Key:is in
+    junction: Pt-br:Key:junction
     landuse: Pt-br:Key:landuse
     lanes: Pt-br:Key:lanes
     leisure: Pt-br:Key:leisure
+    listed_status: Pt-br:Key:listed status
     lit: Pt-br:Key:lit
+    lock: Pt-br:Key:lock
     man_made: Pt-br:Key:man made
     maxdraught: Pt-br:Key:maxdraught
     maxheight: Pt-br:Key:maxheight
@@ -1412,195 +4176,865 @@ pt-br:
     maxspeed: Pt-br:Key:maxspeed
     maxweight: Pt-br:Key:maxweight
     military: Pt-br:Key:military
+    mooring: Pt-br:Key:mooring
     motorcar: Pt-br:Key:motorcar
     motorcycle: Pt-br:Key:motorcycle
+    motorroad: Pt-br:Key:motorroad
+    mountain_pass: Pt-br:Key:mountain pass
+    mtb: Pt-br:Key:mtb
     name: Pt-br:Key:name
     natural: Pt-br:Key:natural
     noname: Pt-br:Key:noname
     office: Pt-br:Key:office
     oneway: Pt-br:Key:oneway
     operator: Pt-br:Key:operator
+    overtaking: Pt-br:Key:overtaking
+    passing_places: Pt-br:Key:passing places
+    place: Pt-br:Key:place
+    population: Pt-br:Key:population
+    postal_code: Pt-br:Key:postal code
+    power: Pt-br:Key:power
     psv: Pt-br:Key:psv
+    public_transport: Pt-br:Key:public transport
     railway: Pt-br:Key:railway
+    ref: Pt-br:Key:ref
     religion: Pt-br:Key:religion
     route: Pt-br:Key:route
+    sac_scale: Pt-br:Key:sac scale
     seamark: Pt-br:Key:seamark
+    seasonal: Pt-br:Key:seasonal
     service: Pt-br:Key:service
     shop: Pt-br:Key:shop
     ski: Pt-br:Key:ski
+    smoothness: Pt-br:Key:smoothness
     source: Pt-br:Key:source
     sport: Pt-br:Key:sport
     surface: Pt-br:Key:surface
     tourism: Pt-br:Key:tourism
     tracktype: Pt-br:Key:tracktype
     traffic_calming: Pt-br:Key:traffic calming
+    trail_visibility: Pt-br:Key:trail visibility
+    tunnel: Pt-br:Key:tunnel
     type: Pt-br:Key:type
+    usage: Pt-br:Key:usage
+    voltage: Pt-br:Key:voltage
     waterway: Pt-br:Key:waterway
+    winter_road: Pt-br:Key:winter road
+    wires: Pt-br:Key:wires
   tag:
+    aerialway=cable_car: Pt-br:Tag:aerialway=cable car
+    aerialway=station: Pt-br:Tag:aerialway=station
+    aeroway=aerodrome: Pt-br:Tag:aeroway=aerodrome
+    aeroway=apron: Pt-br:Tag:aeroway=apron
+    aeroway=gate: Pt-br:Tag:aeroway=gate
+    aeroway=helipad: Pt-br:Tag:aeroway=helipad
+    aeroway=runway: Pt-br:Tag:aeroway=runway
+    aeroway=taxiway: Pt-br:Tag:aeroway=taxiway
+    aeroway=terminal: Pt-br:Tag:aeroway=terminal
+    aeroway=windsock: Pt-br:Tag:aeroway=windsock
+    amenity=architect_office: Pt-br:Tag:amenity=architect office
+    amenity=arts_centre: Pt-br:Tag:amenity=arts centre
+    amenity=atm: Pt-br:Tag:amenity=atm
+    amenity=baby_hatch: Pt-br:Tag:amenity=baby hatch
     amenity=bank: Pt-br:Tag:amenity=bank
+    amenity=bar: Pt-br:Tag:amenity=bar
+    amenity=bbq: Pt-br:Tag:amenity=bbq
+    amenity=bench: Pt-br:Tag:amenity=bench
+    amenity=bicycke_parking: Pt-br:Tag:amenity=bicycke parking
+    amenity=bicycle_rental: Pt-br:Tag:amenity=bicycle rental
+    amenity=biergarten: Pt-br:Tag:amenity=biergarten
     amenity=brothel: Pt-br:Tag:amenity=brothel
+    amenity=bureau_de_change: Pt-br:Tag:amenity=bureau de change
+    amenity=bus_station: Pt-br:Tag:amenity=bus station
+    amenity=cafe: Pt-br:Tag:amenity=cafe
+    amenity=car_rental: Pt-br:Tag:amenity=car rental
+    amenity=car_sharing: Pt-br:Tag:amenity=car sharing
+    amenity=car_wash: Pt-br:Tag:amenity=car wash
+    amenity=cinema: Pt-br:Tag:amenity=cinema
+    amenity=clock: Pt-br:Tag:amenity=clock
+    amenity=college: Pt-br:Tag:amenity=college
+    amenity=community_centre: Pt-br:Tag:amenity=community centre
+    amenity=courthouse: Pt-br:Tag:amenity=courthouse
+    amenity=crematorium: Pt-br:Tag:amenity=crematorium
+    amenity=dentist: Pt-br:Tag:amenity=dentist
+    amenity=doctors: Pt-br:Tag:amenity=doctors
+    amenity=drinking_water: Pt-br:Tag:amenity=drinking water
+    amenity=embassy: Pt-br:Tag:amenity=embassy
+    amenity=ev_charging: Pt-br:Tag:amenity=ev charging
+    amenity=fast_food: Pt-br:Tag:amenity=fast food
+    amenity=ferry_terminal: Pt-br:Tag:amenity=ferry terminal
+    amenity=fire_hydrant: Pt-br:Tag:amenity=fire hydrant
+    amenity=fire_station: Pt-br:Tag:amenity=fire station
+    amenity=food_court: Pt-br:Tag:amenity=food court
+    amenity=fountain: Pt-br:Tag:amenity=fountain
     amenity=fuel: Pt-br:Tag:amenity=fuel
+    amenity=grave_yard: Pt-br:Tag:amenity=grave yard
+    amenity=grit_bin: Pt-br:Tag:amenity=grit bin
+    amenity=hospital: Pt-br:Tag:amenity=hospital
+    amenity=hunting_stand: Pt-br:Tag:amenity=hunting stand
+    amenity=ice_cream: Pt-br:Tag:amenity=ice cream
+    amenity=kindergarten: Pt-br:Tag:amenity=kindergarten
+    amenity=library: Pt-br:Tag:amenity=library
+    amenity=love_hotel: Pt-br:Tag:amenity=love hotel
     amenity=marketplace: Pt-br:Tag:amenity=marketplace
     amenity=nightclub: Pt-br:Tag:amenity=nightclub
+    amenity=nursing_home: Pt-br:Tag:amenity=nursing home
+    amenity=parking: Pt-br:Tag:amenity=parking
+    amenity=pharmacy: Pt-br:Tag:amenity=pharmacy
     amenity=place_of_worship: Pt-br:Tag:amenity=place of worship
+    amenity=police: Pt-br:Tag:amenity=police
+    amenity=post_box: Pt-br:Tag:amenity=post box
+    amenity=post_office: Pt-br:Tag:amenity=post office
+    amenity=prison: Pt-br:Tag:amenity=prison
+    amenity=pub: Pt-br:Tag:amenity=pub
+    amenity=public_building: Pt-br:Tag:amenity=public building
+    amenity=recycling: Pt-br:Tag:amenity=recycling
+    amenity=restaurant: Pt-br:Tag:amenity=restaurant
+    amenity=sauna: Pt-br:Tag:amenity=sauna
+    amenity=school: Pt-br:Tag:amenity=school
+    amenity=shelter: Pt-br:Tag:amenity=shelter
+    amenity=social_centre: Pt-br:Tag:amenity=social centre
+    amenity=social_facility: Pt-br:Tag:amenity=social facility
     amenity=stripclub: Pt-br:Tag:amenity=stripclub
+    amenity=studio: Pt-br:Tag:amenity=studio
+    amenity=taxi: Pt-br:Tag:amenity=taxi
+    amenity=telephone: Pt-br:Tag:amenity=telephone
+    amenity=theatre: Pt-br:Tag:amenity=theatre
+    amenity=toilets: Pt-br:Tag:amenity=toilets
+    amenity=townhall: Pt-br:Tag:amenity=townhall
+    amenity=university: Pt-br:Tag:amenity=university
+    amenity=vending_machine: Pt-br:Tag:amenity=vending machine
+    amenity=veterinary: Pt-br:Tag:amenity=veterinary
+    amenity=waste_basket: Pt-br:Tag:amenity=waste basket
+    amenity=waste_disposal: Pt-br:Tag:amenity=waste disposal
+    amenity=watering_place: Pt-br:Tag:amenity=watering place
+    barrier=city_wall: Pt-br:Tag:barrier=city wall
+    barrier=ditch: Pt-br:Tag:barrier=ditch
+    barrier=fence: Pt-br:Tag:barrier=fence
+    barrier=gate: Pt-br:Tag:barrier=gate
+    barrier=hedge: Pt-br:Tag:barrier=hedge
+    barrier=lift_gate: Pt-br:Tag:barrier=lift gate
+    barrier=retaining_wall: Pt-br:Tag:barrier=retaining wall
+    barrier=toll_booth: Pt-br:Tag:barrier=toll booth
+    barrier=wall: Pt-br:Tag:barrier=wall
+    boundary=administrative: Pt-br:Tag:boundary=administrative
+    boundary=civil: Pt-br:Tag:boundary=civil
     boundary=maritime: Pt-br:Tag:boundary=maritime
+    boundary=national_park: Pt-br:Tag:boundary=national park
+    boundary=political: Pt-br:Tag:boundary=political
+    boundary=protected_area: Pt-br:Tag:boundary=protected area
+    building=house: Pt-br:Tag:building=house
+    craft=agricultural_engines: Pt-br:Tag:craft=agricultural engines
+    craft=basket_maker: Pt-br:Tag:craft=basket maker
+    craft=beekeeper: Pt-br:Tag:craft=beekeeper
+    craft=blacksmith: Pt-br:Tag:craft=blacksmith
+    craft=boatbuilder: Pt-br:Tag:craft=boatbuilder
+    craft=bookbinder: Pt-br:Tag:craft=bookbinder
+    craft=brewery: Pt-br:Tag:craft=brewery
+    craft=carpenter: Pt-br:Tag:craft=carpenter
+    craft=carpet_layer: Pt-br:Tag:craft=carpet layer
+    craft=caterer: Pt-br:Tag:craft=caterer
+    craft=clockmaker: Pt-br:Tag:craft=clockmaker
+    craft=confectionery: Pt-br:Tag:craft=confectionery
+    craft=dressmaker: Pt-br:Tag:craft=dressmaker
+    craft=electrician: Pt-br:Tag:craft=electrician
+    craft=gardener: Pt-br:Tag:craft=gardener
+    craft=glaziery: Pt-br:Tag:craft=glaziery
+    craft=handicraft: Pt-br:Tag:craft=handicraft
+    craft=hvac: Pt-br:Tag:craft=hvac
+    craft=insulation: Pt-br:Tag:craft=insulation
+    craft=jeweller: Pt-br:Tag:craft=jeweller
+    craft=key_cutter: Pt-br:Tag:craft=key cutter
+    craft=locksmith: Pt-br:Tag:craft=locksmith
+    craft=metal_construction: Pt-br:Tag:craft=metal construction
+    craft=optician: Pt-br:Tag:craft=optician
+    craft=painter: Pt-br:Tag:craft=painter
+    craft=parquet_layer: Pt-br:Tag:craft=parquet layer
+    craft=photographer: Pt-br:Tag:craft=photographer
+    craft=photographic_laboratory: Pt-br:Tag:craft=photographic laboratory
+    craft=plasterer: Pt-br:Tag:craft=plasterer
+    craft=plumber: Pt-br:Tag:craft=plumber
+    craft=pottery: Pt-br:Tag:craft=pottery
+    craft=rigger: Pt-br:Tag:craft=rigger
+    craft=roofer: Pt-br:Tag:craft=roofer
+    craft=saddler: Pt-br:Tag:craft=saddler
+    craft=sailmaker: Pt-br:Tag:craft=sailmaker
+    craft=sawmill: Pt-br:Tag:craft=sawmill
+    craft=scaffolder: Pt-br:Tag:craft=scaffolder
+    craft=sculptor: Pt-br:Tag:craft=sculptor
+    craft=shoemaker: Pt-br:Tag:craft=shoemaker
+    craft=stand_builder: Pt-br:Tag:craft=stand builder
+    craft=stonemason: Pt-br:Tag:craft=stonemason
+    craft=sun_protection: Pt-br:Tag:craft=sun protection
+    craft=sweep: Pt-br:Tag:craft=sweep
+    craft=tailor: Pt-br:Tag:craft=tailor
+    craft=tiler: Pt-br:Tag:craft=tiler
+    craft=tinsmith: Pt-br:Tag:craft=tinsmith
+    craft=upholstrer: Pt-br:Tag:craft=upholstrer
+    craft=watchmaker: Pt-br:Tag:craft=watchmaker
+    emergency=ambulance_station: Pt-br:Tag:emergency=ambulance station
+    emergency=fire_hydrant: Pt-br:Tag:emergency=fire hydrant
+    emergency=phone: Pt-br:Tag:emergency=phone
+    emergency=siren: Pt-br:Tag:emergency=siren
+    geological=palaeontological_site: Pt-br:Tag:geological=palaeontological site
+    highway=bridleway: Pt-br:Tag:highway=bridleway
+    highway=bus_guideway: Pt-br:Tag:highway=bus guideway
+    highway=bus_stop: Pt-br:Tag:highway=bus stop
+    highway=byway: Pt-br:Tag:highway=byway
+    highway=crossing: Pt-br:Tag:highway=crossing
+    highway=cycleway: Pt-br:Tag:highway=cycleway
+    highway=emergency_access_point: Pt-br:Tag:highway=emergency access point
+    highway=footway: Pt-br:Tag:highway=footway
+    highway=ford: Pt-br:Tag:highway=ford
+    highway=give_way: Pt-br:Tag:highway=give way
+    highway=living_street: Pt-br:Tag:highway=living street
+    highway=mini_roundabout: Pt-br:Tag:highway=mini roundabout
     highway=motorway: Pt-br:Tag:highway=motorway
     highway=motorway_junction: Pt-br:Tag:highway=motorway junction
     highway=motorway_link: Pt-br:Tag:highway=motorway link
+    highway=passing_place: Pt-br:Tag:highway=passing place
+    highway=path: Pt-br:Tag:highway=path
+    highway=pedestrian: Pt-br:Tag:highway=pedestrian
+    highway=platform: Pt-br:Tag:highway=platform
+    highway=primary: Pt-br:Tag:highway=primary
+    highway=raceway: Pt-br:Tag:highway=raceway
+    highway=residential: Pt-br:Tag:highway=residential
+    highway=rest_area: Pt-br:Tag:highway=rest area
     highway=road: Pt-br:Tag:highway=road
+    highway=secondary: Pt-br:Tag:highway=secondary
+    highway=service: Pt-br:Tag:highway=service
+    highway=services: Pt-br:Tag:highway=services
+    highway=speed_camera: Pt-br:Tag:highway=speed camera
+    highway=steps: Pt-br:Tag:highway=steps
     highway=stop: Pt-br:Tag:highway=stop
+    highway=street_lamp: Pt-br:Tag:highway=street lamp
+    highway=tertiary: Pt-br:Tag:highway=tertiary
+    highway=track: Pt-br:Tag:highway=track
+    highway=traffic_signals: Pt-br:Tag:highway=traffic signals
+    highway=trunk: Pt-br:Tag:highway=trunk
+    highway=turning_circle: Pt-br:Tag:highway=turning circle
     highway=unclassified: Pt-br:Tag:highway=unclassified
+    historic=archaeological_site: Pt-br:Tag:historic=archaeological site
+    historic=battlefield: Pt-br:Tag:historic=battlefield
+    historic=boundary_stone: Pt-br:Tag:historic=boundary stone
+    historic=castle: Pt-br:Tag:historic=castle
+    historic=city_gate: Pt-br:Tag:historic=city gate
+    historic=memorial: Pt-br:Tag:historic=memorial
+    historic=monument: Pt-br:Tag:historic=monument
+    historic=ruins: Pt-br:Tag:historic=ruins
+    historic=wayside_cross: Pt-br:Tag:historic=wayside cross
+    historic=wayside_shrine: Pt-br:Tag:historic=wayside shrine
+    historic=wreck: Pt-br:Tag:historic=wreck
+    junction=roundabout: Pt-br:Tag:junction=roundabout
+    landuse=allotments: Pt-br:Tag:landuse=allotments
+    landuse=basin: Pt-br:Tag:landuse=basin
+    landuse=brownfield: Pt-br:Tag:landuse=brownfield
     landuse=cemetery: Pt-br:Tag:landuse=cemetery
+    landuse=commercial: Pt-br:Tag:landuse=commercial
+    landuse=farm: Pt-br:Tag:landuse=farm
+    landuse=farmyard: Pt-br:Tag:landuse=farmyard
+    landuse=forest: Pt-br:Tag:landuse=forest
+    landuse=garages: Pt-br:Tag:landuse=garages
+    landuse=grass: Pt-br:Tag:landuse=grass
+    landuse=greenfield: Pt-br:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: Pt-br:Tag:landuse=greenhouse horticulture
+    landuse=industrial: Pt-br:Tag:landuse=industrial
+    landuse=landfill: Pt-br:Tag:landuse=landfill
     landuse=meadow: Pt-br:Tag:landuse=meadow
+    landuse=military: Pt-br:Tag:landuse=military
+    landuse=orchard: Pt-br:Tag:landuse=orchard
+    landuse=quarry: Pt-br:Tag:landuse=quarry
+    landuse=railway: Pt-br:Tag:landuse=railway
+    landuse=recreation_ground: Pt-br:Tag:landuse=recreation ground
+    landuse=reservoir: Pt-br:Tag:landuse=reservoir
+    landuse=residential: Pt-br:Tag:landuse=residential
+    landuse=retail: Pt-br:Tag:landuse=retail
+    landuse=salt_pond: Pt-br:Tag:landuse=salt pond
+    landuse=village_green: Pt-br:Tag:landuse=village green
+    landuse=vineyard: Pt-br:Tag:landuse=vineyard
+    leisure=common: Pt-br:Tag:leisure=common
+    leisure=dance: Pt-br:Tag:leisure=dance
+    leisure=dog_park: Pt-br:Tag:leisure=dog park
+    leisure=garden: Pt-br:Tag:leisure=garden
+    leisure=golf_course: Pt-br:Tag:leisure=golf course
+    leisure=ice_rink: Pt-br:Tag:leisure=ice rink
+    leisure=marina: Pt-br:Tag:leisure=marina
+    leisure=miniature_golf: Pt-br:Tag:leisure=miniature golf
+    leisure=nature_reserve: Pt-br:Tag:leisure=nature reserve
+    leisure=park: Pt-br:Tag:leisure=park
+    leisure=pitch: Pt-br:Tag:leisure=pitch
+    leisure=playground: Pt-br:Tag:leisure=playground
+    leisure=slipway: Pt-br:Tag:leisure=slipway
+    leisure=sports_centre: Pt-br:Tag:leisure=sports centre
+    leisure=stadium: Pt-br:Tag:leisure=stadium
+    leisure=swimming_pool: Pt-br:Tag:leisure=swimming pool
+    leisure=track: Pt-br:Tag:leisure=track
+    leisure=water_park: Pt-br:Tag:leisure=water park
+    man_made=adit: Pt-br:Tag:man made=adit
+    man_made=antenna: Pt-br:Tag:man made=antenna
+    man_made=beacon: Pt-br:Tag:man made=beacon
+    man_made=breakwater: Pt-br:Tag:man made=breakwater
+    man_made=crane: Pt-br:Tag:man made=crane
+    man_made=cutline: Pt-br:Tag:man made=cutline
+    man_made=flagpole: Pt-br:Tag:man made=flagpole
+    man_made=groyne: Pt-br:Tag:man made=groyne
+    man_made=jetty: Pt-br:Tag:man made=jetty
+    man_made=lighthouse: Pt-br:Tag:man made=lighthouse
+    man_made=mineshaft: Pt-br:Tag:man made=mineshaft
+    man_made=monitoring_station: Pt-br:Tag:man made=monitoring station
+    man_made=petroleum_well: Pt-br:Tag:man made=petroleum well
+    man_made=pier: Pt-br:Tag:man made=pier
+    man_made=pipeline: Pt-br:Tag:man made=pipeline
+    man_made=reservoir_covered: Pt-br:Tag:man made=reservoir covered
+    man_made=surveillance: Pt-br:Tag:man made=surveillance
     man_made=survey_point: Pt-br:Tag:man made=survey point
+    man_made=tower: Pt-br:Tag:man made=tower
+    man_made=wastewater_plant: Pt-br:Tag:man made=wastewater plant
+    man_made=water_tower: Pt-br:Tag:man made=water tower
+    man_made=water_well: Pt-br:Tag:man made=water well
+    man_made=water_works: Pt-br:Tag:man made=water works
+    man_made=watermill: Pt-br:Tag:man made=watermill
+    man_made=windmill: Pt-br:Tag:man made=windmill
+    man_made=works: Pt-br:Tag:man made=works
+    military=airfield: Pt-br:Tag:military=airfield
+    military=barracks: Pt-br:Tag:military=barracks
+    military=bunker: Pt-br:Tag:military=bunker
+    military=danger_area: Pt-br:Tag:military=danger area
+    military=naval_base: Pt-br:Tag:military=naval base
+    military=range: Pt-br:Tag:military=range
+    natural=bay: Pt-br:Tag:natural=bay
     natural=beach: Pt-br:Tag:natural=beach
+    natural=cave_entrance: Pt-br:Tag:natural=cave entrance
+    natural=cliff: Pt-br:Tag:natural=cliff
+    natural=coastline: Pt-br:Tag:natural=coastline
+    natural=fell: Pt-br:Tag:natural=fell
+    natural=glacier: Pt-br:Tag:natural=glacier
+    natural=grassland: Pt-br:Tag:natural=grassland
+    natural=heath: Pt-br:Tag:natural=heath
+    natural=mud: Pt-br:Tag:natural=mud
+    natural=peak: Pt-br:Tag:natural=peak
+    natural=sand: Pt-br:Tag:natural=sand
+    natural=scree: Pt-br:Tag:natural=scree
+    natural=scrub: Pt-br:Tag:natural=scrub
+    natural=spring: Pt-br:Tag:natural=spring
+    natural=stone: Pt-br:Tag:natural=stone
+    natural=tree: Pt-br:Tag:natural=tree
+    natural=volcano: Pt-br:Tag:natural=volcano
+    natural=water: Pt-br:Tag:natural=water
     natural=wetland: Pt-br:Tag:natural=wetland
+    natural=wood: Pt-br:Tag:natural=wood
+    office=accountant: Pt-br:Tag:office=accountant
+    office=administrative: Pt-br:Tag:office=administrative
+    office=architect: Pt-br:Tag:office=architect
+    office=camping: Pt-br:Tag:office=camping
+    office=company: Pt-br:Tag:office=company
+    office=educational_institution: Pt-br:Tag:office=educational institution
+    office=employment_agency: Pt-br:Tag:office=employment agency
+    office=estate_agent: Pt-br:Tag:office=estate agent
+    office=government: Pt-br:Tag:office=government
+    office=insurance: Pt-br:Tag:office=insurance
+    office=it: Pt-br:Tag:office=it
+    office=lawyer: Pt-br:Tag:office=lawyer
+    office=newspaper: Pt-br:Tag:office=newspaper
+    office=ngo: Pt-br:Tag:office=ngo
+    office=quango: Pt-br:Tag:office=quango
+    office=research: Pt-br:Tag:office=research
+    office=telecommunication: Pt-br:Tag:office=telecommunication
+    office=travel_agent: Pt-br:Tag:office=travel agent
+    place=city: Pt-br:Tag:place=city
+    place=continent: Pt-br:Tag:place=continent
+    place=country: Pt-br:Tag:place=country
+    place=county: Pt-br:Tag:place=county
+    place=farm: Pt-br:Tag:place=farm
+    place=hamlet: Pt-br:Tag:place=hamlet
+    place=island: Pt-br:Tag:place=island
+    place=islet: Pt-br:Tag:place=islet
+    place=isolated_dwelling: Pt-br:Tag:place=isolated dwelling
+    place=locality: Pt-br:Tag:place=locality
+    place=region: Pt-br:Tag:place=region
+    place=state: Pt-br:Tag:place=state
+    place=suburb: Pt-br:Tag:place=suburb
+    place=town: Pt-br:Tag:place=town
+    place=village: Pt-br:Tag:place=village
+    power=cable_distribution_cabinet: Pt-br:Tag:power=cable distribution cabinet
+    power=generator: Pt-br:Tag:power=generator
+    power=line: Pt-br:Tag:power=line
+    power=minor_line: Pt-br:Tag:power=minor line
+    power=pole: Pt-br:Tag:power=pole
+    power=station: Pt-br:Tag:power=station
+    power=sub_station: Pt-br:Tag:power=sub station
+    power=tower: Pt-br:Tag:power=tower
+    railway=buffer_stop: Pt-br:Tag:railway=buffer stop
+    railway=crossing: Pt-br:Tag:railway=crossing
+    railway=derail: Pt-br:Tag:railway=derail
+    railway=funicular: Pt-br:Tag:railway=funicular
+    railway=halt: Pt-br:Tag:railway=halt
+    railway=level_crossing: Pt-br:Tag:railway=level crossing
+    railway=monorail: Pt-br:Tag:railway=monorail
+    railway=platform: Pt-br:Tag:railway=platform
     railway=rail: Pt-br:Tag:railway=rail
+    railway=station: Pt-br:Tag:railway=station
+    railway=subway: Pt-br:Tag:railway=subway
+    railway=subway_entrance: Pt-br:Tag:railway=subway entrance
+    railway=switch: Pt-br:Tag:railway=switch
+    railway=tram: Pt-br:Tag:railway=tram
+    railway=tram_stop: Pt-br:Tag:railway=tram stop
+    railway=turntable: Pt-br:Tag:railway=turntable
+    route=bus: Pt-br:Tag:route=bus
+    route=detour: Pt-br:Tag:route=detour
+    route=ferry: Pt-br:Tag:route=ferry
+    route=railway: Pt-br:Tag:route=railway
+    route=road: Pt-br:Tag:route=road
+    route=train: Pt-br:Tag:route=train
+    route=tram: Pt-br:Tag:route=tram
+    service=alley: Pt-br:Tag:service=alley
+    service=driveway: Pt-br:Tag:service=driveway
+    service=parking_aisle: Pt-br:Tag:service=parking aisle
+    service=siding: Pt-br:Tag:service=siding
+    service=spur: Pt-br:Tag:service=spur
+    service=yard: Pt-br:Tag:service=yard
+    shop=alcohol: Pt-br:Tag:shop=alcohol
+    shop=anime: Pt-br:Tag:shop=anime
+    shop=art: Pt-br:Tag:shop=art
+    shop=baby_goods: Pt-br:Tag:shop=baby goods
+    shop=bakery: Pt-br:Tag:shop=bakery
+    shop=bathroom_furnishing: Pt-br:Tag:shop=bathroom furnishing
+    shop=beauty: Pt-br:Tag:shop=beauty
+    shop=bed: Pt-br:Tag:shop=bed
+    shop=beverages: Pt-br:Tag:shop=beverages
+    shop=bicycle: Pt-br:Tag:shop=bicycle
+    shop=books: Pt-br:Tag:shop=books
+    shop=boutique: Pt-br:Tag:shop=boutique
+    shop=butcher: Pt-br:Tag:shop=butcher
+    shop=car: Pt-br:Tag:shop=car
+    shop=car_repair: Pt-br:Tag:shop=car repair
+    shop=charity: Pt-br:Tag:shop=charity
+    shop=chemist: Pt-br:Tag:shop=chemist
+    shop=clothes: Pt-br:Tag:shop=clothes
+    shop=computer: Pt-br:Tag:shop=computer
+    shop=confectionery: Pt-br:Tag:shop=confectionery
+    shop=convenience: Pt-br:Tag:shop=convenience
+    shop=copyshop: Pt-br:Tag:shop=copyshop
+    shop=curtain: Pt-br:Tag:shop=curtain
+    shop=deli: Pt-br:Tag:shop=deli
+    shop=department_store: Pt-br:Tag:shop=department store
+    shop=dive: Pt-br:Tag:shop=dive
+    shop=doityourself: Pt-br:Tag:shop=doityourself
+    shop=dry_cleaning: Pt-br:Tag:shop=dry cleaning
+    shop=electronics: Pt-br:Tag:shop=electronics
+    shop=erotic: Pt-br:Tag:shop=erotic
+    shop=fabric: Pt-br:Tag:shop=fabric
+    shop=farm: Pt-br:Tag:shop=farm
+    shop=florist: Pt-br:Tag:shop=florist
+    shop=frame: Pt-br:Tag:shop=frame
+    shop=funeral_directors: Pt-br:Tag:shop=funeral directors
+    shop=furnace: Pt-br:Tag:shop=furnace
+    shop=furniture: Pt-br:Tag:shop=furniture
+    shop=garden_centre: Pt-br:Tag:shop=garden centre
+    shop=gas: Pt-br:Tag:shop=gas
+    shop=general: Pt-br:Tag:shop=general
+    shop=gift: Pt-br:Tag:shop=gift
+    shop=glaziery: Pt-br:Tag:shop=glaziery
+    shop=greengrocer: Pt-br:Tag:shop=greengrocer
+    shop=hairdresser: Pt-br:Tag:shop=hairdresser
+    shop=hardware: Pt-br:Tag:shop=hardware
+    shop=hearing_aids: Pt-br:Tag:shop=hearing aids
+    shop=hifi: Pt-br:Tag:shop=hifi
+    shop=hunting: Pt-br:Tag:shop=hunting
+    shop=insurance: Pt-br:Tag:shop=insurance
+    shop=interior_decoration: Pt-br:Tag:shop=interior decoration
+    shop=jewelry: Pt-br:Tag:shop=jewelry
+    shop=kiosk: Pt-br:Tag:shop=kiosk
+    shop=kitchen: Pt-br:Tag:shop=kitchen
+    shop=laundry: Pt-br:Tag:shop=laundry
     shop=mall: Pt-br:Tag:shop=mall
+    shop=massage: Pt-br:Tag:shop=massage
+    shop=mobile_phone: Pt-br:Tag:shop=mobile phone
+    shop=money_lender: Pt-br:Tag:shop=money lender
+    shop=motorcycle: Pt-br:Tag:shop=motorcycle
+    shop=musical_instrument: Pt-br:Tag:shop=musical instrument
+    shop=newsagent: Pt-br:Tag:shop=newsagent
+    shop=optician: Pt-br:Tag:shop=optician
+    shop=organic: Pt-br:Tag:shop=organic
+    shop=outdoor: Pt-br:Tag:shop=outdoor
+    shop=paint: Pt-br:Tag:shop=paint
+    shop=pawnbroker: Pt-br:Tag:shop=pawnbroker
+    shop=pet: Pt-br:Tag:shop=pet
+    shop=radiotechnics: Pt-br:Tag:shop=radiotechnics
+    shop=seafood: Pt-br:Tag:shop=seafood
+    shop=second_hand: Pt-br:Tag:shop=second hand
+    shop=shoes: Pt-br:Tag:shop=shoes
+    shop=sports: Pt-br:Tag:shop=sports
     shop=stationery: Pt-br:Tag:shop=stationery
+    shop=supermarket: Pt-br:Tag:shop=supermarket
+    shop=tattoo: Pt-br:Tag:shop=tattoo
+    shop=tobacco: Pt-br:Tag:shop=tobacco
+    shop=toys: Pt-br:Tag:shop=toys
+    shop=trade: Pt-br:Tag:shop=trade
+    shop=vacant: Pt-br:Tag:shop=vacant
+    shop=vacuum_cleaner: Pt-br:Tag:shop=vacuum cleaner
+    shop=variety_store: Pt-br:Tag:shop=variety store
+    shop=video: Pt-br:Tag:shop=video
     source=IBGE: Pt-br:Tag:source=IBGE
+    sport=soccer: Pt-br:Tag:sport=soccer
+    tourism=alpine_hut: Pt-br:Tag:tourism=alpine hut
+    tourism=artwork: Pt-br:Tag:tourism=artwork
+    tourism=attraction: Pt-br:Tag:tourism=attraction
+    tourism=camp_site: Pt-br:Tag:tourism=camp site
+    tourism=caravan_site: Pt-br:Tag:tourism=caravan site
+    tourism=chalet: Pt-br:Tag:tourism=chalet
+    tourism=guest_house: Pt-br:Tag:tourism=guest house
+    tourism=hostel: Pt-br:Tag:tourism=hostel
+    tourism=hotel: Pt-br:Tag:tourism=hotel
+    tourism=information: Pt-br:Tag:tourism=information
+    tourism=motel: Pt-br:Tag:tourism=motel
+    tourism=museum: Pt-br:Tag:tourism=museum
+    tourism=picnic_site: Pt-br:Tag:tourism=picnic site
+    tourism=theme_park: Pt-br:Tag:tourism=theme park
     tourism=viewpoint: Pt-br:Tag:tourism=viewpoint
+    tourism=zoo: Pt-br:Tag:tourism=zoo
+    waterway=boatyard: Pt-br:Tag:waterway=boatyard
+    waterway=canal: Pt-br:Tag:waterway=canal
+    waterway=dam: Pt-br:Tag:waterway=dam
+    waterway=ditch: Pt-br:Tag:waterway=ditch
+    waterway=dock: Pt-br:Tag:waterway=dock
+    waterway=drain: Pt-br:Tag:waterway=drain
+    waterway=lock_gate: Pt-br:Tag:waterway=lock gate
+    waterway=river: Pt-br:Tag:waterway=river
     waterway=riverbank: Pt-br:Tag:waterway=riverbank
+    waterway=stream: Pt-br:Tag:waterway=stream
+    waterway=turning_point: Pt-br:Tag:waterway=turning point
+    waterway=weir: Pt-br:Tag:waterway=weir
 ro:
+  key:
+    leisure: Ro:Key:leisure
+    tracktype: Ro:Key:tracktype
   tag:
+    amenity=nightclub: Ro:Tag:amenity=nightclub
     junction=roundabout: Ro:Tag:junction=roundabout
-ro-md:
-  tag:
-    amenity=nightclub: Ro-md:Tag:amenity=nightclub
 ru:
   key:
     abutters: RU:Key:abutters
     access: RU:Key:access
     addr: RU:Key:addr
+    addr:flats: RU:Key:addr:flats
+    addr:place: RU:Key:addr:place
+    addr:suburb: RU:Key:addr:suburb
     aerialway: RU:Key:aerialway
     aeroway: RU:Key:aeroway
     amenity: RU:Key:amenity
     area: RU:Key:area
+    area:highway: RU:Key:area:highway
     barrier: RU:Key:barrier
+    bench: RU:Key:bench
     bicycle: RU:Key:bicycle
+    bicycle_parking: RU:Key:bicycle parking
+    bin: RU:Key:bin
     boat: RU:Key:boat
     border_type: RU:Key:border type
     boundary: RU:Key:boundary
+    brand: RU:Key:brand
     bridge: RU:Key:bridge
     building: RU:Key:building
+    building:levels: RU:Key:building:levels
+    building:material: RU:Key:building:material
+    building:min_level: RU:Key:building:min level
+    building:part: RU:Key:building:part
+    building:parts: RU:Key:building:parts
     bunker_type: RU:Key:bunker type
+    cafe: RU:Key:cafe
     capacity: RU:Key:capacity
+    check_date: RU:Key:check date
+    clothes: RU:Key:clothes
+    club: RU:Key:club
+    colour: RU:Key:colour
     comment: RU:Key:comment
     construction: RU:Key:construction
+    contact: RU:Key:contact
     covered: RU:Key:covered
+    craft: RU:Key:craft
     created_by: RU:Key:created by
+    crop: RU:Key:crop
     crossing: RU:Key:crossing
     cuisine: RU:Key:cuisine
     cutting: RU:Key:cutting
     denomination: RU:Key:denomination
     description: RU:Key:description
+    designation: RU:Key:designation
     direction: RU:Key:direction
+    dispensing: RU:Key:dispensing
     disused: RU:Key:disused
+    drive_in: RU:Key:drive in
     ele: RU:Key:ele
+    electrified: RU:Key:electrified
     embankment: RU:Key:embankment
+    emergency: RU:Key:emergency
+    entrance: RU:Key:entrance
+    exit: RU:Key:exit
+    fast_food: RU:Key:fast food
     fee: RU:Key:fee
+    fence_type: RU:Key:fence type
+    ferry: RU:Key:ferry
     fixme: RU:Key:fixme
     foot: RU:Key:foot
+    footway: RU:Key:footway
+    ford: RU:Key:ford
+    fuel: RU:Key:fuel
     gauge: RU:Key:gauge
+    generator:output: RU:Key:generator:output
+    generator:source: RU:Key:generator:source
+    gvr:code: RU:Key:gvr:code
+    handrail: RU:Key:handrail
     height: RU:Key:height
     highway: RU:Key:highway
     historic: RU:Key:historic
     horse: RU:Key:horse
+    ice_road: RU:Key:ice road
+    incline: RU:Key:incline
     information: RU:Key:information
+    inscription: RU:Key:inscription
+    intermittent: RU:Key:intermittent
     internet_access: RU:Key:internet access
     junction: RU:Key:junction
+    kerb: RU:Key:kerb
+    landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
+    layer: RU:Key:layer
     leisure: RU:Key:leisure
+    length: RU:Key:length
+    level: RU:Key:level
     man_made: RU:Key:man made
+    manhole: RU:Key:manhole
+    maxaxleload: RU:Key:maxaxleload
     maxheight: RU:Key:maxheight
     maxlength: RU:Key:maxlength
     maxspeed: RU:Key:maxspeed
+    maxspeed:practical: RU:Key:maxspeed:practical
+    maxstay: RU:Key:maxstay
     maxweight: RU:Key:maxweight
     maxwidth: RU:Key:maxwidth
     military: RU:Key:military
+    min_height: RU:Key:min height
     minspeed: RU:Key:minspeed
+    motorroad: RU:Key:motorroad
     name: RU:Key:name
     natural: RU:Key:natural
     noexit: RU:Key:noexit
     note: RU:Key:note
+    office: RU:Key:office
     oneway: RU:Key:oneway
+    opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
     operator: RU:Key:operator
+    overtaking: RU:Key:overtaking
     parking: RU:Key:parking
+    parking:lane: RU:Key:parking:lane
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
+    payment: RU:Key:payment
     phone: RU:Key:phone
+    piste:type: RU:Key:piste:type
     place: RU:Key:place
+    playground: RU:Key:playground
     population: RU:Key:population
     power: RU:Key:power
-    power_source: RU:Key:power source
+    priority_road: RU:Key:priority road
+    psv: RU:Key:psv
     railway: RU:Key:railway
+    ramp: RU:Key:ramp
     ref: RU:Key:ref
     religion: RU:Key:religion
+    resource: RU:Key:resource
+    roof:material: RU:Key:roof:material
     route: RU:Key:route
+    ruins: RU:Key:ruins
+    seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     service: RU:Key:service
+    shelter: RU:Key:shelter
+    shelter_type: RU:Key:shelter type
     shop: RU:Key:shop
+    side_road: RU:Key:side road
+    sidewalk: RU:Key:sidewalk
+    smoking: RU:Key:smoking
     smoothness: RU:Key:smoothness
+    snowplowing: RU:Key:snowplowing
+    social_facility: RU:Key:social facility
+    sorting_name: RU:Key:sorting name
     source: RU:Key:source
+    source:maxspeed: RU:Key:source:maxspeed
+    species: RU:Key:species
+    sport: RU:Key:sport
     surface: RU:Key:surface
+    surveillance: RU:Key:surveillance
+    tactile_paving: RU:Key:tactile paving
+    toll: RU:Key:toll
     tourism: RU:Key:tourism
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
+    traffic_sign: RU:Key:traffic sign
+    tunnel: RU:Key:tunnel
+    turn: RU:Key:turn
     type: RU:Key:type
+    voltage: RU:Key:voltage
+    water: RU:Key:water
     waterway: RU:Key:waterway
     website: RU:Key:website
+    wheelchair: RU:Key:wheelchair
     width: RU:Key:width
     wikipedia: RU:Key:wikipedia
+    winter_road: RU:Key:winter road
     wood: RU:Key:wood
   tag:
+    abandoned=yes: RU:Tag:abandoned=yes
     access=designated: RU:Tag:access=designated
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=gate: RU:Tag:aeroway=gate
     aeroway=helipad: RU:Tag:aeroway=helipad
+    aeroway=navigationaid: RU:Tag:aeroway=navigationaid
     aeroway=runway: RU:Tag:aeroway=runway
     aeroway=taxiway: RU:Tag:aeroway=taxiway
     aeroway=terminal: RU:Tag:aeroway=terminal
+    aeroway=windsock: RU:Tag:aeroway=windsock
+    amenity=animal_boarding: RU:Tag:amenity=animal boarding
+    amenity=animal_shelter: RU:Tag:amenity=animal shelter
+    amenity=arts_centre: RU:Tag:amenity=arts centre
+    amenity=atm: RU:Tag:amenity=atm
     amenity=bank: RU:Tag:amenity=bank
+    amenity=bar: RU:Tag:amenity=bar
+    amenity=bbq: RU:Tag:amenity=bbq
+    amenity=bench: RU:Tag:amenity=bench
+    amenity=bicycle_parking: RU:Tag:amenity=bicycle parking
     amenity=bicycle_rental: RU:Tag:amenity=bicycle rental
+    amenity=biergarten: RU:Tag:amenity=biergarten
+    amenity=boat_storage: RU:Tag:amenity=boat storage
     amenity=brothel: RU:Tag:amenity=brothel
+    amenity=bureau_de_change: RU:Tag:amenity=bureau de change
     amenity=bus_station: RU:Tag:amenity=bus station
+    amenity=cafe: RU:Tag:amenity=cafe
     amenity=car_rental: RU:Tag:amenity=car rental
     amenity=car_sharing: RU:Tag:amenity=car sharing
+    amenity=car_wash: RU:Tag:amenity=car wash
+    amenity=casino: RU:Tag:amenity=casino
+    amenity=cinema: RU:Tag:amenity=cinema
+    amenity=clinic: RU:Tag:amenity=clinic
+    amenity=clock: RU:Tag:amenity=clock
+    amenity=college: RU:Tag:amenity=college
+    amenity=community_centre: RU:Tag:amenity=community centre
+    amenity=compressed_air: RU:Tag:amenity=compressed air
+    amenity=courthouse: RU:Tag:amenity=courthouse
     amenity=crematorium: RU:Tag:amenity=crematorium
+    amenity=dentist: RU:Tag:amenity=dentist
+    amenity=doctors: RU:Tag:amenity=doctors
+    amenity=drinking_water: RU:Tag:amenity=drinking water
+    amenity=driving_school: RU:Tag:amenity=driving school
+    amenity=embassy: RU:Tag:amenity=embassy
     amenity=fast_food: RU:Tag:amenity=fast food
+    amenity=ferry_terminal: RU:Tag:amenity=ferry terminal
     amenity=fire_station: RU:Tag:amenity=fire station
+    amenity=food_court: RU:Tag:amenity=food court
     amenity=fountain: RU:Tag:amenity=fountain
     amenity=fuel: RU:Tag:amenity=fuel
     amenity=grave_yard: RU:Tag:amenity=grave yard
+    amenity=hospital: RU:Tag:amenity=hospital
+    amenity=kindergarten: RU:Tag:amenity=kindergarten
+    amenity=library: RU:Tag:amenity=library
+    amenity=love_hotel: RU:Tag:amenity=love hotel
+    amenity=marketplace: RU:Tag:amenity=marketplace
+    amenity=monastery: RU:Tag:amenity=monastery
+    amenity=mortuary: RU:Tag:amenity=mortuary
     amenity=nightclub: RU:Tag:amenity=nightclub
+    amenity=nursing_home: RU:Tag:amenity=nursing home
     amenity=parking: RU:Tag:amenity=parking
+    amenity=parking_entrance: RU:Tag:amenity=parking entrance
+    amenity=parking_space: RU:Tag:amenity=parking space
+    amenity=payment_terminal: RU:Tag:amenity=payment terminal
     amenity=pharmacy: RU:Tag:amenity=pharmacy
     amenity=place_of_worship: RU:Tag:amenity=place of worship
+    amenity=police: RU:Tag:amenity=police
+    amenity=post_box: RU:Tag:amenity=post box
+    amenity=post_office: RU:Tag:amenity=post office
+    amenity=prison: RU:Tag:amenity=prison
+    amenity=pub: RU:Tag:amenity=pub
+    amenity=public_building: RU:Tag:amenity=public building
+    amenity=recycling: RU:Tag:amenity=recycling
+    amenity=register_office: RU:Tag:amenity=register office
     amenity=restaurant: RU:Tag:amenity=restaurant
+    amenity=sauna: RU:Tag:amenity=sauna
     amenity=school: RU:Tag:amenity=school
+    amenity=shelter: RU:Tag:amenity=shelter
+    amenity=shower: RU:Tag:amenity=shower
+    amenity=social_facility: RU:Tag:amenity=social facility
     amenity=stripclub: RU:Tag:amenity=stripclub
     amenity=taxi: RU:Tag:amenity=taxi
     amenity=telephone: RU:Tag:amenity=telephone
     amenity=theatre: RU:Tag:amenity=theatre
     amenity=toilets: RU:Tag:amenity=toilets
+    amenity=townhall: RU:Tag:amenity=townhall
+    amenity=university: RU:Tag:amenity=university
     amenity=vending_machine: RU:Tag:amenity=vending machine
+    amenity=veterinary: RU:Tag:amenity=veterinary
     amenity=waste_basket: RU:Tag:amenity=waste basket
     amenity=waste_disposal: RU:Tag:amenity=waste disposal
     atm=yes: RU:Tag:atm=yes
+    barrier=block: RU:Tag:barrier=block
+    barrier=bollard: RU:Tag:barrier=bollard
+    barrier=city_wall: RU:Tag:barrier=city wall
+    barrier=ditch: RU:Tag:barrier=ditch
+    barrier=entrance: RU:Tag:barrier=entrance
     barrier=fence: RU:Tag:barrier=fence
+    barrier=gate: RU:Tag:barrier=gate
+    barrier=hedge: RU:Tag:barrier=hedge
     barrier=lift_gate: RU:Tag:barrier=lift gate
+    barrier=retaining_wall: RU:Tag:barrier=retaining wall
+    barrier=sally_port: RU:Tag:barrier=sally port
     barrier=toll_booth: RU:Tag:barrier=toll booth
+    barrier=turnstile: RU:Tag:barrier=turnstile
+    barrier=wall: RU:Tag:barrier=wall
+    building=detached: RU:Tag:building=detached
+    building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
+    building=roof: RU:Tag:building=roof
+    building=shed: RU:Tag:building=shed
+    building=stable: RU:Tag:building=stable
+    building=train_station: RU:Tag:building=train station
+    bunker_type=pillbox: RU:Tag:bunker type=pillbox
+    cafe=time-cafe: RU:Tag:cafe=time-cafe
+    craft=agricultural_engines: RU:Tag:craft=agricultural engines
+    craft=basket_maker: RU:Tag:craft=basket maker
+    craft=beekeeper: RU:Tag:craft=beekeeper
+    craft=blacksmith: RU:Tag:craft=blacksmith
+    craft=boatbuilder: RU:Tag:craft=boatbuilder
+    craft=bookbinder: RU:Tag:craft=bookbinder
+    craft=brewery: RU:Tag:craft=brewery
+    craft=carpenter: RU:Tag:craft=carpenter
+    craft=carpet_layer: RU:Tag:craft=carpet layer
+    craft=caterer: RU:Tag:craft=caterer
+    craft=clockmaker: RU:Tag:craft=clockmaker
+    craft=dressmaker: RU:Tag:craft=dressmaker
+    craft=electrician: RU:Tag:craft=electrician
+    craft=glaziery: RU:Tag:craft=glaziery
+    craft=handicraft: RU:Tag:craft=handicraft
+    craft=shoemaker: RU:Tag:craft=shoemaker
+    craft=tailor: RU:Tag:craft=tailor
+    emergency=ambulance_station: RU:Tag:emergency=ambulance station
+    emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
+    emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    fast_food=cafeteria: RU:Tag:fast food=cafeteria
+    footway=crossing: RU:Tag:footway=crossing
+    footway=sidewalk: RU:Tag:footway=sidewalk
+    geological=palaeontological_site: RU:Tag:geological=palaeontological site
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_stop: RU:Tag:highway=bus stop
+    highway=construction: RU:Tag:highway=construction
     highway=crossing: RU:Tag:highway=crossing
     highway=cycleway: RU:Tag:highway=cycleway
+    highway=elevator: RU:Tag:highway=elevator
     highway=emergency_access_point: RU:Tag:highway=emergency access point
     highway=footway: RU:Tag:highway=footway
     highway=ford: RU:Tag:highway=ford
+    highway=give_way: RU:Tag:highway=give way
     highway=living_street: RU:Tag:highway=living street
     highway=mini_roundabout: RU:Tag:highway=mini roundabout
     highway=motorway: RU:Tag:highway=motorway
@@ -1613,6 +5047,7 @@ ru:
     highway=primary: RU:Tag:highway=primary
     highway=primary_link: RU:Tag:highway=primary link
     highway=residential: RU:Tag:highway=residential
+    highway=rest_area: RU:Tag:highway=rest area
     highway=road: RU:Tag:highway=road
     highway=secondary: RU:Tag:highway=secondary
     highway=secondary_link: RU:Tag:highway=secondary link
@@ -1622,6 +5057,7 @@ ru:
     highway=steps: RU:Tag:highway=steps
     highway=stop: RU:Tag:highway=stop
     highway=tertiary: RU:Tag:highway=tertiary
+    highway=tertiary_link: RU:Tag:highway=tertiary link
     highway=track: RU:Tag:highway=track
     highway=traffic_signals: RU:Tag:highway=traffic signals
     highway=trunk: RU:Tag:highway=trunk
@@ -1630,77 +5066,288 @@ ru:
     highway=unclassified: RU:Tag:highway=unclassified
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
+    historic=boundary_stone: RU:Tag:historic=boundary stone
+    historic=castle: RU:Tag:historic=castle
+    historic=city_gate: RU:Tag:historic=city gate
+    historic=fort: RU:Tag:historic=fort
+    historic=memorial: RU:Tag:historic=memorial
+    historic=monument: RU:Tag:historic=monument
+    historic=ruins: RU:Tag:historic=ruins
+    historic=rune_stone: RU:Tag:historic=rune stone
+    historic=ship: RU:Tag:historic=ship
+    historic=tree_shrine: RU:Tag:historic=tree shrine
+    historic=wayside_cross: RU:Tag:historic=wayside cross
+    historic=wayside_shrine: RU:Tag:historic=wayside shrine
+    historic=wreck: RU:Tag:historic=wreck
     information=guidepost: RU:Tag:information=guidepost
     junction=roundabout: RU:Tag:junction=roundabout
     landuse=allotments: RU:Tag:landuse=allotments
+    landuse=basin: RU:Tag:landuse=basin
     landuse=cemetery: RU:Tag:landuse=cemetery
+    landuse=commercial: RU:Tag:landuse=commercial
+    landuse=construction: RU:Tag:landuse=construction
+    landuse=farm: RU:Tag:landuse=farm
     landuse=forest: RU:Tag:landuse=forest
     landuse=garages: RU:Tag:landuse=garages
+    landuse=grass: RU:Tag:landuse=grass
+    landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture
     landuse=industrial: RU:Tag:landuse=industrial
+    landuse=landfill: RU:Tag:landuse=landfill
     landuse=meadow: RU:Tag:landuse=meadow
     landuse=military: RU:Tag:landuse=military
+    landuse=orchard: RU:Tag:landuse=orchard
     landuse=peat_cutting: RU:Tag:landuse=peat cutting
+    landuse=plant_nursery: RU:Tag:landuse=plant nursery
+    landuse=pond: RU:Tag:landuse=pond
+    landuse=quarry: RU:Tag:landuse=quarry
     landuse=railway: RU:Tag:landuse=railway
+    landuse=recreation_ground: RU:Tag:landuse=recreation ground
     landuse=reservoir: RU:Tag:landuse=reservoir
     landuse=residential: RU:Tag:landuse=residential
+    landuse=retail: RU:Tag:landuse=retail
+    landuse=village_green: RU:Tag:landuse=village green
+    landuse=vineyard: RU:Tag:landuse=vineyard
+    leisure=beach_resort: RU:Tag:leisure=beach resort
+    leisure=dance: RU:Tag:leisure=dance
+    leisure=firepit: RU:Tag:leisure=firepit
+    leisure=ice_rink: RU:Tag:leisure=ice rink
     leisure=marina: RU:Tag:leisure=marina
+    leisure=park: RU:Tag:leisure=park
+    leisure=pitch: RU:Tag:leisure=pitch
+    leisure=playground: RU:Tag:leisure=playground
+    leisure=sports_centre: RU:Tag:leisure=sports centre
+    leisure=stadium: RU:Tag:leisure=stadium
+    leisure=swimming_pool: RU:Tag:leisure=swimming pool
+    leisure=track: RU:Tag:leisure=track
     leisure=water_park: RU:Tag:leisure=water park
+    man_made=adit: RU:Tag:man made=adit
     man_made=beacon: RU:Tag:man made=beacon
+    man_made=breakwater: RU:Tag:man made=breakwater
     man_made=cutline: RU:Tag:man made=cutline
     man_made=lighthouse: RU:Tag:man made=lighthouse
+    man_made=monitoring_station: RU:Tag:man made=monitoring station
     man_made=pier: RU:Tag:man made=pier
+    man_made=pillar: RU:Tag:man made=pillar
+    man_made=pipeline: RU:Tag:man made=pipeline
+    man_made=reservoir_covered: RU:Tag:man made=reservoir covered
+    man_made=surveillance: RU:Tag:man made=surveillance
+    man_made=tower: RU:Tag:man made=tower
+    man_made=wastewater_plant: RU:Tag:man made=wastewater plant
+    man_made=water_tower: RU:Tag:man made=water tower
+    man_made=water_works: RU:Tag:man made=water works
+    military=airfield: RU:Tag:military=airfield
+    natural=arete: RU:Tag:natural=arete
     natural=beach: RU:Tag:natural=beach
+    natural=cliff: RU:Tag:natural=cliff
+    natural=coastline: RU:Tag:natural=coastline
+    natural=desert: RU:Tag:natural=desert
     natural=fell: RU:Tag:natural=fell
+    natural=grassland: RU:Tag:natural=grassland
+    natural=heath: RU:Tag:natural=heath
+    natural=peak: RU:Tag:natural=peak
+    natural=ridge: RU:Tag:natural=ridge
+    natural=saddle: RU:Tag:natural=saddle
+    natural=sand: RU:Tag:natural=sand
+    natural=scrub: RU:Tag:natural=scrub
     natural=spring: RU:Tag:natural=spring
     natural=tree: RU:Tag:natural=tree
+    natural=tree_row: RU:Tag:natural=tree row
+    natural=volcano: RU:Tag:natural=volcano
     natural=water: RU:Tag:natural=water
     natural=wetland: RU:Tag:natural=wetland
     natural=wood: RU:Tag:natural=wood
+    office=accountant: RU:Tag:office=accountant
+    office=administrative: RU:Tag:office=administrative
+    office=architect: RU:Tag:office=architect
+    office=company: RU:Tag:office=company
+    office=educational_institution: RU:Tag:office=educational institution
+    office=employment_agency: RU:Tag:office=employment agency
+    office=estate_agent: RU:Tag:office=estate agent
+    office=government: RU:Tag:office=government
+    office=insurance: RU:Tag:office=insurance
+    office=it: RU:Tag:office=it
     office=lawyer: RU:Tag:office=lawyer
+    office=newspaper: RU:Tag:office=newspaper
+    office=ngo: RU:Tag:office=ngo
+    office=political_party: RU:Tag:office=political party
+    office=research: RU:Tag:office=research
+    office=telecommunication: RU:Tag:office=telecommunication
+    office=travel_agent: RU:Tag:office=travel agent
     opening_hours=24/7: RU:Tag:opening hours=24/7
+    pipeline=marker: RU:Tag:pipeline=marker
+    place=allotments: RU:Tag:place=allotments
+    place=city: RU:Tag:place=city
+    place=hamlet: RU:Tag:place=hamlet
     place=island: RU:Tag:place=island
+    place=islet: RU:Tag:place=islet
+    place=isolated_dwelling: RU:Tag:place=isolated dwelling
+    place=locality: RU:Tag:place=locality
+    place=neighbourhood: RU:Tag:place=neighbourhood
+    place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
     power=generator: RU:Tag:power=generator
     power=line: RU:Tag:power=line
+    power=minor_line: RU:Tag:power=minor line
+    power=plant: RU:Tag:power=plant
     power=station: RU:Tag:power=station
     power=sub_station: RU:Tag:power=sub station
+    power=substation: RU:Tag:power=substation
     power=tower: RU:Tag:power=tower
+    public_transport=platform: RU:Tag:public transport=platform
+    public_transport=station: RU:Tag:public transport=station
+    public_transport=stop_position: RU:Tag:public transport=stop position
     railway=crossing: RU:Tag:railway=crossing
+    railway=level_crossing: RU:Tag:railway=level crossing
+    railway=miniature: RU:Tag:railway=miniature
+    railway=narrow_gauge: RU:Tag:railway=narrow gauge
+    railway=preserved: RU:Tag:railway=preserved
+    railway=rail: RU:Tag:railway=rail
+    railway=station: RU:Tag:railway=station
+    railway=subway: RU:Tag:railway=subway
     railway=subway_entrance: RU:Tag:railway=subway entrance
+    railway=tram: RU:Tag:railway=tram
     route=bus: RU:Tag:route=bus
+    route=ferry: RU:Tag:route=ferry
     route=railway: RU:Tag:route=railway
     route=train: RU:Tag:route=train
     route=tram: RU:Tag:route=tram
     service=alley: RU:Tag:service=alley
     service=driveway: RU:Tag:service=driveway
     service=parking_aisle: RU:Tag:service=parking aisle
+    shop=alcohol: RU:Tag:shop=alcohol
+    shop=anime: RU:Tag:shop=anime
+    shop=antiques: RU:Tag:shop=antiques
+    shop=art: RU:Tag:shop=art
+    shop=baby_goods: RU:Tag:shop=baby goods
+    shop=bag: RU:Tag:shop=bag
     shop=bakery: RU:Tag:shop=bakery
+    shop=bathroom_furnishing: RU:Tag:shop=bathroom furnishing
+    shop=beauty: RU:Tag:shop=beauty
+    shop=bed: RU:Tag:shop=bed
+    shop=beverages: RU:Tag:shop=beverages
     shop=bicycle: RU:Tag:shop=bicycle
+    shop=books: RU:Tag:shop=books
+    shop=boutique: RU:Tag:shop=boutique
+    shop=butcher: RU:Tag:shop=butcher
     shop=car: RU:Tag:shop=car
+    shop=car_parts: RU:Tag:shop=car parts
+    shop=car_repair: RU:Tag:shop=car repair
+    shop=carpet: RU:Tag:shop=carpet
+    shop=charity: RU:Tag:shop=charity
+    shop=chemist: RU:Tag:shop=chemist
     shop=clothes: RU:Tag:shop=clothes
     shop=computer: RU:Tag:shop=computer
     shop=confectionery: RU:Tag:shop=confectionery
+    shop=convenience: RU:Tag:shop=convenience
+    shop=copyshop: RU:Tag:shop=copyshop
+    shop=curtain: RU:Tag:shop=curtain
+    shop=dairy: RU:Tag:shop=dairy
+    shop=deli: RU:Tag:shop=deli
     shop=department_store: RU:Tag:shop=department store
+    shop=dive: RU:Tag:shop=dive
+    shop=doityourself: RU:Tag:shop=doityourself
+    shop=dry_cleaning: RU:Tag:shop=dry cleaning
+    shop=electronics: RU:Tag:shop=electronics
+    shop=erotic: RU:Tag:shop=erotic
+    shop=fabric: RU:Tag:shop=fabric
     shop=fabrics: RU:Tag:shop=fabrics
+    shop=farm: RU:Tag:shop=farm
+    shop=fishing: RU:Tag:shop=fishing
     shop=florist: RU:Tag:shop=florist
+    shop=frame: RU:Tag:shop=frame
+    shop=funeral_directors: RU:Tag:shop=funeral directors
+    shop=furnace: RU:Tag:shop=furnace
+    shop=furniture: RU:Tag:shop=furniture
+    shop=garden_centre: RU:Tag:shop=garden centre
+    shop=gas: RU:Tag:shop=gas
+    shop=gift: RU:Tag:shop=gift
+    shop=glaziery: RU:Tag:shop=glaziery
+    shop=greengrocer: RU:Tag:shop=greengrocer
+    shop=haberdashery: RU:Tag:shop=haberdashery
     shop=hairdresser: RU:Tag:shop=hairdresser
+    shop=hardware: RU:Tag:shop=hardware
+    shop=hearing_aids: RU:Tag:shop=hearing aids
+    shop=herbalist: RU:Tag:shop=herbalist
+    shop=hifi: RU:Tag:shop=hifi
+    shop=hunting: RU:Tag:shop=hunting
+    shop=interior_decoration: RU:Tag:shop=interior decoration
+    shop=jewelry: RU:Tag:shop=jewelry
     shop=kiosk: RU:Tag:shop=kiosk
+    shop=kitchen: RU:Tag:shop=kitchen
+    shop=laundry: RU:Tag:shop=laundry
+    shop=mall: RU:Tag:shop=mall
+    shop=massage: RU:Tag:shop=massage
+    shop=mobile_phone: RU:Tag:shop=mobile phone
+    shop=money_lender: RU:Tag:shop=money lender
+    shop=motorcycle: RU:Tag:shop=motorcycle
+    shop=musical_instrument: RU:Tag:shop=musical instrument
+    shop=newsagent: RU:Tag:shop=newsagent
+    shop=optician: RU:Tag:shop=optician
+    shop=organic: RU:Tag:shop=organic
+    shop=outdoor: RU:Tag:shop=outdoor
+    shop=paint: RU:Tag:shop=paint
+    shop=pawnbroker: RU:Tag:shop=pawnbroker
+    shop=pet: RU:Tag:shop=pet
+    shop=radiotechnics: RU:Tag:shop=radiotechnics
+    shop=religion: RU:Tag:shop=religion
+    shop=seafood: RU:Tag:shop=seafood
+    shop=second_hand: RU:Tag:shop=second hand
+    shop=ship_chandler: RU:Tag:shop=ship chandler
+    shop=shoes: RU:Tag:shop=shoes
+    shop=sports: RU:Tag:shop=sports
+    shop=stationery: RU:Tag:shop=stationery
     shop=supermarket: RU:Tag:shop=supermarket
+    shop=tattoo: RU:Tag:shop=tattoo
+    shop=ticket: RU:Tag:shop=ticket
+    shop=tobacco: RU:Tag:shop=tobacco
+    shop=toys: RU:Tag:shop=toys
+    shop=trade: RU:Tag:shop=trade
     shop=travel_agency: RU:Tag:shop=travel agency
+    shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner
+    shop=variety_store: RU:Tag:shop=variety store
+    shop=video: RU:Tag:shop=video
+    shop=window_blind: RU:Tag:shop=window blind
+    social_facility=group_home: RU:Tag:social facility=group home
+    sport=archery: RU:Tag:sport=archery
+    sport=scuba_diving: RU:Tag:sport=scuba diving
+    tourism=artwork: RU:Tag:tourism=artwork
+    tourism=attraction: RU:Tag:tourism=attraction
+    tourism=camp_site: RU:Tag:tourism=camp site
+    tourism=chalet: RU:Tag:tourism=chalet
+    tourism=hostel: RU:Tag:tourism=hostel
     tourism=hotel: RU:Tag:tourism=hotel
     tourism=information: RU:Tag:tourism=information
+    tourism=museum: RU:Tag:tourism=museum
+    tourism=picnic_site: RU:Tag:tourism=picnic site
+    tourism=theme_park: RU:Tag:tourism=theme park
+    tourism=viewpoint: RU:Tag:tourism=viewpoint
+    tunnel=culvert: RU:Tag:tunnel=culvert
+    type=site: RU:Tag:type=site
+    waterway=boatyard: RU:Tag:waterway=boatyard
+    waterway=canal: RU:Tag:waterway=canal
     waterway=dam: RU:Tag:waterway=dam
+    waterway=dock: RU:Tag:waterway=dock
+    waterway=drain: RU:Tag:waterway=drain
     waterway=rapids: RU:Tag:waterway=rapids
     waterway=river: RU:Tag:waterway=river
     waterway=riverbank: RU:Tag:waterway=riverbank
     waterway=stream: RU:Tag:waterway=stream
     waterway=weir: RU:Tag:waterway=weir
+    wood=mixed: RU:Tag:wood=mixed
+sq:
+  key:
+    highway: Sq:Key:highway
 sv:
   key:
     access: Sv:Key:access
   tag:
+    aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
+    highway=rest_area: Sv:Tag:highway=rest area
+    junction=roundabout: Sv:Tag:junction=roundabout
+    leisure=dog_park: Sv:Tag:leisure=dog park
+    railway=rail: Sv:Tag:railway=rail
 tr:
   key:
     amenity: Tr:Key:amenity
@@ -1712,18 +5359,39 @@ tr:
     sport: Tr:Key:sport
 uk:
   key:
-    access: Uk:Key:access
-    highway: Uk:Key:highway
-    place: Uk:Key:place
+    bicycle_parking: Uk:Key:bicycle parking
+  tag:
+    amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    shop=antiques: Uk:Tag:shop=antiques
+    shop=bicycle: Uk:Tag:shop=bicycle
+    shop=second_hand: Uk:Tag:shop=second hand
+    vending=bicycle_tube: Uk:Tag:vending=bicycle tube
+zh-hans:
+  key:
+    cuisine: Zh-hans:Key:cuisine
+    name: Zh-hans:Key:name
+  tag:
+    amenity=cafe: Zh-hans:Tag:amenity=cafe
+zh-hant:
+  key:
+    amenity: Zh-hant:Key:amenity
+    fixme: Zh-hant:Key:fixme
+    fuel: Zh-hant:Key:fuel
+    noexit: Zh-hant:Key:noexit
+    opening_hours: Zh-hant:Key:opening hours
+    tracktype: Zh-hant:Key:tracktype
+    trail_visibility: Zh-hant:Key:trail visibility
   tag:
-    highway=motorway: Uk:Tag:highway=motorway
-    highway=motorway_link: Uk:Tag:highway=motorway link
-    highway=primary: Uk:Tag:highway=primary
-    highway=primary_link: Uk:Tag:highway=primary link
-    highway=secondary: Uk:Tag:highway=secondary
-    highway=secondary_link: Uk:Tag:highway=secondary link
-    highway=tertiary: Uk:Tag:highway=tertiary
-    highway=trunk: Uk:Tag:highway=trunk
-    highway=trunk_link: Uk:Tag:highway=trunk link
-    highway=unclassified: Uk:Tag:highway=unclassified
+    amenity=bench: Zh-hant:Tag:amenity=bench
+    amenity=crematorium: Zh-hant:Tag:amenity=crematorium
+    amenity=fuel: Zh-hant:Tag:amenity=fuel
+    amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship
+    amenity=toilets: Zh-hant:Tag:amenity=toilets
+    highway=bus_stop: Zh-hant:Tag:highway=bus stop
+    landuse=cemetery: Zh-hant:Tag:landuse=cemetery
+    natural=peak: Zh-hant:Tag:natural=peak
+    shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
+    shop=gas: Zh-hant:Tag:shop=gas
+    tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut
 

diff --git a/lib/object_finder.rb b/lib/object_finder.rb
deleted file mode 100644 (file)
index 26608a7..0000000
--- a/lib/object_finder.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ObjectFinder
-  def visible
-    find :all, :conditions => "#{proxy_reflection.table_name}.visible = 1"
-  end
-end

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
new file mode 100644 (file)
index 0000000..7a915c2
--- /dev/null
+++ b/lib/tasks/testing.rake
@@ -0,0 +1,5 @@
+namespace :test do
+  Rails::TestTask.new(lib: "test:prepare") do |t|    
+    t.pattern = 'test/lib/**/*_test.rb'
+  end
+end

diff --git a/test/functional/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
similarity index 99%
rename from test/functional/amf_controller_test.rb
rename to test/controllers/amf_controller_test.rb
index f3a4e7cd1b642ea69da87723ea2010eae669761d..36b76c3293dcff76879339c8282516838e191954 100644 (file)
--- a/test/functional/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'stringio'
 include Potlatch
 

diff --git a/test/functional/api_controller_test.rb b/test/controllers/api_controller_test.rb
similarity index 99%
rename from test/functional/api_controller_test.rb
rename to test/controllers/api_controller_test.rb
index c92e1132e3786760ea2278df679818229df4246c..6426184fcdb42e8269dbab8ab6cab8d449786793 100644 (file)
--- a/test/functional/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'api_controller'
 
 class ApiControllerTest < ActionController::TestCase

diff --git a/test/functional/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
similarity index 99%
rename from test/functional/browse_controller_test.rb
rename to test/controllers/browse_controller_test.rb
index 82a0392425e70578f52cd70995c71c4e327d8cd1..2ab9106f1f9e018ab391226e84efd64100bd5add 100644 (file)
--- a/test/functional/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'browse_controller'
 
 class BrowseControllerTest < ActionController::TestCase

diff --git a/test/functional/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
similarity index 99%
rename from test/functional/changeset_controller_test.rb
rename to test/controllers/changeset_controller_test.rb
index ef5e1541a4125a7ad0cd784ef8f642921c74e3c6..25bb936d93975ed126f55d5bbb197d0c0868455b 100644 (file)
--- a/test/functional/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'changeset_controller'
 
 class ChangesetControllerTest < ActionController::TestCase

diff --git a/test/functional/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
similarity index 99%
rename from test/functional/diary_entry_controller_test.rb
rename to test/controllers/diary_entry_controller_test.rb
index 92d9bcffdaae41b47ef2e0db50278016d61df76c..ad3d6787b1aea7581ffbbf1cf5f48fe0979f58c8 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments, :languages

diff --git a/test/functional/export_controller_test.rb b/test/controllers/export_controller_test.rb
similarity index 96%
rename from test/functional/export_controller_test.rb
rename to test/controllers/export_controller_test.rb
index d36f0cfd807e61fa5b78aaf7456213438652a36a..8d61b9911b54b514b3967c65b08cac2f1116699d 100644 (file)
--- a/test/functional/export_controller_test.rb
+++ b/test/controllers/export_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ExportControllerTest < ActionController::TestCase
 

diff --git a/test/functional/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb
similarity index 99%
rename from test/functional/geocoder_controller_test.rb
rename to test/controllers/geocoder_controller_test.rb
index 607e929c11e1d877609900038d5d336cc383d35e..94cf7cf46c9f1d5990ac2b7f6932cc19a6ddf813 100644 (file)
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/controllers/geocoder_controller_test.rb
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'geocoder_controller'
 
 class GeocoderControllerTest < ActionController::TestCase

diff --git a/test/functional/message_controller_test.rb b/test/controllers/message_controller_test.rb
similarity index 99%
rename from test/functional/message_controller_test.rb
rename to test/controllers/message_controller_test.rb
index 66ca8bc7008f3a27ce28a9a06d885ab9e84b9009..44271f5ddb4b5c88881c4d0497d8643763944291 100644 (file)
--- a/test/functional/message_controller_test.rb
+++ b/test/controllers/message_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class MessageControllerTest < ActionController::TestCase
   fixtures :users, :messages

diff --git a/test/functional/node_controller_test.rb b/test/controllers/node_controller_test.rb
similarity index 99%
rename from test/functional/node_controller_test.rb
rename to test/controllers/node_controller_test.rb
index 5c01cba3d08500edcf64e1a92e8915b74bc67761..3d689bb3f4f5f236f90b2a70ed2cd449b27bc664 100644 (file)
--- a/test/functional/node_controller_test.rb
+++ b/test/controllers/node_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeControllerTest < ActionController::TestCase
   api_fixtures

diff --git a/test/functional/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
similarity index 99%
rename from test/functional/notes_controller_test.rb
rename to test/controllers/notes_controller_test.rb
index 374c879d696af6fba53d9830fb52a3cdacc7292d..6f212519326f77475bd4ea8b8a9605977733e14b 100644 (file)
--- a/test/functional/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NotesControllerTest < ActionController::TestCase
   fixtures :users, :notes, :note_comments

diff --git a/test/functional/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb
similarity index 99%
rename from test/functional/oauth_clients_controller_test.rb
rename to test/controllers/oauth_clients_controller_test.rb
index 77f07b2880639ed1699fbf58ecf418d0f0d47e87..a1df9f0f2a7db0f8654ecf1aaa2f640d83f1179f 100644 (file)
--- a/test/functional/oauth_clients_controller_test.rb
+++ b/test/controllers/oauth_clients_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthClientsControllerTest < ActionController::TestCase
   fixtures :users, :client_applications

diff --git a/test/functional/oauth_controller_test.rb b/test/controllers/oauth_controller_test.rb
similarity index 96%
rename from test/functional/oauth_controller_test.rb
rename to test/controllers/oauth_controller_test.rb
index 85358892e9d73d24f39af394ddf703bac51c4663..879e259c3869aeb2cefa298bac2fc10ce6cf9409 100644 (file)
--- a/test/functional/oauth_controller_test.rb
+++ b/test/controllers/oauth_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthControllerTest < ActionController::TestCase
   ##

diff --git a/test/functional/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb
similarity index 99%
rename from test/functional/old_node_controller_test.rb
rename to test/controllers/old_node_controller_test.rb
index ac318f84bd7ba11ca19c73a5067d790823e948dd..5b0436348031c41dd99e493541fe548f78ddbefe 100644 (file)
--- a/test/functional/old_node_controller_test.rb
+++ b/test/controllers/old_node_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_node_controller'
 
 class OldNodeControllerTest < ActionController::TestCase

diff --git a/test/functional/old_relation_controller_test.rb b/test/controllers/old_relation_controller_test.rb
similarity index 99%
rename from test/functional/old_relation_controller_test.rb
rename to test/controllers/old_relation_controller_test.rb
index 55e8a7377afc5f1060a64427bd7bad87d60140e3..1db613cd4733f384344c976f14953529ac53ebe5 100644 (file)
--- a/test/functional/old_relation_controller_test.rb
+++ b/test/controllers/old_relation_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_relation_controller'
 
 class OldRelationControllerTest < ActionController::TestCase

diff --git a/test/functional/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb
similarity index 99%
rename from test/functional/old_way_controller_test.rb
rename to test/controllers/old_way_controller_test.rb
index 2e9ec8263e3e2fa63592c1aab76596b28a499386..40315caa5be37eb7fb15f9329a55eb2add41ea73 100644 (file)
--- a/test/functional/old_way_controller_test.rb
+++ b/test/controllers/old_way_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_way_controller'
 
 class OldWayControllerTest < ActionController::TestCase

diff --git a/test/functional/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
similarity index 98%
rename from test/functional/redactions_controller_test.rb
rename to test/controllers/redactions_controller_test.rb
index 83bb3adc21b8fa0f641f79a83f86cee7d9a5ce7e..44a76069468d3c423217b8128cf64fe85e2a91d5 100644 (file)
--- a/test/functional/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'redactions_controller'
 
 class RedactionsControllerTest < ActionController::TestCase

diff --git a/test/functional/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
similarity index 99%
rename from test/functional/relation_controller_test.rb
rename to test/controllers/relation_controller_test.rb
index 4737fdf51f42d6286f7a4b8006ffa6e5deb9be9a..66d6012840a64bb7b4a648938e287e26c7b10611 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'relation_controller'
 
 class RelationControllerTest < ActionController::TestCase

diff --git a/test/functional/search_controller_test.rb b/test/controllers/search_controller_test.rb
similarity index 93%
rename from test/functional/search_controller_test.rb
rename to test/controllers/search_controller_test.rb
index 7fd060dc4548c98c714dc46c63c581ccddd6d195..c7530477489fc0254d55c1fc34b6dd2133f37770 100644 (file)
--- a/test/functional/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SearchControllerTest < ActionController::TestCase
   ##

diff --git a/test/functional/site_controller_test.rb b/test/controllers/site_controller_test.rb
similarity index 99%
rename from test/functional/site_controller_test.rb
rename to test/controllers/site_controller_test.rb
index 9aff8e572e3e4dee15a9d4daf753ba817fef214c..86a92490ac067fb5ee9ad10b43938c1088119f7a 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SiteControllerTest < ActionController::TestCase
   api_fixtures

diff --git a/test/functional/swf_controller_test.rb b/test/controllers/swf_controller_test.rb
similarity index 84%
rename from test/functional/swf_controller_test.rb
rename to test/controllers/swf_controller_test.rb
index 09b8f3aae32634dac8eeec5f96464485eea6ecc1..d7213133b9a809bd9b78a5ec519ff69aa5b667b9 100644 (file)
--- a/test/functional/swf_controller_test.rb
+++ b/test/controllers/swf_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SwfControllerTest < ActionController::TestCase
   ##

diff --git a/test/functional/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
similarity index 99%
rename from test/functional/trace_controller_test.rb
rename to test/controllers/trace_controller_test.rb
index 1a074082b848e7f167a6cdcd989684440686f394..01c81a1aa5cf45c6bb89a217a4f753dab158d627 100644 (file)
--- a/test/functional/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TraceControllerTest < ActionController::TestCase
   fixtures :users, :gpx_files

diff --git a/test/functional/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
similarity index 99%
rename from test/functional/user_blocks_controller_test.rb
rename to test/controllers/user_blocks_controller_test.rb
index d52ff68c4d73b07ac7d49a37694249efc6cc1843..ffb5744ea25a510ef1f36fae293e826829b960b1 100644 (file)
--- a/test/functional/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserBlocksControllerTest < ActionController::TestCase
   fixtures :users, :user_roles, :user_blocks

diff --git a/test/functional/user_controller_test.rb b/test/controllers/user_controller_test.rb
similarity index 99%
rename from test/functional/user_controller_test.rb
rename to test/controllers/user_controller_test.rb
index 3a9c93238c0c7cfa66895fcf8dcf070ea2db3000..c068ee408168b39e6d42b5b9447ab0ae713984f0 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserControllerTest < ActionController::TestCase
   fixtures :users

diff --git a/test/functional/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb
similarity index 99%
rename from test/functional/user_preference_controller_test.rb
rename to test/controllers/user_preference_controller_test.rb
index 32ece63cddb0d647e1d71a182b29bf3f2849bbf1..f8cafe6a9279a46ed3b7e942b951f3a480055cc5 100644 (file)
--- a/test/functional/user_preference_controller_test.rb
+++ b/test/controllers/user_preference_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserPreferenceControllerTest < ActionController::TestCase
   fixtures :users, :user_preferences

diff --git a/test/functional/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb
similarity index 99%
rename from test/functional/user_roles_controller_test.rb
rename to test/controllers/user_roles_controller_test.rb
index 4e4bd6da72a3e9b523b507dfd48dfec1df34c339..1d005824d2ea840daa9615b9ff46b251cb46d438 100644 (file)
--- a/test/functional/user_roles_controller_test.rb
+++ b/test/controllers/user_roles_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserRolesControllerTest < ActionController::TestCase
   fixtures :users, :user_roles

diff --git a/test/functional/way_controller_test.rb b/test/controllers/way_controller_test.rb
similarity index 99%
rename from test/functional/way_controller_test.rb
rename to test/controllers/way_controller_test.rb
index 332f92dc7898d3bc571fd1817fc4f4f8b8ed6df3..6e2ee3b0f2acf4d46e128aeba4c7c29105797220 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'way_controller'
 
 class WayControllerTest < ActionController::TestCase

diff --git a/test/fixtures/current_node_tags.yml b/test/fixtures/current_node_tags.yml
index 5087310e7dbd0953d21dc4d01e74282ab965ed10..9c41a375e4423d3673f0142bcf18e797ce2a9237 100644 (file)
--- a/test/fixtures/current_node_tags.yml
+++ b/test/fixtures/current_node_tags.yml
@@ -33,3 +33,27 @@ public_v_t1:
   k: 'testvisible'
   v: 'yes'
 
+nwn_name:
+  node_id: 18
+  k: 'name'
+  v: 'Test Node'
+
+nwn_name_ru:
+  node_id: 18
+  k: 'name:ru'
+  v: 'проверки узла'
+
+nwn_building:
+  node_id: 18
+  k: 'building'
+  v: 'yes'
+
+nwn_tourism:
+  node_id: 18
+  k: 'tourism'
+  v: 'museum'
+
+nwn_shop:
+  node_id: 18
+  k: 'shop'
+  v: 'gift'

diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml
index 3f34ddabefac20d98112e619f1e5c58d86da7680..af6ea01d51384fa643b4fe2a3aa7d1eba5fc5c4a 100644 (file)
--- a/test/fixtures/current_nodes.yml
+++ b/test/fixtures/current_nodes.yml
@@ -171,3 +171,12 @@ redacted_node:
   tile: <%= QuadTile.tile_for_point(1,1) %>
   timestamp: 2007-01-01 00:00:00
 
+node_with_name:
+  id: 18
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: true
+  version: 2
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00

diff --git a/test/fixtures/node_tags.yml b/test/fixtures/node_tags.yml
index 6b908aa54c724c81717d8e7bdf34369f6a193bbf..21a63f5b12d061efa8613f20eef976ab3533ce82 100644 (file)
--- a/test/fixtures/node_tags.yml
+++ b/test/fixtures/node_tags.yml
@@ -52,3 +52,62 @@ public_v_t1:
   v: 'yes'
   version: 1
 
+nwnv1_name:
+  node_id: 18
+  k: 'name'
+  v: 'Test Node'
+  version: 1
+
+nwnv1_name_ru:
+  node_id: 18
+  k: 'name:ru'
+  v: 'проверки узла'
+  version: 1
+
+nwnv1_building:
+  node_id: 18
+  k: 'building'
+  v: 'yes'
+  version: 1
+
+nwnv1_tourism:
+  node_id: 18
+  k: 'tourism'
+  v: 'museum'
+  version: 1
+
+nwnv1_shop:
+  node_id: 18
+  k: 'shop'
+  v: 'gift'
+  version: 1
+
+nwnv2_name:
+  node_id: 18
+  k: 'name'
+  v: 'Test Node'
+  version: 2
+
+nwnv2_name_ru:
+  node_id: 18
+  k: 'name:ru'
+  v: 'проверки узла'
+  version: 2
+
+nwnv2_building:
+  node_id: 18
+  k: 'building'
+  v: 'yes'
+  version: 2
+
+nwnv2_tourism:
+  node_id: 18
+  k: 'tourism'
+  v: 'museum'
+  version: 2
+
+nwnv2_shop:
+  node_id: 18
+  k: 'shop'
+  v: 'gift'
+  version: 2

diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 5de3d94af0115072107ff0e333c6945109ff013b..7841c6e0eb6ac800230957f1e72e0ffbcbabcca2 100644 (file)
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -211,3 +211,24 @@ redacted_node_current_version:
   version: 2
   tile: <%= QuadTile.tile_for_point(1,1) %>
   timestamp: 2007-01-01 00:00:00
+
+node_with_name_redacted_version:
+  node_id: 18
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: true
+  version: 1
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00
+  redaction_id: 1
+
+node_with_name_current_version:
+  node_id: 18
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: true
+  version: 2
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
new file mode 100644 (file)
index 0000000..46c35f9
--- /dev/null
+++ b/test/helpers/application_helper_test.rb
@@ -0,0 +1,187 @@
+require 'test_helper'
+
+class ApplicationHelperTest < ActionView::TestCase
+  fixtures :users, :user_roles
+
+  def setup
+    I18n.locale = "en"
+  end
+
+  def test_linkify
+    %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link|
+      text = "Test #{link} is made into a link"
+
+      html = linkify(text)
+      assert_equal false, html.html_safe?
+      assert_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
+
+      html = linkify(text.html_safe)
+      assert_equal true, html.html_safe?    
+      assert_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
+    end
+
+    %w(test@example.com mailto:test@example.com).each do |link|
+      text = "Test #{link} is not made into a link"
+
+      html = linkify(text)
+      assert_equal false, html.html_safe?
+      assert_equal text, html
+
+      html = linkify(text.html_safe)
+      assert_equal true, html.html_safe?    
+      assert_equal text, html
+    end
+  end
+
+  def test_rss_link_to
+    link = rss_link_to(:controller => :diary_entry, :action => :rss)
+    assert_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img alt=\"Rss\" border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+  end
+
+  def test_atom_link_to
+    link = atom_link_to(:controller => :changeset, :action => :feed)
+    assert_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img alt=\"Rss\" border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+  end
+
+  def test_style_rules
+    @user = nil
+
+    css = style_rules
+    assert_match /\.hidden /, css
+    assert_match /\.hide_unless_logged_in /, css
+    assert_no_match /\.hide_if_logged_in /, css
+    assert_no_match /\.hide_if_user_/, css
+    assert_no_match /\.show_if_user_/, css
+    assert_match /\.hide_unless_administrator /, css
+    assert_match /\.hide_unless_moderator /, css
+
+    @user = users(:normal_user)
+
+    css = style_rules
+    assert_match /\.hidden /, css
+    assert_no_match /\.hide_unless_logged_in /, css
+    assert_match /\.hide_if_logged_in /, css
+    assert_match /\.hide_if_user_1 /, css
+    assert_match /\.show_if_user_1 /, css
+    assert_match /\.hide_unless_administrator /, css
+    assert_match /\.hide_unless_moderator /, css
+
+    @user = users(:moderator_user)
+
+    css = style_rules
+    assert_match /\.hidden /, css
+    assert_no_match /\.hide_unless_logged_in /, css
+    assert_match /\.hide_if_logged_in /, css
+    assert_match /\.hide_if_user_5 /, css
+    assert_match /\.show_if_user_5 /, css
+    assert_match /\.hide_unless_administrator /, css
+    assert_no_match /\.hide_unless_moderator /, css
+
+    @user = users(:administrator_user)
+
+    css = style_rules
+    assert_match /\.hidden /, css
+    assert_no_match /\.hide_unless_logged_in /, css
+    assert_match /\.hide_if_logged_in /, css
+    assert_match /\.hide_if_user_6 /, css
+    assert_match /\.show_if_user_6 /, css
+    assert_no_match /\.hide_unless_administrator /, css
+    assert_match /\.hide_unless_moderator /, css
+  end
+
+  def test_if_logged_in
+    html = if_logged_in { "Test 1" }
+    assert_equal "<div class=\"hide_unless_logged_in\">Test 1</div>", html
+
+    html = if_logged_in(:span) { "Test 2" }
+    assert_equal "<span class=\"hide_unless_logged_in\">Test 2</span>", html
+  end
+
+  def test_if_not_logged_in
+    html = if_not_logged_in { "Test 1" }
+    assert_equal "<div class=\"hide_if_logged_in\">Test 1</div>", html
+
+    html = if_not_logged_in(:span) { "Test 2" }
+    assert_equal "<span class=\"hide_if_logged_in\">Test 2</span>", html
+  end
+
+  def test_if_user
+    html = if_user(users(:normal_user)) { "Test 1" }
+    assert_equal "<div class=\"hidden show_if_user_1\">Test 1</div>", html
+
+    html = if_user(users(:normal_user), :span) { "Test 2" }
+    assert_equal "<span class=\"hidden show_if_user_1\">Test 2</span>", html
+
+    html = if_user(nil) { "Test 3" }
+    assert_nil html
+
+    html = if_user(nil, :span) { "Test 4" }
+    assert_nil html
+  end
+
+  def test_unless_user
+    html = unless_user(users(:normal_user)) { "Test 1" }
+    assert_equal "<div class=\"hide_if_user_1\">Test 1</div>", html
+
+    html = unless_user(users(:normal_user), :span) { "Test 2" }
+    assert_equal "<span class=\"hide_if_user_1\">Test 2</span>", html
+
+    html = unless_user(nil) { "Test 3" }
+    assert_equal "<div>Test 3</div>", html
+
+    html = unless_user(nil, :span) { "Test 4" }
+    assert_equal "<span>Test 4</span>", html
+  end
+
+  def test_if_administrator
+    html = if_administrator { "Test 1" }
+    assert_equal "<div class=\"hide_unless_administrator\">Test 1</div>", html
+
+    html = if_administrator(:span) { "Test 2" }
+    assert_equal "<span class=\"hide_unless_administrator\">Test 2</span>", html
+  end
+
+  def test_richtext_area
+    html = richtext_area(:message, :body, :cols => 40, :rows => 20)
+    assert_not_nil html
+  end
+
+  def test_dir
+    assert_equal "ltr", dir
+
+    params[:dir] = "rtl"
+    assert_equal "rtl", dir
+    params.delete(:dir)
+
+    I18n.locale = "he"
+
+    assert_equal "rtl", dir
+
+    params[:dir] = "ltr"
+    assert_equal "ltr", dir
+    params.delete(:dir)
+  end
+
+  def test_friendly_date
+    date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23))
+    assert_match /^<span title=" *5 March 2014 at 18:58">.*<\/span>$/, date
+
+    date = friendly_date(Time.now - 1.hour)
+    assert_match /^<span title=".*">about 1 hour<\/span>$/, date
+
+    date = friendly_date(Time.now - 2.days)
+    assert_match /^<span title=".*">2 days<\/span>$/, date
+
+    date = friendly_date(Time.now - 3.weeks)
+    assert_match /^<span title=".*">21 days<\/span>$/, date
+
+    date = friendly_date(Time.now - 4.months)
+    assert_match /^<span title=".*">4 months<\/span>$/, date
+  end
+
+  def test_body_class
+  end
+
+  def test_current_page_class
+  end
+end

diff --git a/test/helpers/asset_helper_test.rb b/test/helpers/asset_helper_test.rb
new file mode 100644 (file)
index 0000000..20e450e
--- /dev/null
+++ b/test/helpers/asset_helper_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AssetHelperTest < ActionView::TestCase
+  def test_assets
+    assert assets("iD").kind_of?(Hash)
+  end
+end

diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
new file mode 100644 (file)
index 0000000..a48ac4d
--- /dev/null
+++ b/test/helpers/browse_helper_test.rb
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+
+require 'test_helper'
+
+class BrowseHelperTest < ActionView::TestCase
+  include ERB::Util
+  include ApplicationHelper
+
+  api_fixtures
+
+  def setup
+    I18n.locale = "en"
+  end
+
+  def test_printable_name
+    assert_equal "17", printable_name(current_nodes(:redacted_node))
+    assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
+    assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
+    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
+    assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
+    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+
+    I18n.locale = "ru"
+
+    assert_equal "17", printable_name(current_nodes(:redacted_node))
+    assert_equal "проверки узла (18)", printable_name(current_nodes(:node_with_name))
+    assert_equal "проверки узла (18)", printable_name(nodes(:node_with_name_current_version))
+    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
+    assert_equal "проверки узла (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
+    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+
+    I18n.locale = "de"
+
+    assert_equal "17", printable_name(current_nodes(:redacted_node))
+    assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
+    assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
+    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
+    assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
+    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+  end
+
+  def test_link_class
+    assert_equal "node", link_class("node", current_nodes(:visible_node))
+    assert_equal "node deleted", link_class("node", current_nodes(:invisible_node))
+    assert_equal "node deleted", link_class("node", current_nodes(:redacted_node))
+    assert_equal "node building yes shop gift tourism museum", link_class("node", current_nodes(:node_with_name))
+    assert_equal "node building yes shop gift tourism museum", link_class("node", nodes(:node_with_name_current_version))
+    assert_equal "node deleted", link_class("node", nodes(:node_with_name_redacted_version))
+  end
+
+  def test_link_title
+    assert_equal "", link_title(current_nodes(:visible_node))
+    assert_equal "", link_title(current_nodes(:invisible_node))
+    assert_equal "", link_title(current_nodes(:redacted_node))
+    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(current_nodes(:node_with_name))
+    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(nodes(:node_with_name_current_version))
+    assert_equal "", link_title(nodes(:node_with_name_redacted_version))
+  end
+
+  def test_format_key
+    html = format_key("highway")
+    assert_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en\" title=\"The wiki description page for the highway tag\">highway</a>", html
+
+    html = format_key("unknown")
+    assert_equal "unknown", html
+  end
+
+  def test_format_value
+    html = format_value("highway", "primary")
+    assert_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en\" title=\"The wiki description page for the highway=primary tag\">primary</a>", html
+
+    html = format_value("highway", "unknown")
+    assert_equal "unknown", html
+
+    html = format_value("unknown", "unknown")
+    assert_equal "unknown", html
+  end
+
+  def test_icon_tags
+    tags = icon_tags(current_nodes(:node_with_name))
+    assert_equal 3, tags.count
+    assert tags.include?(["building", "yes"])
+    assert tags.include?(["tourism", "museum"])
+    assert tags.include?(["shop", "gift"])
+
+    tags = icon_tags(nodes(:node_with_name_current_version))
+    assert_equal 3, tags.count
+    assert tags.include?(["building", "yes"])
+    assert tags.include?(["tourism", "museum"])
+    assert tags.include?(["shop", "gift"])
+
+    tags = icon_tags(nodes(:node_with_name_redacted_version))
+    assert_equal 3, tags.count
+    assert tags.include?(["building", "yes"])
+    assert tags.include?(["tourism", "museum"])
+    assert tags.include?(["shop", "gift"])
+  end
+
+  def test_wiki_link
+    link = wiki_link("key", "highway")
+    assert_equal "http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
+
+    link = wiki_link("tag", "highway=primary")
+    assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link
+
+    I18n.locale = "de"
+
+    link = wiki_link("key", "highway")
+    assert_equal "http://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
+
+    link = wiki_link("tag", "highway=primary")
+    assert_equal "http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
+
+    I18n.locale = "tr"
+
+    link = wiki_link("key", "highway")
+    assert_equal "http://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
+
+    link = wiki_link("tag", "highway=primary")
+    assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
+  end
+
+  def test_wikipedia_link
+    link = wikipedia_link("wikipedia", "http://en.wikipedia.org/wiki/Full%20URL")
+    assert_nil link
+
+    link = wikipedia_link("wikipedia", "https://en.wikipedia.org/wiki/Full%20URL")
+    assert_nil link
+
+    link = wikipedia_link("wikipedia", "Test")
+    assert_equal "http://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
+    assert_equal "Test", link[:title]
+
+    link = wikipedia_link("wikipedia", "de:Test")
+    assert_equal "http://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
+    assert_equal "de:Test", link[:title]
+
+    link = wikipedia_link("wikipedia:fr", "de:Test")
+    assert_equal "http://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
+    assert_equal "de:Test", link[:title]
+
+    I18n.locale = "pt-BR"
+
+    link = wikipedia_link("wikipedia", "zh-classical:Test#Section")
+    assert_equal "http://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url]
+    assert_equal "zh-classical:Test#Section", link[:title]
+
+    link = wikipedia_link("foo", "Test")
+    assert_nil link
+  end
+end

diff --git a/test/helpers/changeset_helper_test.rb b/test/helpers/changeset_helper_test.rb
new file mode 100644 (file)
index 0000000..3fa5d26
--- /dev/null
+++ b/test/helpers/changeset_helper_test.rb
@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class ChangesetHelperTest < ActionView::TestCase
+  fixtures :changesets, :users
+
+  def test_changeset_user_link
+    assert_equal "<a href=\"/user/test2\">test2</a>", changeset_user_link(changesets(:public_user_first_change))
+    assert_equal "anonymous", changeset_user_link(changesets(:normal_user_first_change))
+  end
+
+  def test_changeset_details
+    assert_match /^Created <abbr title='Mon, 01 Jan 2007 00:00:00 \+0000'>.*<\/abbr> by anonymous$/, changeset_details(changesets(:normal_user_first_change))
+    assert_match /^Closed <abbr title='Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000'>.*<\/abbr> by <a href="\/user\/test2">test2<\/a>$/, changeset_details(changesets(:public_user_closed_change))
+  end
+end

diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
new file mode 100644 (file)
index 0000000..8fb2bc0
--- /dev/null
+++ b/test/helpers/note_helper_test.rb
@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class NoteHelperTest < ActionView::TestCase
+  include ERB::Util
+  include ApplicationHelper
+
+  fixtures :users
+
+  def test_note_event
+    date = Time.new(2014, 3, 5, 21, 37, 45)
+
+    assert_match /^Created by anonymous <abbr title='Wed, 05 Mar 2014 21:37:45 \+0000'><span title=" 5 March 2014 at 21:37">.*<\/span> ago<\/abbr>$/, note_event("open", date, nil)
+    assert_match /^Resolved by <a href="\/user\/test2">test2<\/a> <abbr title='Wed, 05 Mar 2014 21:37:45 \+0000'><span title=" 5 March 2014 at 21:37">.*<\/span> ago<\/abbr>$/, note_event("closed", date, users(:public_user))
+  end
+
+  def test_note_author
+    assert_equal "", note_author(nil)
+    assert_equal "<a href=\"/user/test2\">test2</a>", note_author(users(:public_user))
+    assert_equal "<a href=\"http://test.host/user/test2\">test2</a>", note_author(users(:public_user), :only_path => false)
+  end
+end

diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb
new file mode 100644 (file)
index 0000000..cf7a112
--- /dev/null
+++ b/test/helpers/title_helper_test.rb
@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class TitleHelperTest < ActionView::TestCase
+  def test_set_title
+    set_title(nil)
+    assert_equal "OpenStreetMap", response.header["X-Page-Title"]
+    assert_nil @title
+
+    set_title("Test Title")
+    assert_equal "OpenStreetMap | Test Title", response.header["X-Page-Title"]
+    assert_equal "Test Title", @title
+  end
+end

diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index f40a966757aec4a808bbb6a90e71aadaf578307e..a2361d618f88c02df824f90628512384aa1e04a2 100644 (file)
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ClientApplicationTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index fa4821b7a8eeb8bdc5516029923b20272b0eaccb..f3581f6a21b0b258fabb127ef65072b50f5e728a 100644 (file)
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class CORSTest < ActionDispatch::IntegrationTest
   # Rails 4 adds a built-in `options` method. When we upgrade, we can remove

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index fbb947af45199b977954df05628fdb63f11306a1..dd03fde46ec899210d9ef2f07b025055a1d3d7c5 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OAuthTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications, :gpx_files

diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb
index 357c20212fe542e852282ca5441dcfac737355ac..a4ff2eb7ec0cfa24c5dbfc0091ffc266b4a984a4 100644 (file)
--- a/test/integration/redirect_test.rb
+++ b/test/integration/redirect_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RedirectTest  < ActionDispatch::IntegrationTest
   def test_legacy_redirects

diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb
index aec204e71f23f21e22eb8a971e000c3efa8e53ef..b36082caca91b64a5084f18bb957bac5f15ed0f6 100644 (file)
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index 94ec46e0a43f9d251da101f861ff7b6b334c081b..db81117c338d29816502a605259c4681d4ba0495 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserBlocksTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_blocks, :user_roles

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 6530b7ccbb2ca52c8e3326f7d413874fdcf9e4bc..503160e9daa6c8095ebd9488d0fd4b2ab306e9d1 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserCreationTest < ActionDispatch::IntegrationTest
   fixtures :users

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index 278a68e7b0f904120b18c7d6b7012ea8be4067b2..58e70bfd2c47af077fb40b7dd0a63457a3e0008c 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserDiariesTest < ActionDispatch::IntegrationTest
   fixtures :users, :diary_entries

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 6d8e3e7e0f948c04f179741a3550a00624a0d323..66f8f4b095442e38763bda954a3dc67572bbe543 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserLoginTest < ActionDispatch::IntegrationTest
   fixtures :users

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 3d2fab4d01a8ae677671e42491d6b426dafd2a2b..08031b4de52fcb0cd40ab6982f016bf72283ceb6 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserRolesTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_roles

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index 7063e39c56db797cc1856732dfbfdb8b22bbc45d..1bed53bce8aa13533d1792b185d0d060e17657aa 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest
   fixtures :users

diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js
new file mode 100644 (file)
index 0000000..d7fe4a2
--- /dev/null
+++ b/test/javascripts/osm_test.js
@@ -0,0 +1,252 @@
+//= require jquery
+//= require jquery.cookie
+//= require osm
+//= require leaflet
+//= require leaflet.osm
+//= require leaflet.map
+//= require i18n/translations
+//= require querystring
+
+var querystring = require('querystring-component');
+
+describe("OSM", function () {
+  describe(".apiUrl", function () {
+    it("returns a URL for a way", function () {
+      expect(OSM.apiUrl({type: "way", id: 10})).to.eq("/api/0.6/way/10/full");
+    });
+
+    it("returns a URL for a node", function () {
+      expect(OSM.apiUrl({type: "node", id: 10})).to.eq("/api/0.6/node/10");
+    });
+
+    it("returns a URL for a specific version", function () {
+      expect(OSM.apiUrl({type: "node", id: 10, version: 2})).to.eq("/api/0.6/node/10/2");
+    });
+  });
+
+  describe(".params", function () {
+    it("parses params", function () {
+      var params = OSM.params("?foo=a&bar=b");
+      expect(params).to.have.property("foo", "a");
+      expect(params).to.have.property("bar", "b");
+    });
+  });
+
+  describe(".mapParams", function () {
+    beforeEach(function () {
+      delete OSM.home;
+      delete OSM.location;
+      document.location.hash = "";
+      document.cookie = "_osm_location=; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+
+      // Test with another cookie set.
+      document.cookie = "_osm_session=deadbeef";
+    });
+
+    it("parses marker params", function () {
+      var params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845");
+      expect(params).to.have.property("mlat", 57.6247);
+      expect(params).to.have.property("mlon", -3.6845);
+      expect(params).to.have.property("marker", true);
+    });
+
+    it("parses object params", function () {
+      var params = OSM.mapParams("?node=1");
+      expect(params).to.have.property("object");
+      expect(params.object).to.eql({type: "node", id: 1});
+
+      params = OSM.mapParams("?way=1");
+      expect(params).to.have.property("object");
+      expect(params.object).to.eql({type: "way", id: 1});
+
+      params = OSM.mapParams("?relation=1");
+      expect(params).to.have.property("object");
+      expect(params.object).to.eql({type: "relation", id: 1});
+    });
+
+    it("parses bbox params", function () {
+      var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]);
+      var params = OSM.mapParams("?bbox=-3.6845,57.6247,-3.7845,57.7247");
+      expect(params).to.have.property("bounds").deep.equal(expected);
+
+      params = OSM.mapParams("?minlon=-3.6845&minlat=57.6247&maxlon=-3.7845&maxlat=57.7247");
+      expect(params).to.have.property("bounds").deep.equal(expected);
+    });
+
+    it("parses lat/lon/zoom params", function () {
+      var params = OSM.mapParams("?lat=57.6247&lon=-3.6845");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 5);
+
+      params = OSM.mapParams("?lat=57.6247&lon=-3.6845&zoom=10");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 10);
+
+      params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 12);
+
+      params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845&zoom=16");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 16);
+    });
+
+    it("parses lat/lon/zoom from the hash", function () {
+      document.location.hash = "#map=16/57.6247/-3.6845";
+      params = OSM.mapParams("?");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 16);
+    });
+
+    it("sets lat/lon from OSM.home", function () {
+      OSM.home = {lat: 57.6247, lon: -3.6845};
+      var params = OSM.mapParams("?");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+    });
+
+    it("sets bbox from OSM.location", function () {
+      OSM.location = {minlon: -3.6845, minlat: 57.6247, maxlon: -3.7845, maxlat: 57.7247};
+      var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]);
+      var params = OSM.mapParams("?");
+      expect(params).to.have.property("bounds").deep.equal(expected);
+    });
+
+    it("parses params from the _osm_location cookie", function () {
+      document.cookie = "_osm_location=-3.6845|57.6247|5|M";
+      var params = OSM.mapParams("?");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 5);
+      expect(params).to.have.property("layers", "M");
+    });
+
+    it("defaults lat/lon to London", function () {
+      var params = OSM.mapParams("?");
+      expect(params).to.have.property("lat", 51.5);
+      expect(params).to.have.property("lon", -0.1);
+      expect(params).to.have.property("zoom", 5);
+
+      params = OSM.mapParams("?zoom=10");
+      expect(params).to.have.property("lat", 51.5);
+      expect(params).to.have.property("lon", -0.1);
+      expect(params).to.have.property("zoom", 10);
+    });
+
+    it("parses layers param", function () {
+      var params = OSM.mapParams("?");
+      expect(params).to.have.property("layers", "");
+
+      document.cookie = "_osm_location=-3.6845|57.6247|5|C";
+      params = OSM.mapParams("?");
+      expect(params).to.have.property("layers", "C");
+
+      document.location.hash = "#map=5/57.6247/-3.6845&layers=M"
+      params = OSM.mapParams("?");
+      expect(params).to.have.property("layers", "M");
+    });
+  });
+
+  describe(".parseHash", function () {
+    it("parses lat/lon/zoom params", function () {
+      var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M");
+      expect(args).to.have.property("center").deep.equal(L.latLng(57.6247, -3.6845));
+      expect(args).to.have.property("zoom", 5);
+    });
+
+    it("parses layers params", function () {
+      var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M");
+      expect(args).to.have.property("layers", "M");
+    });
+  });
+
+  describe(".formatHash", function () {
+    it("formats lat/lon/zoom params", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 9 };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845");
+    });
+
+    it("respects zoomPrecision", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 5 };
+      expect(OSM.formatHash(args)).to.eq("#map=5/57.625/-3.685");
+
+      args = { center: L.latLng(57.6247, -3.6845), zoom: 9 };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845");
+    });
+
+    it("formats layers params", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "C" };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845&layers=C");
+    });
+
+    it("ignores default layers", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "M" };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845");
+    });
+  });
+
+  describe(".zoomPrecision", function () {
+    it("suggests 0 digits for z0-1", function () {
+      expect(OSM.zoomPrecision(0)).to.eq(0);
+      expect(OSM.zoomPrecision(1)).to.eq(0);
+    });
+
+    it("suggests 1 digit for z2", function () {
+      expect(OSM.zoomPrecision(2)).to.eq(1);
+    });
+
+    it("suggests 2 digits for z3-4", function () {
+      expect(OSM.zoomPrecision(3)).to.eq(2);
+      expect(OSM.zoomPrecision(4)).to.eq(2);
+    });
+
+    it("suggests 3 digits for z5-8", function () {
+      expect(OSM.zoomPrecision(5)).to.eq(3);
+      expect(OSM.zoomPrecision(6)).to.eq(3);
+      expect(OSM.zoomPrecision(7)).to.eq(3);
+      expect(OSM.zoomPrecision(8)).to.eq(3);
+    });
+
+    it("suggests 4 digits for z9-16", function () {
+      expect(OSM.zoomPrecision(9)).to.eq(4);
+      expect(OSM.zoomPrecision(10)).to.eq(4);
+      expect(OSM.zoomPrecision(11)).to.eq(4);
+      expect(OSM.zoomPrecision(12)).to.eq(4);
+      expect(OSM.zoomPrecision(13)).to.eq(4);
+      expect(OSM.zoomPrecision(14)).to.eq(4);
+      expect(OSM.zoomPrecision(15)).to.eq(4);
+      expect(OSM.zoomPrecision(16)).to.eq(4);
+    });
+
+    it("suggests 5 digits for z17-20", function () {
+      expect(OSM.zoomPrecision(17)).to.eq(5);
+      expect(OSM.zoomPrecision(18)).to.eq(5);
+      expect(OSM.zoomPrecision(19)).to.eq(5);
+      expect(OSM.zoomPrecision(20)).to.eq(5);
+    });
+  });
+
+  describe(".locationCookie", function () {
+    it("creates a location cookie value", function () {
+      $("body").html($("<div id='map'>"));
+      var map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 });
+      map.updateLayers("");
+      expect(OSM.locationCookie(map)).to.eq("-3.6845|57.6247|9|M");
+    });
+
+    it("respects zoomPrecision", function () {
+      $("body").html($("<div id='map'>"));
+      var map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 });
+      map.updateLayers("");
+      expect(OSM.locationCookie(map)).to.eq("-3.6845|57.6247|9|M");
+
+      map.setZoom(5);
+      expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|5|M");
+    });
+  });
+});

diff --git a/test/unit/bounding_box_test.rb b/test/lib/bounding_box_test.rb
similarity index 99%
rename from test/unit/bounding_box_test.rb
rename to test/lib/bounding_box_test.rb
index 1a1059ddfa61a4d9f4e585cd7f1017501aa2ed3d..a5e4a39e0616fc085ea3ea409fd43e2387f01c5a 100644 (file)
--- a/test/unit/bounding_box_test.rb
+++ b/test/lib/bounding_box_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class BoundingBoxTest < ActiveSupport::TestCase
   def setup

diff --git a/test/lib/country_test.rb b/test/lib/country_test.rb
new file mode 100644 (file)
index 0000000..14827c0
--- /dev/null
+++ b/test/lib/country_test.rb
@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class CountryTest < ActiveSupport::TestCase
+  def test_gb
+    gb = Country.find_by_code("GB")
+    assert_not_nil gb
+    assert_equal "GB", gb.code
+    assert_equal -8.623555, gb.min_lon
+    assert_equal 59.360249, gb.max_lat
+    assert_equal 1.759, gb.max_lon
+    assert_equal 49.906193, gb.min_lat
+  end
+
+  def test_au
+    au = Country.find_by_code("AU")
+    assert_not_nil au
+    assert_equal "AU", au.code
+    assert_equal 112.911057, au.min_lon
+    assert_equal -10.062805, au.max_lat
+    assert_equal 153.639252, au.max_lon
+    assert_equal -43.64397, au.min_lat
+  end
+
+  def test_xx
+    xx = Country.find_by_code("XX")
+    assert_nil xx
+  end
+end

diff --git a/test/unit/i18n_test.rb b/test/lib/i18n_test.rb
similarity index 97%
rename from test/unit/i18n_test.rb
rename to test/lib/i18n_test.rb
index 19b9afcfda5d09407a5eb500bcd1e310d13d6c8a..ea67e084eeab12223e3540468feccdac1b38145e 100644 (file)
--- a/test/unit/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|

diff --git a/test/unit/password_hash_test.rb b/test/lib/password_hash_test.rb
similarity index 96%
rename from test/unit/password_hash_test.rb
rename to test/lib/password_hash_test.rb
index 825942afaeb3d4b78dc91f4f10348ca3c48f9ede..bf253c0b8115ed1e496ff4eb31575a0a067ce777 100644 (file)
--- a/test/unit/password_hash_test.rb
+++ b/test/lib/password_hash_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class PasswordHashTest < ActiveSupport::TestCase
   def test_md5_without_salt

diff --git a/test/unit/rich_text_test.rb b/test/lib/rich_text_test.rb
similarity index 98%
rename from test/unit/rich_text_test.rb
rename to test/lib/rich_text_test.rb
index c43dd0e9a2466a13b0d4329c3c594e63abc55611..e99d594a4e184a14f55e1b104bd73d8dd1da8464 100644 (file)
--- a/test/unit/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RichTextTest < ActiveSupport::TestCase
   include ActionDispatch::Assertions::SelectorAssertions

diff --git a/test/unit/short_link_test.rb b/test/lib/short_link_test.rb
similarity index 96%
rename from test/unit/short_link_test.rb
rename to test/lib/short_link_test.rb
index cdc6b3cfd800bd17fec6691f9a52a8bc7407c555..7aa21f3636cb0a71b7f2cb9d8cfe24cd5e326225 100644 (file)
--- a/test/unit/short_link_test.rb
+++ b/test/lib/short_link_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinkTest < ActiveSupport::TestCase
   ##

diff --git a/test/lib/utf8_test.rb b/test/lib/utf8_test.rb
new file mode 100644 (file)
index 0000000..1604b52
--- /dev/null
+++ b/test/lib/utf8_test.rb
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+require 'test_helper'
+
+class UTF8Test < ActiveSupport::TestCase
+  def test_valid?
+    assert_equal true, UTF8.valid?("test")
+    assert_equal true, UTF8.valid?("vergrößern")
+    assert_equal true, UTF8.valid?("ルシステムにも対応します")
+    assert_equal true, UTF8.valid?("輕觸搖晃的遊戲")
+
+    assert_equal false, UTF8.valid?("\xC0")         # always invalid utf8
+    assert_equal false, UTF8.valid?("\xC2\x4a")     # 2-byte multibyte identifier, followed by plain ASCII
+    assert_equal false, UTF8.valid?("\xC2\xC2")     # 2-byte multibyte identifier, followed by another one
+    assert_equal false, UTF8.valid?("\x4a\x82")     # plain ASCII, followed by multibyte continuation
+    assert_equal false, UTF8.valid?("\x82\x82")     # multibyte continuations without multibyte identifier
+    assert_equal false, UTF8.valid?("\xe1\x82\x4a") # three-byte identifier, contination and (incorrectly) plain ASCII
+  end
+end

diff --git a/test/unit/acl_test.rb b/test/models/acl_test.rb
similarity index 70%
rename from test/unit/acl_test.rb
rename to test/models/acl_test.rb
index 991e6eb8465dda99339552a3fc836219b0fb09f3..9d843191206640bcd6a402e3b9119c32e4421019 100644 (file)
--- a/test/unit/acl_test.rb
+++ b/test/models/acl_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class AclTest < ActiveSupport::TestCase
   # Replace this with your real tests.

diff --git a/test/unit/changeset_tag_test.rb b/test/models/changeset_tag_test.rb
similarity index 96%
rename from test/unit/changeset_tag_test.rb
rename to test/models/changeset_tag_test.rb
index cff75a5be9e137579fd0cefda2a0e87ffd9248df..1564361c470029df4863cc22914f77f8f83f1d94 100644 (file)
--- a/test/unit/changeset_tag_test.rb
+++ b/test/models/changeset_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ChangesetTagTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/changeset_test.rb b/test/models/changeset_test.rb
similarity index 98%
rename from test/unit/changeset_test.rb
rename to test/models/changeset_test.rb
index 9533cd55e0da9f1ea1f1743fbd08fa2c28552c88..b6e5ba46ad4bf2cb74bb90c79b7a9d6577ecb43f 100644 (file)
--- a/test/unit/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ChangesetTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/diary_comment_test.rb b/test/models/diary_comment_test.rb
similarity index 77%
rename from test/unit/diary_comment_test.rb
rename to test/models/diary_comment_test.rb
index e6d7a71b443e95f7fabc27a64263775bc0031f0f..e96c122300c99ad9a01114965f36e1067b88c744 100644 (file)
--- a/test/unit/diary_comment_test.rb
+++ b/test/models/diary_comment_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryCommentTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/diary_entry_test.rb b/test/models/diary_entry_test.rb
similarity index 97%
rename from test/unit/diary_entry_test.rb
rename to test/models/diary_entry_test.rb
index 0801aa299a9ca74f86ff0f9575a22caee5e14c5f..e8667bc74d5e7037e9e9bde5c73fde314ddd0cbf 100644 (file)
--- a/test/unit/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryEntryTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/friend_test.rb b/test/models/friend_test.rb
similarity index 74%
rename from test/unit/friend_test.rb
rename to test/models/friend_test.rb
index 6416e38c7db48e1035dc4e27049915e54feb2495..c9f671e7ec4c338d8f997b0678a2cdd03112aaa1 100644 (file)
--- a/test/unit/friend_test.rb
+++ b/test/models/friend_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class FriendTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/language_test.rb b/test/models/language_test.rb
similarity index 69%
rename from test/unit/language_test.rb
rename to test/models/language_test.rb
index a171c1e2e1fae307edf7d1a53b561687b718e6a7..a9d6f5d6a22372eb3a2ade6c61c159622e878a13 100644 (file)
--- a/test/unit/language_test.rb
+++ b/test/models/language_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class LanguageTest < ActiveSupport::TestCase
   test "language count" do

diff --git a/test/unit/message_test.rb b/test/models/message_test.rb
similarity index 99%
rename from test/unit/message_test.rb
rename to test/models/message_test.rb
index 3da91de38365df658a4aa1d243186afae7d62bdb..079e10c4289e441c04599195f9feb4439509f5d0 100644 (file)
--- a/test/unit/message_test.rb
+++ b/test/models/message_test.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class MessageTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/node_tag_test.rb b/test/models/node_tag_test.rb
similarity index 95%
rename from test/unit/node_tag_test.rb
rename to test/models/node_tag_test.rb
index 2f26317925066a267a69577f6ce7bb5553960602..aa50b2f39a5af83641a3c6fe398efa712a01fa66 100644 (file)
--- a/test/unit/node_tag_test.rb
+++ b/test/models/node_tag_test.rb
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeTagTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_tag_count
-    assert_equal 7, NodeTag.count
+    assert_equal 12, NodeTag.count
     node_tag_count(:visible_node, 1)
     node_tag_count(:invisible_node, 1)
     node_tag_count(:used_node_1, 1)

diff --git a/test/unit/node_test.rb b/test/models/node_test.rb
similarity index 99%
rename from test/unit/node_test.rb
rename to test/models/node_test.rb
index 2b28b3ee632c6975960005347dc69c255c2d2a14..f6f5be2966cd3d0f84f3846a08b9de1204b2e565 100644 (file)
--- a/test/unit/node_test.rb
+++ b/test/models/node_test.rb
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_node_count
-    assert_equal 17, Node.count
+    assert_equal 18, Node.count
   end
 
   def test_node_too_far_north

diff --git a/test/unit/oauth_nonce_test.rb b/test/models/oauth_nonce_test.rb
similarity index 91%
rename from test/unit/oauth_nonce_test.rb
rename to test/models/oauth_nonce_test.rb
index def869a054bfcb89b3bdcb4604c516072d6a855f..ffbad0af6a4f2dd04c4d66ab849effdb9658c3b5 100644 (file)
--- a/test/unit/oauth_nonce_test.rb
+++ b/test/models/oauth_nonce_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthNonceTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/oauth_token_test.rb b/test/models/oauth_token_test.rb
similarity index 94%
rename from test/unit/oauth_token_test.rb
rename to test/models/oauth_token_test.rb
index 9ec005c966bbf86b46ce30b64ee83c86e13c844f..da2e449f15cc266b4d7a78963e068ca8c0c4527a 100644 (file)
--- a/test/unit/oauth_token_test.rb
+++ b/test/models/oauth_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthTokenTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/old_node_tag_test.rb b/test/models/old_node_tag_test.rb
similarity index 93%
rename from test/unit/old_node_tag_test.rb
rename to test/models/old_node_tag_test.rb
index af7a186d8ca31a213fd5bdf9803eb42e38dc15ad..249b810a9fee0e3488a859ed53644b01960fb474 100644 (file)
--- a/test/unit/old_node_tag_test.rb
+++ b/test/models/old_node_tag_test.rb
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldNodeTagTest < ActiveSupport::TestCase
   api_fixtures
 
   def test_old_node_tag_count
-    assert_equal 9, OldNodeTag.count, "Unexpected number of fixtures loaded."
+    assert_equal 19, OldNodeTag.count, "Unexpected number of fixtures loaded."
   end
   
   def test_length_key_valid

diff --git a/test/unit/old_node_test.rb b/test/models/old_node_test.rb
similarity index 97%
rename from test/unit/old_node_test.rb
rename to test/models/old_node_test.rb
index fdd61f0900ffaf815bf1dded171ff2e587a9edca..2ccf6d18c5dc6939c5de62a4dd203756aea3ea10 100644 (file)
--- a/test/unit/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldNodeTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_node_count
-    assert_equal 21, OldNode.count
+    assert_equal 23, OldNode.count
   end
 
   def test_node_too_far_north

diff --git a/test/unit/old_relation_tag_test.rb b/test/models/old_relation_tag_test.rb
similarity index 97%
rename from test/unit/old_relation_tag_test.rb
rename to test/models/old_relation_tag_test.rb
index faff45dd004b93e4dbeeb9fc1c11c6efbbfbf086..ec4987ee0f79342bc9addd995d18027cb21aca94 100644 (file)
--- a/test/unit/old_relation_tag_test.rb
+++ b/test/models/old_relation_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldRelationTagTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/old_relation_test.rb b/test/models/old_relation_test.rb
similarity index 98%
rename from test/unit/old_relation_test.rb
rename to test/models/old_relation_test.rb
index 31ff831971322d5015862e8d966cce0744a8487d..14fe8a72cc8a9d0660f259f1c9f787cb3140744d 100644 (file)
--- a/test/unit/old_relation_test.rb
+++ b/test/models/old_relation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldRelationTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/old_way_tag_test.rb b/test/models/old_way_tag_test.rb
similarity index 96%
rename from test/unit/old_way_tag_test.rb
rename to test/models/old_way_tag_test.rb
index dbc001980b3df30c7ca6bb91d66d5e722beaa783..07bdfbca87f4355828ceca94a0b9224ab323da3f 100644 (file)
--- a/test/unit/old_way_tag_test.rb
+++ b/test/models/old_way_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldWayTagTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/old_way_test.rb b/test/models/old_way_test.rb
similarity index 98%
rename from test/unit/old_way_test.rb
rename to test/models/old_way_test.rb
index 44975d1534063d4c08b37dc1b65dfa0c8595ae22..c002ebe39f00423663805944fe65be2d27532f64 100644 (file)
--- a/test/unit/old_way_test.rb
+++ b/test/models/old_way_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldWayTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/redaction_test.rb b/test/models/redaction_test.rb
similarity index 95%
rename from test/unit/redaction_test.rb
rename to test/models/redaction_test.rb
index c19570fc42b20f38d9096ac31131fa231279a63e..61b64f21109c28e4e2993e4ad75533b3de3aa050 100644 (file)
--- a/test/unit/redaction_test.rb
+++ b/test/models/redaction_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'osm'
 
 class RedactionTest < ActiveSupport::TestCase

diff --git a/test/unit/relation_member_test.rb b/test/models/relation_member_test.rb
similarity index 75%
rename from test/unit/relation_member_test.rb
rename to test/models/relation_member_test.rb
index 2b1fe113f9d0644fcbcfe0446c43e2dd0a31d30d..82eaa7e58432a139031520cb2a7fe3de0079efc2 100644 (file)
--- a/test/unit/relation_member_test.rb
+++ b/test/models/relation_member_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationMemberTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/relation_tag_test.rb b/test/models/relation_tag_test.rb
similarity index 98%
rename from test/unit/relation_tag_test.rb
rename to test/models/relation_tag_test.rb
index 0833c572d1de0480ac519e2913a8e33770e6820a..0b5bedb05e88a77414c6f1adb2b45028d225583b 100644 (file)
--- a/test/unit/relation_tag_test.rb
+++ b/test/models/relation_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationTagTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/relation_test.rb b/test/models/relation_test.rb
similarity index 99%
rename from test/unit/relation_test.rb
rename to test/models/relation_test.rb
index 4caa6ce41c856a634eee83eff2caf5af52219a19..7141f54f0c62701ee1c52218195271dab725992e 100644 (file)
--- a/test/unit/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/trace_test.rb b/test/models/trace_test.rb
similarity index 98%
rename from test/unit/trace_test.rb
rename to test/models/trace_test.rb
index d2720e993d900b1ac96783a6c639cc5261f291aa..9ec40f18f40e75c610b101cef01c0a4c5d48388d 100644 (file)
--- a/test/unit/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TraceTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/tracepoint_test.rb b/test/models/tracepoint_test.rb
similarity index 73%
rename from test/unit/tracepoint_test.rb
rename to test/models/tracepoint_test.rb
index c49f9fbdcacde2134247aab632e4c14e1ecb673c..74a0d22f9fa469228f92362e28974b65bfbe49ba 100644 (file)
--- a/test/unit/tracepoint_test.rb
+++ b/test/models/tracepoint_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracepointTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/tracetag_test.rb b/test/models/tracetag_test.rb
similarity index 94%
rename from test/unit/tracetag_test.rb
rename to test/models/tracetag_test.rb
index 473071088be1efa13b062045d3c81362a938cd05..74a1d49aa59aaa57816074c1347d1372090dddb5 100644 (file)
--- a/test/unit/tracetag_test.rb
+++ b/test/models/tracetag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracetagTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/user_preference_test.rb b/test/models/user_preference_test.rb
similarity index 96%
rename from test/unit/user_preference_test.rb
rename to test/models/user_preference_test.rb
index d95989a4f50092fce1caac78547d0feb3a1a2420..4d485b27625c3d72e9d3f712b4eb89460c4d0e2a 100644 (file)
--- a/test/unit/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserPreferenceTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/user_test.rb b/test/models/user_test.rb
similarity index 99%
rename from test/unit/user_test.rb
rename to test/models/user_test.rb
index 1a39309f1b60a798431b4c2e47dd64d938771f57..7f24469f625e66dcafc3131cd9b37e9d2a446db0 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/user_token_test.rb b/test/models/user_token_test.rb
similarity index 76%
rename from test/unit/user_token_test.rb
rename to test/models/user_token_test.rb
index 1fe2634541b89c70e6d09c52d364f06ee2baead1..7be5a2cf7dfceb7ea5b7afa393983f1c419cb3e4 100644 (file)
--- a/test/unit/user_token_test.rb
+++ b/test/models/user_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTokenTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/way_node_test.rb b/test/models/way_node_test.rb
similarity index 72%
rename from test/unit/way_node_test.rb
rename to test/models/way_node_test.rb
index 9d6a3b75597a83425fbb319ac8af4cfbb44fda0c..174fe0bdd2da64494eb5990ba67d1bfbf6262331 100644 (file)
--- a/test/unit/way_node_test.rb
+++ b/test/models/way_node_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayNodeTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/way_tag_test.rb b/test/models/way_tag_test.rb
similarity index 96%
rename from test/unit/way_tag_test.rb
rename to test/models/way_tag_test.rb
index 9766e9c773acb9a777fd693a78f45be29ca0e114..4d6116159d49ccc3c908610cbdc47d23e9140f38 100644 (file)
--- a/test/unit/way_tag_test.rb
+++ b/test/models/way_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayTagTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/test/unit/way_test.rb b/test/models/way_test.rb
similarity index 99%
rename from test/unit/way_test.rb
rename to test/models/way_test.rb
index 6b9237da765d60e770a7b1d6751279e1909ce80a..eb5baef10c32d0b623bb450543be535bd4725583 100644 (file)
--- a/test/unit/way_test.rb
+++ b/test/models/way_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayTest < ActiveSupport::TestCase
   api_fixtures

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 1927b00eb83687855cddeab4a69804ab4c2ffce5..1e63410fa42fcbe2b521b052afe7ddf0380f1abf 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -2732,14 +2732,13 @@ input[type=number] {
 
 .form-field .addr-number {
     width: 33.3333%;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 0;
+    border: 0;
     border-radius: 0;
 }
 
 .form-field .addr-street {
     width: 66.6666%;
+    border-top: 0;
     border-right: 0;
     border-bottom: 0;
     border-radius: 0;

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 6a8d7a87ae3c61c118a5b2f5f0c5ba99c62ec829..c7bb962195dce765dd685e4dafbef7c4c5dbac1e 100644 (file)
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -16151,7 +16151,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.6';
+iD.version = '1.3.7';
 
 (function() {
     var detected = {};
@@ -16187,7 +16187,7 @@ iD.version = '1.3.6';
 })();
 iD.taginfo = function() {
     var taginfo = {},
-        endpoint = 'http://taginfo.openstreetmap.org/api/4/',
+        endpoint = 'https://taginfo.openstreetmap.org/api/4/',
         tag_sorts = {
             point: 'count_nodes',
             vertex: 'count_nodes',
@@ -16323,7 +16323,7 @@ iD.taginfo = function() {
 };
 iD.wikipedia  = function() {
     var wiki = {},
-        endpoint = 'http://en.wikipedia.org/w/api.php?';
+        endpoint = 'https://en.wikipedia.org/w/api.php?';
 
     wiki.search = function(lang, query, callback) {
         lang = lang || 'en';
@@ -17702,10 +17702,14 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
             graph = graph.remove(m);
         });
 
-        members.forEach(function(m) {
-            var entity = graph.entity(m.id);
-            relation = relation.mergeTags(entity.tags);
-            graph = graph.replace(entity.update({ tags: {} }));
+        entities.closedWay.forEach(function(way) {
+            function isThisOuter(m) {
+                return m.id === way.id && m.role !== 'inner';
+            }
+            if (members.some(isThisOuter)) {
+                relation = relation.mergeTags(way.tags);
+                graph = graph.replace(way.update({ tags: {} }));
+            }
         });
 
         return graph.replace(relation.update({
@@ -17719,6 +17723,8 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
         if (entities.other.length > 0 ||
             entities.closedWay.length + entities.multipolygon.length < 2)
             return 'not_eligible';
+        if (!entities.multipolygon.every(function(r) { return r.isComplete(graph); }))
+            return 'incomplete_relation';
     };
 
     return action;
@@ -20567,6 +20573,9 @@ iD.operations.Merge = function(selectedIDs, context) {
         if (j === 'restriction' && m && p)
             return t('operations.merge.restriction', {relation: context.presets().item('type/restriction').name()});
 
+        if (p === 'incomplete_relation' && j && m)
+            return t('operations.merge.incomplete_relation');
+
         if (j && m && p)
             return t('operations.merge.' + j);
 
@@ -22033,7 +22042,9 @@ iD.History = function(context) {
         toJSON: function() {
             if (stack.length <= 1) return;
 
-            var allEntities = {};
+            var allEntities = {},
+                baseEntities = {},
+                base = stack[0];
 
             var s = stack.map(function(i) {
                 var modified = [], deleted = [];
@@ -22046,6 +22057,12 @@ iD.History = function(context) {
                     } else {
                         deleted.push(id);
                     }
+
+                    // make sure that the originals of changed or deleted entities get merged
+                    // into the base of the stack after restoring the data from JSON.
+                    if (id in base.graph.entities) {
+                        baseEntities[id] = base.graph.entities[id];
+                    }
                 });
 
                 var x = {};
@@ -22059,8 +22076,9 @@ iD.History = function(context) {
             });
 
             return JSON.stringify({
-                version: 2,
+                version: 3,
                 entities: _.values(allEntities),
+                baseEntities: _.values(baseEntities),
                 stack: s,
                 nextIDs: iD.Entity.id.next,
                 index: index
@@ -22073,13 +22091,22 @@ iD.History = function(context) {
             iD.Entity.id.next = h.nextIDs;
             index = h.index;
 
-            if (h.version === 2) {
+            if (h.version === 2 || h.version === 3) {
                 var allEntities = {};
 
                 h.entities.forEach(function(entity) {
                     allEntities[iD.Entity.key(entity)] = iD.Entity(entity);
                 });
 
+                if (h.version === 3) {
+                    // this merges originals for changed entities into the base of
+                    // the stack even if the current stack doesn't have them (for
+                    // example when iD has been restarted in a different region)
+                    var baseEntities = h.baseEntities.map(iD.Entity);
+                    stack[0].graph.rebase(baseEntities, _.pluck(stack, 'graph'));
+                    tree.rebase(baseEntities);
+                }
+
                 stack = h.stack.map(function(d) {
                     var entities = {}, entity;
 
@@ -22151,8 +22178,6 @@ iD.History = function(context) {
 
             var json = context.storage(getKey('saved_history'));
             if (json) history.fromJSON(json);
-
-            context.storage(getKey('saved_history', null));
         },
 
         _getKey: getKey
@@ -23066,7 +23091,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
 
     var bing = iD.BackgroundSource(data),
         key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM
-        url = 'http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' +
+        url = 'https://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' +
             key + '&jsonp={callback}',
         providers = [];
 
@@ -23085,7 +23110,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
         dispatch.change();
     });
 
-    var template = 'http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z',
+    var template = 'https://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z',
         subdomains = [0, 1, 2, 3];
 
     bing.url = function(coord) {
@@ -29384,7 +29409,6 @@ iD.ui.preset.access = function(field) {
 };
 iD.ui.preset.address = function(field, context) {
     var event = d3.dispatch('change'),
-        housename,
         housenumber,
         street,
         city,
@@ -29482,12 +29506,6 @@ iD.ui.preset.address = function(field, context) {
         var enter = wrap.enter().append('div')
             .attr('class', 'preset-input-wrap');
 
-        enter.append('input')
-            .property('type', 'text')
-            .attr('placeholder', field.t('placeholders.housename'))
-            .attr('class', 'addr-housename')
-            .attr('id', 'preset-input-' + field.id);
-
         enter.append('input')
             .property('type', 'text')
             .attr('placeholder', field.t('placeholders.number'))
@@ -29510,7 +29528,6 @@ iD.ui.preset.address = function(field, context) {
 
         // Update
 
-        housename = wrap.select('.addr-housename');
         housenumber = wrap.select('.addr-number');
         street = wrap.select('.addr-street');
         city = wrap.select('.addr-city');
@@ -29541,7 +29558,6 @@ iD.ui.preset.address = function(field, context) {
 
     function change() {
         event.change({
-            'addr:housename': housename.value() || undefined,
             'addr:housenumber': housenumber.value() || undefined,
             'addr:street': street.value() || undefined,
             'addr:city': city.value() || undefined,
@@ -29556,7 +29572,6 @@ iD.ui.preset.address = function(field, context) {
     };
 
     address.tags = function(tags) {
-        housename.value(tags['addr:housename'] || '');
         housenumber.value(tags['addr:housenumber'] || '');
         street.value(tags['addr:street'] || '');
         city.value(tags['addr:city'] || '');
@@ -29564,7 +29579,7 @@ iD.ui.preset.address = function(field, context) {
     };
 
     address.focus = function() {
-        housename.node().focus();
+        housenumber.node().focus();
     };
 
     return d3.rebind(address, event, 'on');
@@ -62669,7 +62684,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "dentist's office"
                 ],
                 "tags": {
-                    "amenity": "doctors"
+                    "amenity": "dentist"
                 },
                 "icon": "hospital",
                 "fields": [
@@ -63904,6 +63919,102 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Apartments"
             },
+            "building/barn": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "barn"
+                },
+                "name": "Barn"
+            },
+            "building/bunker": {
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "bunker"
+                },
+                "name": "Bunker",
+                "searchable": false
+            },
+            "building/cabin": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "cabin"
+                },
+                "name": "Cabin"
+            },
+            "building/cathedral": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "cathedral"
+                },
+                "name": "Cathedral"
+            },
+            "building/chapel": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "chapel"
+                },
+                "name": "Chapel"
+            },
+            "building/church": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "church"
+                },
+                "name": "Church"
+            },
             "building/commercial": {
                 "icon": "commercial",
                 "geometry": [
@@ -63916,6 +64027,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Commercial Building"
             },
+            "building/construction": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "construction"
+                },
+                "name": "Building Under Construction"
+            },
+            "building/detached": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "detached"
+                },
+                "name": "Detached Home"
+            },
+            "building/dormitory": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "dormitory"
+                },
+                "name": "Dormitory"
+            },
             "building/entrance": {
                 "icon": "entrance",
                 "geometry": [
@@ -63942,6 +64101,69 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Garage",
                 "icon": "warehouse"
             },
+            "building/garages": {
+                "icon": "warehouse",
+                "fields": [
+                    "capacity"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "garages"
+                },
+                "name": "Garages"
+            },
+            "building/greenhouse": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "greenhouse"
+                },
+                "name": "Greenhouse"
+            },
+            "building/hospital": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "hospital"
+                },
+                "name": "Hospital Building"
+            },
+            "building/hotel": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "hotel"
+                },
+                "name": "Hotel Building"
+            },
             "building/house": {
                 "icon": "building",
                 "fields": [
@@ -63984,6 +64206,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Industrial Building"
             },
+            "building/public": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "public"
+                },
+                "name": "Public Building"
+            },
             "building/residential": {
                 "icon": "building",
                 "fields": [
@@ -64000,6 +64238,167 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Residential Building"
             },
+            "building/retail": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "retail"
+                },
+                "name": "Retail Building"
+            },
+            "building/roof": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "roof"
+                },
+                "name": "Roof"
+            },
+            "building/school": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "school"
+                },
+                "name": "School Building"
+            },
+            "building/shed": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "shed"
+                },
+                "name": "Shed"
+            },
+            "building/stable": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "stable"
+                },
+                "name": "Stable"
+            },
+            "building/static_caravan": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "static_caravan"
+                },
+                "name": "Static Mobile Home"
+            },
+            "building/terrace": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "terrace"
+                },
+                "name": "Row Houses"
+            },
+            "building/train_station": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "train_station"
+                },
+                "name": "Train Station",
+                "searchable": false
+            },
+            "building/university": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "university"
+                },
+                "name": "University Building"
+            },
+            "building/warehouse": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "warehouse"
+                },
+                "name": "Warehouse"
+            },
             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "geometry": [
@@ -67761,6 +68160,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "railway/station": {
                 "icon": "rail",
+                "fields": [
+                    "building_area"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
@@ -67879,6 +68281,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "name": "Liquor Store"
             },
+            "shop/art": {
+                "icon": "art-gallery",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [
+                    "art store",
+                    "art gallery"
+                ],
+                "tags": {
+                    "shop": "art"
+                },
+                "name": "Art Shop"
+            },
             "shop/bakery": {
                 "icon": "bakery",
                 "fields": [
@@ -67953,6 +68376,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Bicycle Shop"
             },
+            "shop/bookmaker": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "bookmaker"
+                },
+                "name": "Bookmaker"
+            },
             "shop/books": {
                 "icon": "shop",
                 "fields": [
@@ -68472,6 +68912,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Locksmith"
             },
+            "shop/lottery": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "lottery"
+                },
+                "name": "Lottery Shop"
+            },
             "shop/mall": {
                 "icon": "shop",
                 "fields": [
@@ -97121,7 +97578,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "address": {
                 "type": "address",
                 "keys": [
-                    "addr:housename",
                     "addr:housenumber",
                     "addr:street",
                     "addr:city",
@@ -97132,7 +97588,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "label": "Address",
                 "strings": {
                     "placeholders": {
-                        "housename": "Housename",
                         "number": "123",
                         "street": "Street",
                         "city": "City",
@@ -109952,7 +110407,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "annotation": "Merged {n} lines.",
                 "not_eligible": "These features can't be merged.",
                 "not_adjacent": "These lines can't be merged because they aren't connected.",
-                "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation."
+                "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
+                "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."
             },
             "move": {
                 "title": "Move",
@@ -110287,7 +110743,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "address": {
                     "label": "Address",
                     "placeholders": {
-                        "housename": "Housename",
                         "number": "123",
                         "street": "Street",
                         "city": "City",
@@ -111108,10 +111563,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Apartments",
                     "terms": ""
                 },
+                "building/barn": {
+                    "name": "Barn",
+                    "terms": ""
+                },
+                "building/bunker": {
+                    "name": "Bunker",
+                    "terms": ""
+                },
+                "building/cabin": {
+                    "name": "Cabin",
+                    "terms": ""
+                },
+                "building/cathedral": {
+                    "name": "Cathedral",
+                    "terms": ""
+                },
+                "building/chapel": {
+                    "name": "Chapel",
+                    "terms": ""
+                },
+                "building/church": {
+                    "name": "Church",
+                    "terms": ""
+                },
                 "building/commercial": {
                     "name": "Commercial Building",
                     "terms": ""
                 },
+                "building/construction": {
+                    "name": "Building Under Construction",
+                    "terms": ""
+                },
+                "building/detached": {
+                    "name": "Detached Home",
+                    "terms": ""
+                },
+                "building/dormitory": {
+                    "name": "Dormitory",
+                    "terms": ""
+                },
                 "building/entrance": {
                     "name": "Entrance",
                     "terms": ""
@@ -111120,6 +111611,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Garage",
                     "terms": ""
                 },
+                "building/garages": {
+                    "name": "Garages",
+                    "terms": ""
+                },
+                "building/greenhouse": {
+                    "name": "Greenhouse",
+                    "terms": ""
+                },
+                "building/hospital": {
+                    "name": "Hospital Building",
+                    "terms": ""
+                },
+                "building/hotel": {
+                    "name": "Hotel Building",
+                    "terms": ""
+                },
                 "building/house": {
                     "name": "House",
                     "terms": ""
@@ -111132,10 +111639,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Industrial Building",
                     "terms": ""
                 },
+                "building/public": {
+                    "name": "Public Building",
+                    "terms": ""
+                },
                 "building/residential": {
                     "name": "Residential Building",
                     "terms": ""
                 },
+                "building/retail": {
+                    "name": "Retail Building",
+                    "terms": ""
+                },
+                "building/roof": {
+                    "name": "Roof",
+                    "terms": ""
+                },
+                "building/school": {
+                    "name": "School Building",
+                    "terms": ""
+                },
+                "building/shed": {
+                    "name": "Shed",
+                    "terms": ""
+                },
+                "building/stable": {
+                    "name": "Stable",
+                    "terms": ""
+                },
+                "building/static_caravan": {
+                    "name": "Static Mobile Home",
+                    "terms": ""
+                },
+                "building/terrace": {
+                    "name": "Row Houses",
+                    "terms": ""
+                },
+                "building/train_station": {
+                    "name": "Train Station",
+                    "terms": ""
+                },
+                "building/university": {
+                    "name": "University Building",
+                    "terms": ""
+                },
+                "building/warehouse": {
+                    "name": "Warehouse",
+                    "terms": ""
+                },
                 "craft/basket_maker": {
                     "name": "Basket Maker",
                     "terms": "basket,basketry,basket maker,basket weaver"
@@ -112112,6 +112663,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Liquor Store",
                     "terms": "alcohol"
                 },
+                "shop/art": {
+                    "name": "Art Shop",
+                    "terms": "art store,art gallery"
+                },
                 "shop/bakery": {
                     "name": "Bakery",
                     "terms": ""
@@ -112128,6 +112683,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Bicycle Shop",
                     "terms": ""
                 },
+                "shop/bookmaker": {
+                    "name": "Bookmaker",
+                    "terms": ""
+                },
                 "shop/books": {
                     "name": "Bookstore",
                     "terms": ""
@@ -112248,6 +112807,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Locksmith",
                     "terms": "keys"
                 },
+                "shop/lottery": {
+                    "name": "Lottery Shop",
+                    "terms": ""
+                },
                 "shop/mall": {
                     "name": "Mall",
                     "terms": ""

diff --git a/vendor/assets/iD/iD/locales/bn.json b/vendor/assets/iD/iD/locales/bn.json
index 1ac9f2b33270f1d264f7e81b9a29330fa24604dd..9b49520b63b32e6a480067a7811591875ce99a10 100644 (file)
--- a/vendor/assets/iD/iD/locales/bn.json
+++ b/vendor/assets/iD/iD/locales/bn.json
@@ -17,7 +17,7 @@
         },
         "browse": {
             "title": "ঘুরে ফিরে দেখুন",
-            "description": "মানচিত্র প্যান এবং  জুম করুন "
+            "description": "মানচিত্র প্যান এবং জুম করুন।"
         },
         "draw_area": {
             "tail": "অাপনার এলাকায় নোড সংযোজন-এর জন্য ক্লিক করুন। এলাকাটি সম্পুর্ন করার জন্য প্রথম নোড-এ ক্লিক করুন।"
@@ -46,7 +46,7 @@
             "description": "এই রেখাকে প্রলম্বিত করুন.",
             "not_eligible": "কোন রেখাকে এখানে প্রলম্বিত করা যাবে না.",
             "annotation": {
-                "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে",
+                "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে।",
                 "area": "একটি ক্ষেত্রকে বড় করা হয়েছে"
             }
         },
@@ -176,7 +176,7 @@
     },
     "redo": {
         "tooltip": "পুনরায় করুন: {action}",
-        "nothing": "পুনরায় করার কিছুই নেই."
+        "nothing": "পুনরায় করার কিছুই নেই।"
     },
     "tooltip_keyhint": "শর্টকাট:",
     "browser_notice": "এই এডিটরটি ফায়ারফক্স, ক্রোম, সাফারি, অপেরা এবং ইন্টারনেট এক্সপ্লোরার ৯ এবং তার উপরে কাজ করে। দয়া করে অাপনার ব্রাউসারটিকে উন্নত করুন অথবা ম্যাপ এ পরিবর্তন করতে পটল্যাচ ২ ব্যব্হার করুন।",

diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index 6360dadea730d98693834aad469131a42242b9de..a95f8a84094858033dbb766dec34027fc8d51a70 100644 (file)
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -134,7 +134,8 @@
             "annotation": "Heu fusionat {n} línies.",
             "not_eligible": "Aquestes característiques no poden ser fusionades.",
             "not_adjacent": "Aquestes línies no poden ser com fusionades ja que no estàn connectades.",
-            "restriction": "Aquestes línies no poden ser fusionades perquè com a mínim una d'elles és membre de la relació \"{relation}\""
+            "restriction": "Aquestes línies no poden ser fusionades perquè com a mínim una d'elles és membre de la relació \"{relation}\"",
+            "incomplete_relation": "Aquestes característiques no poden ser fusionades perquè com a mínim una no s'ha descarregat del tot."
         },
         "move": {
             "title": "Mou",
@@ -1254,15 +1255,55 @@
             "building/apartments": {
                 "name": "Apartaments"
             },
+            "building/barn": {
+                "name": "Graner"
+            },
+            "building/bunker": {
+                "name": "Búnquer"
+            },
+            "building/cabin": {
+                "name": "Cabina"
+            },
+            "building/cathedral": {
+                "name": "Catedral"
+            },
+            "building/chapel": {
+                "name": "Capella"
+            },
+            "building/church": {
+                "name": "Església"
+            },
             "building/commercial": {
                 "name": "Edifici comercial"
             },
+            "building/construction": {
+                "name": "Edifici en construcció"
+            },
+            "building/detached": {
+                "name": "Xalet unifamiliar",
+                "terms": "casa aïllada, casa d'urbanització, xalet, chalet, xalets, chalets, casa i jardí, casa amb jardí"
+            },
+            "building/dormitory": {
+                "name": "Edifici d'habitacions"
+            },
             "building/entrance": {
                 "name": "Entrada"
             },
             "building/garage": {
                 "name": "garatge "
             },
+            "building/garages": {
+                "name": "Garatges"
+            },
+            "building/greenhouse": {
+                "name": "Hivernacle"
+            },
+            "building/hospital": {
+                "name": "Edifici hospitalari"
+            },
+            "building/hotel": {
+                "name": "Edifici hoteler"
+            },
             "building/house": {
                 "name": "Casa"
             },
@@ -1272,9 +1313,42 @@
             "building/industrial": {
                 "name": "Edifici industrial"
             },
+            "building/public": {
+                "name": "Edifici públic"
+            },
             "building/residential": {
                 "name": "Edifici residencial"
             },
+            "building/retail": {
+                "name": "Edifici de grans magatzems"
+            },
+            "building/roof": {
+                "name": "Teulada"
+            },
+            "building/school": {
+                "name": "Edifici escolar"
+            },
+            "building/shed": {
+                "name": "Traster"
+            },
+            "building/stable": {
+                "name": "Estable"
+            },
+            "building/static_caravan": {
+                "name": "Caravana fixa"
+            },
+            "building/terrace": {
+                "name": "Cases unifamiliars"
+            },
+            "building/train_station": {
+                "name": "Estació de ferrocarril"
+            },
+            "building/university": {
+                "name": "Edifici universitari"
+            },
+            "building/warehouse": {
+                "name": "Magatzem"
+            },
             "craft/basket_maker": {
                 "name": "Cistellaire"
             },
@@ -2011,6 +2085,9 @@
             "shop/alcohol": {
                 "name": "Botiga de licors"
             },
+            "shop/art": {
+                "name": "Botiga d'art"
+            },
             "shop/bakery": {
                 "name": "Fleca"
             },
@@ -2023,6 +2100,9 @@
             "shop/bicycle": {
                 "name": "Botiga de bicicletes"
             },
+            "shop/bookmaker": {
+                "name": "Cusidor de llibres"
+            },
             "shop/books": {
                 "name": "Llibreria"
             },
@@ -2113,6 +2193,9 @@
             "shop/locksmith": {
                 "name": "Copisteria de claus"
             },
+            "shop/lottery": {
+                "name": "Administració de loteria"
+            },
             "shop/mall": {
                 "name": "Centre comercial"
             },

diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json
index 397c9b9e3b54210520451302c77650a5497fd4a0..1e62c8b03d88cb396003d8e4b7b9325edefca27e 100644 (file)
--- a/vendor/assets/iD/iD/locales/da.json
+++ b/vendor/assets/iD/iD/locales/da.json
@@ -134,7 +134,8 @@
             "annotation": "Fusionerede {n} linjer.",
             "not_eligible": "Disse elementer kan ikke fusioneres.",
             "not_adjacent": "Disse linjer kan ikke fusioneres fordi de ikke er knyttet sammen",
-            "restriction": "Disse linjer kan ikke flettes sammen, da mindst en af disse er medlem af  \"{relation}\" relation."
+            "restriction": "Disse linjer kan ikke flettes sammen, da mindst en af disse er medlem af  \"{relation}\" relation.",
+            "incomplete_relation": "Disse kortegenskaber kan ikke fusioneres, da de ikke er blevet downloadet fuldstændigt."
         },
         "move": {
             "title": "Flyt",
@@ -1284,10 +1285,46 @@
                 "name": "Lejligheder",
                 "terms": "Lejligheder, Ejerlejligheder"
             },
+            "building/barn": {
+                "name": "Lade",
+                "terms": "Lade, Stald"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker"
+            },
+            "building/cabin": {
+                "name": "Hytte",
+                "terms": "Hytte"
+            },
+            "building/cathedral": {
+                "name": "Katedral",
+                "terms": "Katedral, Domkirke"
+            },
+            "building/chapel": {
+                "name": "Kapel",
+                "terms": "Kapel"
+            },
+            "building/church": {
+                "name": "Kirke",
+                "terms": "Kirke"
+            },
             "building/commercial": {
                 "name": "Indkøbscenter",
                 "terms": "Indkøbscenter, Storcenter"
             },
+            "building/construction": {
+                "name": "Bygning under konstruktion",
+                "terms": "Bygning under konstruktion, Byggeplads"
+            },
+            "building/detached": {
+                "name": "Parcelhus",
+                "terms": "Parcelhus"
+            },
+            "building/dormitory": {
+                "name": " Kollegie",
+                "terms": " Kollegie, Klubværelse, Kollegium"
+            },
             "building/entrance": {
                 "name": "Indgang",
                 "terms": "Indgang"
@@ -1296,6 +1333,22 @@
                 "name": "Garage",
                 "terms": "Garage, Carport"
             },
+            "building/garages": {
+                "name": "Garager",
+                "terms": "Garager"
+            },
+            "building/greenhouse": {
+                "name": "Drivhus",
+                "terms": "Drivhus"
+            },
+            "building/hospital": {
+                "name": "Hospitalsbygning",
+                "terms": "Hospitalsbygning, Sygehusbygning"
+            },
+            "building/hotel": {
+                "name": "Hotelbygning",
+                "terms": "Hotelbygning"
+            },
             "building/house": {
                 "name": "Hus",
                 "terms": "Hus, Parcelhus"
@@ -1308,10 +1361,54 @@
                 "name": "Industribygning",
                 "terms": "Industribygning"
             },
+            "building/public": {
+                "name": "Offentlig bygning",
+                "terms": "Offentlig bygning"
+            },
             "building/residential": {
                 "name": "Beboelsesbygning",
                 "terms": "Beboelsesbygning, Parcelhus"
             },
+            "building/retail": {
+                "name": "Butiksbygning",
+                "terms": "Butiksbygning, Forretningsbygning"
+            },
+            "building/roof": {
+                "name": "Tag",
+                "terms": "Tag"
+            },
+            "building/school": {
+                "name": "Skolebygning",
+                "terms": "Skolebygning"
+            },
+            "building/shed": {
+                "name": "Skur",
+                "terms": "Skur"
+            },
+            "building/stable": {
+                "name": "Stald",
+                "terms": "Stald, Hestestald, Kostald, Grisestald"
+            },
+            "building/static_caravan": {
+                "name": "Fast mobilt hus",
+                "terms": "Fast mobilt hus"
+            },
+            "building/terrace": {
+                "name": "Rækkehuse",
+                "terms": "Rækkehuse"
+            },
+            "building/train_station": {
+                "name": "Togstation",
+                "terms": "Togstation, Station"
+            },
+            "building/university": {
+                "name": "Universitetsbygning",
+                "terms": "Universitetsbygning"
+            },
+            "building/warehouse": {
+                "name": "Lager",
+                "terms": "Lager, Lagerhotel, Varelager"
+            },
             "craft/basket_maker": {
                 "name": "Kurvemager",
                 "terms": "Kurvemager"
@@ -2288,6 +2385,10 @@
                 "name": "Vinforhandler",
                 "terms": "Vinforhandler, Vinbutik, Vinforretning"
             },
+            "shop/art": {
+                "name": "Kunstbutik",
+                "terms": "Kunstbutik, Kunstforretning"
+            },
             "shop/bakery": {
                 "name": "Bager",
                 "terms": "Bager, Bageri"
@@ -2304,6 +2405,10 @@
                 "name": "Cykelbutik",
                 "terms": "Cykelforretning, Cykelbutik"
             },
+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": "Bookmaker"
+            },
             "shop/books": {
                 "name": "Boghandler",
                 "terms": "Boghandler"
@@ -2424,6 +2529,10 @@
                 "name": "Låsesmed",
                 "terms": "Låsesmed"
             },
+            "shop/lottery": {
+                "name": "Lotteributik",
+                "terms": "Lotteributik, Lotteriforretning"
+            },
             "shop/mall": {
                 "name": "Indkøbscenter",
                 "terms": "Indkøbscenter"

diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json
index a20ecaa5e12aa49dfa4aa9f89b467b1f1692ea80..0556e801ac8783bfdf7691fdbf1184a0af66a900 100644 (file)
--- a/vendor/assets/iD/iD/locales/de.json
+++ b/vendor/assets/iD/iD/locales/de.json
@@ -134,7 +134,8 @@
             "annotation": "{n} Linien vereinigt.",
             "not_eligible": "Diese Objekte können nicht vereinigt werden.",
             "not_adjacent": "Diese Linien können nicht vereinigt werden, da sie nicht verbunden sind.",
-            "restriction": "Diese Linien können nicht vereinigt werden, da mindestens eine Linie ein Mitglied einer \"{relation}\" Relation ist."
+            "restriction": "Diese Linien können nicht vereinigt werden, da mindestens eine Linie ein Mitglied einer \"{relation}\" Relation ist.",
+            "incomplete_relation": "Diese Objekte können nicht zusammengefügt werden, da mindestens eines noch nicht vollständig heruntergeladen wurde."
         },
         "move": {
             "title": "Verschieben",
@@ -332,7 +333,7 @@
     },
     "help": {
         "title": "Hilfe",
-        "help": "#Hilfe\n\nDies ist ein Editor für [OpenStreetMap](http://www.openstreetmap.org/), der freien und editierbaren Weltkarte. Du kannst ihn verwenden, um Daten in deiner Umgebung hinzuzufügen oder zu verändern und so diese Karte mit freien Quellen und freien Daten für jeden verbessern.\n\nVeränderungen werden für alle Nutzer von OpenStreetMap sichtbar. Um Veränderungen vornehmen zu können, musst du ein [kostenloses OpenStreetMap Profil](https://www.openstreetmap.org/user/new) anlegen.\n\nDer [iD editor](http://ideditor.com/) ist ein Gemeinschaftsprojektn dessen [Quellcode\nauf GitHub verfügbar ist](https://github.com/openstreetmap/iD).\n",
+        "help": "#Hilfe\n\nDies ist ein Editor für [OpenStreetMap](http://www.openstreetmap.org/), der freien und editierbaren Weltkarte. Du kannst ihn verwenden, um Daten in deiner Umgebung hinzuzufügen oder zu verändern und so diese Karte mit freien Quellen und freien Daten für jeden verbessern.\n\nVeränderungen werden für alle Nutzer von OpenStreetMap sichtbar. Um Veränderungen vornehmen zu können, musst du ein [kostenloses OpenStreetMap Profil](https://www.openstreetmap.org/user/new) anlegen.\n\nDer [iD editor](http://ideditor.com/) ist ein Gemeinschaftsprojekt dessen [Quellcode\nauf GitHub verfügbar ist](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Editieren & Speichern\n\nDieser Editor wurde entworfen, um online zu arbeiten und du erreichst ihn über diese Webseite.\n\n### Objekte auswählen\n\nUm ein Kartenobjekt wie eine Straße oder ein Sonderziel (POI) auszuwählen, klicke auf der Karte darauf. Dadurch wird das Objekt hervorgehoben und ein Bedienfeld mit Details und Möglichkeiten zur Veränderung aufgerufen.\n\nMehrere Objekte kannst du auswählen indem du die Shift-Taste (Umschalttaste) drückst und die Objekte einzeln anklickst oder klickst und einen Rahmen darum ziehst.\nSo können mehrere Objekte gleichzeitig geändert werden.\n\n### Speichern der Änderungen\n\nWenn du Änderungen an einer Straße, einem Gebäude oder einem Platz vorgenommen hast, sind diese lokal gespeichert, bis du sie auf dem Server speicherst. Keine Sorge falls du einen Fehler machen solltest: Du kannst Änderungen jederzeit über den Rückgängig-Knopf rückgängig machen oder über den Wiederherstellen-Knopf noch einmal ausführen.\n\nKlicke auf \"Speichern\", um eine Gruppe von Änderungen zu speichern. Zum Beispiel, wenn du in einem Stadtteil fertig bist und in einer neuen Gegend editieren willst.\nDu bekommst dann die Möglichkeit noch einmal zu überprüfen, was du gerade getan hast und der Editor zeigt dir nützliche Hinweise oder mögliche Fehler, wenn etwas nicht in Ordnung zu sein scheint.\n\nWenn alles gut aussieht kannst du einen kurzen Kommentar schreiben, der erklärt, was du gemacht hast. Drücke nun \"Speichern\", um die Änderungen auf dem Server zu speichern.\nNun können es alle auf [OpenStreetMap.org](http://www.openstreetmap.org/) sehen und darauf aufbauen.\n\nWenn du es zeitlich nicht schaffst, kannst du das Editor-Fenster einfach schließen. Wenn du die Seite wieder aufrufst (mit dem gleichen Browser und Computer) wird dir angeboten, die letzte Sitzung wiederherzustellen.\n",
         "roads": "# Straßen\n\nMit dem Editor kannst du Wege erstellen, verändern und löschen. Wege können alles mögliche sein, zum Beispiel Pfade, Straßen, Schienen, Fahrradwege und anderes.\n\n### Auswählen\n\nKlicke auf einen Weg, um ihn auszuwählen. Er sollte nun hervorgehoben werden. Außerdem erscheint ein kleines Werkzeugmenü und eine Seitenleiste mit den Eigenschaften des Weges.\n\n### Modifizieren\n\nOft sieht man, dass Wege nicht mit dem Luftbild oder einer GPS-Spur übereinstimmen. Du kannst den Weg aber so anpassen, dass er an der richtigen Stelle ist. Beachte jedoch, dass Luftbilder einen Versatz aufweisen können.\n\nAls Erstes wählst du einen Weg aus. Dieser wird nun hervorgehoben und es werden die Knoten des Weges angezeigt. Diese kannst du verschieben, bis sie an der richtigen Stelle sind. Wenn du neue Knoten hinzufügen möchtest, klicke doppelt zwischen den Knoten auf die Linie und es wird ein neuer Punkt erzeugt.\n\nWenn zwei Wege in Wirklichkeit mit einander verbunden sind, aber auf der Karte nicht, kannst du sie verbinden, indem du einen Knoten des einen Weges auf den anderen Weg ziehst. Dass Wege verbunden sind, ist wichtig für die Karte und essentiell für die Nutzung von Routenführung.\n\nDu kannst auch das \"Bewegen\"-Werkzeug nutzen oder \"M\" drücken, um den kompletten Weg zu verschieben. Beende die Aktion mit einem Klick.\n\n### Löschen\n\nWenn du weißt, dass ein Weg nicht existiert, kannst du ihn löschen, um ihn von der Karte zu entfernen. Sei beim Löschen von Objekten besonders vorsichtig, da diese Änderungen von jedem gesehen werden können und Luftbilder oft veraltet sind. Das heißt, dass ein Weg, der im Luftbild nicht zu sehen ist, vielleicht einfach neu gebaut wurde.\n\nDu kannst Wege löschen, indem du sie anklickst und das Mülltonnensymbol auswählst oder die \"Entfernen\"-Taste drückst.\n\n### Erstellen\n\nDu kennst einen Weg der nicht eingezeichnet ist? Dann klicke auf das \"Linien\"-Symbol oben links im Editor oder drücke die Taste \"2\" und beginne mit dem Zeichnen einer Linie.\n\nKlicke dort hin, wo die Straße anfängt. Sollte sie von einer bereits existierenden Straße abzweigen, klicke an der entsprechenden Stelle auf diese Straße.\n\nZeichne nun den Weg, indem du Punkte anhand der Luftaufnahme oder der GPS-Spur entlang des Weges setzt. Sollte der Weg einen anderen kreuzen, klicke auf den  Kreuzungspunkt, um beide Wege zu verbinden. Wenn du mit dem Zeichnen fertig bist, klicke doppelt oder drücke \"Enter\" auf der Tastatur, um den Weg abzuschließen.\n",
         "gps": "# GPS\n\nGPS-Daten sind die vertrauenswürdigste Quelle für OpenStreetMap.\nDieser Editor unterstützt lokale GPS-Spuren — \".gpx\"-Dateien auf \ndeinem Computer. Du kannst diese GPS-Spuren mit Hilfe diverser\nSmartphone-Apps oder anderen GPS-Geräten aufnehmen.\n\nFür Informationen über das Sammeln von GPS-Daten kannst du dir\nfolgende Anleitung durchlesen: [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/) (zur Zeit nur auf Englisch)\n\nUm einen GPX-Track zu verwenden, ziehe ihn einfach in den Karteneditor.\nWenn er erkannt wurde, wird dieser Track als leuchtend grüne Linie auf\nder Karte dargestellt. Klicke auf \"Hintergrundeinstellungen\", um sie zu\n(de-)aktivieren, oder um zum Gebiet des Tracks zu gelangen (Lupe).\n\nDer GPX-Track wird nicht automatisch direkt zu OpenStreetMap hochgeladen.\nAm besten verwendest du ihn, um neue Wege hinzuzufügen. Möchtest du den \nGPX-Track jedem zugänglich machen, kannst du ihn über die [Track-Upload-Seite](http://www.openstreetmap.org/trace/create) hochladen.\n",
@@ -465,7 +466,7 @@
             "address": {
                 "label": "Adresse",
                 "placeholders": {
-                    "housename": "Hausname",
+                    "housename": "postalischer Hausname",
                     "number": "123",
                     "street": "Straße",
                     "city": "Stadt",
@@ -961,7 +962,7 @@
                 "terms": "Geldautomat"
             },
             "amenity/bank": {
-                "name": "Bank",
+                "name": "Bank (Geldinstitut)",
                 "terms": "Kasse,Kontor,Kreditgenossenschaft,Lagerstelle,Fiskus,Fonds,Vermögen,Investmentfirma,Register,Rücklage,Vorrat,Tresor,Rücklagen,Grundkapital,Vorrat,Lager,Lagerhaus,Sparkasse,Schatz,Treuhandgesellschaft,Tresorraum"
             },
             "amenity/bar": {
@@ -969,7 +970,7 @@
                 "terms": "Bar"
             },
             "amenity/bench": {
-                "name": "Bank",
+                "name": "Sitzbank",
                 "terms": "Bank, Sitzbank"
             },
             "amenity/bicycle_parking": {
@@ -1284,10 +1285,46 @@
                 "name": "Wohnungen",
                 "terms": "Wohnung"
             },
+            "building/barn": {
+                "name": "Scheune",
+                "terms": "Scheune, Stall"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker, Schutzraum"
+            },
+            "building/cabin": {
+                "name": "Hütte",
+                "terms": "Hütte, Wochenendhaus"
+            },
+            "building/cathedral": {
+                "name": "Kathedrale",
+                "terms": "Kathedrale, Dom"
+            },
+            "building/chapel": {
+                "name": "Kapelle (Sakralbau)",
+                "terms": "Kapelle"
+            },
+            "building/church": {
+                "name": "Kirche",
+                "terms": "Kirche"
+            },
             "building/commercial": {
                 "name": "Geschäftshaus",
                 "terms": "Gewerbehaus,gewerblich genutztes Gebäude,"
             },
+            "building/construction": {
+                "name": "im Bau befindliches Gebäude",
+                "terms": "Gebäude im Bau"
+            },
+            "building/detached": {
+                "name": "Doppelhaus",
+                "terms": "Haushälfte, Doppelhaus"
+            },
+            "building/dormitory": {
+                "name": "Schlafsaal",
+                "terms": "Schlafsaal, Dormitorium"
+            },
             "building/entrance": {
                 "name": "Eingang",
                 "terms": "Eingang"
@@ -1296,6 +1333,22 @@
                 "name": "Garage",
                 "terms": "Garage"
             },
+            "building/garages": {
+                "name": "Garagen",
+                "terms": "Garagen"
+            },
+            "building/greenhouse": {
+                "name": "Gewächshaus",
+                "terms": "Glashaus, Gewächshaus, Treibhaus"
+            },
+            "building/hospital": {
+                "name": "Krankenhausgebäude",
+                "terms": "Krankenhausgebäude, Klinikgebäude"
+            },
+            "building/hotel": {
+                "name": "Hotelgebäude",
+                "terms": "Hotelgebäude"
+            },
             "building/house": {
                 "name": "Haus",
                 "terms": "Haus"
@@ -1308,10 +1361,54 @@
                 "name": "Industriegebäude",
                 "terms": "Industriegebäude"
             },
+            "building/public": {
+                "name": "Öffentliches Gebäude",
+                "terms": "Öffentliches Gebäude"
+            },
             "building/residential": {
                 "name": "Wohngebäude",
                 "terms": "Wohnhaus,Einfamilienhaus,Mehrfamilienhaus"
             },
+            "building/retail": {
+                "name": "Geschäftsgebäude",
+                "terms": "Geschäftsgebäude, Gebäude mit Läden"
+            },
+            "building/roof": {
+                "name": "Dach",
+                "terms": "Dach"
+            },
+            "building/school": {
+                "name": "Schulgebäude",
+                "terms": "Schulgebäude, Schulhaus"
+            },
+            "building/shed": {
+                "name": "Schuppen",
+                "terms": "Hütte, Baracke"
+            },
+            "building/stable": {
+                "name": "Stall",
+                "terms": "Stall, Stallgebäude"
+            },
+            "building/static_caravan": {
+                "name": "Feststehender Wohnwagen",
+                "terms": "Abgestellter Wohnwagen"
+            },
+            "building/terrace": {
+                "name": "Reihenhäuser",
+                "terms": "Reihenhäuser"
+            },
+            "building/train_station": {
+                "name": "Bahnhof",
+                "terms": "Bahnhof, Haltestelle, Haltepunkt"
+            },
+            "building/university": {
+                "name": "Universitätsgebäude",
+                "terms": "Universitätsgebäude, Campusgebäude"
+            },
+            "building/warehouse": {
+                "name": "Lagerhalle",
+                "terms": "Lagerhaus, Lagergebäude"
+            },
             "craft/basket_maker": {
                 "name": "Korbflechter",
                 "terms": "Korbflecher, Korbmacher, Korbhersteller"
@@ -1754,7 +1851,7 @@
             },
             "landuse/commercial": {
                 "name": "Gewerbegebiet",
-                "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Buissenes Park,Büros"
+                "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Business Park,Büros"
             },
             "landuse/construction": {
                 "name": "Baustelle",
@@ -2288,6 +2385,10 @@
                 "name": "Spirituosenladen",
                 "terms": "Alkohol"
             },
+            "shop/art": {
+                "name": "Kunsthandlung",
+                "terms": "Kunsthandlung, Kunstladen"
+            },
             "shop/bakery": {
                 "name": "Bäckerei",
                 "terms": "Bäckerei"
@@ -2304,6 +2405,10 @@
                 "name": "Fahrradladen",
                 "terms": "Fahrradladen, Fahrradgeschäft, Fahrrad-Geschäft, Fahrrad-Handlung"
             },
+            "shop/bookmaker": {
+                "name": "Buchmacher",
+                "terms": "Buchmacher"
+            },
             "shop/books": {
                 "name": "Buchhandlung",
                 "terms": "Buchhandlung, Buchladen"
@@ -2424,6 +2529,10 @@
                 "name": "Schlosser",
                 "terms": "Schlosser, Schlüsseldienst"
             },
+            "shop/lottery": {
+                "name": "Lottoannahmestelle",
+                "terms": "Lottoannahmestelle"
+            },
             "shop/mall": {
                 "name": "Einkaufzentrum",
                 "terms": "Einkaufszentrum, Mall"

diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json
index f8db4d76e7389b06c7e5f8b09c0f9f68a803ab49..ef23eab654674a905c2e7748ad160697d510d102 100644 (file)
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -82,6 +82,12 @@
             "amenity/theatre": {
                 "name": "Theatre"
             },
+            "building/static_caravan": {
+                "name": "Static Caravan"
+            },
+            "building/terrace": {
+                "name": "Terraced houses"
+            },
             "leisure/sports_center": {
                 "name": "Sports Centre"
             },

diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index 5a7bf2306d89b4c68b223849c9a79e2fa5460ab8..1b40481ad320d9c016eab66e977b1edb943cbd98 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -134,7 +134,8 @@
             "annotation": "Merged {n} lines.",
             "not_eligible": "These features can't be merged.",
             "not_adjacent": "These lines can't be merged because they aren't connected.",
-            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation."
+            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
+            "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."
         },
         "move": {
             "title": "Move",
@@ -1290,10 +1291,46 @@
                 "name": "Apartments",
                 "terms": ""
             },
+            "building/barn": {
+                "name": "Barn",
+                "terms": ""
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": ""
+            },
+            "building/cabin": {
+                "name": "Cabin",
+                "terms": ""
+            },
+            "building/cathedral": {
+                "name": "Cathedral",
+                "terms": ""
+            },
+            "building/chapel": {
+                "name": "Chapel",
+                "terms": ""
+            },
+            "building/church": {
+                "name": "Church",
+                "terms": ""
+            },
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
             },
+            "building/construction": {
+                "name": "Building Under Construction",
+                "terms": ""
+            },
+            "building/detached": {
+                "name": "Detached Home",
+                "terms": ""
+            },
+            "building/dormitory": {
+                "name": "Dormitory",
+                "terms": ""
+            },
             "building/entrance": {
                 "name": "Entrance",
                 "terms": ""
@@ -1302,6 +1339,22 @@
                 "name": "Garage",
                 "terms": ""
             },
+            "building/garages": {
+                "name": "Garages",
+                "terms": ""
+            },
+            "building/greenhouse": {
+                "name": "Greenhouse",
+                "terms": ""
+            },
+            "building/hospital": {
+                "name": "Hospital Building",
+                "terms": ""
+            },
+            "building/hotel": {
+                "name": "Hotel Building",
+                "terms": ""
+            },
             "building/house": {
                 "name": "House",
                 "terms": ""
@@ -1314,10 +1367,54 @@
                 "name": "Industrial Building",
                 "terms": ""
             },
+            "building/public": {
+                "name": "Public Building",
+                "terms": ""
+            },
             "building/residential": {
                 "name": "Residential Building",
                 "terms": ""
             },
+            "building/retail": {
+                "name": "Retail Building",
+                "terms": ""
+            },
+            "building/roof": {
+                "name": "Roof",
+                "terms": ""
+            },
+            "building/school": {
+                "name": "School Building",
+                "terms": ""
+            },
+            "building/shed": {
+                "name": "Shed",
+                "terms": ""
+            },
+            "building/stable": {
+                "name": "Stable",
+                "terms": ""
+            },
+            "building/static_caravan": {
+                "name": "Static Mobile Home",
+                "terms": ""
+            },
+            "building/terrace": {
+                "name": "Row Houses",
+                "terms": ""
+            },
+            "building/train_station": {
+                "name": "Train Station",
+                "terms": ""
+            },
+            "building/university": {
+                "name": "University Building",
+                "terms": ""
+            },
+            "building/warehouse": {
+                "name": "Warehouse",
+                "terms": ""
+            },
             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "terms": "basket,basketry,basket maker,basket weaver"
@@ -2294,6 +2391,10 @@
                 "name": "Liquor Store",
                 "terms": "alcohol"
             },
+            "shop/art": {
+                "name": "Art Shop",
+                "terms": "art store,art gallery"
+            },
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
@@ -2310,6 +2411,10 @@
                 "name": "Bicycle Shop",
                 "terms": ""
             },
+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": ""
+            },
             "shop/books": {
                 "name": "Bookstore",
                 "terms": ""
@@ -2430,6 +2535,10 @@
                 "name": "Locksmith",
                 "terms": "keys"
             },
+            "shop/lottery": {
+                "name": "Lottery Shop",
+                "terms": ""
+            },
             "shop/mall": {
                 "name": "Mall",
                 "terms": ""

diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index 666f75cd79215b89b563a236a03fb5f31e4b6006..6689264bf59229ad924c278f42083ed86d6e9865 100644 (file)
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -134,7 +134,8 @@
             "annotation": "{n} líneas combinadas.",
             "not_eligible": "Estos elementos no pueden ser fusionados.",
             "not_adjacent": "Estas líneas no pueden ser fusionadas porque no están conectadas",
-            "restriction": "Estas líneas no se pueden combinar porque al menos una es miembro de una relación de \"{relation}\"."
+            "restriction": "Estas líneas no se pueden combinar porque al menos una es miembro de una relación de \"{relation}\".",
+            "incomplete_relation": "Estos elementos no se pueden combinar porque al menos uno de ellos no se ha descargado por completo."
         },
         "move": {
             "title": "Mover",
@@ -490,6 +491,7 @@
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/occupancy": {
+                "label": "Ocupación",
                 "placeholder": "2, 4, 8..."
             },
             "aeroway": {
@@ -525,6 +527,9 @@
             "building_area": {
                 "label": "Edificio"
             },
+            "cans": {
+                "label": "Acepta envases"
+            },
             "capacity": {
                 "label": "Capacidad",
                 "placeholder": "50, 100, 200..."
@@ -539,6 +544,9 @@
                     "anticlockwise": "En sentido antihorario"
                 }
             },
+            "clothes": {
+                "label": "Acepta ropas"
+            },
             "collection_times": {
                 "label": "Horario de recogida"
             },
@@ -566,6 +574,9 @@
             "description": {
                 "label": "Descripción"
             },
+            "electrified": {
+                "label": "Electrificación"
+            },
             "elevation": {
                 "label": "Altura"
             },
@@ -580,7 +591,7 @@
                 "placeholder": "+31 42 123 4567"
             },
             "fee": {
-                "label": "Tarifa"
+                "label": "Couta"
             },
             "fire_hydrant/type": {
                 "label": "Tipo"
@@ -588,6 +599,9 @@
             "fixme": {
                 "label": "Arreglame"
             },
+            "gauge": {
+                "label": "Gálibo"
+            },
             "generator/method": {
                 "label": "Método"
             },
@@ -597,6 +611,9 @@
             "generator/type": {
                 "label": "Tipo"
             },
+            "glass": {
+                "label": "Acepta vidrio"
+            },
             "golf_hole": {
                 "label": "Referencia",
                 "placeholder": "Número de hoyo (1-18)"
@@ -689,6 +706,9 @@
             "operator": {
                 "label": "Operador"
             },
+            "paper": {
+                "label": "Acepta papel"
+            },
             "par": {
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
@@ -760,6 +780,9 @@
             "shop": {
                 "label": "Tipo"
             },
+            "social_facility_for": {
+                "placeholder": "Personas sin hogar, discapacitados, niños, etc"
+            },
             "source": {
                 "label": "Fuente"
             },
@@ -840,8 +863,23 @@
             "aerialway": {
                 "name": "Pista aérea"
             },
+            "aerialway/cable_car": {
+                "name": "Teleférico",
+                "terms": "transbordador, funicular, telecabina, telesilla, telesquí"
+            },
+            "aerialway/chair_lift": {
+                "name": "Telesilla",
+                "terms": "telesquí, teleférico, funicular"
+            },
             "aerialway/gondola": {
-                "name": "Góndola"
+                "name": "Góndola",
+                "terms": "Telecabina"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Alfombra mágica"
+            },
+            "aerialway/pylon": {
+                "name": "Pilona"
             },
             "aeroway": {
                 "name": "Aerovía",
@@ -938,7 +976,8 @@
                 "terms": "cinematógrafo,cine"
             },
             "amenity/clinic": {
-                "name": "Clínica"
+                "name": "Clínica",
+                "terms": "clínica, centro médico, hospital"
             },
             "amenity/clock": {
                 "name": "Reloj"
@@ -952,10 +991,12 @@
                 "terms": "tribunal, magistratura, judicatura, audiencia,justicia"
             },
             "amenity/dentist": {
-                "name": "Dentista"
+                "name": "Dentista",
+                "terms": "dentista, odontólogo"
             },
             "amenity/doctor": {
-                "name": "Médico"
+                "name": "Médico",
+                "terms": "médico, doctor, facultativo, medicina, curador"
             },
             "amenity/drinking_water": {
                 "name": "Agua potable",
@@ -982,7 +1023,7 @@
                 "terms": "gasolinera,surtidor, estación de servicio"
             },
             "amenity/grave_yard": {
-                "name": "Camposanto",
+                "name": "Cementerio",
                 "terms": "cementerio,camposanto, necrópolis, sacramental"
             },
             "amenity/hospital": {
@@ -1059,7 +1100,18 @@
                 "terms": "escuela,colegio, academia, instituto, liceo, conservatorio"
             },
             "amenity/shelter": {
-                "name": "Refugio"
+                "name": "Refugio",
+                "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio"
+            },
+            "amenity/social_facility": {
+                "name": "Instalación social"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Banco de alimentos"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Refugio de vagabundos",
+                "terms": "Refugio social"
             },
             "amenity/swimming_pool": {
                 "name": "Piscina",
@@ -1078,7 +1130,7 @@
                 "terms": "Teatro"
             },
             "amenity/toilets": {
-                "name": "Baños",
+                "name": "Aseos",
                 "terms": "baños, baño, aseo, letrina, lavabo, servicio, tocador, ducha"
             },
             "amenity/townhall": {
@@ -1093,7 +1145,8 @@
                 "name": "Máquina expendedora"
             },
             "amenity/veterinary": {
-                "name": "Veterinario"
+                "name": "Veterinario",
+                "terms": "veterinario, albéitar, mascotas, animales"
             },
             "amenity/waste_basket": {
                 "name": "Papelera",
@@ -1183,10 +1236,39 @@
                 "name": "Apartamentos",
                 "terms": "apartamento, piso, vivienda, alojamiento, buhardilla, estudio, edificio"
             },
+            "building/barn": {
+                "name": "Granero"
+            },
+            "building/bunker": {
+                "name": "Búnker",
+                "terms": "Fortaleza"
+            },
+            "building/cabin": {
+                "name": "Cabina"
+            },
+            "building/cathedral": {
+                "name": "Catedral",
+                "terms": "Iglesia, Lugar de culto, templo, basílica, parroquia, santuario, oratorio, iglesia, basílica"
+            },
+            "building/chapel": {
+                "name": "Capilla"
+            },
+            "building/church": {
+                "name": "Iglesia",
+                "terms": "templo, basílica, capilla, colegiata, parroquia, santuario, ermita, oratorio,iglesia, basílica, catedral"
+            },
             "building/commercial": {
                 "name": "Edificio comercial",
                 "terms": "centro comercial, edificio comercial"
             },
+            "building/construction": {
+                "name": "Edificio bajo construcción",
+                "terms": "Edificio en construcción"
+            },
+            "building/detached": {
+                "name": "Casa unifamiliar",
+                "terms": "Chalet, unifamiliar"
+            },
             "building/entrance": {
                 "name": "Entrada",
                 "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco"
@@ -1195,6 +1277,20 @@
                 "name": "Garaje",
                 "terms": "garaje,cochera"
             },
+            "building/garages": {
+                "name": "Garajes",
+                "terms": "garajes, cocheras"
+            },
+            "building/greenhouse": {
+                "name": "Invernadero"
+            },
+            "building/hospital": {
+                "name": "Edificio hospital",
+                "terms": "Hospital, sanatorio, Centro de primeros auxilios"
+            },
+            "building/hotel": {
+                "name": "Edificio Hotel"
+            },
             "building/house": {
                 "name": "Casa",
                 "terms": "domicilio, hogar, vivienda, morada, residencia"
@@ -1207,52 +1303,164 @@
                 "name": "Edificio industrial",
                 "terms": "fábrica,factoría, industria, manufactura, taller, empresa, explotación"
             },
+            "building/public": {
+                "name": "Edificio Público"
+            },
             "building/residential": {
                 "name": "Edificio residencial",
                 "terms": "bloque"
             },
+            "building/roof": {
+                "name": "Tejado"
+            },
+            "building/school": {
+                "name": "Edificio Escuela",
+                "terms": "Edificio colegio"
+            },
+            "building/shed": {
+                "name": "Cobertizo"
+            },
+            "building/stable": {
+                "name": "Establo",
+                "terms": "Cuadra, caballeriza"
+            },
+            "building/static_caravan": {
+                "name": "Caravana estática"
+            },
+            "building/terrace": {
+                "name": "Bloque"
+            },
+            "building/train_station": {
+                "name": "Estación de ferrocarril",
+                "terms": "parada, alto, detención, apeadero, terminal, tren, ferrocarril"
+            },
+            "building/university": {
+                "name": "Edificio universidad"
+            },
+            "building/warehouse": {
+                "name": "Almacén",
+                "terms": "almacén, depósito, bodega, lonja, nave"
+            },
             "craft/beekeeper": {
                 "name": "Apicultor"
             },
             "craft/blacksmith": {
                 "name": "Herrero"
             },
+            "craft/boatbuilder": {
+                "name": "Constructor de barco"
+            },
+            "craft/bookbinder": {
+                "name": "Capa"
+            },
+            "craft/brewery": {
+                "name": "Cervecería"
+            },
+            "craft/carpenter": {
+                "name": "Carpintería",
+                "terms": "carpintero, ebanistería, ebanista, madera, madedero"
+            },
+            "craft/caterer": {
+                "name": "Abastecedor, Proveedor"
+            },
+            "craft/clockmaker": {
+                "name": "Relojero"
+            },
+            "craft/confectionary": {
+                "name": "Golosinas",
+                "terms": "golosinas, chucherías, caramelos"
+            },
+            "craft/dressmaker": {
+                "name": "Modista"
+            },
+            "craft/electrician": {
+                "name": "Electricista",
+                "terms": "electricista, iluminista, trabajo de electricista"
+            },
+            "craft/gardener": {
+                "name": "Jardinero, Jardinería"
+            },
+            "craft/glaziery": {
+                "name": "Vidriería"
+            },
+            "craft/handicraft": {
+                "name": "Artesanía"
+            },
             "craft/hvac": {
                 "name": "Aire acondicionado"
             },
             "craft/insulator": {
                 "name": "Aislante"
             },
+            "craft/jeweler": {
+                "name": "Joyería",
+                "terms": "joyero, relojería, relojero, platería, orfebrería, orfebre"
+            },
+            "craft/locksmith": {
+                "name": "Cerrajero",
+                "terms": "Cerrajero, cerraduras"
+            },
             "craft/metal_construction": {
                 "name": "Construcción metálica"
             },
+            "craft/optician": {
+                "name": "Óptico",
+                "terms": "óptico, óptica, gafas"
+            },
+            "craft/painter": {
+                "name": "Pintor, albañil"
+            },
             "craft/photographer": {
-                "name": "Fotógrafo"
+                "name": "Fotógrafo",
+                "terms": "fotógrafo, retratista"
             },
             "craft/photographic_labratory": {
                 "name": "Laboratorio fotográfico"
             },
+            "craft/plasterer": {
+                "name": "Yesero",
+                "terms": "yeso, albañil, obra"
+            },
             "craft/plumber": {
                 "name": "Fontanero"
             },
             "craft/pottery": {
+                "name": "Cerámica",
                 "terms": "cerámica, cerasmista, alfarería, cantarería, alcaller, alfar"
             },
             "craft/saddler": {
                 "terms": "guarnicionero, talabartero, guarnicería"
             },
             "craft/sailmaker": {
+                "name": "Velero",
                 "terms": "Fabricante de velas"
             },
+            "craft/sawmill": {
+                "name": "Aserradero"
+            },
+            "craft/scaffolder": {
+                "name": "Andamiaje"
+            },
             "craft/sculpter": {
+                "name": "Escultor",
                 "terms": "escultor, artista, cincelador, imaginero, tallista, modelista"
             },
             "craft/shoemaker": {
-                "name": "zapatero, remendón, zapatería, arreglo de zapatos"
+                "name": "zapatero, remendón, zapatería, arreglo de zapatos",
+                "terms": "zapatero, remendón"
+            },
+            "craft/tailor": {
+                "name": "Sastre"
             },
             "craft/upholsterer": {
                 "name": "Tapicero"
             },
+            "craft/watchmaker": {
+                "name": "Relojero"
+            },
+            "craft/window_construction": {
+                "name": "Construcción de ventanas"
+            },
             "embankment": {
                 "name": "Terraplén"
             },
@@ -1272,7 +1480,8 @@
                 "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla"
             },
             "footway/crossing": {
-                "name": "Cruce peatonal"
+                "name": "Cruce peatonal",
+                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones"
             },
             "footway/sidewalk": {
                 "name": "Acera",
@@ -1349,7 +1558,8 @@
                 "terms": "calle, vía, paseo, avenida, bulevar, rambla, ronda, carrera, arteria, corredera, callejón, travesía, pasadizo, pasaje, rúa, vial, costanilla, callejuela"
             },
             "highway/rest_area": {
-                "name": "Área de Descanso"
+                "name": "Área de Descanso",
+                "terms": "Área de descanso"
             },
             "highway/road": {
                 "name": "Carretera sin categoría conocida",
@@ -1388,14 +1598,16 @@
                 "terms": "aparcamiento, parking"
             },
             "highway/services": {
-                "name": "Área de Servicio"
+                "name": "Área de Servicio",
+                "terms": "área de servicios, área de descanso"
             },
             "highway/steps": {
                 "name": "Escaleras",
                 "terms": "escalera, escalinata, grada, gradería, escala, escalerilla, peldaños, escalones"
             },
             "highway/stop": {
-                "name": "Señal de Stop"
+                "name": "Señal de Stop",
+                "terms": "señal de detención, señal de parada, señal, stop, detención, parada"
             },
             "highway/tertiary": {
                 "name": "Carretera local",
@@ -1494,7 +1706,8 @@
                 "terms": "Granja"
             },
             "landuse/farmland": {
-                "name": "Tierra de labranza"
+                "name": "Tierra de labranza",
+                "terms": "granja, tierra de cultivo"
             },
             "landuse/farmyard": {
                 "name": "Tierras de cultivo",
@@ -1684,10 +1897,15 @@
                 "terms": "Aerodromo, Aeropuerto, Pista"
             },
             "military/barracks": {
-                "name": "Cuartel"
+                "name": "Cuartel",
+                "terms": "cuartel, barracones, acantonamiento, acuartelamiento, campamento"
             },
             "military/bunker": {
-                "name": "Búnker"
+                "name": "Búnker",
+                "terms": "búnker, refugio subterráneo"
+            },
+            "military/range": {
+                "name": "Rango militar"
             },
             "natural": {
                 "name": "Natural",
@@ -1849,8 +2067,8 @@
                 "terms": "urbe, capital, metrópoli, ciudad, núcleo urbano, localidad, villa"
             },
             "place/hamlet": {
-                "name": "Aldea",
-                "terms": "aldea, caserío, poblado, pueblo, aldehuela, aldeorrio, villorrio, pueblecito"
+                "name": "Aldea o barrio",
+                "terms": "aldea, caserío, poblado, pueblo, aldehuela, aldeorrio, villorrio, localidad, barrio, vecindario"
             },
             "place/island": {
                 "name": "Isla",
@@ -1911,7 +2129,8 @@
                 "name": "Plataforma"
             },
             "public_transport/stop_position": {
-                "name": "Punto de parada"
+                "name": "Punto de parada",
+                "terms": "punto de detención, stop, parada"
             },
             "railway": {
                 "name": "Ferrocarril",
@@ -1940,6 +2159,9 @@
                 "name": "Monorraíl ",
                 "terms": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Carril de vía estrecha"
+            },
             "railway/platform": {
                 "name": "Andén",
                 "terms": "Andén de ferrocarril"
@@ -1980,6 +2202,10 @@
                 "name": "Licorería",
                 "terms": "licor, trago, bebida, alcohol, tienda, licorería"
             },
+            "shop/art": {
+                "name": "Tienda de arte",
+                "terms": "Galería de arte"
+            },
             "shop/bakery": {
                 "name": "Panadería o pastelería",
                 "terms": "panadería, horno, tahona, tienda, pastelería, confitería, pastel, pan, bollería, bollo"
@@ -1996,6 +2222,9 @@
                 "name": "Tienda de bicicletas",
                 "terms": "tienda de bicicletas, bici"
             },
+            "shop/bookmaker": {
+                "name": "Librero"
+            },
             "shop/books": {
                 "name": "Librería",
                 "terms": "librería, venta de libros"
@@ -2112,6 +2341,9 @@
             "shop/locksmith": {
                 "name": "Cerrajero"
             },
+            "shop/lottery": {
+                "name": "Administración de loterías"
+            },
             "shop/mall": {
                 "name": "Centro comercial",
                 "terms": "mall,centro comercial,plaza comercial"
@@ -2209,16 +2441,16 @@
                 "terms": "casa"
             },
             "tourism/guest_house": {
-                "name": "Pensión",
-                "terms": "hostal,hotel,pensión"
+                "name": "Hospedaje",
+                "terms": "hostal, hotel, pensión, B&B, Bed & Breakfast, casa rural, bed and breakfast, posada, cama y desayuno, alojamiento, alojamiento rural, agroturismo, casa de aldea, casa de labranza, hostería"
             },
             "tourism/hostel": {
                 "name": "Albergue",
-                "terms": "hostal,hotel,pensión"
+                "terms": "hostal, hotel, pensión, alojamiento, albergue, hostería"
             },
             "tourism/hotel": {
                 "name": "Hotel",
-                "terms": "hotel,hostal,pensión"
+                "terms": "hotel, hostal, pensión, alojamiento"
             },
             "tourism/information": {
                 "name": "Información",
@@ -2226,7 +2458,7 @@
             },
             "tourism/motel": {
                 "name": "Motel",
-                "terms": "hostal,hotel.motel,pensión"
+                "terms": "hostal, hotel, motel, pensión, alojamiento"
             },
             "tourism/museum": {
                 "name": "Museo",
@@ -2237,10 +2469,12 @@
                 "terms": "picnic,barbacoa,espercimiento"
             },
             "tourism/theme_park": {
-                "name": "Parque temático"
+                "name": "Parque temático",
+                "terms": "parque temático, parque de atracciones, atracciones"
             },
             "tourism/viewpoint": {
-                "name": "Vista panorámica"
+                "name": "Vista panorámica",
+                "terms": "oteadero, punto de vista, mirador, vistas"
             },
             "tourism/zoo": {
                 "name": "Zoo",
@@ -2270,22 +2504,27 @@
                 "name": "Ruta en bicicleta"
             },
             "type/route/bus": {
-                "name": "Ruta del colectivo"
+                "name": "Ruta del colectivo",
+                "terms": "ruta de autobús, ruta de bus, línea de autobús, recorrido, trayecto, itinerario, bus, autobús"
             },
             "type/route/detour": {
-                "name": "Ruta de desvío"
+                "name": "Ruta de desvío",
+                "terms": "ruta de desvío, dirección alternativa, alternativa, ruta, itinerario alternativo,"
             },
             "type/route/ferry": {
-                "name": "Ruta de Ferry"
+                "name": "Ruta de Ferry",
+                "terms": "ruta, itinerario, rumbo, dirección, trayecto, ferry, transbordador"
             },
             "type/route/foot": {
-                "name": "Ruta a pie"
+                "name": "Ruta a pie",
+                "terms": "ruta, itinerario, rumbo, dirección, trayecto, peatonal, pie, senderismo , camino, derrotero, vía"
             },
             "type/route/hiking": {
                 "name": "Ruta de senderismo"
             },
             "type/route/pipeline": {
-                "name": "Ruta de tubería"
+                "name": "Ruta de tubería",
+                "terms": "ruta, itinerario, rumbo, dirección, trayecto, ferry, trasbordador, tubería, gasoducto, oleoducto, conducto, cañería"
             },
             "type/route/power": {
                 "name": "Ruta de red elécrica"
@@ -2303,7 +2542,8 @@
                 "name": "Ruta maestra"
             },
             "vertex": {
-                "name": "Otro"
+                "name": "Otro",
+                "terms": "diferente, distinto, ajeno, otro"
             },
             "waterway": {
                 "name": "Vía fluvial",

diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json
index c41a6934634af730b7b05b7332ef564d6848e224..b3930bd81adb27e8fc504fee5e5abbe154c15c6e 100644 (file)
--- a/vendor/assets/iD/iD/locales/fi.json
+++ b/vendor/assets/iD/iD/locales/fi.json
@@ -488,6 +488,9 @@
                 "label": "Vaunun matkustajamäärä",
                 "placeholder": "2, 4, 8..."
             },
+            "aerialway/summer/access": {
+                "label": "Käyttöoikeus kesällä"
+            },
             "aeroway": {
                 "label": "Tyyppi"
             },
@@ -521,6 +524,9 @@
             "building_area": {
                 "label": "Rakennus"
             },
+            "cans": {
+                "label": "Tölkinkeräys"
+            },
             "capacity": {
                 "label": "Paikkamäärä",
                 "placeholder": "50, 100, 200..."
@@ -535,6 +541,9 @@
                     "anticlockwise": "Vastapäivään"
                 }
             },
+            "clothes": {
+                "label": "Vaatekeräys"
+            },
             "collection_times": {
                 "label": "Tyhjennysaika"
             },
@@ -544,6 +553,9 @@
             "country": {
                 "label": "Maa"
             },
+            "covered": {
+                "label": "Katos"
+            },
             "crossing": {
                 "label": "Tyyppi"
             },
@@ -593,6 +605,9 @@
             "generator/type": {
                 "label": "Tyyppi"
             },
+            "glass": {
+                "label": "Lasinkeräys"
+            },
             "highway": {
                 "label": "Tyyppi"
             },
@@ -606,7 +621,7 @@
                 "label": "ICAO"
             },
             "incline": {
-                "label": "Kallista"
+                "label": "Kaltevuus"
             },
             "internet_access": {
                 "label": "Internet-yhteys",
@@ -674,6 +689,9 @@
             "operator": {
                 "label": "Toimija"
             },
+            "paper": {
+                "label": "Paperinkeräys"
+            },
             "park_ride": {
                 "label": "Autoparkki"
             },
@@ -730,7 +748,7 @@
                 "label": "Tyyppi"
             },
             "sac_scale": {
-                "label": "Polun haastavuus"
+                "label": "Haastavuus"
             },
             "service": {
                 "label": "Tyyppi"
@@ -776,7 +794,7 @@
                 "label": "Tyyppi"
             },
             "trail_visibility": {
-                "label": "Polun näkyvyys"
+                "label": "Näkyvyys"
             },
             "tunnel": {
                 "label": "Tunneli"
@@ -1028,6 +1046,10 @@
             "amenity/pub": {
                 "name": "Pubi"
             },
+            "amenity/recycling": {
+                "name": "Kierrätyspiste",
+                "terms": "kierrättäminen, kierrätys, lajittelu, uudelleenkäyttö, uudelleenkäyttäminen, ympäristö, lajittelupiste, lajitteluasema, jäte, jätteet, roskat, roska, roskikset, roskis, säiliö, roskasäiliö"
+            },
             "amenity/restaurant": {
                 "name": "Ravintola"
             },
@@ -1895,7 +1917,7 @@
             },
             "shop/hairdresser": {
                 "name": "Parturi-kampaamo",
-                "terms": "parturi, kampaaja, parturi-kampaamo, hiustenleikkuu, hiukset, hiusliike, hiusmyymälä, hiustenvärjäys, parranajo, parta"
+                "terms": "parturi, kampaaja, kampaamo, parturi-kampaamo, hiustenleikkuu, hiukset, hiusliike, hiusmyymälä, hiustenvärjäys, parranajo, parta"
             },
             "shop/hardware": {
                 "name": "Rautakauppa"

diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json
index 9eddaeed243d48bfa9c83175d419d0f307bfffc0..f78780555fa80d756589dd869fc7150e973ef458 100644 (file)
--- a/vendor/assets/iD/iD/locales/fr.json
+++ b/vendor/assets/iD/iD/locales/fr.json
@@ -332,6 +332,7 @@
     },
     "help": {
         "title": "Aide",
+        "help": "#Aide\n\n Ceci est un éditeur pour [OpenStreetMap](http://www.openstreetmap.org/), la carte du\n monde gratuite et éditable. Vous pouvez l'utiliser pour ajouter ou corriger les données\n dans votre zone, et participer ainsi à la réalisation d'une carte du monde libre de droits.\n\n Les modifications que vous réaliserez seront visibles de tout le monde. Pour commencer\n à éditer, vous devez créer un [compte gratuit sur OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n [iD editor](http://ideditor.com/) est un projet collaboratif dont le [code source est\n disponible sur GitHub](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Éditer et sauvegarder⏎\n⏎\nCet éditeur est conçu principalement pour travailler en mode connecté, et vous l'accéder depuis un site Web en ce moment.⏎\n⏎\n### Sélectionner un élément de la carte⏎\n⏎\nPour sélection un élément de la carte, tel qu'une rue ou un point d'intérêt, cliquez sur ce dernier⏎\nsur la carte. Cette action mettra l'élément en surbrillance, et ouvrira le panneau latéral⏎\nqui affiche les propriétés de l'élément. Un menu apparaîtra également sur la carte,⏎\npermettant de poser des actions sur l'élément (telles que le déplacer, repositionner⏎\nses points constituants, etc).\n⏎\nPour sélectionner plusieurs éléments, appuyez sur la touche 'Majuscule'. Puis, cliquez⏎\nun à un sur les éléments à sélectionner. Alternativement, il est possible de dessinez un rectangle⏎\nsur la carte (toujours en appuyant sur 'Majuscule) pour effectuer la sélection multiple.⏎\nles points à sélectionner.⏎\n⏎\n### Enregistrer les modifications⏎\n⏎\nL'éditeur enregistre localement (sur votre ordinateur) toutes les modifications⏎\nque vous effectuez sur les éléments de la carte (les rues, les bâtiments, etc.).⏎\nCes modifications seront envoyées au serveur OpenStreetMap uniquement⏎\nlorsque vous appuierez sur \"Sauvegarder\".⏎\n⏎\nNe vous faites donc pas de souci si vous faites une erreur. Vous pouvez annuler⏎\ntout changement effectué en appuyant sur le bouton d'annulation (la flèche de demi-tour⏎\npointant vers la gauche).⏎\n⏎\nLorsque vous avez terminé un groupe de modifications - par exemple, vous avez⏎\ncomplété une partie de la ville et vous voulez en débuter une nouvelle,⏎\nil suffit d'appuyer sur le bouton \"Sauvegarder\". Vos changements ne seront pas⏎\nenvoyés immédiatement - vous avez l'occasion de réviser le travail effectué⏎\navant de confirmer les changements. ⏎\n⏎\nSi tout semble bon, entrez un commentaire décrivant vos changements⏎\n(par exemple: \"Ajout d'une boulangerie\" ou \"Ajout de commerces du quartier\"),⏎\npuis appuyez à nouveau sur le bouton 'Sauvegarder' (qui, cette fois-ci, apparaîtra\nen bleu dans le panneau latéral). Vos changements seront alors envoyés à⏎\n[OpenStreetMap.org](http://www.openstreetmap.org/), où il seront partagés et rendus⏎\nvisibles à tous les autres utilisateurs.\n⏎\nSi vous ne pouvez pas terminer vos changements en une seule séance, vous pouvez⏎\nfermer la fenêtre de l'éditeur. Vos changements seront enregistrés localement.⏎\nLorsque vous ouvrirez à nouveau l'éditeur, sur le même ordinateur et avec le même⏎\nnavigateur Web, l'éditeur vous proposera de récupérer le travail de la séance précédente.⏎\n",
         "roads": "# Routes\n\nVous pouvez créer, mettre à jour et supprimer des routes à l'aide de l'éditeur. Il peut s'agir de tous types de routes : chemins, autoroutes, pistes cyclables, et plus encore : toute voie régulièrement fréquentée peut être cartographiée.\n\n### Sélection\n\nCliquez sur une route pour la sélectionner. Elle sera alors surlignée et un menu 'outils' apparaîtra sur la carte, ainsi qu'une barre d'état affichant des informations supplémentaires.\n\n### Modification\n\nIl est fréquent que les routes ne soient pas bien alignées avec l'imagerie satellite ou avec les traces GPS. Vous pouvez ajuster et corriger la position des routes.\n\nCliquez d'abord sur la route à modifier. Elle est alors surlignée et des points de contrôle apparaissent qui permettent de corriger sa position. Pour ajouter des points de contrôle, double-cliquez sur un segment de la route sans nœuds.\n\nSi la route est connectée à une autre, mais que la connexion est incorrecte, vous pouvez déplacer un de ses points de contrôle sur la seconde route pour corriger la connexion. Des routes bien connectées sont essentielles pour la carte et pour fournir de bonnes informations d'itinéraire.\n\nVous pouvez également cliquer sur l'outil 'Déplacer' ou appuyer sur le raccourci `M` pour déplacer l'ensemble de la route en une fois, puis cliquer de nouveau une fois pour sauvegarder le déplacement.\n\n### Suppression\n\nSi une route est complètement fausse - c'est-à-dire qu'elle n'apparaît pas sur l'image satellite, et que dans l'idéal, vous avez confirmé qu'elle n'existe pas sur le terrain - vous pouvez la supprimer, ce qui l'enlèvera de la carte. Faites attention lorsque vous supprimez des éléments : comme n'importe quelle autre modification, le résultat sera visible par tout le monde sur la carte. Les photos aériennes sont souvent dépassées et la route est peut-être tout simplement récente.\n\nPour supprimer une route, sélectionnez-la en cliquant dessus, puis cliquez sur l'icône 'Poubelle' ou appuyez sur la touche 'Suppr'.\n\n### Création\n\nVous avez constaté qu'une route de votre connaissance manque à la carte ? Cliquez sur l'icône 'Ligne' en haut à gauche de l'éditeur ou appuyez sur le raccourci `2` pour dessiner une route. \n\nPour commencer le dessin, cliquez sur l'endroit où commence la route. Si elle commence à l'embranchement d'une autre route, commencez le dessin en cliquant à l'endroit de la connexion.\n\nCliquez ensuite régulièrement le long de la route pour ajouter des points, en utilisant l'imagerie satellite comme référence. Si la route que vous dessinez croise une autre route, connectez les deux en cliquant à l'endroit de l'intersection. Lorsque vous avez terminé le dessin, double-cliquez ou appuyez sur 'Entrée'.\n",
         "gps": "# GPS⏎\n⏎\nLes traces GPS sont les données les plus fiables pour OpenStreetMap. ⏎\nCet éditeur connaît les traces au format  -`.gpx`. Vous pouvez enregistrer ce\ntype de traces avec un grand nombre d'applications pour smartphones\nainsi qu'avec certains GPS de randonnées.⏎\n⏎\nPour plus d'informations sur la manière de relever des traces GPS, vous\npouvez consulter le guide [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).⏎\n⏎\nPour utiliser un relevé GPX, il vous suffit de glisser-déposer le fichier GPX\ndirectement sur la carte. S'il est reconnu, il sera ajouté sur la carte sous\nla forme d'une ligne vert clair. Cliquez sur le menu \"Configuration du fond\nde carte\" à gauche pour activer et désactiver l'affichage de la trace, ou\nencore pour centrer le zoom sur la trace.⏎\n⏎\nLes traces GPX ne sont pas directement enregistrée dans OpenStreetMap.⏎\nLe meilleur moyen de les utiliser est de les prendre comme guide pour ajouter⏎\nvous même des informations sur la carte ou bien en les [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npour les fournir aux autres contributeurs⏎\n",
@@ -481,7 +482,8 @@
                 "label": "Accès"
             },
             "aerialway/capacity": {
-                "label": "Capacité (par heure)"
+                "label": "Capacité (par heure)",
+                "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
                 "label": "Durée (minutes)",
@@ -490,6 +492,10 @@
             "aerialway/heating": {
                 "label": "Chauffé"
             },
+            "aerialway/occupancy": {
+                "label": "Nombre de places",
+                "placeholder": "2, 4, 8..."
+            },
             "aerialway/summer/access": {
                 "label": "Accès (été)"
             },
@@ -716,6 +722,9 @@
             "piste/difficulty": {
                 "label": "Difficulté"
             },
+            "piste/grooming": {
+                "label": "Damage"
+            },
             "piste/type": {
                 "label": "Type"
             },
@@ -786,6 +795,9 @@
                     "cutting": "Tranchée"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "supervised": {
                 "label": "Supervisé"
             },
@@ -844,12 +856,37 @@
                 "name": "Adresse",
                 "terms": "Adresse"
             },
+            "aerialway": {
+                "name": "Remontée mécanique"
+            },
             "aerialway/cable_car": {
                 "name": "Téléphérique"
             },
             "aerialway/chair_lift": {
                 "name": "Télésiège"
             },
+            "aerialway/gondola": {
+                "name": "Gondole"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Bande transporteuse de personnes"
+            },
+            "aerialway/platter": {
+                "name": "Téléski",
+                "terms": "Remonte-pente, tire-fesses, téléski à enrouleurs, téléski à perches débrayables"
+            },
+            "aerialway/pylon": {
+                "name": "Pylône de remontée mécanique"
+            },
+            "aerialway/rope_tow": {
+                "name": "Télécorde"
+            },
+            "aerialway/station": {
+                "name": "Gare de remontée mécanique"
+            },
+            "aerialway/t-bar": {
+                "name": "Téléski bi-place"
+            },
             "aeroway": {
                 "name": "Aviation",
                 "terms": "Piste de décollage, Piste d'atterissage, Piste"
@@ -1078,6 +1115,9 @@
                 "name": "Abri",
                 "terms": "Abri"
             },
+            "amenity/studio": {
+                "name": "Studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Piscine",
                 "terms": "Piscine"
@@ -1111,6 +1151,7 @@
                 "terms": "Machine distributrice"
             },
             "amenity/veterinary": {
+                "name": "Vétérinaire",
                 "terms": "Vétérinaire"
             },
             "amenity/waste_basket": {
@@ -1201,6 +1242,15 @@
                 "name": "Résidence",
                 "terms": "Appartements"
             },
+            "building/cathedral": {
+                "name": "Cathédrale"
+            },
+            "building/chapel": {
+                "name": "Chapelle"
+            },
+            "building/church": {
+                "name": "Église"
+            },
             "building/commercial": {
                 "name": "Bâtiment commercial",
                 "terms": "Bâtiment commercial"
@@ -1213,6 +1263,12 @@
                 "name": "Garage",
                 "terms": "Garage"
             },
+            "building/greenhouse": {
+                "name": "Serre"
+            },
+            "building/hotel": {
+                "name": "Hôtel"
+            },
             "building/house": {
                 "name": "Maison",
                 "terms": "Maison"
@@ -1225,10 +1281,25 @@
                 "name": "Bâtiment industriel",
                 "terms": "Bâtiment industriel"
             },
+            "building/public": {
+                "name": "Établissement public"
+            },
             "building/residential": {
                 "name": "Bâtiment résidentiel",
                 "terms": "Bâtiment résidentiel"
             },
+            "building/school": {
+                "name": "Bâtiment d'enseignement"
+            },
+            "building/stable": {
+                "name": "Étable"
+            },
+            "building/train_station": {
+                "name": "Gare ferroviaire"
+            },
+            "building/university": {
+                "name": "Université"
+            },
             "craft/blacksmith": {
                 "name": "Forgeron"
             },
@@ -1449,6 +1520,9 @@
                 "name": "Route résidentielle",
                 "terms": "Route résidentielle"
             },
+            "highway/rest_area": {
+                "name": "Aire de repos"
+            },
             "highway/road": {
                 "name": "Voie de type inconnu",
                 "terms": "Route inconnue"
@@ -1962,6 +2036,9 @@
                 "name": "Agence de voyage",
                 "terms": "Agence de voyage"
             },
+            "piste": {
+                "name": "Piste de ski"
+            },
             "place": {
                 "name": "Toponymie",
                 "terms": "Lieu"
@@ -2048,6 +2125,9 @@
                 "name": "Voie ferrée désaffectée",
                 "terms": "Voie ferrée non utilisée"
             },
+            "railway/funicular": {
+                "name": "Funiculaire"
+            },
             "railway/halt": {
                 "name": "Hall de gare",
                 "terms": "Halte ferroviaire"

diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json
index edda10936af88db6ba701e461e2035d09eb7c4c4..a0afa93b3d356069690aaa90e6245d5ae98e1e63 100644 (file)
--- a/vendor/assets/iD/iD/locales/hr.json
+++ b/vendor/assets/iD/iD/locales/hr.json
@@ -134,7 +134,8 @@
             "annotation": "Spojeno {n} linija.",
             "not_eligible": "Ova svojstva se ne mogu spojiti.",
             "not_adjacent": "Ove se linije ne mogu stopiti u jednu jer nisu spojene.",
-            "restriction": "Ove se linije ne mogu spojiti jer je barem jedna član \"{relation}\" relacije."
+            "restriction": "Ove se linije ne mogu spojiti jer je barem jedna član \"{relation}\" relacije.",
+            "incomplete_relation": "Ove se značajke ne mogu spojiti jer bar jedna od njih nije potpuno preuzeta s Interneta."
         },
         "move": {
             "title": "Premjesti",

diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json
index 56cf0d3ad8f71a0e7528effc24b3d55cd667cc3b..6a5724b43ead872ac2e0f4e9cd131eab4a4824af 100644 (file)
--- a/vendor/assets/iD/iD/locales/it.json
+++ b/vendor/assets/iD/iD/locales/it.json
@@ -134,7 +134,8 @@
             "annotation": "Unite {n} linee.",
             "not_eligible": "Questi elementi non possono essere uniti.",
             "not_adjacent": "Queste linee non possono essere unite perché non sono connesse.",
-            "restriction": "Queste linee non possono essere unite perché almeno una è membro di una relazione \"{relation}\"."
+            "restriction": "Queste linee non possono essere unite perché almeno una è membro di una relazione \"{relation}\".",
+            "incomplete_relation": "Questi elementi non posso essere uniti perché almeno uno di loro non è stato completamente scaricato."
         },
         "move": {
             "title": "Muovi",
@@ -1284,10 +1285,30 @@
                 "name": "Appartamenti",
                 "terms": "appartamenti,condominio,palazzo,palazzone,casermone,case popolari,abitazioni,case,edilizia popolare,peep,iacp"
             },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "bunker,casamatta"
+            },
+            "building/cathedral": {
+                "name": "Cattedrale",
+                "terms": "cattedrale,chiesa,monumento,religioso"
+            },
+            "building/church": {
+                "name": "Chiesa",
+                "terms": "cristiano,abbazia,basilica,cattedrale,presbiterio,cappella,chiesa,casa di Dio,luogo di preghiera,luogo di culto,missione,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio"
+            },
             "building/commercial": {
                 "name": "Edificio commerciale",
                 "terms": "Edificio commerciale"
             },
+            "building/construction": {
+                "name": "Edificio in costruzione",
+                "terms": "cantiere,struttura,in costruzione"
+            },
+            "building/dormitory": {
+                "name": "Dormitorio",
+                "terms": "dormitorio,struttura sociale"
+            },
             "building/entrance": {
                 "name": "Entrata",
                 "terms": "Entrata"
@@ -1296,6 +1317,22 @@
                 "name": "Garage",
                 "terms": "Garage"
             },
+            "building/garages": {
+                "name": "Garage",
+                "terms": "Garage,rimesse"
+            },
+            "building/greenhouse": {
+                "name": "Serra",
+                "terms": "serra,coltivazione,piante,orto,coltivazione,vegetali"
+            },
+            "building/hospital": {
+                "name": "Edificio ospedaliero",
+                "terms": "clinica,pronto soccorso,servizio sanitario,salute,hospice,ospizio,infermeria,istituzione,casa di cura,casa di riposo,sanatorio,ambulatorio,chirurgia,reparto"
+            },
+            "building/hotel": {
+                "name": "Edificio alberghiero",
+                "terms": "albergo,hotel"
+            },
             "building/house": {
                 "name": "Casa",
                 "terms": "Casa"
@@ -1308,10 +1345,38 @@
                 "name": "Edificio industriale",
                 "terms": "Edifico industriale"
             },
+            "building/public": {
+                "name": "Edificio pubblico",
+                "terms": "comunita,edificio comunitario,comunità"
+            },
             "building/residential": {
                 "name": "Edificio residenziale",
                 "terms": "Edificio residenziale"
             },
+            "building/roof": {
+                "name": "Tettoia",
+                "terms": "tetto,pensilina"
+            },
+            "building/school": {
+                "name": "Edificio scolastico",
+                "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università"
+            },
+            "building/stable": {
+                "name": "Stalla",
+                "terms": "stalla,ricovero,scuderia"
+            },
+            "building/train_station": {
+                "name": "Stazione ferroviaria",
+                "terms": "treno,stazione,centrale"
+            },
+            "building/university": {
+                "name": "Edificio universitario",
+                "terms": "college,alma"
+            },
+            "building/warehouse": {
+                "name": "Magazzino",
+                "terms": "magazzino,ripostiglio,rimessa"
+            },
             "craft/blacksmith": {
                 "name": "Maniscalco",
                 "terms": "ferri di cavallo"
@@ -2124,6 +2189,10 @@
                 "name": "Negozio di liquori",
                 "terms": "alcool,liquori,grappa,rum,vodka"
             },
+            "shop/art": {
+                "name": "Negozio di opere d'arte",
+                "terms": "opere d'arte,quadri,sculture,galleria"
+            },
             "shop/bakery": {
                 "name": "Panificio",
                 "terms": "Panificio"
@@ -2140,6 +2209,10 @@
                 "name": "Negozio di biciclette",
                 "terms": "Negozio biciclette"
             },
+            "shop/bookmaker": {
+                "name": "Negozio di scommesse",
+                "terms": "scommesse,puntate,allibratore"
+            },
             "shop/books": {
                 "name": "Libreria",
                 "terms": "Negozio di libri"
@@ -2260,6 +2333,10 @@
                 "name": "Fabbro",
                 "terms": "<tradurre con sinonimi o termini collegati alla parola 'fabbro, separati da virgole'>"
             },
+            "shop/lottery": {
+                "name": "Ricevitoria",
+                "terms": "lotto,lotteria"
+            },
             "shop/mall": {
                 "name": "Centro commerciale",
                 "terms": " Centro commerciale "

diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index ab22789df770e1137dc3a8403de4fbbab96d6003..d958b69686575e4c5d3c48280622e4319a919b2d 100644 (file)
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -134,7 +134,8 @@
             "annotation": "{n} 本のラインを結合",
             "not_eligible": "地物情報がマージできません",
             "not_adjacent": "ラインをマージするには、ラインが結合している必要があります。",
-            "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。"
+            "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。",
+            "incomplete_relation": "地物全体がダウンロードされていないため、マージさせることができません。"
         },
         "move": {
             "title": "移動",
@@ -1284,21 +1285,73 @@
                 "name": "アパート",
                 "terms": "アパート"
             },
+            "building/barn": {
+                "name": "納屋",
+                "terms": "納屋"
+            },
+            "building/bunker": {
+                "name": "掩体壕",
+                "terms": "掩体壕, 掩蔽壕"
+            },
+            "building/cabin": {
+                "name": "ログハウス",
+                "terms": "ログハウス"
+            },
+            "building/cathedral": {
+                "name": "大聖堂",
+                "terms": "大聖堂"
+            },
+            "building/chapel": {
+                "name": "礼拝堂",
+                "terms": "礼拝堂"
+            },
+            "building/church": {
+                "name": "教会",
+                "terms": "教会"
+            },
             "building/commercial": {
                 "name": "オフィスビル",
                 "terms": "オフィスビル"
             },
+            "building/construction": {
+                "name": "建設中の建物",
+                "terms": "建設中の建物"
+            },
+            "building/detached": {
+                "name": "一戸建て住宅",
+                "terms": "一戸建て住宅"
+            },
+            "building/dormitory": {
+                "name": "寮",
+                "terms": "寮"
+            },
             "building/entrance": {
                 "name": "出入口",
                 "terms": "出入口, エントランス"
             },
             "building/garage": {
                 "name": "車庫",
-                "terms": "車庫,ガレージ"
+                "terms": "車庫, ガレージ"
+            },
+            "building/garages": {
+                "name": "集合車庫",
+                "terms": "集合車庫"
+            },
+            "building/greenhouse": {
+                "name": "温室",
+                "terms": "温室"
+            },
+            "building/hospital": {
+                "name": "病院の建物",
+                "terms": "病院の建物, 病棟"
+            },
+            "building/hotel": {
+                "name": "ホテルの建物",
+                "terms": "ホテルの建物, 宿泊棟"
             },
             "building/house": {
-                "name": "住宅",
-                "terms": "住宅"
+                "name": "連結住宅",
+                "terms": "連結住宅"
             },
             "building/hut": {
                 "name": "小屋",
@@ -1308,10 +1361,54 @@
                 "name": "工場",
                 "terms": "工場"
             },
+            "building/public": {
+                "name": "公共施設",
+                "terms": "公共施設"
+            },
             "building/residential": {
                 "name": "住宅",
                 "terms": "住宅, アパート, マンション"
             },
+            "building/retail": {
+                "name": "商業施設",
+                "terms": "商業施設, 店舗"
+            },
+            "building/roof": {
+                "name": "屋根",
+                "terms": "屋根, 屋根付きテラス"
+            },
+            "building/school": {
+                "name": "校舎",
+                "terms": "校舎, 学校の建物"
+            },
+            "building/shed": {
+                "name": "格納庫",
+                "terms": "格納庫, 離れ"
+            },
+            "building/stable": {
+                "name": "厩",
+                "terms": "厩, 馬小屋"
+            },
+            "building/static_caravan": {
+                "name": "トレーラーハウス",
+                "terms": "トレーラーハウス"
+            },
+            "building/terrace": {
+                "name": "テラスハウス",
+                "terms": "テラスハウス, 長屋"
+            },
+            "building/train_station": {
+                "name": "駅舎",
+                "terms": "駅舎"
+            },
+            "building/university": {
+                "name": "大学",
+                "terms": "大学, 大学の建物"
+            },
+            "building/warehouse": {
+                "name": "倉庫",
+                "terms": "倉庫, 蔵"
+            },
             "craft/basket_maker": {
                 "name": "かご製造所",
                 "terms": "かご,籠"
@@ -2288,6 +2385,10 @@
                 "name": "酒店",
                 "terms": "酒店, 酒屋"
             },
+            "shop/art": {
+                "name": "美術工芸品店",
+                "terms": "美術工芸品店, 美術品店, アートショップ,工芸品店"
+            },
             "shop/bakery": {
                 "name": "パン屋",
                 "terms": "パン屋, ベーカリー"
@@ -2304,6 +2405,10 @@
                 "name": "自転車店",
                 "terms": "自転車店"
             },
+            "shop/bookmaker": {
+                "name": "公営競技投票券売り場",
+                "terms": "公営競技投票券売り場, 馬券売り場, 車券売り場, 舟券売り場"
+            },
             "shop/books": {
                 "name": "書店",
                 "terms": "書店, 本屋"
@@ -2424,6 +2529,10 @@
                 "name": "錠前屋",
                 "terms": "錠前屋"
             },
+            "shop/lottery": {
+                "name": "宝くじ売り場",
+                "terms": "宝くじ売り場"
+            },
             "shop/mall": {
                 "name": "ショッピングセンター",
                 "terms": "ショッピングセンター, ショッピングモール, 複合商業施設"

diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index 3457f0ba5bc794c2e4c95e355be1249f1f0d8fa4..60ca34b48edf5a076b70f0f69451607d30b95dc8 100644 (file)
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -395,6 +395,9 @@
             "category-building": {
                 "name": "Budynek"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Zagospodarowanie terenu"
             },
@@ -504,6 +507,9 @@
             "building_area": {
                 "label": "Budynek"
             },
+            "cans": {
+                "label": "Przyjmowanie puszek"
+            },
             "capacity": {
                 "label": "Pojemność",
                 "placeholder": "50, 100, 200..."
@@ -518,6 +524,9 @@
                     "anticlockwise": "Przeciwnie do wskazówek zegara"
                 }
             },
+            "clothes": {
+                "label": "Przyjmowanie ciuchów"
+            },
             "collection_times": {
                 "label": "Czas zbierania"
             },
@@ -573,6 +582,9 @@
             "generator/type": {
                 "label": "Typ"
             },
+            "glass": {
+                "label": "Przyjmowanie szkła"
+            },
             "highway": {
                 "label": "Typ"
             },
@@ -709,6 +721,9 @@
             "shelter": {
                 "label": "Schronienie"
             },
+            "shelter_type": {
+                "label": "Typ"
+            },
             "shop": {
                 "label": "Typ"
             },
@@ -752,6 +767,9 @@
             "tree_type": {
                 "label": "Typ"
             },
+            "tunnel": {
+                "label": "Tunel"
+            },
             "vending": {
                 "label": "Rodzaje towarów"
             },
@@ -876,6 +894,9 @@
                 "name": "Kino",
                 "terms": "duży ekran,drive-in,film,ruchomy obraz,pokaz zdjęć,zdjęcia,pokaz,silver screen"
             },
+            "amenity/clock": {
+                "name": "Zegar"
+            },
             "amenity/college": {
                 "name": "Uczelnia",
                 "terms": "uczelnia"
@@ -971,6 +992,9 @@
                 "name": "Pub",
                 "terms": "pub,piwo,wino"
             },
+            "amenity/recycling": {
+                "name": "Recykling"
+            },
             "amenity/restaurant": {
                 "name": "Restauracja",
                 "terms": "bar,kawiarnia,stołówka,jadalnia,drive-in,knajpa,jadłodajnia,fast food,grill,gospoda,klub nocny,pizzeria"
@@ -982,6 +1006,15 @@
             "amenity/shelter": {
                 "name": "Schronienie"
             },
+            "amenity/social_facility": {
+                "name": "Placówka pomocy społecznej"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Bank żywności"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Schronisko dla bezdomnych"
+            },
             "amenity/swimming_pool": {
                 "name": "Basen",
                 "terms": "basen,pływalnia"
@@ -1014,6 +1047,9 @@
                 "name": "Automat sprzedający",
                 "terms": "automat do sprzedaży"
             },
+            "amenity/veterinary": {
+                "name": "Weterynarz"
+            },
             "amenity/waste_basket": {
                 "name": "Kosz na śmieci",
                 "terms": "kosz,kubeł,śmietnik"
@@ -1100,6 +1136,9 @@
                 "name": "Apartamenty",
                 "terms": "blok,kamienica"
             },
+            "building/church": {
+                "name": "Kościół"
+            },
             "building/commercial": {
                 "name": "Nieruchomość komercyjna",
                 "terms": "sklep,komercyjny,sprzedaż,handlowy"
@@ -1128,6 +1167,51 @@
                 "name": "Budynek mieszkalny",
                 "terms": "blok, kamienica, dom, czynszówka"
             },
+            "building/warehouse": {
+                "name": "Magazyn"
+            },
+            "craft/clockmaker": {
+                "name": "Zegarmistrz"
+            },
+            "craft/confectionary": {
+                "name": "Cukiernik"
+            },
+            "craft/dressmaker": {
+                "name": "Krawiec"
+            },
+            "craft/electrician": {
+                "name": "Elektryk"
+            },
+            "craft/gardener": {
+                "name": "Ogrodnik"
+            },
+            "craft/glaziery": {
+                "name": "Szklarz"
+            },
+            "craft/jeweler": {
+                "name": "Jubiler"
+            },
+            "craft/locksmith": {
+                "name": "Ślusarz"
+            },
+            "craft/optician": {
+                "name": "Optyk"
+            },
+            "craft/painter": {
+                "name": "Malarz"
+            },
+            "craft/photographer": {
+                "name": "Fotograf"
+            },
+            "craft/photographic_labratory": {
+                "name": "Laboratorium fotograficzne"
+            },
+            "craft/plumber": {
+                "name": "Hydraulik"
+            },
+            "craft/roofer": {
+                "name": "Dekarz"
+            },
             "emergency/ambulance_station": {
                 "name": "Stacja pogotowia ratunkowego",
                 "terms": "pogotowie ratunkowe"
@@ -1215,6 +1299,9 @@
                 "name": "Droga lokalna",
                 "terms": "lokalna, osiedlowa, zamieszkała"
             },
+            "highway/rest_area": {
+                "name": "Obszar wypoczynkowy"
+            },
             "highway/road": {
                 "name": "Nieokreślona droga",
                 "terms": "droga,nieznana,niewiadoma"
@@ -1247,6 +1334,9 @@
             "highway/service/parking_aisle": {
                 "name": "Uliczka parkingowa"
             },
+            "highway/services": {
+                "name": "Obszar usługowy"
+            },
             "highway/steps": {
                 "name": "Schody",
                 "terms": "schody"
@@ -1592,9 +1682,25 @@
             "office/architect": {
                 "terms": "architekt"
             },
+            "office/educational_institution": {
+                "name": "Instytucja edukacyjna"
+            },
+            "office/employment_agency": {
+                "name": "Agencja zatrudnienia"
+            },
+            "office/estate_agent": {
+                "name": "Biuro nieruchomości"
+            },
+            "office/insurance": {
+                "name": "Biuro ubezpieczeń"
+            },
             "office/political_party": {
+                "name": "Partia polityczna",
                 "terms": "partia polityczna"
             },
+            "office/therapist": {
+                "name": "Terapeuta"
+            },
             "office/travel_agent": {
                 "name": "Biuro podróży"
             },
@@ -1652,6 +1758,9 @@
             "power/transformer": {
                 "name": "Transformator"
             },
+            "public_transport/stop_position": {
+                "name": "Miejsce zatrzymania"
+            },
             "railway": {
                 "name": "Kolej",
                 "terms": "torowisko, kolej"
@@ -1724,6 +1833,9 @@
                 "name": "Sklep rowerowy",
                 "terms": "sklep rowerowy"
             },
+            "shop/bookmaker": {
+                "name": "Bukmacher"
+            },
             "shop/books": {
                 "name": "Księgarnia",
                 "terms": "księgarnia"
@@ -1827,6 +1939,9 @@
             "shop/locksmith": {
                 "name": "Ślusarz"
             },
+            "shop/lottery": {
+                "name": "Kolektura"
+            },
             "shop/mall": {
                 "name": "Centrum handlowe"
             },

diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json
index c13273ca931230681d4f348e5b1c4f0f284dbf70..fdde3d88d9297d1b0a7e0f1c9f8e833d9d44a4de 100644 (file)
--- a/vendor/assets/iD/iD/locales/pt-BR.json
+++ b/vendor/assets/iD/iD/locales/pt-BR.json
@@ -134,7 +134,8 @@
             "annotation": "Mesclou {n} linhas.",
             "not_eligible": "Esses elementos não podem ser mesclados.",
             "not_adjacent": "Essas linhas não podem ser mescladas porque não estão conectadas.",
-            "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\"."
+            "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\".",
+            "incomplete_relation": "Estas funcionalidades não podem ser mescladas porque pelo menos uma delas não foi transferida completamente."
         },
         "move": {
             "title": "Mover",
@@ -332,6 +333,7 @@
     },
     "help": {
         "title": "Ajuda",
+        "help": "# Ajuda\n\nEste é um editor para OpenStreetMap (http://www.openstreetmap.org/), o mapa mundial livre e editavel. Você pode usá-lo para adicionar e atualizar de dados em sua área,  tornando um mapa mundi de codigo aberto melhor para todos.\nAs edições que você fizer nesse mapa serão visíveis para todos que usam OpenStreetMap. Para fazer uma edição você precisará de uma conta gratuita OpenStreetMap(https://www.openstreetmap.org/user/new).\n\nO editor iD (http://ideditor.com/) é um projeto colaborativo com o código fonte disponível no GitHub(https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o elemento\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos elementos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos elementos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários elementos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n",
         "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um nó, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir recursos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n",
         "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos elementos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n",
@@ -395,6 +397,9 @@
             "category-building": {
                 "name": "Prédio"
             },
+            "category-golf": {
+                "name": "Golfe"
+            },
             "category-landuse": {
                 "name": "Uso da Terra"
             },
@@ -438,7 +443,7 @@
                         "description": "Acesso não permitido ao público em geral"
                     },
                     "permissive": {
-                        "title": "Permissivo",
+                        "title": "Concedido",
                         "description": "Acesso permitido até que o dono cancele a permissão"
                     },
                     "private": {
@@ -461,16 +466,43 @@
             "address": {
                 "label": "Endereço",
                 "placeholders": {
-                    "housename": "Nome da Casa",
+                    "housename": "Complemento",
                     "number": "123",
                     "street": "Rua",
-                    "city": "Cidade",
+                    "city": "Município",
                     "postcode": "CEP"
                 }
             },
             "admin_level": {
                 "label": "Nível Administrativo"
             },
+            "aerialway": {
+                "label": "Tipo"
+            },
+            "aerialway/access": {
+                "label": "Acesso"
+            },
+            "aerialway/bubble": {
+                "label": "Bolha"
+            },
+            "aerialway/capacity": {
+                "label": "Capacidade (por hora)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Duração (minutos)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Aquecido"
+            },
+            "aerialway/occupancy": {
+                "label": "Ocupação",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Acesso (verão)"
+            },
             "aeroway": {
                 "label": "Tipo"
             },
@@ -504,6 +536,9 @@
             "building_area": {
                 "label": "Edifício"
             },
+            "cans": {
+                "label": "Aceita Cans"
+            },
             "capacity": {
                 "label": "Capacidade",
                 "placeholder": "50, 100, 200..."
@@ -518,6 +553,9 @@
                     "anticlockwise": "Sentido Anti-horário"
                 }
             },
+            "clothes": {
+                "label": "Aceita Clothes"
+            },
             "collection_times": {
                 "label": "Horários de Coleta"
             },
@@ -527,6 +565,9 @@
             "country": {
                 "label": "País"
             },
+            "covered": {
+                "label": "Coberto"
+            },
             "crossing": {
                 "label": "Tipo"
             },
@@ -543,7 +584,7 @@
                 "label": "Descrição"
             },
             "elevation": {
-                "label": "Elevação"
+                "label": "Altitude"
             },
             "emergency": {
                 "label": "Emergência"
@@ -573,6 +614,17 @@
             "generator/type": {
                 "label": "Tipo"
             },
+            "glass": {
+                "label": "Aceita Vidro"
+            },
+            "golf_hole": {
+                "label": "Referência",
+                "placeholder": "Buraco numero (1-18)"
+            },
+            "handicap": {
+                "label": "Desvantagem",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tipo"
             },
@@ -586,7 +638,10 @@
                 "label": "Código ICAO"
             },
             "incline": {
-                "label": "Aclive"
+                "label": "Declividade"
+            },
+            "information": {
+                "label": "Tipo"
             },
             "internet_access": {
                 "label": "Acesso a Internet",
@@ -610,7 +665,7 @@
                 "label": "Tipo"
             },
             "levels": {
-                "label": "Níveis",
+                "label": "Número de andares",
                 "placeholder": "2, 4, 6..."
             },
             "lit": {
@@ -654,6 +709,13 @@
             "operator": {
                 "label": "Operador"
             },
+            "paper": {
+                "label": "Aceita Papel"
+            },
+            "par": {
+                "label": "par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Estacionamento de Intercâmbio"
             },
@@ -664,6 +726,12 @@
                 "label": "Telefone",
                 "placeholder": "+55 11 0982 1098"
             },
+            "piste/difficulty": {
+                "label": "Dificuldade"
+            },
+            "piste/type": {
+                "label": "Modelo"
+            },
             "place": {
                 "label": "Tipo"
             },
@@ -707,7 +775,7 @@
                 "label": "Tipo"
             },
             "shelter": {
-                "label": "Abrigo"
+                "label": "Abrigo contra Intempéries"
             },
             "shelter_type": {
                 "label": "Tipo"
@@ -727,7 +795,7 @@
                 "options": {
                     "bridge": "Ponte",
                     "tunnel": "Túnel",
-                    "embankment": "Aterro",
+                    "embankment": "Aterro Elevado",
                     "cutting": "Escavação"
                 }
             },
@@ -807,7 +875,7 @@
                 "terms": "Hangar"
             },
             "aeroway/helipad": {
-                "name": "Heliporto",
+                "name": "Heliponto",
                 "terms": "Heliporto, Heliponto, ponto de pouso de helicópteros"
             },
             "aeroway/runway": {
@@ -815,8 +883,8 @@
                 "terms": "Pista de pouso e decolagem"
             },
             "aeroway/taxiway": {
-                "name": "Taxiway",
-                "terms": "Pista de taxiamento"
+                "name": "Pista de taxiamento",
+                "terms": "Taxiway"
             },
             "aeroway/terminal": {
                 "name": "Terminal de Aeroporto",
@@ -827,15 +895,15 @@
                 "terms": "Serviço"
             },
             "amenity/arts_centre": {
-                "name": "Centro de Artes",
-                "terms": "Artes, Teatro, Cinema, Espetáculo, Exposições"
+                "name": "Centro/Escola de Artes",
+                "terms": "Centro de Artes, Escola de Artes, Artes, Centro Artístico, Escola Artística, Teatro, Cinema, Espetáculo, Exposições"
             },
             "amenity/atm": {
                 "name": "Caixa Eletrônico",
                 "terms": "Caixa eletrônico"
             },
             "amenity/bank": {
-                "name": "Banco",
+                "name": "Agência bancária",
                 "terms": "Banco"
             },
             "amenity/bar": {
@@ -890,6 +958,9 @@
                 "name": "Tribunal",
                 "terms": "Tribunal, Fórum"
             },
+            "amenity/dentist": {
+                "name": "Dentista"
+            },
             "amenity/drinking_water": {
                 "name": "Água Potável",
                 "terms": "Água Potável, Bebedouro"
@@ -903,7 +974,7 @@
                 "terms": "fast food, lanchonete, lanches, Lancheria"
             },
             "amenity/fire_station": {
-                "name": "Bombeiros",
+                "name": "Posto de Bombeiros",
                 "terms": "Posto de Bombeiros, Bombeiros, Central de Bombeiros"
             },
             "amenity/fountain": {
@@ -911,7 +982,7 @@
                 "terms": "Chafariz, Fonte Aquática"
             },
             "amenity/fuel": {
-                "name": "Posto de Gasolina",
+                "name": "Posto de Combustível",
                 "terms": "Posto de Gasolina"
             },
             "amenity/grave_yard": {
@@ -943,7 +1014,7 @@
                 "terms": "Farmácia, Drogaria, Farmácia de Manipulação"
             },
             "amenity/place_of_worship": {
-                "name": "Templo",
+                "name": "Local de Prática Religiosa",
                 "terms": "Local de Culto, Lugar de Adoração, Abadia, Basílica, Betel, Catedral, Mor, Capela, Igreja, Aprisco, Casa de Deus, Casa de oração, Casa de adoração, Mesquita, Oratório, Paróquia, Santuário, Sinagoga, Tabernáculo, Templo"
             },
             "amenity/place_of_worship/buddhist": {
@@ -982,6 +1053,9 @@
                 "name": "Estação de Patrulha",
                 "terms": "Patrulha, Ranger"
             },
+            "amenity/recycling": {
+                "name": "Reciclagem"
+            },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "Restaurante"
@@ -1003,7 +1077,7 @@
                 "terms": "Ponto de Táxi"
             },
             "amenity/telephone": {
-                "name": "Telefone",
+                "name": "Telefone Público",
                 "terms": "Telefone"
             },
             "amenity/theatre": {
@@ -1011,11 +1085,11 @@
                 "terms": "Teatro"
             },
             "amenity/toilets": {
-                "name": "Banheiros",
+                "name": "Banheiros Públicos",
                 "terms": "Banheiros, Sanitário, WC, Toiletes, Toilettes, Lavabo, Toalete"
             },
             "amenity/townhall": {
-                "name": "Prefeitura",
+                "name": "Paço Municipal",
                 "terms": "Prefeitura"
             },
             "amenity/university": {
@@ -1027,7 +1101,7 @@
                 "terms": "Totem de vendas, Máquina de Venda Automática"
             },
             "amenity/waste_basket": {
-                "name": "Cesto de Lixo",
+                "name": "Lixeira",
                 "terms": "Cesto de Lixo, Lixeira, Balde de Lixo"
             },
             "area": {
@@ -1043,8 +1117,8 @@
                 "terms": "Bloco"
             },
             "barrier/bollard": {
-                "name": "Poste",
-                "terms": "Pilar, Poste, Cabeço"
+                "name": "Pilarete",
+                "terms": "Pilar, Poste, Cabeço, Pedestal, Estaca"
             },
             "barrier/cattle_grid": {
                 "name": "Mata-burro",
@@ -1079,23 +1153,23 @@
                 "terms": "Cerca viva"
             },
             "barrier/kissing_gate": {
-                "name": "Porteira Giratória",
+                "name": "Kissing Gate",
                 "terms": "Porteira Giratória"
             },
             "barrier/lift_gate": {
-                "name": "Cancela",
+                "name": "Cancela Elevatória",
                 "terms": "Cancela"
             },
             "barrier/retaining_wall": {
-                "name": "Barreira de Retenção",
-                "terms": "Muro de Contenção"
+                "name": "Muro de Contenção",
+                "terms": "Barreira de Retenção"
             },
             "barrier/stile": {
-                "name": "Passagem Fixa por Barreira",
+                "name": "Travessia em Cerca/Muro",
                 "terms": "Passagem Fixa por Barreira"
             },
             "barrier/toll_booth": {
-                "name": "Pedágio",
+                "name": "Cabine de Pedágio",
                 "terms": "Pedágio"
             },
             "barrier/wall": {
@@ -1114,6 +1188,12 @@
                 "name": "Apartamentos",
                 "terms": "Apartamentos, Kit net"
             },
+            "building/chapel": {
+                "name": "Capela"
+            },
+            "building/church": {
+                "name": "Igreja"
+            },
             "building/commercial": {
                 "name": "Edifício Comercial",
                 "terms": "Edifício Comercial, Prédio Comercial"
@@ -1123,9 +1203,13 @@
                 "terms": "Entrada"
             },
             "building/garage": {
-                "name": "Garagem",
+                "name": "Garagem Individual",
                 "terms": "Garagem"
             },
+            "building/garages": {
+                "name": "Garagens",
+                "terms": "Garagens"
+            },
             "building/house": {
                 "name": "Casa",
                 "terms": "Casa"
@@ -1142,8 +1226,29 @@
                 "name": "Edifício Residencial",
                 "terms": "Edifício Residencial"
             },
+            "building/roof": {
+                "name": "Teto"
+            },
+            "craft/beekeeper": {
+                "name": "Apicultor"
+            },
+            "craft/blacksmith": {
+                "name": "Ferreiro"
+            },
+            "craft/brewery": {
+                "name": "Cervejaria"
+            },
+            "craft/carpenter": {
+                "name": "Carpinteiro"
+            },
+            "craft/locksmith": {
+                "name": "Chaveiro"
+            },
+            "craft/photographer": {
+                "name": "Fotógrafo"
+            },
             "embankment": {
-                "name": "Aterro",
+                "name": "Aterro Elevado",
                 "terms": "aterro,terrapleno"
             },
             "emergency/ambulance_station": {
@@ -1163,8 +1268,8 @@
                 "terms": "Entrada"
             },
             "footway/crossing": {
-                "name": "Cruzamento",
-                "terms": "cruzamento,passagem"
+                "name": "Travessia",
+                "terms": "faixa de segurança,cruzamento,passagem"
             },
             "footway/sidewalk": {
                 "name": "Calçada",
@@ -1175,27 +1280,27 @@
                 "terms": "Rodovia"
             },
             "highway/bridleway": {
-                "name": "Trilha de Equitação",
-                "terms": "Hipovia, Picadeiro, Caminho para Calvagada"
+                "name": "Hipovia",
+                "terms": "Hipovia, Picadeiro, Caminho para Calvagada, Trilha de Equitação"
             },
             "highway/bus_stop": {
                 "name": "Ponto de Ônibus",
                 "terms": "Ponto de Ônibus, Parada de Ônibus"
             },
             "highway/crossing": {
-                "name": "Cruzamento",
-                "terms": "Travessia, Faixa de Segurança"
+                "name": "Faixa de Pedestre",
+                "terms": "Interseção"
             },
             "highway/cycleway": {
                 "name": "Ciclovia",
                 "terms": "Ciclovia"
             },
             "highway/footway": {
-                "name": "Via de Pedestre",
-                "terms": "Caminho de Pedestre, Passeio, Calçada"
+                "name": "Pista de Caminhada",
+                "terms": "Via de Pedestre, Caminho de Pedestre, Passeio, Calçada"
             },
             "highway/living_street": {
-                "name": "Rua Viva",
+                "name": "Via de Espaço Compartilhado",
                 "terms": "Rua Viva, Rua Preferencial a Pedestres"
             },
             "highway/mini_roundabout": {
@@ -1203,19 +1308,19 @@
                 "terms": "Mini-Rotatória"
             },
             "highway/motorway": {
-                "name": "Auto-Estrada",
-                "terms": "Autoestrada"
+                "name": "Autoestrada",
+                "terms": "Auto-estrada, auto estrada"
             },
             "highway/motorway_junction": {
                 "name": "Saída de Autoestrada",
                 "terms": "Saída de Autoestrada"
             },
             "highway/motorway_link": {
-                "name": "Acesso a Autoestrada",
+                "name": "Ligação de Autoestrada",
                 "terms": "Acesso a Autoestrada"
             },
             "highway/path": {
-                "name": "Caminho",
+                "name": "Trilha Não-Automotiva",
                 "terms": "Trilha"
             },
             "highway/pedestrian": {
@@ -1227,8 +1332,8 @@
                 "terms": "Via Primária"
             },
             "highway/primary_link": {
-                "name": "Acesso a Via Primária",
-                "terms": "Acesso Primário"
+                "name": "Ligação Primária",
+                "terms": "Acesso Primário, Acesso a Via Primária"
             },
             "highway/residential": {
                 "name": "Via Residencial",
@@ -1243,8 +1348,8 @@
                 "terms": "Via Secundária"
             },
             "highway/secondary_link": {
-                "name": "Acesso a Via Secundária",
-                "terms": "Acesso a Via Secundária"
+                "name": "Ligação Secundária",
+                "terms": "Acesso Secundário, Acesso a Via Secundária"
             },
             "highway/service": {
                 "name": "Via de Serviço",
@@ -1271,8 +1376,8 @@
                 "terms": "Corredor de Estacionamento"
             },
             "highway/steps": {
-                "name": "Escadaria",
-                "terms": "Degraus, Escada"
+                "name": "Via com Degraus",
+                "terms": "Degraus, Escada, Escadaria"
             },
             "highway/stop": {
                 "name": "Placa de Pare",
@@ -1283,12 +1388,12 @@
                 "terms": "Via Terciária"
             },
             "highway/tertiary_link": {
-                "name": "Acesso a Via Terciária",
-                "terms": "Acesso a Via Terciária"
+                "name": "Ligação Terciária",
+                "terms": "Acesso Terciário, Acesso a Via Terciária"
             },
             "highway/track": {
-                "name": "Trilha",
-                "terms": "Caminho"
+                "name": "Estrada Rústica",
+                "terms": "Trilha Automotiva, Estrada de Fazenda, Estrada Agrícola, Estrada Bucólica, Caminho"
             },
             "highway/traffic_signals": {
                 "name": "Semáforo",
@@ -1299,11 +1404,11 @@
                 "terms": "Via Expressa"
             },
             "highway/trunk_link": {
-                "name": "Acesso a Via Expressa",
+                "name": "Ligação de Via Expressa",
                 "terms": "Acesso a Via Expressa"
             },
             "highway/turning_circle": {
-                "name": "Rotatória",
+                "name": "Balão de Retorno",
                 "terms": "Balão de Retorno"
             },
             "highway/unclassified": {
@@ -1340,11 +1445,11 @@
             },
             "historic/wayside_cross": {
                 "name": "Cruz de Beira de Estrada",
-                "terms": "Cruz de Beira de Estrada"
+                "terms": "Cruz de Beira de Estrada, Cruzeiro"
             },
             "historic/wayside_shrine": {
-                "name": "Ermida",
-                "terms": "Ermida"
+                "name": "Capelinha de Beira de Estrada",
+                "terms": "Ermida, Alminhas"
             },
             "landuse": {
                 "name": "Uso da Terra",
@@ -1359,7 +1464,7 @@
                 "terms": "Bacia"
             },
             "landuse/cemetery": {
-                "name": "Cemitério",
+                "name": "Cemitério Secular",
                 "terms": "Sepulcrário, Cemitério"
             },
             "landuse/commercial": {
@@ -1371,7 +1476,7 @@
                 "terms": "Construção"
             },
             "landuse/farm": {
-                "name": "Fazenda",
+                "name": "Lavoura",
                 "terms": "Fazenda"
             },
             "landuse/farmland": {
@@ -1379,7 +1484,7 @@
                 "terms": "agricultura,terra,campo,roça"
             },
             "landuse/farmyard": {
-                "name": "Granja",
+                "name": "Pátio de Fazenda",
                 "terms": "Pátio de Fazenda"
             },
             "landuse/forest": {
@@ -1396,7 +1501,7 @@
             },
             "landuse/meadow": {
                 "name": "Prado",
-                "terms": "Prado, Pasto"
+                "terms": "Prado, Pasto, Pradaria"
             },
             "landuse/orchard": {
                 "name": "Pomar",
@@ -1411,11 +1516,11 @@
                 "terms": "Residencial"
             },
             "landuse/retail": {
-                "name": "Comércio",
-                "terms": "Varejo"
+                "name": "Varejo",
+                "terms": "Varejo, comércio"
             },
             "landuse/vineyard": {
-                "name": "Vinhedo",
+                "name": "Vinha",
                 "terms": "Vinha, Vinhedo"
             },
             "leisure": {
@@ -1427,8 +1532,8 @@
                 "terms": "Comum, Habitual, Frequente"
             },
             "leisure/dog_park": {
-                "name": "Parque de Cães",
-                "terms": "Parque de Cães"
+                "name": "Cachorródromo",
+                "terms": "Canódromo, Parque de Cães, Parque Canino"
             },
             "leisure/garden": {
                 "name": "Jardim",
@@ -1443,12 +1548,12 @@
                 "terms": "Marina"
             },
             "leisure/park": {
-                "name": "Parque",
-                "terms": "Parque"
+                "name": "Parque/Praça",
+                "terms": "Parque, praça"
             },
             "leisure/pitch": {
-                "name": "Campo de Esportes",
-                "terms": "Campo Esportivo, Quadra Esportiva"
+                "name": "Quadra Esportiva",
+                "terms": "Campo de Esportes, Campo Esportivo, Quadra Esportiva"
             },
             "leisure/pitch/american_football": {
                 "name": "Campo de Futebol Americano",
@@ -1487,8 +1592,8 @@
                 "terms": "Rampa Náutica"
             },
             "leisure/sports_center": {
-                "name": "Centro Esportivo",
-                "terms": "Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes,"
+                "name": "Centro/Clube Esportivo",
+                "terms": "Centro Esportivo, Clube Esportivo, Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes, Academia de Ginástica"
             },
             "leisure/stadium": {
                 "name": "Estádio",
@@ -1511,8 +1616,8 @@
                 "terms": "Construção Humana"
             },
             "man_made/breakwater": {
-                "name": "Quebra-mar",
-                "terms": "Quebra-mar"
+                "name": "Molhe/Quebra-Mar",
+                "terms": "Molhe, Quebra-Mar"
             },
             "man_made/cutline": {
                 "name": "Linha de Corte em Floresta",
@@ -1523,7 +1628,7 @@
                 "terms": "aterro,terrapleno"
             },
             "man_made/flagpole": {
-                "name": "Mastro",
+                "name": "Mastro de Bandeira",
                 "terms": "matro,bandeira,pau de bandeira"
             },
             "man_made/lighthouse": {
@@ -1539,12 +1644,12 @@
                 "terms": "Píer"
             },
             "man_made/pipeline": {
-                "name": "Encanamento",
-                "terms": "Tubulação"
+                "name": "Tubulação",
+                "terms": "Encanamento"
             },
             "man_made/survey_point": {
-                "name": "Marco Geodésico",
-                "terms": "Marco Geodésico"
+                "name": "Ponto de Exame Geográfico",
+                "terms": "Marco Geodésico, Equipamento de GPS Diferencial"
             },
             "man_made/tower": {
                 "name": "Torre",
@@ -1555,7 +1660,7 @@
                 "terms": "Estação de Tratamento de Esgoto"
             },
             "man_made/water_tower": {
-                "name": "Caixa d'água",
+                "name": "Caixa d'Ã\81gua",
                 "terms": "Caixa d'Água"
             },
             "man_made/water_well": {
@@ -1603,8 +1708,7 @@
                 "terms": "Orla Marítima, Linha Costeira"
             },
             "natural/fell": {
-                "name": "Colina",
-                "terms": "Caiu"
+                "name": "Fell"
             },
             "natural/glacier": {
                 "name": "Geleira",
@@ -1615,20 +1719,20 @@
                 "terms": "Pradaria"
             },
             "natural/heath": {
-                "name": "Matagal",
-                "terms": "Matagal"
+                "name": "Urzal",
+                "terms": "Urzal"
             },
             "natural/peak": {
-                "name": "Pico",
+                "name": "Cume",
                 "terms": "Pico, Topo de Montanha, Serra, Montanha, Monte"
             },
             "natural/scree": {
-                "name": "Cascalho",
-                "terms": "Seixos, Pedras"
+                "name": "Pedregulhos",
+                "terms": "Seixos, Pedras, Cascalho"
             },
             "natural/scrub": {
                 "name": "Arbustos",
-                "terms": "Moita, Arbusto"
+                "terms": "Moita, Arbusto, Matagal"
             },
             "natural/spring": {
                 "name": "Nascente",
@@ -1715,7 +1819,7 @@
                 "terms": "advogado,advocacia,escritório"
             },
             "office/newspaper": {
-                "name": "Jornal",
+                "name": "Escritório de Jornal",
                 "terms": "jornal,notícia"
             },
             "office/ngo": {
@@ -1751,8 +1855,8 @@
                 "terms": "Local"
             },
             "place/city": {
-                "name": "Cidade",
-                "terms": "Cidade"
+                "name": "Cidade Maior",
+                "terms": "Cidade, Município"
             },
             "place/hamlet": {
                 "name": "Lugarejo",
@@ -1771,8 +1875,8 @@
                 "terms": "Localidade"
             },
             "place/town": {
-                "name": "Vila",
-                "terms": "Vila, Cidade"
+                "name": "Cidade Menor",
+                "terms": "Vila, Cidade, Município"
             },
             "place/village": {
                 "name": "Povoado",
@@ -1791,7 +1895,7 @@
                 "terms": "Gerador, Energia"
             },
             "power/line": {
-                "name": "Linha de Transmissão de Energia Elétrica",
+                "name": "Linha de Transmissão",
                 "terms": "Fio Elétrico"
             },
             "power/minor_line": {
@@ -1799,7 +1903,7 @@
                 "terms": "Menor Linha de Energia"
             },
             "power/pole": {
-                "name": "Poste Elétrico",
+                "name": "Poste de Transmissão",
                 "terms": "Poste Elétrico"
             },
             "power/sub_station": {
@@ -1831,12 +1935,11 @@
                 "terms": "Ferrovia Abandonada"
             },
             "railway/disused": {
-                "name": "Ferrovia em Desuso",
+                "name": "Ferrovia Inativa",
                 "terms": "Ferrovia em Desuso"
             },
             "railway/halt": {
-                "name": "Interrupção de Ferrovia",
-                "terms": "Final de Ferrovia, Interrupção de Estrada de Ferro"
+                "name": "Parada de Ferrovia"
             },
             "railway/level_crossing": {
                 "name": "Passagem de Nível",
@@ -1851,7 +1954,7 @@
                 "terms": "Plataforma de Trem"
             },
             "railway/rail": {
-                "name": "Trilho",
+                "name": "Trilho de trem",
                 "terms": "Trilho"
             },
             "railway/station": {
@@ -1859,7 +1962,7 @@
                 "terms": "Estação Ferroviária"
             },
             "railway/subway": {
-                "name": "Metrô",
+                "name": "Trilho de metrô",
                 "terms": "Metrô"
             },
             "railway/subway_entrance": {
@@ -1867,7 +1970,7 @@
                 "terms": "Entrada de Metrô"
             },
             "railway/tram": {
-                "name": "Bonde",
+                "name": "Trilho de bonde",
                 "terms": "Bonde"
             },
             "relation": {
@@ -1875,7 +1978,7 @@
                 "terms": "Relação"
             },
             "route/ferry": {
-                "name": "Rota de Barco",
+                "name": "Rota de Balsa",
                 "terms": "Rota de Barco, Rota de Balsa"
             },
             "shop": {
@@ -1915,7 +2018,7 @@
                 "terms": "Açougue"
             },
             "shop/car": {
-                "name": "Concessionária de Automóveis",
+                "name": "Revenda de Automóveis",
                 "terms": "Concessionária de Automóveis"
             },
             "shop/car_parts": {
@@ -1923,7 +2026,7 @@
                 "terms": "Loja de Peças Automotivas"
             },
             "shop/car_repair": {
-                "name": "Oficina Automotiva",
+                "name": "Oficina Mecânica",
                 "terms": "Oficina Automotiva"
             },
             "shop/chemist": {
@@ -1951,15 +2054,15 @@
                 "terms": "Delicatessen"
             },
             "shop/department_store": {
-                "name": "Loja de Departamentos",
+                "name": "Loja de Departamento",
                 "terms": "Loja de Departamento"
             },
             "shop/doityourself": {
-                "name": "Loja de Bricolagem",
+                "name": "Loja de Ferragens/Bricolagem",
                 "terms": "Loja de Bricolagem, Faça você mesmo"
             },
             "shop/dry_cleaning": {
-                "name": "Limpeza a Seco",
+                "name": "Lavagem de Roupas a Seco",
                 "terms": "Limpeza a Seco, Lavagem a Seco"
             },
             "shop/electronics": {
@@ -1983,7 +2086,7 @@
                 "terms": "Loja de Móveis, Decoração"
             },
             "shop/garden_centre": {
-                "name": "Loja de Jardinagem",
+                "name": "Centro de Jardinagem",
                 "terms": "Loja de Jardinagem"
             },
             "shop/gift": {
@@ -1991,8 +2094,8 @@
                 "terms": "Loja de Presentes"
             },
             "shop/greengrocer": {
-                "name": "Quitanda",
-                "terms": "Quitanda"
+                "name": "Verdureiro",
+                "terms": "Quitanda, Quitandeiro"
             },
             "shop/hairdresser": {
                 "name": "Cabeleireiro",
@@ -2003,15 +2106,15 @@
                 "terms": "Loja de Ferragens, Material de Construção, Loja de Tintas, Loja de Parafusos"
             },
             "shop/hifi": {
-                "name": "Loja de Equipamentos de Áudio",
-                "terms": "Loja de Equipamentos de Áudio"
+                "name": "Loja de Aparelhos Hi-Fi",
+                "terms": "Loja de Equipamentos de Áudio, Loja de Aparelhos de Alta Fidelidade"
             },
             "shop/jewelry": {
                 "name": "Joalheria",
                 "terms": "Joalheria"
             },
             "shop/kiosk": {
-                "name": "Quiosque",
+                "name": "Quiosque Comercial",
                 "terms": "Quiosque"
             },
             "shop/laundry": {
@@ -2023,20 +2126,20 @@
                 "terms": "Técnico de Chaves e Cadeados, Cópia de Chaves, Conserto de Cadeados"
             },
             "shop/mall": {
-                "name": "Shopping Center",
-                "terms": "Centro Comercial, Galeria"
+                "name": "Centro Comercial",
+                "terms": "Shopping Center, Galeria"
             },
             "shop/mobile_phone": {
                 "name": "Loja de Celulares",
                 "terms": "Loja de Celulares, Loja de Telefones Celulares"
             },
             "shop/motorcycle": {
-                "name": "Concessionária de Motos",
+                "name": "Revenda de Motos",
                 "terms": "Concessionária de Motos"
             },
             "shop/music": {
-                "name": "Loja Musical",
-                "terms": "Loja de Discos Musicais, Loja de CD's, Loja de Vinil"
+                "name": "Loja de Instrumentos Musicais",
+                "terms": "Loja de Discos Musicais, Loja de CD's, Loja de Vinil, Loja Musical"
             },
             "shop/newsagent": {
                 "name": "Banca de Jornal",
@@ -2047,7 +2150,7 @@
                 "terms": "Ótica"
             },
             "shop/outdoor": {
-                "name": "Loja de Esportes de Aventura",
+                "name": "Loja de Esporte/Aventura",
                 "terms": "Loja de Esportes de Aventura"
             },
             "shop/pet": {
@@ -2091,12 +2194,12 @@
                 "terms": "Loja Desocupada"
             },
             "shop/variety_store": {
-                "name": "Loja de Variedades",
-                "terms": "Loja de Variedades"
+                "name": "Loja de Variedades a 1,99",
+                "terms": "Loja de Variedades, Um e Noventa e Nove, 1.99, 199"
             },
             "shop/video": {
-                "name": "Loja ou Locadora de Vídeos",
-                "terms": "Loja de Vídeos"
+                "name": "Loja/Locadora de Vídeos",
+                "terms": "Loja de Vídeos, Locadora de Vídeos, Videolocadora"
             },
             "tourism": {
                 "name": "Turismo",
@@ -2115,8 +2218,8 @@
                 "terms": "Atração Turística"
             },
             "tourism/camp_site": {
-                "name": "Camping",
-                "terms": "Parque de Campismo, Acampamento"
+                "name": "Local de Acampamento",
+                "terms": "Parque de Campismo, Acampamento, Camping"
             },
             "tourism/caravan_site": {
                 "name": "Estacionamento de Trailers",
@@ -2131,12 +2234,12 @@
                 "terms": "Guesthouse"
             },
             "tourism/hostel": {
-                "name": "Albergue",
-                "terms": "Albergue, Hostel"
+                "name": "Hostel",
+                "terms": "Albergue"
             },
             "tourism/hotel": {
                 "name": "Hotel",
-                "terms": "Hotel, Pousada"
+                "terms": "Hotel, Pousada, Motel"
             },
             "tourism/information": {
                 "name": "Informações Turísticas",
@@ -2151,7 +2254,7 @@
                 "terms": "Museu"
             },
             "tourism/picnic_site": {
-                "name": "Lugar de Piquenique",
+                "name": "Local de Piquenique",
                 "terms": "Lugar de Piquenique"
             },
             "tourism/theme_park": {
@@ -2239,7 +2342,7 @@
                 "terms": "Outro"
             },
             "waterway": {
-                "name": "Hidrovia",
+                "name": "Via Aquática",
                 "terms": "Canal, Hidrovia, Curso d'Água"
             },
             "waterway/canal": {
@@ -2247,15 +2350,15 @@
                 "terms": "Canal"
             },
             "waterway/dam": {
-                "name": "Represa",
-                "terms": "Represa, Barragem"
+                "name": "Barragem",
+                "terms": "Represa"
             },
             "waterway/ditch": {
                 "name": "Vala",
                 "terms": "Vala"
             },
             "waterway/drain": {
-                "name": "Dreno",
+                "name": "Valeta de drenagem",
                 "terms": "Dreno"
             },
             "waterway/river": {

diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index 2040d731b2b7160109ceb8b423af44c892b19096..53a6e44c243d66fb390cec6ca75ddb456454d7ab 100644 (file)
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -134,7 +134,8 @@
             "annotation": "Объединены {n} линий.",
             "not_eligible": "Эти объекты нельзя склеить.",
             "not_adjacent": "Эти линии не склеить, потому что они не соединены.",
-            "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\""
+            "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\"",
+            "incomplete_relation": "Эти объекты нельзя объединить, потому что как минимум один из них не был загружен целиком."
         },
         "move": {
             "title": "Сместить",
@@ -1099,7 +1100,8 @@
                 "terms": "Паб"
             },
             "amenity/recycling": {
-                "name": "Переработка мусора"
+                "name": "Переработка мусора",
+                "terms": "Переработка мусора, Мусоропереработка, Утилизация мусора, Переработка отходов, Утилизация отходов"
             },
             "amenity/restaurant": {
                 "name": "Ресторан",
@@ -1110,7 +1112,14 @@
                 "terms": "Школа, лицей, гимназия"
             },
             "amenity/shelter": {
-                "name": "Укрытие"
+                "name": "Укрытие",
+                "terms": "Укрытие, Навес, Защита от непогоды"
+            },
+            "amenity/social_facility": {
+                "name": "Социальное учреждение"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Ночлежка для бездомных"
             },
             "amenity/studio": {
                 "name": "Студия"
@@ -1164,20 +1173,24 @@
                 "terms": "препятствие, преграда, барьер, заграждение"
             },
             "barrier/block": {
-                "name": "Бетонный блок"
+                "name": "Бетонный блок",
+                "terms": "Блок, преграда"
             },
             "barrier/bollard": {
-                "name": "Столбики"
+                "name": "Столбики",
+                "terms": "Столб, столбик, преграда"
             },
             "barrier/cattle_grid": {
-                "name": "Сетка для животных"
+                "name": "Сетка для животных",
+                "terms": "Сетка для животных, Препятствие для животных"
             },
             "barrier/city_wall": {
                 "name": "Городская стена",
                 "terms": "Городская стена"
             },
             "barrier/cycle_barrier": {
-                "name": "Барьер для велосипедистов"
+                "name": "Барьер для велосипедистов",
+                "terms": "Барьер для велосипедистов, Велосипедное препятствие"
             },
             "barrier/ditch": {
                 "name": "Траншея",
@@ -1200,20 +1213,24 @@
                 "terms": "Живая изгородь, Зелёное ограждение"
             },
             "barrier/kissing_gate": {
-                "name": "Преграда для животных"
+                "name": "Преграда для животных",
+                "terms": "Ворота с защитой от животных, Преграда для животных"
             },
             "barrier/lift_gate": {
                 "name": "Шлагбаум",
                 "terms": "шлагбаум"
             },
             "barrier/retaining_wall": {
-                "name": "Укрепляющая стена"
+                "name": "Укрепляющая стена",
+                "terms": "Подпорная стена"
             },
             "barrier/stile": {
-                "name": "Турникет"
+                "name": "Турникет",
+                "terms": "Турникет"
             },
             "barrier/toll_booth": {
-                "name": "Пункт оплаты проезда"
+                "name": "Пункт оплаты проезда",
+                "terms": "Пункт оплаты проезда, Касса, Пропускной пункт"
             },
             "barrier/wall": {
                 "name": "Стена",
@@ -1231,10 +1248,33 @@
                 "name": "Многоквартирный дом",
                 "terms": "многоэтажка, высотка"
             },
+            "building/bunker": {
+                "name": "Бункер"
+            },
+            "building/cathedral": {
+                "name": "Собор",
+                "terms": "Собор, Храм"
+            },
+            "building/chapel": {
+                "name": "Капелла"
+            },
+            "building/church": {
+                "name": "Церковь, Храм",
+                "terms": "Церковь, Храм"
+            },
             "building/commercial": {
                 "name": "Деловое здание",
                 "terms": "Деловое здание, Коммерческое здание, Деловая недвижимость"
             },
+            "building/construction": {
+                "name": "Строящееся здание"
+            },
+            "building/detached": {
+                "name": "Отдельностоящий частный жилой дом"
+            },
+            "building/dormitory": {
+                "name": "Общежитие"
+            },
             "building/entrance": {
                 "name": "Вход",
                 "terms": "вход, дверь, главный вход"
@@ -1243,6 +1283,18 @@
                 "name": "Гараж",
                 "terms": "гараж, ракушка"
             },
+            "building/garages": {
+                "name": "Гаражи"
+            },
+            "building/greenhouse": {
+                "name": "Теплица"
+            },
+            "building/hospital": {
+                "name": "Здание больницы"
+            },
+            "building/hotel": {
+                "name": "Здание гостиницы"
+            },
             "building/house": {
                 "name": "Дом",
                 "terms": "дом, частный дом, изба, хата"
@@ -1255,10 +1307,40 @@
                 "name": "Промышленное здание",
                 "terms": "Промышленное здание, Производственное здание, Индустриальное здание, Цех"
             },
+            "building/public": {
+                "name": "Общественное здание, Общественный центр"
+            },
             "building/residential": {
                 "name": "Жилой Дом",
                 "terms": "Жилой дом, Жилое здание"
             },
+            "building/retail": {
+                "name": "Магазин розничной торговли"
+            },
+            "building/roof": {
+                "name": "Крыша"
+            },
+            "building/school": {
+                "name": "Здание школы"
+            },
+            "building/shed": {
+                "name": "Сарай"
+            },
+            "building/stable": {
+                "name": "Конюшня"
+            },
+            "building/terrace": {
+                "name": "Блокированные дома"
+            },
+            "building/train_station": {
+                "name": "Железнодорожный вокзал"
+            },
+            "building/university": {
+                "name": "Здание университета, института "
+            },
+            "building/warehouse": {
+                "name": "Склад"
+            },
             "craft/basket_maker": {
                 "name": "Корзина",
                 "terms": "корзинщик"
@@ -1413,10 +1495,12 @@
                 "terms": "вход, дверь, главный вход"
             },
             "footway/crossing": {
-                "name": "Пешеходный переход"
+                "name": "Пешеходный переход",
+                "terms": "Пешеходный переход"
             },
             "footway/sidewalk": {
-                "name": "Тротуар с дорогой"
+                "name": "Тротуар",
+                "terms": "Тротуар, Тротуарчик, Пешеходная обочина"
             },
             "golf/bunker": {
                 "name": "Бункер",
@@ -1435,21 +1519,28 @@
                 "terms": "Лунка для гольфа"
             },
             "golf/lateral_water_hazard": {
-                "name": "Боковая водная преграда"
+                "name": "Боковая водная преграда",
+                "terms": "Боковая водная преграда, Боковое водное препятствие"
             },
             "golf/rough": {
                 "name": "Раф",
                 "terms": "Неровная площадка, Высокая трава"
             },
+            "golf/tee": {
+                "name": "Стартовая площадка",
+                "terms": "Стартовая площадка, Стартовая зона"
+            },
             "golf/water_hazard": {
-                "name": "Водная преграда"
+                "name": "Прямая водная преграда",
+                "terms": "Водное препятствие, Водная преграда, Прямая водная преграда"
             },
             "highway": {
                 "name": "Дорога",
                 "terms": "шоссе, магистраль, автомагистраль, дорога, автодорога, трасса, путь, автострада"
             },
             "highway/bridleway": {
-                "name": "Конная тропа"
+                "name": "Конная тропа",
+                "terms": "Конная тропа, Дорога для верховой езды, Дорога для конной езды"
             },
             "highway/bus_stop": {
                 "name": "Автобусная остановка",
@@ -1464,28 +1555,35 @@
                 "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": "Автомагистраль"
             },
             "highway/motorway_link": {
-                "name": "Съезд с автомагистрали"
+                "name": "Съезд с автомагистрали",
+                "terms": "Съезд с автомагистрали, Съезд со скоростной автострады, Съезд со скоростного шоссе, Съезд с автобана, Съезд со скоростной автодороги, Съезд с хайвэя, Съезд со скоростной автотрассы"
             },
             "highway/path": {
-                "name": "Тропа"
+                "name": "Тропа",
+                "terms": "Тропа, Тропинка, Тропка"
             },
             "highway/pedestrian": {
-                "name": "Пешеходная дорога"
+                "name": "Пешеходная дорога",
+                "terms": "Пешеходная улица"
             },
             "highway/primary": {
                 "name": "Дорога регионального значения",
@@ -1495,7 +1593,8 @@
                 "name": "Съезд с дороги регионального значения"
             },
             "highway/residential": {
-                "name": "Улица"
+                "name": "Улица",
+                "terms": "Улица, Жилая улица"
             },
             "highway/road": {
                 "name": "Дорога неизвестного класса",
@@ -1508,16 +1607,20 @@
                 "name": "Съезд с важной дороги"
             },
             "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": "Неотложная помощь"
@@ -1555,23 +1658,27 @@
                 "terms": "Заезд на магистраль, Съезд с магистрали"
             },
             "highway/turning_circle": {
-                "name": "Разворот"
+                "name": "Разворот",
+                "terms": "Площадка ля разворота, Разворотный круг, Разворотный тупик"
             },
             "highway/unclassified": {
                 "name": "Обычная дорога"
             },
             "historic": {
-                "name": "Историческое место"
+                "name": "Историческое место",
+                "terms": "Археологическая площадка, Археологические раскопки"
             },
             "historic/archaeological_site": {
-                "name": "Археологические раскопки"
+                "name": "Археологические раскопки",
+                "terms": "Археологическая площадка, Археологические раскопки"
             },
             "historic/boundary_stone": {
                 "name": "Пограничный камень",
                 "terms": "межевой камень"
             },
             "historic/castle": {
-                "name": "Замок"
+                "name": "Замок",
+                "terms": "Замок, Форт, Укрепление"
             },
             "historic/memorial": {
                 "name": "Памятник, мемориал",
@@ -1586,33 +1693,40 @@
                 "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": "Кладбище",
                 "terms": "кладбище"
             },
             "landuse/commercial": {
-                "name": "Коммерческая застройка"
+                "name": "Коммерческая застройка",
+                "terms": "Коммерческое землепользование, Территории торгово-офисного назначения"
             },
             "landuse/construction": {
                 "name": "Стройплощадка",
                 "terms": "стройка, строительство"
             },
             "landuse/farm": {
-                "name": "Земельные угодья"
+                "name": "Земельные угодья",
+                "terms": "Ферма, Сельхоз предприятие"
             },
             "landuse/farmland": {
                 "name": "Сельскохозяйственные угодья"
@@ -1625,10 +1739,12 @@
                 "terms": "лес, лесной массив"
             },
             "landuse/grass": {
-                "name": "Трава"
+                "name": "Трава",
+                "terms": "Газон, Искусственный газон, Земля используемая под газон"
             },
             "landuse/industrial": {
-                "name": "Промышленная застройка"
+                "name": "Промышленная застройка",
+                "terms": "Промышленная территория, Производственная территория, Промышленное землепользование"
             },
             "landuse/meadow": {
                 "name": "Луг",
@@ -1643,7 +1759,8 @@
                 "terms": "карьер, каменоломня, открытая разработка"
             },
             "landuse/residential": {
-                "name": "Жилой квартал"
+                "name": "Жилой квартал",
+                "terms": "Жилая территория, Селитебная территория, Жилые земли, Селитебные земли"
             },
             "landuse/retail": {
                 "name": "Торговля"
@@ -1653,7 +1770,8 @@
                 "terms": "виноградник"
             },
             "leisure": {
-                "name": "Отдых"
+                "name": "Отдых",
+                "terms": "Территории для отдыха"
             },
             "leisure/dog_park": {
                 "name": "Площадка для Выгула Собак",
@@ -1664,10 +1782,12 @@
                 "terms": "Парк, Сквер"
             },
             "leisure/golf_course": {
-                "name": "Площадка для гольфа"
+                "name": "Площадка для гольфа",
+                "terms": "Поле для гольфа, Гольфполе"
             },
             "leisure/marina": {
-                "name": "Яхтклуб"
+                "name": "Яхтклуб",
+                "terms": "Марина, Стоянка для яхт"
             },
             "leisure/park": {
                 "name": "Парк",
@@ -1682,7 +1802,8 @@
                 "terms": "поле для американского футбола"
             },
             "leisure/pitch/baseball": {
-                "name": "Бейсбольная площадка"
+                "name": "Бейсбольная площадка",
+                "terms": "Бейсбол"
             },
             "leisure/pitch/basketball": {
                 "name": "Баскетбольная площадка",
@@ -1709,7 +1830,8 @@
                 "terms": "детская площадка, игровая площадка"
             },
             "leisure/slipway": {
-                "name": "Стапель"
+                "name": "Стапель",
+                "terms": "Стапель"
             },
             "leisure/sports_center": {
                 "name": "Спортивный Комплекс",
@@ -1728,13 +1850,16 @@
                 "terms": "Трасса для Гонок, Трек, Трасса, Автодром"
             },
             "line": {
-                "name": "Линия"
+                "name": "Линия",
+                "terms": "Линия"
             },
             "man_made": {
-                "name": "Сооружения"
+                "name": "Сооружения",
+                "terms": "рукотворное"
             },
             "man_made/breakwater": {
-                "name": "Волнорез"
+                "name": "Волнорез",
+                "terms": "Мол, Оградительное гидросооружение"
             },
             "man_made/cutline": {
                 "name": "Просека",
@@ -1765,10 +1890,12 @@
                 "terms": "трубопровод"
             },
             "man_made/survey_point": {
-                "name": "Тригонометрический пункт"
+                "name": "Тригонометрический пункт",
+                "terms": "Тригонометрический пункт"
             },
             "man_made/tower": {
-                "name": "Башня"
+                "name": "Башня",
+                "terms": "Башня"
             },
             "man_made/wastewater_plant": {
                 "name": "Станция водоочистки",
@@ -1783,22 +1910,27 @@
                 "terms": "колодец"
             },
             "man_made/water_works": {
-                "name": "Станция водоподготовки"
+                "name": "Станция водоподготовки",
+                "terms": "Водозабор"
             },
             "military/airfield": {
                 "name": "Аэродром"
             },
             "military/barracks": {
-                "name": "Бараки"
+                "name": "Бараки",
+                "terms": "Бараки, Казарма"
             },
             "military/bunker": {
-                "name": "Бункер"
+                "name": "Бункер",
+                "terms": "Бункер, Подземное убежище, Подземное укрытие"
             },
             "military/range": {
-                "name": "Военный полигон"
+                "name": "Военный полигон",
+                "terms": "Военный полигон, Стрельбище"
             },
             "natural": {
-                "name": "Природа"
+                "name": "Природа",
+                "terms": "Природные объекты"
             },
             "natural/bay": {
                 "name": "Бухта",
@@ -1809,7 +1941,8 @@
                 "terms": "пляж"
             },
             "natural/cliff": {
-                "name": "Скала"
+                "name": "Скала",
+                "terms": "Скала, Утёс, Шхеры"
             },
             "natural/coastline": {
                 "name": "Береговая линия",
@@ -1820,10 +1953,12 @@
                 "terms": "ледник"
             },
             "natural/grassland": {
-                "name": "Травяной луг"
+                "name": "Травяной луг",
+                "terms": "Травяной луг, Луговина, Лужок, Выкос, Перелесье"
             },
             "natural/heath": {
-                "name": "Поросший луг"
+                "name": "Поросший луг",
+                "terms": "Поросший луг"
             },
             "natural/peak": {
                 "name": "Вершина",
@@ -1833,17 +1968,20 @@
                 "name": "Осыпь"
             },
             "natural/scrub": {
-                "name": "Кустарник"
+                "name": "Кустарник",
+                "terms": "Кустарник, Кусты, Кустовник, Подлесок, Лозняк, Чапыжник"
             },
             "natural/spring": {
-                "name": "Родник"
+                "name": "Родник",
+                "terms": "Ручей, Ключ"
             },
             "natural/tree": {
                 "name": "Дерево",
                 "terms": "дерево"
             },
             "natural/water": {
-                "name": "Водоём"
+                "name": "Водоём",
+                "terms": "Вода, Водоём"
             },
             "natural/water/lake": {
                 "name": "Озеро",
@@ -1854,17 +1992,20 @@
                 "terms": "пруд"
             },
             "natural/water/reservoir": {
-                "name": "Водохранилище"
+                "name": "Водохранилище",
+                "terms": "Водохранилище, Рукотворное озеро, Водоместилище,"
             },
             "natural/wetland": {
                 "name": "Болото",
                 "terms": "болото, заболоченная территория"
             },
             "natural/wood": {
-                "name": "Лес"
+                "name": "Лес",
+                "terms": "Лес, Деревья, Роща, Чаща"
             },
             "office": {
-                "name": "Офисы"
+                "name": "Офисы",
+                "terms": "Офисы, Офис, Контора, Канцелярия"
             },
             "office/accountant": {
                 "name": "Бухгалтерская контора",
@@ -1893,7 +2034,8 @@
                 "terms": "Бюро по недвижимости, Риелтор, Риелторская фирма, Риелторская компания,"
             },
             "office/financial": {
-                "name": "Финансовая организация"
+                "name": "Финансовая организация",
+                "terms": "финансовая организация"
             },
             "office/government": {
                 "name": "Правительственное учреждение"
@@ -1915,7 +2057,8 @@
                 "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение,"
             },
             "office/physician": {
-                "name": "Фельдшер"
+                "name": "Фельдшер",
+                "terms": "врач"
             },
             "office/political_party": {
                 "name": "Политическая партия",
@@ -1926,7 +2069,8 @@
                 "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки"
             },
             "office/telecommunication": {
-                "name": "Телеком"
+                "name": "Телеком",
+                "terms": "Телеком"
             },
             "office/therapist": {
                 "name": "Терапевт"
@@ -1935,38 +2079,48 @@
                 "name": "Турагентство",
                 "terms": "Туристическое агентство, Бюро путешествий, Турфирма, Туристическая фирма"
             },
+            "piste": {
+                "name": "Лыжная трасса"
+            },
             "place": {
-                "name": "Населённый пункт"
+                "name": "Населённый пункт",
+                "terms": "Населённый пункт, Местность"
             },
             "place/city": {
                 "name": "Большой город",
                 "terms": "город"
             },
             "place/hamlet": {
-                "name": "Малое село"
+                "name": "Малое село",
+                "terms": "Деревня"
             },
             "place/island": {
                 "name": "Остров",
                 "terms": "остров"
             },
             "place/isolated_dwelling": {
-                "name": "Изолированное жильё"
+                "name": "Изолированное жильё",
+                "terms": "Хутор, Заимка"
             },
             "place/locality": {
-                "name": "Местность"
+                "name": "Местность",
+                "terms": "Урочище, Заброшенное поселение"
             },
             "place/town": {
-                "name": "Город"
+                "name": "Город",
+                "terms": "Город"
             },
             "place/village": {
-                "name": "Деревня"
+                "name": "Деревня",
+                "terms": "Село, Станица, Поселение, Посёлок городского типа"
             },
             "point": {
                 "name": "Точка",
                 "terms": "точка"
             },
             "power": {
-                "name": "Электричество"
+                "name": "Электричество",
+                "terms": "Электроэнергетика"
             },
             "power/generator": {
                 "name": "Силовой Генератор",
@@ -1980,21 +2134,24 @@
                 "name": "Низковольтная ЛЭП"
             },
             "power/pole": {
-                "name": "Столб ЛЭП"
+                "name": "Столб ЛЭП",
+                "terms": "Столб линии электропередачи, Опора маломощной линии электропередачи"
             },
             "power/sub_station": {
                 "name": "Трансформаторная подстанция",
                 "terms": "подстанция"
             },
             "power/tower": {
-                "name": "Опора ЛЭП"
+                "name": "Опора ЛЭП",
+                "terms": "Опора ЛЭП, Опора линии электропередачи"
             },
             "power/transformer": {
                 "name": "Трансформатор",
                 "terms": "трансформатор"
             },
             "public_transport/platform": {
-                "name": "Платформа"
+                "name": "Платформа",
+                "terms": "Платформа, Остановка, Посадочная платформа, Место посадки и высадки пассажиров"
             },
             "public_transport/stop_position": {
                 "name": "Место остановки транспорта",
@@ -2005,10 +2162,12 @@
                 "terms": "железная дорога"
             },
             "railway/abandoned": {
-                "name": "Разобранная железная дорога"
+                "name": "Разобранная железная дорога",
+                "terms": "Разобранная железнодорожная ветка,"
             },
             "railway/disused": {
-                "name": "Заброшенная железная дорога"
+                "name": "Заброшенная железная дорога",
+                "terms": "Неиспользуемая железнодорожная ветка"
             },
             "railway/funicular": {
                 "name": "Фуникулёр",
@@ -2019,7 +2178,8 @@
                 "terms": "Железнодорожная станция, ЖД станция"
             },
             "railway/level_crossing": {
-                "name": "Переезд"
+                "name": "Переезд",
+                "terms": "Железнодорожный переезд"
             },
             "railway/monorail": {
                 "name": "Монорельс",
@@ -2053,44 +2213,52 @@
                 "terms": "трамвай"
             },
             "relation": {
-                "name": "Отношение"
+                "name": "Отношение",
+                "terms": "отношение"
             },
             "route/ferry": {
                 "name": "Паромный маршрут",
                 "terms": "паром, паромная переправа"
             },
             "shop": {
-                "name": "Магазин"
+                "name": "Магазин",
+                "terms": "Магазин, Торговая лавка, Точка продаж"
             },
             "shop/alcohol": {
-                "name": "Винный магазин"
+                "name": "Винный магазин",
+                "terms": "Винный магазин, Винная лавка, Вино-водочный магазин"
             },
             "shop/bakery": {
-                "name": "Хлебный"
+                "name": "Хлебный",
+                "terms": "Булочная, Хлебный магазин"
             },
             "shop/beauty": {
                 "name": "Салон красоты",
                 "terms": "салон красоты"
             },
             "shop/beverages": {
-                "name": "Магазин напитков"
+                "name": "Магазин напитков",
+                "terms": "Магазин напитков, Продажа напитков"
             },
             "shop/bicycle": {
-                "name": "Веломагазин"
+                "name": "Веломагазин",
+                "terms": "Веломагазин"
             },
             "shop/books": {
                 "name": "Книжный",
                 "terms": "книги, книжный"
             },
             "shop/boutique": {
-                "name": "Бутик"
+                "name": "Бутик",
+                "terms": "Бутик, Фирменный магазин"
             },
             "shop/butcher": {
                 "name": "Мясной",
                 "terms": "мясной, мясная лавка, мясник"
             },
             "shop/car": {
-                "name": "Автодилер"
+                "name": "Автодилер",
+                "terms": "Автомобильный салон, Диллерский автоцентр "
             },
             "shop/car_parts": {
                 "name": "Автозапчасти",
@@ -2101,65 +2269,83 @@
                 "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": "Магазин \"Сделай Сам\", Всё для ремонта"
             },
             "shop/dry_cleaning": {
                 "name": "пылесосы",
                 "terms": "химчистка"
             },
             "shop/electronics": {
-                "name": "Магазин электроники"
+                "name": "Магазин электроники",
+                "terms": "Магазин электроники"
             },
             "shop/farm": {
                 "name": "Продуктовый Лоток"
             },
             "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": "Техника Hi-fi"
+                "name": "Техника Hi-fi",
+                "terms": "Техника Hi-fi, Акустика Hi-fi"
             },
             "shop/jewelry": {
                 "name": "Ювелирный",
@@ -2173,27 +2359,36 @@
                 "name": "Прачечная",
                 "terms": "прачечная"
             },
+            "shop/locksmith": {
+                "name": "Изготовление ключей"
+            },
             "shop/mall": {
-                "name": "Торговый центр"
+                "name": "Торговый центр",
+                "terms": "Торговый центр, Торговый дом"
             },
             "shop/mobile_phone": {
-                "name": "Мобильные телефоны"
+                "name": "Мобильные телефоны",
+                "terms": "Салон сотовой связи, Продажа сотовых телефонов"
             },
             "shop/motorcycle": {
-                "name": "Магазин мотоциклов"
+                "name": "Магазин мотоциклов",
+                "terms": "Магазин мотоциклов, Мотодиллер"
             },
             "shop/music": {
-                "name": "Музыкальный магазин"
+                "name": "Музыкальный магазин",
+                "terms": "Музыкальный магазин, Аудио салон"
             },
             "shop/newsagent": {
-                "name": "Газеты-журналы"
+                "name": "Газеты-журналы",
+                "terms": "Газеты-журналы, Новостной киоск, Пресса, Союзпечать"
             },
             "shop/optician": {
                 "name": "Оптика",
                 "terms": "оптика, очки"
             },
             "shop/outdoor": {
-                "name": "Товары для отдыха и туризма"
+                "name": "Товары для отдыха и туризма",
+                "terms": "Товары для отдыха и туризма, Товары для кэмпинга, Туристическое снаряжение"
             },
             "shop/pet": {
                 "name": "Зоомагазин",
@@ -2204,13 +2399,16 @@
                 "terms": "Фототовары, Фототехника"
             },
             "shop/shoes": {
-                "name": "Обувной"
+                "name": "Обувной",
+                "terms": "Обувной магазин"
             },
             "shop/sports": {
-                "name": "Спорттовары"
+                "name": "Спорттовары",
+                "terms": "магазин спорттоваров, Спорттовары, Спортивные товары"
             },
             "shop/stationery": {
-                "name": "Канцелярский магазин"
+                "name": "Канцелярский магазин",
+                "terms": "Канцелярский магазин, Канцтовары"
             },
             "shop/supermarket": {
                 "name": "Гипермаркет",
@@ -2221,34 +2419,42 @@
                 "terms": "магазин игрушек"
             },
             "shop/travel_agency": {
-                "name": "Бюро путешествий"
+                "name": "Бюро путешествий",
+                "terms": "Турагенство"
             },
             "shop/tyres": {
-                "name": "Шины, покрышки"
+                "name": "Шины, покрышки",
+                "terms": "Шины, Покрышки, Автопокрышки, Автошины"
             },
             "shop/vacant": {
                 "name": "Закрытый магазин"
             },
             "shop/variety_store": {
-                "name": "Товары по одной цене"
+                "name": "Товары по одной цене",
+                "terms": "Товары по одной цене, \"Всё по одной цене\", Магазин фиксированной цены"
             },
             "shop/video": {
-                "name": "Видеомагазин"
+                "name": "Видеомагазин",
+                "terms": "Видео салон, Продажа фильмов и видеозаписей"
             },
             "tourism": {
-                "name": "Туризм"
+                "name": "Туризм",
+                "terms": "Туризм, Отдых, Путешествия"
             },
             "tourism/alpine_hut": {
                 "name": "Альпийский домик"
             },
             "tourism/artwork": {
-                "name": "Произведение искусства"
+                "name": "Произведение искусства",
+                "terms": "Произведение искусства"
             },
             "tourism/attraction": {
-                "name": "Достопримечательность"
+                "name": "Достопримечательность",
+                "terms": "Достопримечательность"
             },
             "tourism/camp_site": {
-                "name": "Кемпинг"
+                "name": "Кемпинг",
+                "terms": "лагерь, палаточный лагерь, турбаза, место для лагеря"
             },
             "tourism/caravan_site": {
                 "name": "Стоянка автодомов"
@@ -2257,7 +2463,8 @@
                 "name": "Сельский домик, шале"
             },
             "tourism/guest_house": {
-                "name": "Гостевой дом"
+                "name": "Гостевой дом",
+                "terms": "Гостевой дом"
             },
             "tourism/hostel": {
                 "name": "Хостел",
@@ -2268,7 +2475,8 @@
                 "terms": "гостиница, отель"
             },
             "tourism/information": {
-                "name": "Инфопункт"
+                "name": "Инфопункт",
+                "terms": "Инфопункт, Инфостэнд, Информационный пункт"
             },
             "tourism/motel": {
                 "name": "Мотель",
@@ -2279,7 +2487,8 @@
                 "terms": "музей"
             },
             "tourism/picnic_site": {
-                "name": "Место для пикника"
+                "name": "Место для пикника",
+                "terms": "Место для пикника, Поляна для пикника"
             },
             "tourism/theme_park": {
                 "name": "Парк развлечений"
@@ -2292,25 +2501,32 @@
                 "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": "Объезд"
@@ -2320,7 +2536,8 @@
                 "terms": "паром, паромная переправа"
             },
             "type/route/foot": {
-                "name": "Пешеходный маршрут"
+                "name": "Пешеходный маршрут",
+                "terms": "Пеший маршрут, Пешеходный маршрут"
             },
             "type/route/hiking": {
                 "name": "Пешеходный Маршрут"
@@ -2339,7 +2556,8 @@
                 "name": "Железнодорожный маршрут"
             },
             "type/route/tram": {
-                "name": "Трамвайный маршрут"
+                "name": "Трамвайный маршрут",
+                "terms": "Трамвайный маршрут"
             },
             "type/route_master": {
                 "name": "Главное Отношение Маршрута"
@@ -2349,7 +2567,8 @@
                 "terms": "другое"
             },
             "waterway": {
-                "name": "Водный путь"
+                "name": "Водный путь",
+                "terms": "Водоток, Водное русло"
             },
             "waterway/canal": {
                 "name": "Канал",
@@ -2364,20 +2583,24 @@
                 "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/sk.json b/vendor/assets/iD/iD/locales/sk.json
index 9696e7c18343a4f5f3ab7952a155f7b9ed313e72..29b8610f73c2604c089cfca2ed40388dd1b7eb3b 100644 (file)
--- a/vendor/assets/iD/iD/locales/sk.json
+++ b/vendor/assets/iD/iD/locales/sk.json
@@ -1284,6 +1284,9 @@
                 "name": "Bytovka",
                 "terms": "Bytovka,obytna budova,panelak,panelák,vežiak,veziak,barak,barák,činžiak,cinziak,apartmany,apartmány"
             },
+            "building/barn": {
+                "name": "Stodola"
+            },
             "building/commercial": {
                 "name": "Komerčná budova",
                 "terms": "Obchody,firmy,firma,predaj,podnik,podniky,kancelarie,kancelárie"

diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index e4bd6fa495a88e258f88bd44afa833cca00a1a81..088216154313f5ab706df5e6248c3d40692ebe77 100644 (file)
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -41,9 +41,11 @@
             }
         },
         "continue": {
+            "key": "A",
             "title": "Fortsätt",
             "description": "Fortsätt denna linje.",
             "not_eligible": "Ingen linje kan fortsätta här.",
+            "multiple": "Flera linjer kan fortsätta härifrån. För att välja en linje, tryck på tangenten Skift och klicka på den för att välja.",
             "annotation": {
                 "line": "Fortsatte en linje.",
                 "area": "Fortsatt ett område."
@@ -72,15 +74,24 @@
             "not_closed": "Denna kan inte göras rund då den inte är en loop."
         },
         "orthogonalize": {
+            "title": "Räta upp",
+            "description": {
+                "line": "Räta upp hörnen på denna linje.",
+                "area": "Räta upp hörnen på denna ytan."
+            },
+            "key": "S",
             "annotation": {
                 "line": "Gjort hörnen på en linje fyrkantiga.",
                 "area": "Gjort hörnen på ett område fyrkantiga."
-            }
+            },
+            "not_squarish": "Denna kan inte rätas upp då den inte är fyrkantig."
         },
         "straighten": {
             "title": "Räta ut",
             "description": "Räta ut denna linje.",
-            "annotation": "Rätade ut en linje."
+            "key": "S",
+            "annotation": "Rätade ut en linje.",
+            "too_bendy": "Den kan inte rätas upp då den är för böjd."
         },
         "delete": {
             "title": "Ta bort",
@@ -123,7 +134,8 @@
             "annotation": "Sammanfogade {n} linjer.",
             "not_eligible": "Dessa objekt kan inte slås samman.",
             "not_adjacent": "Dessa linjer kan inte slås ihop då dem inte är ihopsatta.",
-            "restriction": "Dessa linjer kan inte slås samman då minst en av dem tillhör relationen \"{relation}\"."
+            "restriction": "Dessa linjer kan inte slås samman då minst en av dem tillhör relationen \"{relation}\".",
+            "incomplete_relation": "Dessa objekt kan inte sammanfogas då åtminstone ett inte hämtats fullständigt."
         },
         "move": {
             "title": "Flytta",
@@ -236,18 +248,24 @@
         "back_tooltip": "Ändra objekt",
         "remove": "Ta bort",
         "search": "Sök",
+        "multiselect": "Välj objekt",
         "unknown": "Okänd",
         "incomplete": "<inte hämtad>",
         "feature_list": "Sök efter egenskaper",
         "edit": "Ändra objekt",
+        "none": "Ingen",
+        "node": "Nod",
         "way": "Väg",
-        "relation": "Relation"
+        "relation": "Relation",
+        "location": "Plats"
     },
     "background": {
         "title": "Bakgrund",
         "description": "Bakgrundsinställningar",
         "percent_brightness": "{opacity}% ljusstyrka",
+        "none": "Ingen",
         "custom": "Anpassa",
+        "fix_misalignment": "Justera bildplacering",
         "reset": "ta bort"
     },
     "restore": {
@@ -297,6 +315,7 @@
         "untagged_area": "Otaggat område",
         "many_deletions": "Du håller på att ta bort {n} objekt. Är du helt säker? Detta tar bort dem för alla som använder openstreetmap.org.",
         "tag_suggests_area": "Taggen {tag} indikerar att detta borde vara ett område istället för en linje",
+        "untagged_tooltip": "Välj en typ som beskriver vad denna {geometry} är.",
         "deprecated_tags": "Borttagna taggar: {tags}"
     },
     "zoom": {
@@ -306,11 +325,15 @@
     "cannot_zoom": "Går ej att zooma ut ytterligare med nuvarande sätt.",
     "gpx": {
         "local_layer": "Lokal gpx-fil",
+        "drag_drop": "Dra och släpp en .gpx-fil på sidan, eller klicka på knappen till höger för att bläddra",
         "zoom": "Zooma till GPX-spår",
         "browse": "Bläddra efter en .gpx-fil"
     },
     "help": {
-        "title": "Hjälp"
+        "title": "Hjälp",
+        "help": "# Hjälp\n\nDetta är en redigerare för [OpenStreetMap](http://www.openstreetmap.org/), den\nfri och redigerbara världskartan. Du kan använda den för att lägga till och uppdatera\ndata i ditt närområde, allt för att ytterligare förbättra en världskarta för alla baserad på öppen källkod och data.\n\nÄndringar du gör i den här kartan kommer att visas för alla som använder\nOpenStreetMap. För att göra en ändring behöver du ett\n[gratis OpenStreetMap-konto](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) är ett samarbetsprojekt med [källkodkod \ntillgänglig på GitHub](https://github.com/openstreetmap/iD).\n",
+        "gps": "# GPS \n\nGPS-data är den mest pålitliga källan för uppgifter till OpenStreetMap. Denna redigerare \nstödjer lokala spår – ”.GPX”-filer på din lokala dator. Du kan skapa \ndenna typ av GPS-spår med ett flertal smartphone-appar samt med\npersonlig GPS-hårdvara. \n\nFör information om hur man skapar en GPS-spårning, läs \n[Kartläggning med en GPS](http://learnosm.org/en/beginner/using-gps/). \n\nFör att använda ett GPX-spår för kartläggning, dra och släpp GPX-filen på \nkartredigeraren. Om den känns igen kommer den att läggas till på kartan som en klargrön \nlinje. Klicka på menyn \"Bakgrundsinställningar\" på höger sida för att aktivera, \navaktivera eller zooma till detta nya GPX-drivna lager. \n\nGPX spår överförs inte direkt till OpenStreetMap - det bästa sättet att \nanvända dem är att rita på kartan, använda den som en guide för de nya objekt som \ndu lägger till, och också [ladda upp dem till OpenStreetMap](http://www.openstreetmap.org/trace/create) \nför att användas av andra.\n",
+        "buildings": "# Byggnader\n\nOpenStreetMap är världens största databas över byggnader. Du kan skapa\noch förbättra denna databas.\n\n### Markering\n\nDu kan markera en byggnad genom att klicka på dess kant. Detta kommer att markera \nbyggnaden och öppna en litet verktygsmeny och ett sidofält som visar mer information\nom byggnaden.\n\n### Modifiering\n\nIbland är byggnader felaktigt placerade eller har felaktiga taggar.\n\nFör att flytta en hel byggnad, markera den och klicka sedan på \"Flytta\"-verktyget. flytta\nmus för att flytta byggnaden, och klicka när den är korrekt placerad.\n\nFör att fixa den specifika formen av en byggnad, klicka och dra noderna som bildar\nramen till bättre platser.\n\n### Skapa\n\nEn av de viktigaste frågorna att tänka på vid tilläggning av byggnader till kartan är att\nOpenStreetMap registrerar byggnader både som form och punkt. Tumregeln\när att _kartlägga en byggnad som en form när möjligt_ och kartlägg företag, bostäder,\nfacilitet, och andra saker finns i byggandena som punkter placerade\ninuti byggnadernas ram.\n\nBörja rita en byggnad som en ram genom att klicka på knappen \"område\" högst upp till vänster\ngränssnittet, och avsluta det antingen genom att trycka på \"Retur\" på tangentbordet\neller genom att klicka på den första ritade noden för att stänga formen.\n\n### Radering\n\nOm en byggnad är helt fel – du kan se att den inte finns med i någon satellitbild\noch helst har bekräftat lokalt att det inte finns – kan du ta bort\nden, vilket tar bort det från kartan. Var försiktig när du tar bort objekt –\nlikt alla ändringar kommer resultatet ses av alla och satellitbilder\när ofta föråldrad, så byggnaden kan helt enkelt vara nybyggd.\n\nDu kan ta bort en byggnad genom att klicka på den för att markera den och sedan klicka på\nikonen papperskorg eller trycka på \"Delete\"-tangenten.\n"
     },
     "intro": {
         "navigation": {
@@ -344,6 +367,7 @@
         },
         "lines": {
             "title": "Linjer",
+            "add": "Linjer används för att representera objekt så som vägar, järnvägar och floder. **Klicka på knappen Linje för att lägga till en ny linje.***",
             "start": "**Påbörja linjen genom att klicka på slutet av vägen.**",
             "intersect": "Klicka för att lägga till fler punkter på linjen (vägen). Du kan flytta kartan under tiden du ritar. Vägar och många andra typer av linjer är en del av ett större nät med linjer. Det är därför viktigt att linjer blir korrekt anslutna till varandra för att exempelvis körinstruktioner ska fungera.**Klicka på Flower Street för att skapa en anslutning mellan de två linjerna (vägarna).**",
             "finish": "Linjer avslutas genom att klicka på slutpunkten en gång till.**Avsluta linjen.**",
@@ -372,11 +396,15 @@
             },
             "category-road": {
                 "name": "Väg"
+            },
+            "category-route": {
+                "name": "Rutt"
             }
         },
         "fields": {
             "access": {
                 "label": "Tillgång",
+                "placeholder": "Okänt",
                 "types": {
                     "access": "Generell",
                     "foot": "Fotgängare",
@@ -439,6 +467,9 @@
             "bicycle_parking": {
                 "label": "Typ"
             },
+            "boundary": {
+                "label": "Typ"
+            },
             "building": {
                 "label": "Byggnad"
             },
@@ -552,7 +583,8 @@
                 "placeholder": "50, 70, 90..."
             },
             "name": {
-                "label": "Namn"
+                "label": "Namn",
+                "placeholder": "Vanligt namn (om något)"
             },
             "natural": {
                 "label": "Natur"
@@ -600,6 +632,9 @@
             "ref": {
                 "label": "Referens"
             },
+            "relation": {
+                "label": "Typ"
+            },
             "religion": {
                 "label": "Religion",
                 "options": {
@@ -612,6 +647,15 @@
                     "taoist": "Taoism"
                 }
             },
+            "restriction": {
+                "label": "Typ"
+            },
+            "route": {
+                "label": "Typ"
+            },
+            "route_master": {
+                "label": "Typ"
+            },
             "sac_scale": {
                 "label": "Svårighetsgrad"
             },
@@ -632,6 +676,7 @@
             },
             "structure": {
                 "label": "Struktur",
+                "placeholder": "Okänt",
                 "options": {
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
@@ -681,11 +726,16 @@
             }
         },
         "presets": {
+            "address": {
+                "name": "Adress",
+                "terms": "Adress, husnummer, destination, gatuadress, postnummer, postort"
+            },
             "aeroway": {
                 "name": "Flygbana"
             },
             "aeroway/aerodrome": {
-                "name": "Flygplats"
+                "name": "Flygplats",
+                "terms": "flygplats, flygfält, flyghamn, aerodrom, landningsplats, lufthamn"
             },
             "aeroway/apron": {
                 "name": "Parkering av flygplan (Apron)"
@@ -719,7 +769,8 @@
                 "name": "Bank"
             },
             "amenity/bar": {
-                "name": "Bar"
+                "name": "Bar",
+                "terms": "Bar, krog, servering, matställe, pub, cocktailsalong, saloon"
             },
             "amenity/bench": {
                 "name": "Bänk"
@@ -736,6 +787,9 @@
             "amenity/car_rental": {
                 "name": "Biluthyrning"
             },
+            "amenity/car_sharing": {
+                "name": "Bilpool"
+            },
             "amenity/car_wash": {
                 "name": "Biltvätt"
             },
@@ -774,6 +828,9 @@
             "amenity/hospital": {
                 "name": "Sjukhus"
             },
+            "amenity/kindergarten": {
+                "name": "Förskola"
+            },
             "amenity/library": {
                 "name": "Bibliotek"
             },
@@ -786,6 +843,9 @@
             "amenity/place_of_worship": {
                 "name": "Plats för tillbedjan"
             },
+            "amenity/place_of_worship/buddhist": {
+                "name": "Buddhisttempel"
+            },
             "amenity/place_of_worship/christian": {
                 "name": "Kyrka"
             },
@@ -816,6 +876,9 @@
             "amenity/swimming_pool": {
                 "name": "Simbassäng"
             },
+            "amenity/taxi": {
+                "name": "Taxihållplats"
+            },
             "amenity/telephone": {
                 "name": "Telefon"
             },
@@ -900,9 +963,15 @@
             "building/entrance": {
                 "name": "Entré"
             },
+            "building/garage": {
+                "name": "Garage"
+            },
             "building/house": {
                 "name": "Hus"
             },
+            "building/industrial": {
+                "name": "Industribyggnad"
+            },
             "building/residential": {
                 "name": "Bostadshus",
                 "terms": "Bostadshus, Boningshus, Flerfamiljshus, Hyreshus"
@@ -1112,6 +1181,9 @@
             "leisure": {
                 "name": "Nöje"
             },
+            "leisure/dog_park": {
+                "name": "Hundpark"
+            },
             "leisure/garden": {
                 "name": "Trädgård"
             },
@@ -1163,21 +1235,36 @@
             "man_made": {
                 "name": "Människoskapad"
             },
+            "man_made/breakwater": {
+                "name": "Vågbrytare"
+            },
+            "man_made/cutline": {
+                "name": "Snittlinje"
+            },
             "man_made/lighthouse": {
                 "name": "Fyr"
             },
             "man_made/pier": {
                 "name": "Pir"
             },
+            "man_made/pipeline": {
+                "name": "Pipeline"
+            },
             "man_made/survey_point": {
                 "name": "Trianguleringspunkt"
             },
+            "man_made/tower": {
+                "name": "Torn"
+            },
             "man_made/wastewater_plant": {
                 "name": "Avloppsreningsverk"
             },
             "man_made/water_tower": {
                 "name": "Vattentorn"
             },
+            "man_made/water_well": {
+                "name": "Brunn"
+            },
             "man_made/water_works": {
                 "name": "Vattenverk"
             },
@@ -1322,6 +1409,9 @@
             "relation": {
                 "name": "Relation"
             },
+            "route/ferry": {
+                "name": "Färjerutt"
+            },
             "shop": {
                 "name": "Affär"
             },
@@ -1388,6 +1478,9 @@
             "shop/electronics": {
                 "name": "Elektronikbutik"
             },
+            "shop/farm": {
+                "name": "Gårdsbutik"
+            },
             "shop/fishmonger": {
                 "name": "Fiskhandlare"
             },
@@ -1529,6 +1622,57 @@
             "tourism/zoo": {
                 "name": "Zoo"
             },
+            "type/boundary": {
+                "name": "Gräns"
+            },
+            "type/boundary/administrative": {
+                "name": "Administrativ gräns"
+            },
+            "type/multipolygon": {
+                "name": "Multipolygon"
+            },
+            "type/restriction": {
+                "name": "Restriktion"
+            },
+            "type/route": {
+                "name": "Rutt"
+            },
+            "type/route/bicycle": {
+                "name": "cykelrutt"
+            },
+            "type/route/bus": {
+                "name": "Bussrutt"
+            },
+            "type/route/detour": {
+                "name": "Alternativ rutt"
+            },
+            "type/route/ferry": {
+                "name": "Färjerutt"
+            },
+            "type/route/foot": {
+                "name": "Vandringsrutt"
+            },
+            "type/route/pipeline": {
+                "name": "Rörledningsrutt"
+            },
+            "type/route/power": {
+                "name": "Kraftledningsrutt"
+            },
+            "type/route/road": {
+                "name": "Vägrutt"
+            },
+            "type/route/train": {
+                "name": "Tågrutt"
+            },
+            "type/route/tram": {
+                "name": "Spårvagnsrutt"
+            },
+            "type/route_master": {
+                "name": "Huvudrutt"
+            },
+            "vertex": {
+                "name": "Annat"
+            },
             "waterway": {
                 "name": "Vattenväg"
             },

diff --git a/vendor/assets/iD/iD/locales/ta.json b/vendor/assets/iD/iD/locales/ta.json
index cbb357d801be9ecf7210ea46c888276e077dbfb6..4361cf0b3471547de315fbc2eb458de94c64de2a 100644 (file)
--- a/vendor/assets/iD/iD/locales/ta.json
+++ b/vendor/assets/iD/iD/locales/ta.json
@@ -112,6 +112,7 @@
             "address": {
                 "label": "முகவரி",
                 "placeholders": {
+                    "housename": "வீட்டின் பெயர்",
                     "number": "123",
                     "street": "தெரு",
                     "city": "மாநகரம்"
@@ -138,6 +139,9 @@
             "artwork_type": {
                 "label": "வகை"
             },
+            "atm": {
+                "label": "ஏ.டி.எம்"
+            },
             "barrier": {
                 "label": "வகை"
             },
@@ -206,6 +210,7 @@
                 "label": "வகை"
             },
             "lanes": {
+                "label": "சந்துகள்",
                 "placeholder": "1, 2, 3..."
             },
             "leisure": {
@@ -221,11 +226,15 @@
                 "label": "வகை"
             },
             "maxspeed": {
+                "label": "வேக எல்லை",
                 "placeholder": "40, 50, 60..."
             },
             "name": {
                 "label": "பெயர்"
             },
+            "natural": {
+                "label": "இயற்கையான"
+            },
             "note": {
                 "label": "குறிப்பு"
             },
@@ -346,6 +355,9 @@
             "amenity/bank": {
                 "name": "வங்கி"
             },
+            "amenity/bicycle_parking": {
+                "name": "ஈருருளை நிறுத்தகம்"
+            },
             "amenity/cafe": {
                 "name": "டீக்கடை"
             },
@@ -358,6 +370,12 @@
             "amenity/college": {
                 "name": "கல்லூரி"
             },
+            "amenity/fire_station": {
+                "name": "தீயணைப்பு நிலையம்"
+            },
+            "amenity/grave_yard": {
+                "name": "இடுகாடு"
+            },
             "amenity/hospital": {
                 "name": "மருத்துவமனை"
             },
@@ -379,6 +397,9 @@
             "amenity/police": {
                 "name": "காவல்"
             },
+            "amenity/post_box": {
+                "name": "அஞ்சல்பெட்டி"
+            },
             "amenity/post_office": {
                 "name": "அஞ்சலகம்"
             },
@@ -439,6 +460,9 @@
             "highway/bus_stop": {
                 "name": "பேருந்து நிலையம்"
             },
+            "highway/footway": {
+                "name": "நடைபாதை"
+            },
             "highway/path": {
                 "name": "வழி"
             },
@@ -451,9 +475,15 @@
             "historic/castle": {
                 "name": "கோட்டை"
             },
+            "landuse/construction": {
+                "name": "கட்டுமானம்"
+            },
             "landuse/farm": {
                 "name": "பண்ணை"
             },
+            "landuse/farmyard": {
+                "name": "பண்ணை"
+            },
             "landuse/forest": {
                 "name": "காடு"
             },
@@ -496,9 +526,15 @@
             "man_made/water_tower": {
                 "name": "தண்ணீர்த் தொட்டி"
             },
+            "natural": {
+                "name": "இயற்கையான"
+            },
             "natural/beach": {
                 "name": "கடற்கரை"
             },
+            "natural/coastline": {
+                "name": "கடற்கரை"
+            },
             "natural/glacier": {
                 "name": "பனிப் பாறை"
             },
@@ -535,6 +571,9 @@
             "place/city": {
                 "name": "மாநகரம்"
             },
+            "place/island": {
+                "name": "தீவு"
+            },
             "place/town": {
                 "name": "நகரம்"
             },
@@ -565,6 +604,12 @@
             "railway/station": {
                 "name": "இரயில் நிலையம்"
             },
+            "railway/subway": {
+                "name": "சுரங்கப்பாதை"
+            },
+            "railway/subway_entrance": {
+                "name": "சுரங்கப்பாதை நுழைவுவாயில்"
+            },
             "relation": {
                 "name": "தொடர்பு"
             },
@@ -598,6 +643,9 @@
             "shop/shoes": {
                 "name": "காலணியகம்"
             },
+            "tourism": {
+                "name": "சுற்றுலா"
+            },
             "tourism/artwork": {
                 "name": "ஓவியம்"
             },

diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json
index 1ff531ad34ca4f96eda3647824c8c8954f6fa9f8..706c1342e484e7e73f8e1b3e94a810c7231f3290 100644 (file)
--- a/vendor/assets/iD/iD/locales/te.json
+++ b/vendor/assets/iD/iD/locales/te.json
@@ -153,6 +153,7 @@
         "truncated_list": "మార్పులు చేసినవారు {users} మరియు {count} మంది"
     },
     "geocoder": {
+        "search": "విశ్వవ్యాప్తంగా వెతుకు",
         "no_results_visible": "కనిపిస్తూన్న పటంలో ఫలితాలు ఏమీ లేవు",
         "no_results_worldwide": "ఫలితాలు ఏమీ లేవు"
     },
@@ -177,6 +178,8 @@
         "search": "వెతుకు",
         "multiselect": "ఎన్నుకున్న అంశాలు",
         "unknown": "గుర్తు తెలియని",
+        "feature_list": "విశేషాలు వెతుకు",
+        "edit": "విశేషం మార్చు",
         "none": "ఏవీ కాదు",
         "way": "దారి",
         "relation": "సంబంధం",
@@ -198,6 +201,8 @@
         "unsaved_changes": "భద్రపరచని మార్పులు ఉన్నాయి"
     },
     "success": {
+        "just_edited": "మీరు ఇప్పుడే OpenStreetMapను మార్చారు",
+        "view_on_osm": "OSM/ఓఎస్ఎం లో వీక్షించు",
         "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి",
         "twitter": "ట్విట్టర్లో పంచుకోండి",
         "google": "గూగుల్+లో పంచుకోండి"
@@ -227,6 +232,7 @@
         },
         "areas": {
             "title": "ప్రదేశాలు",
+            "search": "**'{name}' కొరకు వెతుకు**",
             "choose": "జాబితా నుండి మైదానం ఎంచుకోండి"
         },
         "lines": {
@@ -236,7 +242,8 @@
         "startediting": {
             "title": "కూర్పు మొదలుపెట్టు",
             "help": "మరిన్ని వివరాలు ఇక్కడ లబించును",
-            "save": "మీరు మార్చిన విశేషాలను భద్రపరచడం మరచిపోకండి!"
+            "save": "మీరు మార్చిన విశేషాలను భద్రపరచడం మరచిపోకండి!",
+            "start": "మ్యాప్ చేయడం మొదలుపెట్టు"
         }
     },
     "presets": {

diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index 3a523822b8566b2516d00757168e0ec7f3cf1f05..0a00c6e4aad6ae5acecf23cb8ae6b00f3f82c3b4 100644 (file)
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -134,7 +134,8 @@
             "annotation": "gộp {n} đường kẻ",
             "not_eligible": "Không thể gộp các đối tượng này.",
             "not_adjacent": "Không thể gộp các đường kẻ không nối liền với nhau.",
-            "restriction": "Không thể gộp các đường kẻ này vì ít nhất một trong những đường kẻ trực thuộc quan hệ “{relation}”."
+            "restriction": "Không thể gộp các đường kẻ này vì ít nhất một trong những đường kẻ trực thuộc quan hệ “{relation}”.",
+            "incomplete_relation": "Không thể gộp vì một trong số đối tượng này chưa được tải về hoàn toàn."
         },
         "move": {
             "title": "Di chuyển",
@@ -1284,10 +1285,46 @@
                 "name": "Khu chung cư",
                 "terms": "khu chung cư, khu chung cu"
             },
+            "building/barn": {
+                "name": "Chuồng",
+                "terms": "chuồng, chuồng trâu bò, chuồng ngựa, kho thóc, chuong, chuong trau bo, chuong ngua, kho thoc"
+            },
+            "building/bunker": {
+                "name": "Boong ke",
+                "terms": "boong ke, boong-ke, boongke"
+            },
+            "building/cabin": {
+                "name": "Nhà tranh",
+                "terms": "nhà tranh, túp lều, nhà gỗ, nha tranh, tup leu, nha go"
+            },
+            "building/cathedral": {
+                "name": "Nhà thờ Chánh tòa",
+                "terms": "nhà thờ chánh tòa, nhà thờ chánh toà, nhà thờ chính tòa, nhà thờ chính toà, vương cung thánh đường, đại vương cung thánh đường, tiểu vương cung thánh đường, nha tho chanh toa, nha tho chinh toa, vuong cung thanh duong, dai vuong cung thanh duong, tieu vuong cung thanh duong"
+            },
+            "building/chapel": {
+                "name": "Nhà nguyện",
+                "terms": "nhà nguyện, nhà thờ nhỏ, nha nguyen, nha tho nho"
+            },
+            "building/church": {
+                "name": "Nhà thờ",
+                "terms": "nhà thờ, Ki-tô giáo, Kitô giáo, Thiên Chúa giáo, đạo Thiên Chúa, Công giáo, Tin Lành, giáo xứ, thánh đường, nha tho, Ki-to giao, Kito giao, Thien Chua giao, dao Thien Chua, Cong giao, Tin Lanh, giao xu, thanh duong"
+            },
             "building/commercial": {
                 "name": "Tòa nhà Thương mại",
                 "terms": "tòa nhà thương mại, toà nhà thương mại, toa nha thuong mai"
             },
+            "building/construction": {
+                "name": "Tòa nhà đang Xây dựng",
+                "terms": "tòa nhà đang xây dựng, toà nhà đang xây dựng, nhà đang xây, toa nha dang xay dung, nha dang xay"
+            },
+            "building/detached": {
+                "name": "Nhà Tách biệt",
+                "terms": "nhà tách biệt, nhà biệt lập, nha tach biet, nha biet lap"
+            },
+            "building/dormitory": {
+                "name": "Ký túc xá",
+                "terms": "ký túc xá, kí túc xá, ký túc sá, kí túc sá, cư xá, ky tuc xa, ki tuc xa, ky tuc sa, ki tuc sa, cu xa"
+            },
             "building/entrance": {
                 "name": "Cửa vào",
                 "terms": "cửa vào, lối vào, cua vao, loi vao"
@@ -1296,6 +1333,22 @@
                 "name": "Ga ra",
                 "terms": "ga ra, ga-ra"
             },
+            "building/garages": {
+                "name": "Dãy Ga ra",
+                "terms": "dãy ga ra, dãy ga-ra, dãy nhà để xe, day ga ra, day ga-ra, day nha de xe"
+            },
+            "building/greenhouse": {
+                "name": "Nhà kính",
+                "terms": "nhà kính, nhà kiếng, nhà trồng rau, nhà trồng hoa, nha kinh, nha kieng, nha trong rau, nha trong hoa"
+            },
+            "building/hospital": {
+                "name": "Tòa nhà Bệnh viện",
+                "terms": "tòa nhà bệnh viện, toà nhà bệnh viện, tòa nhà nhà thường, toà nhà nhà thường"
+            },
+            "building/hotel": {
+                "name": "Tòa nhà Khách sạn",
+                "terms": "tòa nhà khách sạn, toà nhà khách sạn"
+            },
             "building/house": {
                 "name": "Nhà ở",
                 "terms": "nhà ở, căn nhà, tòa nhà, toà nhà, nha o, can nha, toa nha"
@@ -1308,10 +1361,54 @@
                 "name": "Tòa nhà Công nghiệp",
                 "terms": "tòa nhà công nghiệp, toà nhà công nghiệp, toa nha cong nghiep"
             },
+            "building/public": {
+                "name": "Tòa nhà Công cộng",
+                "terms": "tòa nhà công cộng, toà nhà công cộng"
+            },
             "building/residential": {
                 "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"
             },
+            "building/retail": {
+                "name": "Tòa nhà Bán lẻ",
+                "terms": "tòa nhà bán lẻ, toà nhà bán lẻ, toa nha ban le"
+            },
+            "building/roof": {
+                "name": "Mái Che",
+                "terms": "mái che, mái, mái nhà, nóc, mai che, mai, mai nha, noc"
+            },
+            "building/school": {
+                "name": "Nhà Trường",
+                "terms": "nhà trường, trường học, học viện, nha truong, truong học, hoc vien"
+            },
+            "building/shed": {
+                "name": "Lán",
+                "terms": "lán, lán trại, lều lán, túp lều, chuồng, lan, lan trai, leu lan, tup leu, chuong"
+            },
+            "building/stable": {
+                "name": "Chuồng Ngựa",
+                "terms": "chuồng ngựa, chuong ngua"
+            },
+            "building/static_caravan": {
+                "name": "Nhà Lưu động để Một Chỗ",
+                "terms": "nhà lưu động để một chỗ, nhà di động để một chỗ, nha luu dong de mot cho, nha di dong de mot cho"
+            },
+            "building/terrace": {
+                "name": "Dãy Nhà",
+                "terms": "dãy nhà, day nha"
+            },
+            "building/train_station": {
+                "name": "Nhà ga",
+                "terms": "nhà ga,nha ga"
+            },
+            "building/university": {
+                "name": "Tòa nhà Đại học",
+                "terms": "tòa nhà đại học, toà nhà đại học, tòa nhà trường đại học, toà nhà trường đại học, toa nha dai hoc, toa nha truong dai hoc"
+            },
+            "building/warehouse": {
+                "name": "Nhà kho",
+                "terms": "nhà kho, kho, kho tàng, kho bãi, nha kho, kho tang, kho bai"
+            },
             "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"
@@ -2288,6 +2385,10 @@
                 "name": "Tiệm Rượu",
                 "terms": "tiệm rượu, nơi bán rượu, chỗ bán rượu, quầy bán rượu, cửa hàng rượu, cửa hàng bán rượu, tiệm bán rượu, tiem ruou, noi ban ruou, cho ban ruou, quay ban ruou, cua hang ruou, cua hang ban ruou, tiem ban ruou"
             },
+            "shop/art": {
+                "name": "Tiệm Nghệ phẩm",
+                "terms": "tiệm nghệ phẩm, tiệm bức tranh, tiệm bức vẽ, cửa hàng nghệ phẩm, cửa hàng bức tranh, cửa hàng bức vẽ, quán nghệ phẩm, quán bức tranh, quán bức vẽ, nơi bán nghệ phẩm, nơi bán bức tranh, nơi bán bức vẽ, tiem nghe pham, tiem buc tranh, tiem buc ve, cua hang nghe pham, cua hang buc tranh, cua hang buc ve, quan nghe pham, quan buc tranh, quan buc ve, noi ban nghe pham, noi ban buc tranh, noi ban buc ve"
+            },
             "shop/bakery": {
                 "name": "Tiệm Bánh",
                 "terms": "tiệm bánh, tiệm bánh mì, tiệm bán bánh, nơi bán bánh, chỗ bán bánh, quầy bán bánh, nhà bán bánh, tiem banh, tiem banh mi, tiem ban banh, noi ban banh, cho ban banh, quay ban banh, nha ban banh"
@@ -2304,6 +2405,10 @@
                 "name": "Tiệm Xe đạp",
                 "terms": "tiệm xe đạp, cửa hàng xe đạp, chỗ bán xe đạp, tiem xe dap, cua hang xe dap, cho ban xe dap"
             },
+            "shop/bookmaker": {
+                "name": "Phòng Đánh cá Ngựa",
+                "terms": "phòng đánh cá ngựa, văn phòng đánh cá ngựa, cửa sổ đánh cá ngựa, tiệm đánh cá ngựa, cửa hàng đánh cá ngựa, nơi đánh cá ngựa, phong danh ca ngua, van phong danh ca ngua, cua so danh ca ngua, tiem danh ca ngua, cua hang danh ca ngua, noi danh ca ngua"
+            },
             "shop/books": {
                 "name": "Hiệu Sách",
                 "terms": "hiệu sách, tiệm sách, chỗ bán sách vở, hieu sach, tiem sach, cho ban sach vo"
@@ -2424,6 +2529,10 @@
                 "name": "Thợ khóa",
                 "terms": "thợ khóa, thợ sửa khóa, thợ khoá, trợ sửa khoá, thợ kim khí, tho khoa, tho sua khoa, tho kim khi"
             },
+            "shop/lottery": {
+                "name": "Tiệm Xổ số",
+                "terms": "quầy xổ số, quầy vé xổ số, tiệm xổ số, tiệm vé xổ số, cửa hàng xổ số, cửa hàng vé xổ số, quán xổ số, quán vé xổ số, nơi bán vé xổ số, nơi mua vé xổ số, quay xo so, quay ve xo so, tiem xo so, tiem ve xo so, cua hang xo so, cua hang ve xo so, quan xo so, quan ve xo so, noi ban ve xo so, noi mua ve xo so"
+            },
             "shop/mall": {
                 "name": "Trung tâm Thương mại",
                 "terms": "trung tâm thương mại, khu thương mại, trung tam thuong mai, khu thuong mai"

diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json
index 6a7d139be7f92bb60906ddb2f6fdadbf3bce3ffe..e3b45f21add5f8263a088a455944ddf073a0b2e3 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -297,7 +297,7 @@
     "splash": {
         "welcome": "欢迎使用OpenStreetMap iD编辑器",
         "text": "ID编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是{version}版本。欲知详情，请浏览{website}及在{github}报告程序错误。“",
-        "walkthrough": "开始导览",
+        "walkthrough": "开始演练",
         "start": "现在编辑"
     },
     "source_switch": {
@@ -836,6 +836,9 @@
                 "name": "缆车线路",
                 "terms": "缆车线路"
             },
+            "aerialway/cable_car": {
+                "name": "缆车"
+            },
             "aerialway/pylon": {
                 "name": "缆车塔",
                 "terms": "缆车塔"

diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index ea593741601eb8f4754db719ae9fc899c9f5ae90..ee017637c0eb1e76690641835b3a49238f218120 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -45,7 +45,7 @@
             "title": "繼續繪製",
             "description": "繼續繪製此線段",
             "not_eligible": "無法在此繼續繪製線段",
-            "multiple": "有多條線段可在此被繼續繪製。要選擇其中一條，請按 Shift 鍵並點擊它。",
+            "multiple": "有多條線段可在此延續。要選擇其中一條，請按 Shift 鍵並點擊它。",
             "annotation": {
                 "line": "繼續繪製一線段。",
                 "area": "繼續繪製一區域。"
@@ -74,17 +74,17 @@
             "not_closed": "非圈狀物件，不能環形化。"
         },
         "orthogonalize": {
-            "title": "方形化",
+            "title": "方角化",
             "description": {
-                "line": "方形化此線。",
-                "area": "方形化此區域。"
+                "line": "將此線方角化。",
+                "area": "將此區域方角化。"
             },
             "key": "S",
             "annotation": {
                 "line": "已將線段上的彎角換成直角。",
                 "area": "已將區域的彎角換成直角。"
             },
-            "not_squarish": "這個區域無法被方形化，因為它並非近似方形。"
+            "not_squarish": "物件無法被方角化，因為它並非近似方形。"
         },
         "straighten": {
             "title": "拉直",
@@ -134,7 +134,8 @@
             "annotation": "合併了 {n} 條線段。",
             "not_eligible": "不能合併這些物件。",
             "not_adjacent": "這些線段並不連接，不能合併。",
-            "restriction": "這些線段不能合併，因為其中最少有一條線段是\"{relation}\" 關係的成員。"
+            "restriction": "這些線段不能合併，因為其中最少有一條線段是\"{relation}\" 關係的成員。",
+            "incomplete_relation": "這些物件不能合併，因為其中最少有一件未有完全下載。"
         },
         "move": {
             "title": "移動",
@@ -151,7 +152,7 @@
         },
         "rotate": {
             "title": "旋轉",
-            "description": "以物件中心點為圓心旋轉",
+            "description": "以物件中心點為軸心旋轉物件",
             "key": "R",
             "annotation": {
                 "line": "旋轉了一線段。",
@@ -200,7 +201,7 @@
     "zoom_in_edit": "放大以開始編輯",
     "logout": "登出",
     "loading_auth": "正在連接 OpenStreetMap...",
-    "report_a_bug": "回報錯誤",
+    "report_a_bug": "回報編輯器問題",
     "status": {
         "error": "未能連接至伺服器介面。",
         "offline": "伺服器介面離線，請稍後再嘗試編輯。",
@@ -225,8 +226,8 @@
     },
     "geocoder": {
         "search": "搜尋全世界...",
-        "no_results_visible": "å\8f¯è¦\8bç\9a\84å\9c°å\9c\96å\8d\80å\9f\9f中æ²\92æ\9c\89æ\90\9cå°\8bç\9b®æ¨\99",
-        "no_results_worldwide": "æ\89¾ä¸\8då\88°æ\90\9cå°\8bç\9b®æ¨\99"
+        "no_results_visible": "å\8f¯è¦\8bç\9a\84å\9c°å\9c\96å\8d\80å\9f\9f中æ²\92æ\9c\89æ\90\9cå°\8bçµ\90æ\9e\9c",
+        "no_results_worldwide": "æ\89¾ä¸\8då\88°æ\90\9cå°\8bçµ\90æ\9e\9c"
     },
     "geolocate": {
         "title": "顯示我的位置"
@@ -247,7 +248,7 @@
         "back_tooltip": "修改物件",
         "remove": "移除",
         "search": "搜尋",
-        "multiselect": "選擇多物件",
+        "multiselect": "已選擇的物件",
         "unknown": "未知種類",
         "incomplete": "<未有下載>",
         "feature_list": "搜尋物件",
@@ -264,7 +265,7 @@
         "percent_brightness": "{opacity}%的光度",
         "none": "無",
         "custom": "客製化",
-        "custom_prompt": "輸入一個暫時標題名稱。因為{z}、{x}、{y}代表著 Z/X/Y 主題，{u}代表 quadtile 主題所以無法使用。",
+        "custom_prompt": "輸入地圖影像區塊的模版。以 Z/X/Y 方式存取區塊的伺服器，可在模版中使用{z}, {x}, {y}作參數，而以quadtile存取區塊的伺服器，則可使用{u}作參數。",
         "fix_misalignment": "校準",
         "reset": "重設"
     },
@@ -289,7 +290,7 @@
         "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'>details</a>).\n"
+        "help_html": "您的修改應會在數分鐘內在\"標準\"圖層中出現。其他圖層和某些物件則可能會花較長時間。\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>details</a>).\n"
     },
     "confirm": {
         "okay": "確定"
@@ -316,7 +317,7 @@
         "untagged_area": "未有標籤的區域",
         "many_deletions": "你正在刪除 {n} 個物件。這些物件會從openstreetmap.org上所有人可以看見的地圖上刪除，你是否確定需要這樣做？",
         "tag_suggests_area": "{tag} 標籤所建議的線段應為區域，但這個不是一區域",
-        "untagged_tooltip": "選擇一個物件類型符合這個{geometry}。",
+        "untagged_tooltip": "選擇可描述這個{geometry}的一個物件種類。",
         "deprecated_tags": "已棄用的標籤︰{tags}"
     },
     "zoom": {
@@ -326,8 +327,8 @@
     "cannot_zoom": "在此模式下不能再縮小。",
     "gpx": {
         "local_layer": "本機GPX檔案",
-        "drag_drop": "拖移一個 .gpx 檔案到頁面上，或是點擊右方的按紐",
-        "zoom": "移至 GPX 軌跡",
+        "drag_drop": "拖移一個 .gpx 檔案到頁面上，或是點擊右方的按鈕以瀏覽",
+        "zoom": "放大至 GPX 軌跡",
         "browse": "開啟一個 .gpx 檔案"
     },
     "help": {
@@ -336,11 +337,11 @@
         "editing_saving": "# 編輯和保存\n\n這個編輯器的設計，主要是為在網上進行編輯工作，而你現正通過一個網站使用它。\n\n### 選擇物件\n\n要選擇地圖上一個物件，如道路或興趣點，可於地圖上點擊該物件。這將令所選取的物件以高亮顯示，並開啟一個載有其細節的面板，以及顯示一個您可對該物件進行的操作的功能菜單。\n\n要選擇多個物件，可以按住'Shift'鍵，在地圖上點擊並拖曳。這將選擇所顯示的方框內的所有物件，讓您可同時對幾個物件進行操作。\n\n### 保存編輯\n\n當您對地圖作出修改，如編輯道路，建築物和場所，這些修改都只是儲存在本機上而未被上載，直到您將它們保存到伺服器為止。如果您期間作出錯誤的修改，亦不用擔心，您可以點擊“撤消”按鈕修改，亦可點擊“重做”按鈕，重做經撤消的修改。\n\n點擊“保存”按鈕以完成一組編輯 － 例如，如果您已經完成了某市鎮的一個區域，而想開始一個新的區域。您將有機會覆核你做了什麼編輯，而如果看起來您作出了一些不適當的改變，編輯器會提供有用的建議及警告。\n\n如果一切看起來不錯，您可以輸入簡短的註釋，解釋您作出的修改，並再點擊“保存”以向[OpenStreetMap.org](http://www.openstreetmap.org/)發布這些修改。這些修改將可被其他OpenStreetMap用戶看見，並可供其他用戶在其上作進一步修訂及完善。\n\n如果您不能一次就完成您的編輯，您可以離開編輯器視窗，日後(在相同的瀏覽器和電腦上)回來，編輯器將讓你選擇是否希望恢復上一次未完成的編輯。\n",
         "roads": "# 道路\n\n您可以利用這個編輯器創建，修復，及刪除道路。道路可以有很多種：路徑，公路，郊遊徑，單車徑，和更多 － 任何經常使用的路段都可製圖。\n\n### 選擇道路\n\n點擊圖上的道路以選擇該道路。道路的輪廓會以高亮度顯示，而同時地圖上會出現小工具選單，旁邊亦會彈出面板，顯示有關該道路的資訊。\n\n### 修訂道路\n\n您或會經常注意到，道路並非對齊在背景中顯示的衛星圖像或GPS軌跡。您可以調整這些道路，讓他們位於正確的位置。\n\n首先，點擊您想修訂的道路。這會將道路以高亮度顯示，並顯示沿著這道路的節點，你可以拖曳這些節點到更好的位置。如果您想增加細節，可以為道路添加新的節點，點擊兩下道路上沒有節點的部分，便可在該處増加節點。\n\n如果道路連接到另一條道路，但在地圖上並未妥善連接，你可以拖曳道路的其中一個節點到另一條道路上，以連接兩條道路。連接好道路，對地圖非常重要，特別是對提供駕駛指示的應用程序而言，是必要的。\n\n您也可以點擊'移動'工具或按`M`快速鍵，來移動整條道路，然後點擊一下以完成移動的動作。\n\n### 刪除道路\n\n如果一條道路完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將道路刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該道路或許只是新建的。\n\n要刪除道路，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n\n### 繪製新道路\n\n發現某處應有一條道路，但地圖上沒有？點擊編輯器左上方的'線'圖標，或按下`2`快速鍵，以開始繪製線段。\n\n在地圖上點擊道路的開端，以開始繪製道路。如果道路從一條現有的道路分支出來，應點擊兩者連接的地方，以開始繪製。\n\n然後點擊沿著道路的點，以根據衛星影像或GPS軌跡，正確地繪製道路。如果您繪製的道路如果與另一條道路交匯，請點擊相交點以將它們連接起來。當您完成繪製後，可點擊兩下或按鍵盤上的 'Return' 或 ’Enter’ 鍵。\n\n",
         "gps": "# GPS軌跡\n\nGPS數據是OpenStreetMap中最可信的的數據來源。此編輯器\n支援在您的電腦上的GPS軌跡 - `.gpx`文件。你可以使用多個智能手機的應用程序或個人GPS硬件，收集這類GPS數據。\n\n有關如何進行GPS測量的資料，請參閱[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)。\n\n要使用一個GPX軌跡製圖，可將GPX文件拖曳到編輯器中。如果編輯器能讀取該文件，它會被添加到地圖上，並以明亮的綠色線顯示。點擊左側的'設置背景'選單，便可啟用、停用或縮放這個新的的GPX圖層。\n\nGPX軌跡並不會直接上載到OpenStreetMap － 使用GPX軌跡的最佳方式，是以它作為指引，在繪製地圖時添加新的物件，並[上傳至 OpenStreetMap](http://www.openstreetmap.org/trace/create)來讓其他使用者運用。\n",
-        "imagery": "# 圖像\n\n空照圖是繪製地圖重要的資料來源。\n\n在右方的'背景圖像設定'選單中，將有幾組可使用的圖像，\n他們分別為空照圖、衛星影像和自由編輯的資源。\n\n編輯器原始設定為[Bing Maps](http://www.bing.com/maps/)的衛星圖層，\n但當您平移或縮放地圖至一個新的地理區域，新的資源將可被使用。\n在有些國家的一些區域，像是美國、法國或丹麥就有非常高品質的圖像。\n\n圖像有時候會對不上地圖資料，那是因為提供圖像的人犯了點小錯。\n如果您看到有很多路與背景是平移錯位的，請不要立刻將它們移至符合背景。\n您所要做的，只需要利用背景圖像設定介面底部的'校準'，\n來調整圖像讓它符合現有資料。\n",
+        "imagery": "# 圖像\n\n空照圖是繪製地圖重要的資料來源。在畫面右方的'背景圖像設定'選單中，可選擇使用的圖像，\n他們分別為空照圖、衛星影像和其他可自由編輯的圖像資源。\n\n編輯器預設使用[Bing Maps](http://www.bing.com/maps/)的衛星圖層，\n但當您平移或縮放地圖至一個新的地理區域，或可使用新的資源。\n在一些國家，像美國、法國和丹麥，部分區域有非常高品質的圖像。\n\n圖像會與地圖數據有所偏移。如果你看見很多的道路與背景有偏移，請不要立刻將它們全部搬移以與背景刎合。相反，你可以在「背景設定」選單中，點擊下方的「校準底圖」，以調整圖像以配合現有地圖數據。 \n\n圖像有時候或會因為圖像提供者方面的誤差，與地圖資料有所偏移。\n如果您看到有很多路與背景是平移錯位的，請不要立刻將它們全部搬移以與背景刎合。\n您只需要點擊圖像設定介面底部的'校準'來調整圖像，讓它符合現有資料。\n",
         "addresses": "# 地址 \n\n地址是地圖中最有用的訊息之一。 \n\n雖然地址通常被視為街道的一部分，在 OpenStreetMap 中，它們是沿相關街道的建築物和地方的屬性。 \n\n您可以將地址訊息，添加到以建築物輪廓為代表、或以點為代表的地方之上。地址資料的最佳來源，是實地調查或個人知識 － 與任何其他物件一樣，抄襲商業來源（如谷歌地圖）的資料，是嚴格禁止的。\n",
         "inspector": "# 使用檢視面板\n\n檢視面板是畫面右面的用戶界面元素，當您選擇一個物件時便會出現，讓您可編輯物件的詳細資料。\n\n### 選擇物件類型\n\n在您添加一個點、線段或區域後，您可以選擇物件的類型，例如該物件應是高速公路還是住宅區道路，是超級市場還是咖啡廳。檢視面板將顯示常用物件類型的按鈕，要找出其他物件類型，您可以在搜尋框中輸入您所要的物件類型。\n\n點擊物件類型按鈕右下角的'i'字，可顯示物件類型的更多資訊。點擊按鈕以選擇該類型。\n\n### 使用表格和編輯標籤\n\n在您選擇物件類型後，或選擇已經被編配類型的物件時，檢查面板會顯示該物件詳細資料的欄位，\n如名稱和地址。\n\n在欄位下方，您可以點擊圖標，以添加其他詳細資料，如[維基百科](http://www.wikipedia.org/)的條目資料，輪椅可否到達，以及其他更多資料。\n\n在面板的底部，點擊'增加標籤'以添加其他任意的標籤到該物件。您可透過[Taginfo](http://taginfo.openstreetmap.org/)，了解有關常用的標籤組合的更多資料。\n\n您在檢查面板所做的更改，會自動應用到地圖上。您可以隨時點擊'撤消'按鈕，撤消這些更改。\n\n### 關閉檢查面板\n\n您可以點擊檢查面板右上角的關閉按鈕、按’Escape'鍵，或在地圖上點擊，以關閉檢查面板。\n",
         "buildings": "# 建築物\n\nOpenStreetMap 是世界上最大的建築物的數據庫。您可以建立\n和改善這個數據庫。\n\n### 選擇建築物\n\n您可以點擊建築物的邊界，以選擇該建築物。該建築物將以高亮度顯示，並會開啟小工具選單，和在右邊顯示有關建築物更多資料的面板。\n\n### 修改建築物\n\n有時候，建築物的位置或其標籤或許會不正確。\n\n要移動整個建築物的位置，先選擇該建築物，然後點擊’移動’工具。移動您的滑鼠以移動築物，在移到正確位置上點擊一下。\n\n要更正建築物的形狀，點擊並拖曳建築物輪廓的節點，以移到更佳的位置。\n\n### 繪製新建築物\n\n為地圖添加建築物的主要問題之一，是 OpenStreetMap 可以用輪廓或點的形式，記錄建築物。一般來說，應_盡可能以區域記錄建築物的輪廓_，並以置於建築輪廓內的點，記錄建築物中的公司、住宅、設施及其他東西。\n\n要開始繪製建築物，先單擊左上方的’區域’按鈕，最後則按鍵盤上的’Return'鍵或點擊所繪的第一個節點，完成輪廓的繪製。\n\n### 刪除建築物\n\n如果一項建築物完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將建築物刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該建築物或許只是新建的。\n\n要刪除建築物，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n",
-        "relations": "# 關係\n\n關係是指在 OpenStreetMap 裡能使不同物件成為群組的特別類別。\n舉例來說，兩個常見的類別同為*道路關係*，則會組合成為屬於一個\n特定高速公路或快速道路的群組；而*多重多邊形*則會組合一些標記\n出複雜區域的線段(像甜甜圈一樣有個空缺在裡面的區域)。\n\n在關係中，物件的群組被稱作*成員*。\n在面板裡，您可以看到物件屬於哪個關係，並可點選任一個關係。\n當您選擇了一個關係後，您可以看見關係中的所有成員，\n它們會在面板及地圖上標誌出來。\n\n在大多時候，iD會自動維持您編輯的關係。\n最主要的是須注意當您為了繪製出更精確的道路而刪除舊有的，\n您必須確保新的元素必須同樣是原本關係的成員。\n\n## 編輯關係\n\n如果您想編輯關係，以下是基本要領。\n\n要增加物件至一種關係中，選擇該物件，\n點擊面板中\"所有關係\"的\"+\"按鈕，並選擇或輸入一種關係的名稱。\n\n要增加一種新關係，點選第一個物件作為成員，\n點擊面板中\"所有關係\"的\"+\"按鈕，並選擇\"建立新關係...\"。\n\n要物件從一種關係中移除，選擇該物件，\n點擊您想移除的關係旁的垃圾桶按鈕。\n\n您可以運用\"合併\"工具創建內含空缺的多重多邊形。\n繪製兩個區域(內部與外部)，按住 Shift 鍵並分別點擊它們，\n然後點擊 \"合併\"(+)按鈕。\n"
+        "relations": "# 關係\n\n關係是在 OpenStreetMap 裡將其他物件組合在一起的特殊物件。\n舉兩個常見的例子－*路線關係*可用來將屬於某一高速公路或道路的路段併合；而*多重多邊形*則可用來將數條線段組合，以勾劃出較為複雜區域(如分開為數個區塊，或像甜甜圈一樣中間穿洞的區域)。\n\n在一個關係中組合在一起的物件，稱為該關係的*成員*。\n在面板裡，您可以看到一個物件屬於哪些關係，並可點選當中任何一個關係。\n當您點選了一個關係後，面板會列出關係中的所有成員，\n而這些成員亦會在地圖上標示出來。\n\n在您編輯時，iD在大多數情況下都會自動處理所涉及的關係。唯您主要須注意的，是若您刪除舊有的路段以重繪更精確的路段，\n您必須確保將新的路段，仍為原本路段所屬各關係的成員。\n\n## 編輯關係\n\n如果您想編輯關係，以下是基本要領。\n\n要將物件加入一個現有的關係，請選擇該物件，\n點擊面板中\"所有關係\"下的\"+\"按鈕，並選擇或輸入關係的名稱。\n\n要增加一個新的關係，點選第一個要加入新關係作為成員的物件，\n點擊面板中\"所有關係\"下的\"+\"按鈕，並選擇\"建立新關係...\"。\n\n要將物件從一個關係中移除，選擇該物件，\n點擊您想將該物件移除的關係旁的垃圾桶按鈕。\n\n您可以運用\"合併\"工具，創建內含空洞的多重多邊形。\n繪製兩個區域(內部與外部)，按住 Shift 鍵並分別點選它們兩者，\n然後點擊 \"合併\"(+)按鈕。\n"
     },
     "intro": {
         "navigation": {
@@ -374,7 +375,7 @@
         },
         "lines": {
             "title": "線",
-            "add": "線用於表現如道路、鐵路以及河流。 **點擊線按鈕來新增一條線段。**",
+            "add": "線後可用於表示如道路、鐵路以及河流。 **點擊線按鈕來新增一條線段。**",
             "start": "**點擊道路末端，以開始繪製線段。**",
             "intersect": "點擊以為線段添加更多的節點。在繪圖是，如有需要，您可以拖曳地圖。道路和許多其他類型的線段，是整個體系的一部分。這些線段正確地連接起來，對導航的應用程序的運作相當重要。**點擊Flower Street，建立連接這兩條線段的相交點。**",
             "finish": "再次點擊最後的節點，可完成繪製線段。**完成繪製此道路**",
@@ -382,7 +383,7 @@
             "residential": "道路有不同種類，最常見的為住宅區道路。**選擇住宅區道路**",
             "describe": "**給道路一個名稱，並關閉物件編輯器。**",
             "restart": "這道路須與Flower Street相交。",
-            "wrong_preset": "æ\82¨å°\9aæ\9cªé\81¸æ\93\87ä½\8få®\85å\8d\80é\81\93è·¯ã\80\82**é»\9eæ\93\8aé\80\99裡並再次選擇**"
+            "wrong_preset": "æ\82¨å°\9aæ\9cªé\81¸æ\93\87ä½\8få®\85å\8d\80é\81\93è·¯ã\80\82**é»\9eæ\93\8aé\80\99裡以再次選擇**"
         },
         "startediting": {
             "title": "開始編輯",
@@ -393,6 +394,12 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "樓宇"
+            },
+            "category-golf": {
+                "name": "高爾夫球"
+            },
             "category-landuse": {
                 "name": "土地用途"
             },
@@ -407,6 +414,12 @@
             },
             "category-route": {
                 "name": "路線"
+            },
+            "category-water-area": {
+                "name": "水"
+            },
+            "category-water-line": {
+                "name": "水"
             }
         },
         "fields": {
@@ -447,6 +460,9 @@
                     }
                 }
             },
+            "access_simple": {
+                "label": "通行限制"
+            },
             "address": {
                 "label": "地址",
                 "placeholders": {
@@ -460,15 +476,51 @@
             "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": "自動櫃員機"
             },
+            "backrest": {
+                "label": "椅背"
+            },
             "barrier": {
                 "label": "種類"
             },
@@ -484,6 +536,9 @@
             "building_area": {
                 "label": "建築物"
             },
+            "cans": {
+                "label": "接受金屬罐"
+            },
             "capacity": {
                 "label": "容量",
                 "placeholder": "50, 100, 200..."
@@ -498,6 +553,9 @@
                     "anticlockwise": "反時針"
                 }
             },
+            "clothes": {
+                "label": "接受衣物"
+            },
             "collection_times": {
                 "label": "收集時間"
             },
@@ -507,6 +565,9 @@
             "country": {
                 "label": "國家"
             },
+            "covered": {
+                "label": "有蓋"
+            },
             "crossing": {
                 "label": "種類"
             },
@@ -522,8 +583,11 @@
             "description": {
                 "label": "描述"
             },
+            "electrified": {
+                "label": "電氣化"
+            },
             "elevation": {
-                "label": "高度"
+                "label": "海拔"
             },
             "emergency": {
                 "label": "緊急"
@@ -538,9 +602,35 @@
             "fee": {
                 "label": "費用"
             },
+            "fire_hydrant/type": {
+                "label": "種類"
+            },
             "fixme": {
                 "label": "Fix Me"
             },
+            "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": "種類"
             },
@@ -556,6 +646,9 @@
             "incline": {
                 "label": "斜度"
             },
+            "information": {
+                "label": "種類"
+            },
             "internet_access": {
                 "label": "網際網絡連接",
                 "options": {
@@ -581,6 +674,9 @@
                 "label": "屋宇層數",
                 "placeholder": "2, 4, 6..."
             },
+            "lit": {
+                "label": "照明"
+            },
             "location": {
                 "label": "位置"
             },
@@ -608,7 +704,7 @@
                 "label": "種類"
             },
             "oneway": {
-                "label": "單程路"
+                "label": "單行道"
             },
             "oneway_yes": {
                 "label": "單程路"
@@ -619,6 +715,13 @@
             "operator": {
                 "label": "營運商"
             },
+            "paper": {
+                "label": "接受廢紙"
+            },
+            "par": {
+                "label": "標準桿數",
+                "placeholder": "3,4,5..."
+            },
             "park_ride": {
                 "label": "泊車轉乘"
             },
@@ -629,6 +732,15 @@
                 "label": "電話",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "難度"
+            },
+            "piste/grooming": {
+                "label": "雪道種類"
+            },
+            "piste/type": {
+                "label": "種類"
+            },
             "place": {
                 "label": "種類"
             },
@@ -652,7 +764,7 @@
                     "buddhist": "佛教",
                     "jewish": "猶太教",
                     "hindu": "印度教",
-                    "shinto": "神道教徒",
+                    "shinto": "神道教",
                     "taoist": "道教"
                 }
             },
@@ -674,9 +786,16 @@
             "shelter": {
                 "label": "遮雨棚／涼亭"
             },
+            "shelter_type": {
+                "label": "種類"
+            },
             "shop": {
                 "label": "種類"
             },
+            "social_facility_for": {
+                "label": "服務對象",
+                "placeholder": "露宿者，殘疾人士，小童等"
+            },
             "source": {
                 "label": "來源"
             },
@@ -693,12 +812,18 @@
                     "cutting": "挖土"
                 }
             },
+            "studio_type": {
+                "label": "種類"
+            },
             "supervised": {
                 "label": "受監察"
             },
             "surface": {
                 "label": "路面鋪設"
             },
+            "toilets/disposal": {
+                "label": "處置方式"
+            },
             "tourism": {
                 "label": "種類"
             },
@@ -711,6 +836,15 @@
             "trail_visibility": {
                 "label": "路徑可見度"
             },
+            "tree_type": {
+                "label": "種類"
+            },
+            "tunnel": {
+                "label": "隧道"
+            },
+            "vending": {
+                "label": "貨品種類"
+            },
             "water": {
                 "label": "種類"
             },
@@ -739,6 +873,36 @@
                 "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": "機場相關設施"
             },
@@ -756,7 +920,7 @@
                 "name": "飛機庫"
             },
             "aeroway/helipad": {
-                "name": "ç\9b´æ\98\87æ©\9få ´"
+                "name": "ç\9b´æ\98\87æ©\9få\9dª"
             },
             "aeroway/runway": {
                 "name": "跑道"
@@ -770,6 +934,9 @@
             "amenity": {
                 "name": "便利設施"
             },
+            "amenity/arts_centre": {
+                "name": "藝術中心"
+            },
             "amenity/atm": {
                 "name": "自動櫃員機"
             },
@@ -780,7 +947,7 @@
                 "name": "酒吧"
             },
             "amenity/bench": {
-                "name": "長凳"
+                "name": "長椅"
             },
             "amenity/bicycle_parking": {
                 "name": "單車停泊處"
@@ -788,6 +955,9 @@
             "amenity/bicycle_rental": {
                 "name": "單車租賃"
             },
+            "amenity/boat_rental": {
+                "name": "小艇租賃"
+            },
             "amenity/cafe": {
                 "name": "咖啡廳"
             },
@@ -804,12 +974,18 @@
                 "terms": "洗車行,洗車店"
             },
             "amenity/childcare": {
-                "name": "幼兒園",
+                "name": "托兒所",
                 "terms": "幼兒園,托兒所"
             },
             "amenity/cinema": {
                 "name": "戲院"
             },
+            "amenity/clinic": {
+                "name": "診所"
+            },
+            "amenity/clock": {
+                "name": "時鐘"
+            },
             "amenity/college": {
                 "name": "書院",
                 "terms": "學院,大學,專校,大專"
@@ -817,8 +993,14 @@
             "amenity/courthouse": {
                 "name": "法院"
             },
+            "amenity/dentist": {
+                "name": "牙醫"
+            },
+            "amenity/doctor": {
+                "name": "醫生"
+            },
             "amenity/drinking_water": {
-                "name": "飲水處",
+                "name": "飲處",
                 "terms": "飲水,水源,活水"
             },
             "amenity/embassy": {
@@ -890,6 +1072,12 @@
             "amenity/pub": {
                 "name": "酒館"
             },
+            "amenity/ranger_station": {
+                "name": "郊野公園管理站"
+            },
+            "amenity/recycling": {
+                "name": "回收設施"
+            },
             "amenity/restaurant": {
                 "name": "餐廳",
                 "terms": "飯店,飯館,酒樓,餐館"
@@ -898,6 +1086,24 @@
                 "name": "學校",
                 "terms": "學校,小學,中學,國小,國中,高中,校園,校區"
             },
+            "amenity/shelter": {
+                "name": "亭"
+            },
+            "amenity/social_facility": {
+                "name": "社福設施"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "食物銀行"
+            },
+            "amenity/social_facility/group_home": {
+                "name": "安老院"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "露宿者中心"
+            },
+            "amenity/studio": {
+                "name": "工作室"
+            },
             "amenity/swimming_pool": {
                 "name": "游泳池",
                 "terms": "游泳池,泳池"
@@ -923,6 +1129,12 @@
                 "name": "大學",
                 "terms": "大專"
             },
+            "amenity/vending_machine": {
+                "name": "自動販賣機"
+            },
+            "amenity/veterinary": {
+                "name": "獸醫"
+            },
             "amenity/waste_basket": {
                 "name": "廢物箱"
             },
@@ -963,7 +1175,7 @@
                 "name": "樹籬"
             },
             "barrier/kissing_gate": {
-                "name": "單人轉門 "
+                "name": "單人轉門"
             },
             "barrier/lift_gate": {
                 "name": "道閘"
@@ -984,25 +1196,247 @@
                 "name": "行政界線"
             },
             "building": {
-                "name": "建築物"
+                "name": "樓宇"
             },
             "building/apartments": {
-                "name": "分層屋宇"
+                "name": "分層公寓"
+            },
+            "building/commercial": {
+                "name": "商用樓宇"
             },
             "building/entrance": {
                 "name": "入口"
             },
+            "building/garage": {
+                "name": "車庫"
+            },
+            "building/garages": {
+                "name": "車庫"
+            },
+            "building/greenhouse": {
+                "name": "溫室"
+            },
+            "building/hospital": {
+                "name": "醫院建築物"
+            },
+            "building/hotel": {
+                "name": "酒店建築物"
+            },
             "building/house": {
                 "name": "洋房"
             },
+            "building/hut": {
+                "name": "棚屋"
+            },
+            "building/industrial": {
+                "name": "工業樓宇"
+            },
+            "building/public": {
+                "name": "公共建築物"
+            },
+            "building/residential": {
+                "name": "住宅屋宇"
+            },
+            "building/retail": {
+                "name": "零售樓宇"
+            },
+            "building/roof": {
+                "name": "上蓋"
+            },
+            "building/school": {
+                "name": "學校建築物"
+            },
+            "building/shed": {
+                "name": "小屋"
+            },
+            "building/stable": {
+                "name": "馬房"
+            },
+            "building/static_caravan": {
+                "name": "固定的拖掛式房車"
+            },
+            "building/terrace": {
+                "name": "排屋"
+            },
+            "building/train_station": {
+                "name": "鐵路站建築物"
+            },
+            "building/university": {
+                "name": "大學建築物"
+            },
+            "building/warehouse": {
+                "name": "倉庫"
+            },
+            "craft/boatbuilder": {
+                "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": "緊急電話"
             },
             "entrance": {
                 "name": "入口"
             },
+            "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": "開球區"
+            },
+            "golf/water_hazard": {
+                "name": "水障礙區"
+            },
             "highway": {
-                "name": "公路"
+                "name": "道路"
             },
             "highway/bridleway": {
                 "name": "馬道"
@@ -1049,6 +1483,9 @@
             "highway/residential": {
                 "name": "住宅區道路"
             },
+            "highway/rest_area": {
+                "name": "公路休憩區"
+            },
             "highway/road": {
                 "name": "未知種類的道路"
             },
@@ -1062,7 +1499,8 @@
                 "name": "輔助道路"
             },
             "highway/service/alley": {
-                "name": "巷弄"
+                "name": "巷弄",
+                "terms": "小巷,巷弄,後巷,橫巷,窄巷,胡同"
             },
             "highway/service/drive-through": {
                 "name": "駕駛通過以獲取服務"
@@ -1076,10 +1514,16 @@
             "highway/service/parking_aisle": {
                 "name": "停車場通道"
             },
+            "highway/services": {
+                "name": "公路服務區"
+            },
             "highway/steps": {
                 "name": "樓梯",
                 "terms": "樓梯,階梯,石階"
             },
+            "highway/stop": {
+                "name": "停車標誌"
+            },
             "highway/tertiary": {
                 "name": "三級道路"
             },
@@ -1153,6 +1597,9 @@
                 "name": "農場",
                 "terms": "農田,稻田,農地,田"
             },
+            "landuse/farmland": {
+                "name": "耕地"
+            },
             "landuse/farmyard": {
                 "name": "農莊"
             },
@@ -1186,6 +1633,12 @@
             "leisure": {
                 "name": "休閒設施"
             },
+            "leisure/common": {
+                "name": "公共用地"
+            },
+            "leisure/dog_park": {
+                "name": "狗公園"
+            },
             "leisure/garden": {
                 "name": "花園",
                 "terms": "花園,果園,菜園,植物園,公園"
@@ -1212,6 +1665,9 @@
                 "name": "籃球場",
                 "terms": "籃球場,球場"
             },
+            "leisure/pitch/skateboard": {
+                "name": "滑板公園"
+            },
             "leisure/pitch/soccer": {
                 "name": "足球場"
             },
@@ -1227,12 +1683,18 @@
             "leisure/slipway": {
                 "name": "船架滑道"
             },
+            "leisure/sports_center": {
+                "name": "體肓中心"
+            },
             "leisure/stadium": {
                 "name": "體育場"
             },
             "leisure/swimming_pool": {
                 "name": "游泳池"
             },
+            "leisure/track": {
+                "name": "賽道"
+            },
             "line": {
                 "name": "線"
             },
@@ -1245,9 +1707,18 @@
             "man_made/cutline": {
                 "name": "山林分界線"
             },
+            "man_made/embankment": {
+                "name": "基堤"
+            },
+            "man_made/flagpole": {
+                "name": "旗桿"
+            },
             "man_made/lighthouse": {
                 "name": "燈塔"
             },
+            "man_made/observation": {
+                "name": "瞭望塔"
+            },
             "man_made/pier": {
                 "name": "碼頭"
             },
@@ -1272,6 +1743,18 @@
             "man_made/water_works": {
                 "name": "水務設施"
             },
+            "military/airfield": {
+                "name": "軍用機場"
+            },
+            "military/barracks": {
+                "name": "軍營"
+            },
+            "military/bunker": {
+                "name": "地堡"
+            },
+            "military/range": {
+                "name": "軍事靶場"
+            },
             "natural": {
                 "name": "自然物件"
             },
@@ -1287,6 +1770,9 @@
             "natural/coastline": {
                 "name": "海岸線"
             },
+            "natural/fell": {
+                "name": "高原荒地"
+            },
             "natural/glacier": {
                 "name": "冰川",
                 "terms": "冰川,冰河"
@@ -1300,6 +1786,9 @@
             "natural/peak": {
                 "name": "山頂"
             },
+            "natural/scree": {
+                "name": "碎石崖錐"
+            },
             "natural/scrub": {
                 "name": "灌木叢"
             },
@@ -1307,7 +1796,7 @@
                 "name": "溫泉"
             },
             "natural/tree": {
-                "name": "樹"
+                "name": "樹木"
             },
             "natural/water": {
                 "name": "水"
@@ -1319,7 +1808,8 @@
                 "name": "池塘"
             },
             "natural/water/reservoir": {
-                "name": "水塘"
+                "name": "貯水庫",
+                "terms": "水塘"
             },
             "natural/wetland": {
                 "name": "濕地",
@@ -1331,6 +1821,71 @@
             "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": "律師樓",
+                "terms": "法律事務所"
+            },
+            "office/newspaper": {
+                "name": "報社",
+                "terms": "報社,報館"
+            },
+            "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": "地方"
             },
@@ -1361,8 +1916,14 @@
             "power": {
                 "name": "電力設施"
             },
+            "power/generator": {
+                "name": "發電機"
+            },
             "power/line": {
-                "name": "電線"
+                "name": "電纜"
+            },
+            "power/minor_line": {
+                "name": "次要電纜"
             },
             "power/pole": {
                 "name": "電線桿"
@@ -1376,6 +1937,12 @@
             "power/transformer": {
                 "name": "變電所"
             },
+            "public_transport/platform": {
+                "name": "站台"
+            },
+            "public_transport/stop_position": {
+                "name": "停車位置"
+            },
             "railway": {
                 "name": "鐵路"
             },
@@ -1385,12 +1952,21 @@
             "railway/disused": {
                 "name": "廢棄的鐵路"
             },
+            "railway/funicular": {
+                "name": "纜车"
+            },
+            "railway/halt": {
+                "name": "鐵路停車處"
+            },
             "railway/level_crossing": {
                 "name": "平交道"
             },
             "railway/monorail": {
                 "name": "單軌電車"
             },
+            "railway/narrow_gauge": {
+                "name": "窄軌鐵路"
+            },
             "railway/platform": {
                 "name": "鐵道月台"
             },
@@ -1422,6 +1998,9 @@
                 "name": "酒類商店",
                 "terms": "酒店,酒莊"
             },
+            "shop/art": {
+                "name": "藝術品店"
+            },
             "shop/bakery": {
                 "name": "麵包店"
             },
@@ -1435,6 +2014,9 @@
             "shop/bicycle": {
                 "name": "單車店"
             },
+            "shop/bookmaker": {
+                "name": "書商"
+            },
             "shop/books": {
                 "name": "書店"
             },
@@ -1484,7 +2066,7 @@
                 "name": "電器店"
             },
             "shop/farm": {
-                "name": "水果攤"
+                "name": "農場直賣店"
             },
             "shop/fishmonger": {
                 "name": "海產店"
@@ -1522,6 +2104,12 @@
             "shop/laundry": {
                 "name": "洗衣店"
             },
+            "shop/locksmith": {
+                "name": "鎖匠"
+            },
+            "shop/lottery": {
+                "name": "投注站"
+            },
             "shop/mall": {
                 "name": "商場"
             },
@@ -1546,6 +2134,9 @@
             "shop/pet": {
                 "name": "寵物店"
             },
+            "shop/photo": {
+                "name": "攝影用品店"
+            },
             "shop/shoes": {
                 "name": "鞋店"
             },
@@ -1657,6 +2248,9 @@
             "type/route/foot": {
                 "name": "步行路線"
             },
+            "type/route/hiking": {
+                "name": "遠足路線"
+            },
             "type/route/pipeline": {
                 "name": "管道路線"
             },

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index 6928837f6f10bda885ab24ef2570565f64170301..e40bfbfafdc09a82ee0b89c519f939a587a801ef 100644 (file)
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
-L.version = '0.7.1';
+L.version = '0.7.2';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -2436,7 +2436,8 @@ L.TileLayer = L.Class.extend({
                attribution: '',
                zoomOffset: 0,
                opacity: 1,
-               /* (undefined works too)
+               /*
+               maxNativeZoom: null,
                zIndex: null,
                tms: false,
                continuousWorld: false,
@@ -2485,9 +2486,6 @@ L.TileLayer = L.Class.extend({
                // create a container div for tiles
                this._initContainer();
 
-               // create an image to clone for tiles
-               this._createTileProto();
-
                // set up events
                map.on({
                        'viewreset': this._reset,
@@ -2707,9 +2705,10 @@ L.TileLayer = L.Class.extend({
 
                if (!this._map) { return; }
 
-               var bounds = this._map.getPixelBounds(),
-                   zoom = this._map.getZoom(),
-                   tileSize = this.options.tileSize;
+               var map = this._map,
+                   bounds = map.getPixelBounds(),
+                   zoom = map.getZoom(),
+                   tileSize = this._getTileSize();
 
                if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
                        return;
@@ -2870,12 +2869,14 @@ L.TileLayer = L.Class.extend({
                        zoom = options.maxZoom - zoom;
                }
 
-               return zoom + options.zoomOffset;
+               zoom += options.zoomOffset;
+
+               return options.maxNativeZoom ? Math.min(zoom, options.maxNativeZoom) : zoom;
        },
 
        _getTilePos: function (tilePoint) {
                var origin = this._map.getPixelOrigin(),
-                   tileSize = this.options.tileSize;
+                   tileSize = this._getTileSize();
 
                return tilePoint.multiplyBy(tileSize).subtract(origin);
        },
@@ -2894,7 +2895,7 @@ L.TileLayer = L.Class.extend({
        _getWrapTileNum: function () {
                var crs = this._map.options.crs,
                    size = crs.getSize(this._map.getZoom());
-               return size.divideBy(this.options.tileSize);
+               return size.divideBy(this._getTileSize())._floor();
        },
 
        _adjustTilePoint: function (tilePoint) {
@@ -2918,12 +2919,6 @@ L.TileLayer = L.Class.extend({
                return this.options.subdomains[index];
        },
 
-       _createTileProto: function () {
-               var img = this._tileImg = L.DomUtil.create('img', 'leaflet-tile');
-               img.style.width = img.style.height = this.options.tileSize + 'px';
-               img.galleryimg = 'no';
-       },
-
        _getTile: function () {
                if (this.options.reuseTiles && this._unusedTiles.length > 0) {
                        var tile = this._unusedTiles.pop();
@@ -2937,7 +2932,10 @@ L.TileLayer = L.Class.extend({
        _resetTile: function (/*tile*/) {},
 
        _createTile: function () {
-               var tile = this._tileImg.cloneNode(false);
+               var tile = L.DomUtil.create('img', 'leaflet-tile');
+               tile.style.width = tile.style.height = this._getTileSize() + 'px';
+               tile.galleryimg = 'no';
+
                tile.onselectstart = tile.onmousemove = L.Util.falseFn;
 
                if (L.Browser.ielt9 && this.options.opacity !== undefined) {
@@ -3140,13 +3138,9 @@ L.TileLayer.Canvas = L.TileLayer.extend({
                this.drawTile(tile, tile._tilePoint, this._map._zoom);
        },
 
-       _createTileProto: function () {
-               var proto = this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile');
-               proto.width = proto.height = this.options.tileSize;
-       },
-
        _createTile: function () {
-               var tile = this._canvasProto.cloneNode(false);
+               var tile = L.DomUtil.create('canvas', 'leaflet-tile');
+               tile.width = tile.height = this.options.tileSize;
                tile.onselectstart = tile.onmousemove = L.Util.falseFn;
                return tile;
        },
@@ -6535,26 +6529,15 @@ L.DomEvent = {
        },
 
        getMousePosition: function (e, container) {
-               var body = document.body,
-                   docEl = document.documentElement,
-                   //gecko makes scrollLeft more negative as you scroll in rtl, other browsers don't
-                       //ref: https://code.google.com/p/closure-library/source/browse/closure/goog/style/bidi.js
-                       x = L.DomUtil.documentIsLtr() ?
-                                       (e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft : e.clientX) :
-                                               (L.Browser.gecko ? e.pageX - body.scrollLeft - docEl.scrollLeft :
-                                                e.pageX ? e.pageX - body.scrollLeft + docEl.scrollLeft : e.clientX),
-                   y = e.pageY ? e.pageY - body.scrollTop - docEl.scrollTop: e.clientY,
-                   pos = new L.Point(x, y);
-
                if (!container) {
-                       return pos;
+                       return new L.Point(e.clientX, e.clientY);
                }
 
-               var rect = container.getBoundingClientRect(),
-                   left = rect.left - container.clientLeft,
-                   top = rect.top - container.clientTop;
+               var rect = container.getBoundingClientRect();
 
-               return pos._subtract(new L.Point(left, top));
+               return new L.Point(
+                       e.clientX - rect.left - container.clientLeft,
+                       e.clientY - rect.top - container.clientTop);
        },
 
        getWheelDelta: function (e) {