diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b15b64a6..5689436aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,211 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@xxxx]: https://github.com/xxxx
 -->
 
+
+# 2.5.1
+##### November 16, 2017
+
+#### :sparkles: Usability
+
+* Keep the highlighted feature selected when cancelling save mode ([#4407])
+
+[#4407]: https://github.com/openstreetmap/iD/issues/4407
+
+#### :bug: Bugfixes
+
+* Fix crash when exiting the walkthrough ([#4533])
+* Fix crash in Firefox when doing a lot of zoom (e.g. when pressing "Zoom in to edit" button) ([#4421])
+* Fix garbled label text - vertex labels being drawn over node labels ([#4473])
+* Don't use real filenames in the imagery_used field (for privacy) ([#4530])
+* Don't pull stale data from OSM after switching connection between live/dev servers ([#4288])
+* Switch OpenStreetCam from `http` to `https` to avoid mixed content issues ([#4527])
+* Fix issue where Mapillary sitelink was always linking to first image viewed ([#4526])
+
+[#4533]: https://github.com/openstreetmap/iD/issues/4533
+[#4530]: https://github.com/openstreetmap/iD/issues/4530
+[#4527]: https://github.com/openstreetmap/iD/issues/4527
+[#4526]: https://github.com/openstreetmap/iD/issues/4526
+[#4473]: https://github.com/openstreetmap/iD/issues/4473
+[#4421]: https://github.com/openstreetmap/iD/issues/4421
+[#4288]: https://github.com/openstreetmap/iD/issues/4288
+
+#### :rocket: Presets
+
+* Add preset for `railway=light_rail` ([#4531], [#4528], thanks [@Vonter])
+
+[#4531]: https://github.com/openstreetmap/iD/issues/4531
+[#4528]: https://github.com/openstreetmap/iD/issues/4528
+[@Vonter]: https://github.com/Vonter
+
+
+# 2.5.0
+##### November 10, 2017
+
+#### :mega: Release Highlights
+
+* :camera: We've added support for [OpenStreetCam](http://openstreetcam.org/) in the photo viewer!
+This brings over 100 million user-contributed photos into the iD editor for improving OpenStreetMap.<br/>
+_Check out what streetlevel photo coverage is available by opening the Map Data pane (shortcut <kbd>F</kbd>)_
+
+* :pray: Special thank you to all of our new and first-time contributors who submitted pull requests for
+[Hacktoberfest](https://hacktoberfest.digitalocean.com/)!
+
+#### :tada: New Features
+
+* Add support for OpenStreetCam ([#4499], [#3795])
+* Add support for DigitalGlobe imagery vintage overlays (see [editor-layer-index/issues/#371], thanks [@marracci])
+* Add API parameter to conditionally disable feature types ([#4439], [#4393], thanks [@ferdibiflator])
+* Display name of gpx file in `imagery_used` instead of "Local GPX" ([#4440], [#4385], thanks [@ferdibiflator])
+* Remove lodash from build scripts ([#4447], [#4378], [@DzikowskiW])
+
+[editor-layer-index/issues/#371]: https://github.com/osmlab/editor-layer-index/issues/371
+[#4499]: https://github.com/openstreetmap/iD/issues/4499
+[#4447]: https://github.com/openstreetmap/iD/issues/4447
+[#4440]: https://github.com/openstreetmap/iD/issues/4440
+[#4439]: https://github.com/openstreetmap/iD/issues/4439
+[#4393]: https://github.com/openstreetmap/iD/issues/4393
+[#4385]: https://github.com/openstreetmap/iD/issues/4385
+[#4378]: https://github.com/openstreetmap/iD/issues/4378
+[#3795]: https://github.com/openstreetmap/iD/issues/3795
+[@marracci]: https://github.com/marracci
+[@ferdibiflator]: https://github.com/ferdibiflator
+[@DzikowskiW]: https://github.com/DzikowskiW
+
+#### :sparkles: Usability
+
+* Improvements to Mapillary and OpenStreetCam usability ([#4512])
+  * Traces are the only thing drawn at low zoom, circles appear at zoom 16, viewfield cones appear at zoom 18
+  * Everything is drawn very dim by default
+  * Hovering a marker will brighten that marker, the parent trace, and other markers along the trace
+  * The selected marker is drawn bright yellow and scaled up to be extra visible
+  * Standardize on "username | captured_at | sitelink" for attribution line
+  * Render panoramic Mapillary viewfields as a sphere instead of cone ([#3154])
+* Bump default max_zoom from 20 to 22 (this affects custom imagery layers)
+* Allow spellcheck in textarea fields ([#4471])
+* Move "Zoom in to edit" button out of the way, and allow wheel events to pass through to the map ([#4482])
+* Better capitalization for "Zoom in", "Zoom out", "Edit now", "Zoom in to edit" ([#4492], thanks [@jaller94])
+
+[#4512]: https://github.com/openstreetmap/iD/issues/4512
+[#4492]: https://github.com/openstreetmap/iD/issues/4492
+[#4482]: https://github.com/openstreetmap/iD/issues/4482
+[#4471]: https://github.com/openstreetmap/iD/issues/4471
+[#3154]: https://github.com/openstreetmap/iD/issues/3154
+[@jaller94]: https://github.com/jaller94
+
+#### :bug: Bugfixes
+
+* Add code so `tunnel=building_passage` doesn't default to `layer=-1` ([#4516])
+* Clicking on a search result should take you to that location the first time ([#4276])
+* Fix label placement on areas that don't have an icon ([#4479])
+* Don't add underscores to `source=*` field ([#4475], [#4474], thanks [@octagonal])
+* Depend on `bhousel/node-diff3` which includes fix for conflict resolution node duplication bug ([#3544], [#3058])
+* Allow copying text from info panels ([#4456], [#4406], thanks [@ferdibiflator])
+* Make sure `imagery_used` field is updated if a user cancels save and makes more edits ([#4445], [#4443], thanks [@moshen])
+* Fallback Area preset should preserve the `area=yes` tag ([#4424])
+
+[#4516]: https://github.com/openstreetmap/iD/issues/4516
+[#4479]: https://github.com/openstreetmap/iD/issues/4479
+[#4475]: https://github.com/openstreetmap/iD/issues/4475
+[#4474]: https://github.com/openstreetmap/iD/issues/4474
+[#4456]: https://github.com/openstreetmap/iD/issues/4456
+[#4445]: https://github.com/openstreetmap/iD/issues/4445
+[#4443]: https://github.com/openstreetmap/iD/issues/4443
+[#4424]: https://github.com/openstreetmap/iD/issues/4424
+[#4406]: https://github.com/openstreetmap/iD/issues/4406
+[#4276]: https://github.com/openstreetmap/iD/issues/4276
+[#3544]: https://github.com/openstreetmap/iD/issues/3544
+[#3058]: https://github.com/openstreetmap/iD/issues/3058
+[@octagonal]: https://github.com/octagonal
+[@ferdibiflator]: https://github.com/ferdibiflator
+[@moshen]: https://github.com/moshen
+
+#### :rocket: Presets
+
+* Add `government=*` type field to Government Office preset ([#4517])
+* Change `craft=sweep` -> `craft=chimney_sweeper` ([#4510])
+* Add `shop=agrarian` preset and `agrarian=*` field ([#4507], thanks [@willemarcel])
+* Change `max_age` to `min_age` for `min_age` field ([#4506], thanks [@JamesKingdom])
+* Rename sculpter to sculptor ([#4504], thanks [@simonpoole])
+* Add preset for music schools ([#4500], thanks [@tyrasd])
+* Add `voltage`,`operator`,`ref` fields to several `power=*` presets.
+* Add `power=switch` preset ([#4441])
+* Drop `vertex` geometry from `office=*` presets (i.e. make them like `shop=*` presets)
+* Add preset for "Pedestrian Area" (highway=pedestrian + area=yes) ([#4488])
+* Rename `tourism=chalet` to "Holiday Cottage" and add search terms ([#4490])
+* Remove poi-foot icon from `place=square` ([#4486])
+* Add several presets for common `office=*` types ([#4491], [#4489], thanks [@Nmargolis])
+* Add preset for `tourism=wilderness_hut` ([#4485], [#4483], thanks [@YuliyaVeklicheva])
+* Fix reference links for `highway=crossing`, `footway=crossing` ([#4480])
+* Add preset for `landuse=religious` ([#4478], [#4476], thanks [@YuliyaVeklicheva])
+* Add "Climbing hut" search term to alpine hut ([#4470], [#4469], thanks [@JamesKingdom])
+* Add presets for many kinds of Fitness Station equipment ([#4404], [#4373], thanks [@JamesKingdom])
+* Deprecate `amenity=scrapyard` in favor of "approved" `industrial=scrap_yard` (revert of [#3387])
+* Add `industrial=slaughterhouse` preset ([#4467], [#4466], thanks [@JamesKingdom])
+* Add `power=transformer` preset ([#4464], [#4442], thanks [@ToeBee])
+* Change drain icon to ditch ([#4462], [#4460], thanks [@AndreasHae])
+* Add preset for `place=islet` ([#4461], [#4458], thanks [@AndreasHae])
+* Add `leisure=boules` as "Boules/Bocce Court" ([#4451], [#4449], thanks [@DzikowskiW])
+* Add `landuse=brownfield` and `landuse=greenfield` presets ([#4448], [#4444], thanks [@manfredbrandl])
+* Add `leisure=sauna` preset ([#4438], [#4436], thanks [@haroldb])
+* Add `substance=*` field to pipeline preset ([#4432], [#4430], thanks [@xmile1])
+* Add `place=plot` preset ([#4427], [#4423], thanks [@humanforklift])
+
+[#4517]: https://github.com/openstreetmap/iD/issues/4517
+[#4510]: https://github.com/openstreetmap/iD/issues/4510
+[#4507]: https://github.com/openstreetmap/iD/issues/4507
+[#4506]: https://github.com/openstreetmap/iD/issues/4506
+[#4504]: https://github.com/openstreetmap/iD/issues/4504
+[#4500]: https://github.com/openstreetmap/iD/issues/4500
+[#4441]: https://github.com/openstreetmap/iD/issues/4441
+[#4488]: https://github.com/openstreetmap/iD/issues/4488
+[#4490]: https://github.com/openstreetmap/iD/issues/4490
+[#4486]: https://github.com/openstreetmap/iD/issues/4486
+[#4491]: https://github.com/openstreetmap/iD/issues/4491
+[#4489]: https://github.com/openstreetmap/iD/issues/4489
+[#4485]: https://github.com/openstreetmap/iD/issues/4485
+[#4483]: https://github.com/openstreetmap/iD/issues/4483
+[#4480]: https://github.com/openstreetmap/iD/issues/4480
+[#4478]: https://github.com/openstreetmap/iD/issues/4478
+[#4476]: https://github.com/openstreetmap/iD/issues/4476
+[#4470]: https://github.com/openstreetmap/iD/issues/4470
+[#4469]: https://github.com/openstreetmap/iD/issues/4469
+[#4404]: https://github.com/openstreetmap/iD/issues/4404
+[#4373]: https://github.com/openstreetmap/iD/issues/4373
+[#4467]: https://github.com/openstreetmap/iD/issues/4467
+[#4466]: https://github.com/openstreetmap/iD/issues/4466
+[#4464]: https://github.com/openstreetmap/iD/issues/4464
+[#4462]: https://github.com/openstreetmap/iD/issues/4462
+[#4442]: https://github.com/openstreetmap/iD/issues/4442
+[#4461]: https://github.com/openstreetmap/iD/issues/4461
+[#4460]: https://github.com/openstreetmap/iD/issues/4460
+[#4458]: https://github.com/openstreetmap/iD/issues/4458
+[#4451]: https://github.com/openstreetmap/iD/issues/4451
+[#4449]: https://github.com/openstreetmap/iD/issues/4449
+[#4448]: https://github.com/openstreetmap/iD/issues/4448
+[#4444]: https://github.com/openstreetmap/iD/issues/4444
+[#4438]: https://github.com/openstreetmap/iD/issues/4438
+[#4436]: https://github.com/openstreetmap/iD/issues/4436
+[#4432]: https://github.com/openstreetmap/iD/issues/4432
+[#4430]: https://github.com/openstreetmap/iD/issues/4430
+[#4427]: https://github.com/openstreetmap/iD/issues/4427
+[#4423]: https://github.com/openstreetmap/iD/issues/4423
+[#3387]: https://github.com/openstreetmap/iD/issues/3387
+[@willemarcel]: https://github.com/willemarcel
+[@JamesKingdom]: https://github.com/JamesKingdom
+[@simonpoole]: https://github.com/simonpoole
+[@tyrasd]: https://github.com/tyrasd
+[@Nmargolis]: https://github.com/Nmargolis
+[@YuliyaVeklicheva]: https://github.com/YuliyaVeklicheva
+[@ToeBee]: https://github.com/ToeBee
+[@AndreasHae]: https://github.com/AndreasHae
+[@DzikowskiW]: https://github.com/DzikowskiW
+[@manfredbrandl]: https://github.com/manfredbrandl
+[@haroldb]: https://github.com/haroldb
+[@xmile1]: https://github.com/xmile1
+[@humanforklift]: https://github.com/humanforklift
+
+
+
 # 2.4.3
 ##### October 9, 2017
 
@@ -39,14 +244,12 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [#4398]: https://github.com/openstreetmap/iD/issues/4398
 [@mojodna]: https://github.com/mojodna
 
-
 #### :mortar_board: Walkthrough
 
 * Make sure "Add Field" scrolls into view during "Area" chapter of walkthrough ([#4417])
 
 [#4417]: https://github.com/openstreetmap/iD/issues/4417
 
-
 #### :rocket: Presets
 
 * Refined playground presets terms for Spring Rider and Play Roundabout ([#4415], thanks, [@1ec5])
@@ -78,7 +281,6 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@iandees]: https://github.com/iandees
 [@jgravois]: https://github.com/jgravois
 
-
 #### :sparkles: Usability
 
 * Change label for hashtag field to "Suggested Hashtags") ([#4396] thanks [@arka-nitd])
@@ -99,7 +301,6 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@arka-nitd]: https://github.com/arka-nitd
 [@leegenes]: https://github.com/leegenes
 
-
 #### :bug: Bugfixes
 
 * Fix overlapping in preset list when multiple tag references are expanded ([#4023], [#4412], thanks [@jleh])
@@ -135,7 +336,6 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@jgravois]: https://github.com/jgravois
 [@leegenes]: https://github.com/leegenes
 
-
 #### :earth_asia: Localization
 
 * Improve Address format for Poland ([#4328], thanks [@Teiron])
@@ -151,7 +351,6 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@manfredbrandl]: https://github.com/manfredbrandl
 [@willemarcel]: https://github.com/willemarcel
 
-
 #### :rocket: Presets
 
 * Add Tile Shop and Trade Shop presets ([#4410], thanks [@TheGreenToaster])
@@ -267,7 +466,6 @@ _Check out the new imagery by opening the Background pane (shortcut <kbd>B</kbd>
 [@kepta]: https://github.com/kepta
 [@JamesKingdom]: https://github.com/JamesKingdom
 
-
 #### :sparkles: Usability
 
 * In save mode, <kbd>esc</kbd> should cancel and return to browse mode ([#4230])
@@ -285,7 +483,6 @@ _Check out the new imagery by opening the Background pane (shortcut <kbd>B</kbd>
 [#4182]: https://github.com/openstreetmap/iD/issues/4182
 [#4042]: https://github.com/openstreetmap/iD/issues/4042
 
-
 #### :bug: Bugfixes
 
 * Include imagery offset when calculating tiles for background layer ([#4232])
@@ -296,7 +493,6 @@ _Check out the new imagery by opening the Background pane (shortcut <kbd>B</kbd>
 [#4222]: https://github.com/openstreetmap/iD/issues/4222
 [#4184]: https://github.com/openstreetmap/iD/issues/4184
 
-
 #### :earth_asia: Localization
 
 * Update Chinese address format ([#4248], thanks [@Stenive])
@@ -307,7 +503,6 @@ _Check out the new imagery by opening the Background pane (shortcut <kbd>B</kbd>
 [#4248]: https://github.com/openstreetmap/iD/issues/4248
 [@Stenive]: https://github.com/Stenive
 
-
 #### :hourglass: Performance
 
 * Use `requestIdleCallback` in supported browsers for deferred data fetching ([#4259], thanks [@kepta])
@@ -318,7 +513,6 @@ _Check out the new imagery by opening the Background pane (shortcut <kbd>B</kbd>
 [#4259]: https://github.com/openstreetmap/iD/issues/4259
 [@kepta]: https://github.com/kepta
 
-
 #### :rocket: Presets
 
 * Add signpost term to guidepost preset ([#4277], thanks [@JamesKingdom])
diff --git a/build_src.js b/build_src.js
index 7a48ae683..8f8315781 100644
--- a/build_src.js
+++ b/build_src.js
@@ -26,7 +26,7 @@ module.exports = function buildSrc() {
 
         return rollup
             .rollup({
-                entry: './modules/id.js',
+                input: './modules/id.js',
                 plugins: [
                     includePaths({
                         paths: [
@@ -34,7 +34,7 @@ module.exports = function buildSrc() {
                         ]
                     }),
                     nodeResolve({
-                        jsnext: true,
+                        module: true,
                         main: true,
                         browser: false
                     }),
@@ -47,9 +47,9 @@ module.exports = function buildSrc() {
                 cache = bundle;
                 return bundle.write({
                     format: 'iife',
-                    dest: 'dist/iD.js',
-                    sourceMap: true,
-                    useStrict: false
+                    file: 'dist/iD.js',
+                    sourcemap: true,
+                    strict: false
                 });
             })
             .then(function() {
diff --git a/css/60_mapillary.css b/css/60_mapillary.css
deleted file mode 100644
index a3067ea7e..000000000
--- a/css/60_mapillary.css
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Mapillary Image Layer */
-
-.layer-mapillary-images {
-    pointer-events: none;
-}
-
-.layer-mapillary-images .viewfield-group {
-    pointer-events: visible;
-    cursor: pointer; /* Opera */
-    cursor: url(img/cursor-select-mapillary.png) 6 1, pointer; /* FF */
-}
-
-.layer-mapillary-images .viewfield-group * {
-    stroke-width: 1;
-    stroke: #444;
-    fill: #ffc600;
-    z-index: 50;
-}
-
-.layer-mapillary-images .viewfield-group:hover * {
-    stroke-width: 1;
-    stroke: #333;
-    fill: #ff9900;
-    z-index: 60;
-}
-
-.layer-mapillary-images .viewfield-group.selected  * {
-    stroke-width: 2;
-    stroke: #222;
-    fill: #ff5800;
-    z-index: 60;
-}
-
-.layer-mapillary-images .viewfield-group:hover path.viewfield,
-.layer-mapillary-images .viewfield-group.selected path.viewfield,
-.layer-mapillary-images .viewfield-group path.viewfield {
-    stroke-width: 0;
-    fill-opacity: 0.6;
-}
-
-/* Mapillary Sign Layer */
-
-.layer-mapillary-signs {
-    pointer-events: none;
-}
-
-.layer-mapillary-signs .icon-sign .icon-sign-body {
-    min-width: 20px;
-    height: 24px;
-    width: 24px;
-    outline: 2px solid transparent;
-    pointer-events: visible;
-    cursor: pointer; /* Opera */
-    cursor: url(img/cursor-select-mapillary.png) 6 1, pointer; /* FF */
-    z-index: 70;
-    overflow: visible;
-}
-
-.layer-mapillary-signs .icon-sign:hover .icon-sign-body {
-    outline: 2px solid rgba(255,198,0,0.8);
-    z-index: 80;
-}
-
-.layer-mapillary-signs .icon-sign.selected .icon-sign-body {
-    outline: 2px solid rgba(255,0,0,0.8);
-    z-index: 80;
-}
-
-
-/* Mapillary viewer */
-#mly .domRenderer .TagSymbol {
-    font-size: 10px;
-    background-color: rgba(0, 0, 0, 0.4);
-    padding: 0 4px;
-    border-radius: 4px;
-    top: -25px;
-}
-
-#mly .domRenderer .Attribution {
-    width: 100%;
-    font-size: 10px;
-    text-align: right;
-}
-
-.mapillary-wrap {
-    position: absolute;
-    bottom: 30px;
-    width: 330px;
-    height: 250px;
-    padding: 5px;
-    background-color: #fff;
-}
-
-.mapillary-wrap.hidden {
-    visibility: hidden;
-}
-
-.mapillary-wrap button.thumb-hide {
-    border-radius: 0;
-    padding: 5px;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 500;
-}
-
-.mly-wrapper {
-    visibility: hidden;
-    width: 100%;
-    height: 100%;
-}
-
-.mly-wrapper.active {
-    visibility: visible;
-}
diff --git a/css/60_photos.css b/css/60_photos.css
new file mode 100644
index 000000000..3d2d8670f
--- /dev/null
+++ b/css/60_photos.css
@@ -0,0 +1,241 @@
+/* photo viewer div */
+#photoviewer {
+    position: absolute;
+    bottom: 30px;
+    width: 330px;
+    height: 250px;
+    padding: 5px;
+    background-color: #fff;
+}
+
+#photoviewer button.thumb-hide {
+    border-radius: 0;
+    padding: 5px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 48;
+}
+
+.photo-wrapper,
+.photo-wrapper img {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+.photo-wrapper .photo-attribution {
+    width: 100%;
+    font-size: 10px;
+    text-align: right;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    padding: 4px 2px;
+    z-index: 10;
+}
+
+.photo-attribution a,
+.photo-attribution a:visited,
+.photo-attribution span {
+    padding: 4px 2px;
+    color: #fff;
+}
+
+/* markers and sequences */
+.viewfield-group {
+    pointer-events: visible;
+    cursor: pointer;
+}
+
+.viewfield-group.selected * {
+    fill: #ffee00 !important;
+}
+.viewfield-group.hovered * {
+    fill: #eebb00 !important;
+}
+
+.viewfield-group circle {
+    stroke: #555;
+    stroke-width: 1;
+    stroke-opacity: 0.4;
+    fill-opacity: 0.4;
+}
+.viewfield-group.highlighted circle {
+    stroke: #222;
+    stroke-opacity: 0.9;
+    fill-opacity: 0.9;
+}
+.viewfield-group.highlighted.hovered circle {
+    stroke: #222;
+    stroke-width: 2;
+    stroke-opacity: 0.9;
+    fill-opacity: 0.9;
+}
+.viewfield-group.highlighted.selected circle {
+    stroke: #222;
+    stroke-width: 2;
+    stroke-opacity: 1;
+    fill-opacity: 1;
+}
+
+.viewfield-group .viewfield {
+    stroke-width: 0;
+    stroke: #222;
+    fill-opacity: 0.4;
+}
+.viewfield-group.highlighted .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.8;
+}
+.viewfield-group.highlighted.hovered .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.8;
+}
+.viewfield-group.highlighted.selected .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.9;
+}
+
+.viewfield-group.selected .viewfield-scale {
+    transform: scale(2,2);
+}
+
+.sequence {
+    fill: none;
+    stroke-width: 2;
+    stroke-opacity: 0.4;
+}
+.sequence.highlighted,
+.sequence.selected {
+    stroke-width: 4;
+    stroke-opacity: 1;
+}
+
+
+/* Mapillary Image Layer */
+.layer-mapillary-images {
+    pointer-events: none;
+}
+.layer-mapillary-images .viewfield-group * {
+    fill: #55ff22;
+}
+.layer-mapillary-images .sequence {
+    stroke: #55ff22;
+}
+
+
+/* Mapillary Sign Layer */
+.layer-mapillary-signs {
+    pointer-events: none;
+}
+.layer-mapillary-signs .icon-sign .icon-sign-body {
+    min-width: 20px;
+    height: 24px;
+    width: 24px;
+    outline: 2px solid transparent;
+    pointer-events: visible;
+    cursor: pointer;
+    z-index: 30;
+    overflow: visible;
+}
+.layer-mapillary-signs .icon-sign:hover .icon-sign-body {
+    outline: 5px solid #eebb00;
+    background-color: #eebb00;
+    z-index: 70;
+}
+.layer-mapillary-signs .icon-sign.selected .icon-sign-body {
+    outline: 5px solid #ffee00;
+    background-color: #ffee00;
+    z-index: 40;
+}
+
+
+/* OpenStreetCam Image Layer */
+.layer-openstreetcam-images {
+    pointer-events: none;
+}
+.layer-openstreetcam-images .viewfield-group * {
+    fill: #77ddff;
+}
+.layer-openstreetcam-images .sequence {
+    stroke: #77ddff;
+}
+
+
+/* Mapillary viewer */
+#mly .domRenderer .TagSymbol {
+    font-size: 10px;
+    background-color: rgba(0,0,0,0.4);
+    padding: 0 4px;
+    border-radius: 4px;
+    top: -25px;
+}
+#mly .domRenderer .Attribution {
+    /* we will roll our own to avoid async update issues like #4526 */
+    display: none;
+}
+
+.mly-wrapper .photo-attribution a:active,
+.mly-wrapper .photo-attribution a:hover {
+    color: #35af6d;
+}
+
+.mly-wrapper .mapillary-js-dom {
+    z-index: 9;
+}
+
+/* OpenStreetCam viewer */
+.osc-wrapper {
+    position: relative;
+    background-color: #000;
+    background-image: url(img/loader-black.gif);
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.osc-wrapper .photo-attribution a:active,
+.osc-wrapper .photo-attribution a:hover {
+    color: #77ddff;
+}
+
+.osc-controls-wrap {
+    text-align: center;
+    position: absolute;
+    top: 10px;
+    width: 100%;
+    z-index: 10;
+}
+
+.osc-controls {
+    display: inline-block;
+    z-index: 10;
+}
+
+.osc-controls button {
+    height: 18px;
+    width: 18px;
+    background: rgba(0,0,0,0.65);
+    color: #eee;
+    border-radius: 0;
+}
+.osc-controls button:first-of-type {
+    border-radius: 3px 0 0 3px;
+}
+.osc-controls button:last-of-type {
+    border-radius: 0 3px 3px 0;
+}
+.osc-controls button:hover,
+.osc-controls button:active,
+.osc-controls button:focus {
+    background: rgba(0,0,0,0.85);
+    color: #fff;
+}
+
+.osc-image-wrap {
+    transform-origin:0 0;
+    -ms-transform-origin:0 0;
+    -webkit-transform-origin:0 0;
+    -moz-transform-origin:0 0;
+    -o-transform-origin:0 0;
+}
diff --git a/css/80_app.css b/css/80_app.css
index 18d63e9fc..83205fb0b 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -2613,12 +2613,26 @@ div.full-screen > button:hover {
 }
 
 .help-wrap .left-content .body p code {
-    padding:2px 4px;
-    background:#eee;
+    padding: 3px 4px;
+    font-size: 12px;
+    color: #555;
+    vertical-align: baseline;
+    background-color: #f6f6f6;
+    border: solid 1px #ccc;
+    margin: 0 2px;
+    border-bottom-color: #bbb;
+    border-radius: 3px;
+    box-shadow: inset 0 -1px 0 #bbb;
+}
+
+.help-wrap .left-content .icon.pre-text {
+    vertical-align: text-top;
+    margin-right: 0;
+    margin-left: 0;
+    display: inline-block;
 }
 
 .help-wrap .toc {
-    /* This is two columns, 41.66666 x .4 = 16.6666 */
     width:40%;
     float:right;
     margin-left: 20px;
@@ -2629,7 +2643,7 @@ div.full-screen > button:hover {
 .help-wrap .toc li a,
 .help-wrap .nav a {
     display: block;
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     padding: 5px 10px;
 }
 
@@ -2643,7 +2657,7 @@ div.full-screen > button:hover {
 }
 
 .help-wrap .toc li a.selected {
-    background: #E8EBFF;
+    background: #e8ebff;
 }
 
 .help-wrap .toc li:first-child a {
@@ -2651,7 +2665,7 @@ div.full-screen > button:hover {
 }
 
 .help-wrap .toc li:nth-last-child(3) a {
-    border-bottom: 1px solid #CCC;
+    border-bottom: 1px solid #ccc;
     border-radius: 0 0 4px 4px
 }
 
@@ -2724,7 +2738,7 @@ img.tile {
     padding: 5px;
     border-radius: 3px;
     z-index: 2;
-    margin-left: -50px;
+    margin-left: -70px;
     margin-top: -20px;
 
     transform-origin:0 0;
@@ -2945,21 +2959,32 @@ img.tile-removing {
     position: relative;
 }
 
+.panel-content li span {
+    display: inline-block;
+    white-space: nowrap;
+    margin: 0 8px;
+}
+
 .panel-content .button {
     display: inline-block;
     background: #7092ff;
     border-radius: 2px;
     padding: 0 4px;
     margin-top: 10px;
+    margin-right: 10px;
     color: white;
 }
+[dir='rtl'] .panel-content .button {
+    margin-right: auto;
+    margin-left: 10px;
+}
 
 .panel-content-history .links a {
-    margin-left: 10px;
+    margin-left: 8px;
 }
 [dir='rtl'] .panel-content-history .links a {
     margin-left: auto;
-    margin-right: 10px;
+    margin-right: 8px;
 }
 
 .panel-content-history .view-history-on-osm {
@@ -3033,13 +3058,13 @@ img.tile-removing {
     margin: 0 3px;
 }
 
-
 #footer {
     pointer-events: all;
     display: block;
     height: 30px;
 }
 
+/* footer flash message */
 
 #flash-wrap {
     display: flex;
@@ -3052,7 +3077,7 @@ img.tile-removing {
     left: 0;
 }
 
-#flash-wrap .content {
+.flash-content {
     display: flex;
     flex: 1 0 auto;
     flex-flow: row nowrap;
@@ -3061,15 +3086,38 @@ img.tile-removing {
     height: 30px;
 }
 
-
-#flash-wrap svg.operation-icon {
+.flash-icon {
     flex: 0 0 auto;
     width: 20px;
     height: 20px;
     margin: 0 8px;
 }
 
-#flash-wrap div.operation-tip {
+.flash-icon circle {
+    fill: #eee;
+}
+.flash-icon.disabled circle {
+    cursor: auto;
+    fill: rgba(255,255,255,0.7);
+}
+
+.flash-icon use {
+    color: #222;
+}
+.flash-icon.disabled use {
+    color: rgba(32,32,32,0.7);
+}
+
+.flash-icon.operation use {
+    fill: #222;
+    color: #79f;
+}
+.flash-icon.operation.disabled use {
+    fill: rgba(32,32,32,0.7);
+    color: rgba(40,40,40,0.7);
+}
+
+.flash-text {
     flex: 1 1 auto;
 }
 
@@ -3099,6 +3147,8 @@ img.tile-removing {
 }
 
 
+/* footer scale */
+
 #scale-block {
     vertical-align: bottom;
     width: 250px;
@@ -3483,11 +3533,11 @@ img.tile-removing {
     box-shadow: inset 0 -1px 0 #bbb;
 }
 
-.modal-shortcuts .shortcut-keys svg.mouseclick use.left {
+svg.mouseclick use.left {
     fill: rgba(112, 146, 255, 1);
     color: rgba(112, 146, 255, 0);
 }
-.modal-shortcuts .shortcut-keys svg.mouseclick use.right {
+svg.mouseclick use.right {
     fill: rgba(112, 146, 255, 0);
     color: rgba(112, 146, 255, 1);
 }
@@ -3649,8 +3699,7 @@ img.tile-removing {
 
 .notice {
     position: absolute;
-    top: 50%;
-    bottom: 50%;
+    top: 45px;
     left: 0;
     right: 0;
     text-align: center;
@@ -3659,7 +3708,7 @@ img.tile-removing {
 .notice .zoom-to {
     margin: auto;
     width: 300px;
-    height: 80px;
+    height: 70px;
     font-size: 150%;
     border-radius: 8px;
 }
diff --git a/data/core.yaml b/data/core.yaml
index 95814d96f..9999cdc98 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -19,6 +19,8 @@ en:
       tail: Click to add nodes to your area. Click the first node to finish the area.
     draw_line:
       tail: "Click to add more nodes to the line. Click on other lines to connect to them, and double-click to end the line."
+    drag_node:
+      connected_to_hidden: This can't be edited because it is connected to a hidden feature.
   operations:
     add:
       annotation:
@@ -238,7 +240,7 @@ en:
     localized_translation_label: Multilingual name
     localized_translation_language: Choose language
     localized_translation_name: Name
-  zoom_in_edit: Zoom in to Edit
+  zoom_in_edit: Zoom in to edit
   login: login
   logout: logout
   loading_auth: "Connecting to OpenStreetMap..."
@@ -268,7 +270,7 @@ en:
     about_changeset_comments: About changeset comments
     about_changeset_comments_link: //wiki.openstreetmap.org/wiki/Good_changeset_comments
     google_warning: "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden."
-    google_warning_link: http://www.openstreetmap.org/copyright
+    google_warning_link: https://www.openstreetmap.org/copyright
   contributors:
     list: "Edits by {users}"
     truncated_list: "Edits by {users} and {count} others"
@@ -286,6 +288,8 @@ en:
       unknown: Unknown
       show_tiles: Show Tiles
       hide_tiles: Hide Tiles
+      show_vintage: Show Vintage
+      hide_vintage: Hide Vintage
     history:
       key: H
       title: History
@@ -499,7 +503,7 @@ en:
     welcome: Welcome to the iD OpenStreetMap editor
     text: "iD is a friendly but powerful tool for contributing to the world's best free world map. This is version {version}. For more information see {website} and report bugs at {github}."
     walkthrough: "Start the Walkthrough"
-    start: "Edit Now"
+    start: "Edit now"
   source_switch:
     live: live
     lose_changes: "You have unsaved changes. Switching the map server will discard them. Are you sure you want to switch servers?"
@@ -527,8 +531,8 @@ en:
     tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area"
     deprecated_tags: "Deprecated tags: {tags}"
   zoom:
-    in: Zoom In
-    out: Zoom Out
+    in: Zoom in
+    out: Zoom out
   cannot_zoom: "Cannot zoom out further in current mode."
   full_screen: Toggle Full Screen
   gpx:
@@ -544,285 +548,164 @@ en:
     title: "Traffic Sign Overlay (Mapillary)"
   mapillary:
     view_on_mapillary: "View this image on Mapillary"
+  openstreetcam_images:
+    tooltip: "Street-level photos from OpenStreetCam"
+    title: "Photo Overlay (OpenStreetCam)"
+  openstreetcam:
+    view_on_openstreetcam: "View this image on OpenStreetCam"
   help:
-    title: "Help"
+    title: Help
     key: H
-    help: |
-      # Help
-
-      This is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the
-      free and editable map of the world. You can use it to add and update
-      data in your area, making an open-source and open-data map of the world
-      better for everyone.
-
-      Edits that you make on this map will be visible to everyone who uses
-      OpenStreetMap. In order to make an edit, you'll need to
-      [log in](https://www.openstreetmap.org/login).
-
-      The [iD editor](http://ideditor.com/) is a collaborative project with [source
-      code available on GitHub](https://github.com/openstreetmap/iD).
-    editing_saving: |
-      # Editing & Saving
-
-      This editor is designed to work primarily online, and you're accessing
-      it through a website right now.
-
-      ### Selecting Features
-
-      To select a map feature, like a road or point of interest, click on it on
-      the map. This will highlight the selected feature and load a sidebar with
-      details about it. If you right-click on it, it will show a menu of things
-      you can do with the feature.
-
-      To select multiple features, hold down the 'Shift' key. Then either click
-      on the features you want to select, or drag on the map to draw a contour
-      around those features. All the points inside the lasso area will be selected.
-
-      ### Saving Edits
-
-      When you make changes like editing roads, buildings, and places, these are
-      stored locally until you save them to the server. Don't worry if you make
-      a mistake - you can undo changes by clicking the undo button, and redo
-      changes by clicking the redo button.
-
-      Click 'Save' to finish a group of edits - for instance, if you've completed
-      an area of town and would like to start on a new area. You'll have a chance
-      to review what you've done, and the editor supplies helpful suggestions
-      and warnings if something doesn't seem right about the changes.
-
-      If everything looks good, you can enter a short comment explaining the change
-      you made, and click 'Upload' to post the changes to
-      [OpenStreetMap.org](http://www.openstreetmap.org/), where they will be visible
-      to all other users and available for others to build and improve upon.
-
-      If you can't finish your edits in one sitting, you can leave the editor
-      window and come back (on the same browser and computer), and the
-      editor application will offer to restore your work.
-
-      ### Using the editor
-
-      You can view a list of keyboard shortcuts by pressing the `?` key.
-
-    roads: |
-      # Roads
-
-      You can create, fix, and delete roads with this editor. Roads can be all
-      kinds: paths, highways, trails, cycleways, and more - any often-crossed
-      segment should be mappable.
-
-      ### Selecting
-
-      Click on a road to select it. An outline should become visible, along
-      with a sidebar showing more information about the road. If you right-click
-      on it, you'll have a menu of actions you can apply on the road.
-
-      ### Modifying
-
-      Often you'll see roads that aren't aligned to the imagery behind them
-      or to a GPS track. You can adjust these roads so they are in the correct
-      place.
-
-      First click on the road you want to change. This will highlight it and show
-      control points along it that you can drag to better locations. If
-      you want to add new control points for more detail, double-click a part
-      of the road without a node, and one will be added.
-
-      If the road connects to another road, but doesn't properly connect on
-      the map, you can drag one of its control points onto the other road in
-      order to join them. Having roads connect is important for the map
-      and essential for providing driving directions.
-
-      You can also right-click on it and select the 'Move' tool, or simply press
-      the `M` shortcut key, to move the entire road at one time, and then click
-      again to save that movement.
-
-      ### Deleting
-
-      If a road is entirely incorrect - you can see that it doesn't exist in satellite
-      imagery and ideally have confirmed locally that it's not present - you can delete
-      it, which removes it from the map. Be cautious when deleting features -
-      like any other edit, the results are seen by everyone and satellite imagery
-      is often out of date, so the road could simply be newly built.
-
-      You can delete a road by clicking on it to select it, then pressing the 'Delete'
-      key or right-clicking it and then clicking the trash can icon.
-
-      ### Creating
-
-      Found somewhere there should be a road but there isn't? Click the 'Line'
-      icon in the top-left of the editor or press the shortcut key `2` to start drawing
-      a line.
-
-      Click on the start of the road on the map to start drawing. If the road
-      branches off from an existing road, start by clicking on the place where they connect.
-
-      Then click on points along the road so that it follows the right path, according
-      to satellite imagery or GPS. If the road you are drawing crosses another road, connect
-      it by clicking on the intersection point. When you're done drawing, double-click
-      or press 'Return' or 'Enter' on your keyboard.
-    gps: |
-      # GPS
-
-      Collected GPS traces are one valuable source of data for OpenStreetMap. This editor
-      supports local traces - `.gpx` files on your local computer. You can collect
-      this kind of GPS trace with a number of smartphone applications as well as
-      personal GPS hardware.
-
-      For information on how to perform a GPS survey, read
-      [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).
-
-      To use a GPX track for mapping, drag and drop the GPX file onto the map
-      editor. If it's recognized, it will be added to the map as a bright purple
-      line. Click on the 'Map Data' menu on the right side to enable,
-      disable, or zoom to this new GPX-powered layer.
-
-      The GPX track isn't directly uploaded to OpenStreetMap - the best way to
-      use it is to draw on the map, using it as a guide for the new features that
-      you add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)
-      for other users to use.
-    imagery: |
-      # Imagery
-
-      Aerial imagery is an important resource for mapping. A combination of
-      airplane flyovers, satellite views, and freely-compiled sources are available
-      in the editor under the 'Background Settings' menu on the right.
-
-      By default a [Bing Maps](http://www.bing.com/maps/) satellite layer is
-      presented in the editor, but as you pan and zoom the map to new geographical
-      areas, new sources will become available. Some countries, like the United
-      States, France, and Denmark have very high-quality imagery available for some areas.
-
-      Imagery is sometimes offset from the map data because of a mistake on the
-      imagery provider's side. If you see a lot of roads shifted from the background,
-      don't immediately move them all to match the background. Instead you can adjust
-      the imagery so that it matches the existing data by clicking 'Fix alignment' at
-      the bottom of the Background Settings UI.
-    addresses: |
-      # Addresses
-
-      Addresses are some of the most useful information for the map.
-
-      Although addresses are often represented as parts of streets, in OpenStreetMap
-      they're recorded as attributes of buildings and places along streets.
-
-      You can add address information to places mapped as building outlines
-      as well as those mapped as single points. The optimal source of address
-      data is from an on-the-ground survey or personal knowledge - as with any
-      other feature, copying from commercial sources like Google Maps is strictly
-      forbidden.
-    inspector: |
-      # Using the Inspector
-
-      The inspector is the section on the left side of the page that allows you to
-      edit the details of the selected feature.
-
-      ### Selecting a Feature Type
-
-      After you add a point, line, or area, you can choose what type of feature it
-      is, like whether it's a highway or residential road, supermarket or cafe.
-      The inspector will display buttons for common feature types, and you can
-      find others by typing what you're looking for in the search box.
-
-      Click the 'i' in the bottom-right-hand corner of a feature type button to
-      learn more about it. Click a button to choose that type.
-
-      ### Using Forms and Editing Tags
-
-      After you choose a feature type, or when you select a feature that already
-      has a type assigned, the inspector will display fields with details about
-      the feature like its name and address.
-
-      Below the fields you see, you can click the 'Add field' dropdown to add
-      other details, like a Wikipedia link, wheelchair access, and more.
-
-      At the bottom of the inspector, click 'Additional tags' to add arbitrary
-      other tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a
-      great resource for learn more about popular tag combinations.
-
-      Changes you make in the inspector are automatically applied to the map.
-      You can undo them at any time by clicking the 'Undo' button.
-    buildings: |
-      # Buildings
-
-      OpenStreetMap is the world's largest database of buildings. You can create
-      and improve this database.
-
-      ### Selecting
-
-      You can select a building by clicking on its border. This will highlight the
-      building and load a sidebar showing more information about the building.
-      If you right-click on it, it will show a menu of actions you can execute
-      in the building.
-
-      ### Modifying
-
-      Sometimes buildings are incorrectly placed or have incorrect tags.
-
-      To move an entire building, select it and press the 'M' shortcut key,
-      or right-click it and select the 'Move' tool. Move your
-      mouse to shift the building, and click when it's correctly placed.
-
-      To fix the specific shape of a building, click and drag the nodes that form
-      its border into better places.
-
-      ### Creating
-
-      One of the main questions around adding buildings to the map is that
-      OpenStreetMap records buildings both as shapes and points. The rule of thumb
-      is to _map a building as a shape whenever possible_, and map companies, homes,
-      amenities, and other things that operate out of buildings as points placed
-      within the building shape.
-
-      Start drawing a building as a shape by clicking the 'Area' button in the top
-      left of the interface, and end it either by pressing 'Return' on your keyboard
-      or clicking on the first node drawn to close the shape.
-
-      ### Deleting
-
-      If a building is entirely incorrect - you can see that it doesn't exist in satellite
-      imagery and ideally have confirmed locally that it's not present - you can delete
-      it, which removes it from the map. Be cautious when deleting features -
-      like any other edit, the results are seen by everyone and satellite imagery
-      is often out of date, so the building could simply be newly built.
-
-      You can delete a building by clicking on it to select it, then pressing the 'Delete'
-      key, or right-clicking it and then clicking the trash can icon.
-    relations: |
-      # Relations
-
-      A relation is a special type of feature in OpenStreetMap that groups together
-      other features. For example, two common types of relations are *route relations*,
-      which group together sections of road that belong to a specific freeway or
-      highway, and *multipolygons*, which group together several lines that define
-      a complex area (one with several pieces or holes in it like a donut).
-
-      The group of features in a relation are called *members*. In the bottom of the
-      sidebar, you can see which relations a feature is a member of, and click on a
-      relation there will select it. When the relation is selected, you can see all of
-      its members listed in the sidebar and highlighted on the map.
-
-      For the most part, iD will take care of maintaining relations automatically
-      while you edit. The main thing you should be aware of is that if you delete a
-      section of road to redraw it more accurately, you should make sure that the
-      new section is a member of the same relations as the original.
-
-      ## Editing Relations
-
-      If you want to edit relations, here are the basics.
-
-      To add a feature to a relation, select the feature, click the "+" button in the
-      "All relations" section of the sidebar, and select or type the name of the relation.
-
-      To create a new relation, select the first feature that should be a member,
-      click the "+" button in the "All relations" section, and select "New relation...".
-
-      To remove a feature from a relation, select the feature and click the trash
-      button next to the relation you want to remove it from.
-
-      You can create multipolygons with holes using the "Merge" tool. Draw two areas (inner
-      and outer), hold the Shift key and click on each of them to select them both, and then
-      press the 'C' shortcut key. Other option is to select both, and then right-click one
-      of the and click the "Merge" (+) button.
+    help:
+      title: Help
+      welcome: "Welcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/). With this editor you can update OpenStreetMap right from your web browser."
+      open_data_h: "Open Data"
+      open_data: "Edits that you make on this map will be visible to everyone who uses OpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying, or imagery collected from aerial or street level photos. Copying from commercial sources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright)."
+      before_start_h: "Before you start"
+      before_start: "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes."
+      open_source_h: "Open Source"
+      open_source: "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD)."
+      open_source_help: "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+    overview:
+      title: Overview
+      navigation_h: "Navigation"
+      navigation_drag: "You can drag the map by pressing and holding down the {leftclick} left mouse button and moving the mouse around. You can also use the `↓`, `↑`, `←`, `→` arrow keys on your keyboard."
+      navigation_zoom: "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons along the side of the map. You can also use the `+`, `-` keys on your keyboard."
+      features_h: "Map Features"
+      features: "We use the word *features* to describe things that appear on the map, such as roads, buildings, or points of interest. Anything in the real world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*."
+      nodes_ways: "In OpenStreetmap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
+    editing:
+      title: "Editing & Saving"
+      select_h: "Select"
+      select_left_click: "{leftclick} Left-click on a feature to select it. This will highlight it with a pulsing glow, and the sidebar will display details about that feature, such as its name or address."
+      select_right_click: "{rightclick} Right-click on a feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting."
+      multiselect_h: "Multiselect"
+      multiselect_shift_click: "`{shift}`+{leftclick} left-click to select several features together.  This makes it easier to move or delete multiple items."
+      multiselect_lasso: "Another way to select multiple features is to hold down the `{shift}` key, then press and hold down the {leftclick} left mouse button and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected."
+      undo_redo_h: "Undo & Redo"
+      undo_redo: "Your edits are stored locally in your browser until you choose to save them to the OpenStreetMap server. You can undo edits by clicking the {undo} **Undo** button, and redo them by clicking the {redo} **Redo** button."
+      save_h: "Save"
+      save: "Click {save} **Save** to finish your edits and send them to OpenStreetMap. You should remember to save your work frequently!"
+      save_validation: "On the save screen, you'll have a chance to review what you've done. iD will also perform some basic checks for missing data and may offer helpful suggestions and warnings if something doesn't seem right."
+      upload_h: "Upload"
+      upload: "Before uploading your changes you must enter a [changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments). Then click **Upload** to send your changes to OpenStreetMap, where they will be merged into the map and publicly visible to everyone."
+      backups_h: "Automatic Backups"
+      backups: "If you can't finish your edits in one sitting, for example if your computer crashes or you close the browser tab, your edits are still saved in your browser's storage. You can come back later (on the same browser and computer), and iD will offer to restore your work."
+      keyboard_h: "Keyboard Shortcuts"
+      keyboard: "You can view a list of keyboard shortcuts by pressing the `?` key."
+    feature_editor:
+      title: Feature Editor
+      intro: "The *feature editor* appears alongside the map, and allows you to see and edit all of the information for the selected feature."
+      definitions: "The top section displays the feature's type. The middle section contains *fields* showing the feature's attributes, such as its name or address."
+      type_h: "Feature Type"
+      type: "You can click on the feature type to change the feature to a different type. Everything that exists in the real world can be added to OpenStreetMap, so there are thousands of feature types to choose from."
+      type_picker: "The type picker displays the most common feature types, such as parks, hospitals, restaurants, roads, and buildings. You can search for anything by typing what you're looking for in the search box. You can also click the {inspect} **Info** icon next to the feature type to learn more about it."
+      fields_h: "Fields"
+      fields_all_fields: "The \"All fields\" section contains all of the feature's details that you may edit. In OpenStreetMap, all of the fields are optional, and it's OK to leave a field blank if you are unsure."
+      fields_example: "Each feature type will display different fields. For example, a road may display fields for its surface and speed limit, but a restaurant may display fields for the type of food it serves and the hours it is open."
+      fields_add_field: "You can also click the \"Add field\" dropdown to add more fields, such as a description, Wikipedia link, wheelchair access, and more."
+      tags_h: "Tags"
+      tags_all_tags: "Below the fields section, you can expand the \"All tags\" section to edit any of the OpenStreetMap *tags* for the selected feature. Each tag consists of a *key* and *value*, data elements that define all of the features stored in OpenStreetMap."
+      tags_resources: "Editing a feature's tags requires intermediate knowledge about OpenStreetMap. You should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) or [Taginfo](https://taginfo.openstreetmap.org/) to learn more about accepted OpenStreetMap tagging practices."
+    points:
+      title: Points
+      intro: "*Points* can be used to represent features such as shops, restaurants, and monuments. They mark a specific location, and describe what's there."
+      add_point_h: "Adding Points"
+      add_point: "To add a point, click the {point} **Point** button on the toolbar above the map, or press the shortcut key `1`. This will change the mouse cursor to a cross symbol."
+      add_point_finish: "To place the new point on the map, position the mouse cursor where the point should go, then {leftclick} left-click or press `Space`."
+      move_point_h: "Moving Points"
+      move_point: "To move a point, place the mouse cursor over the point, then press and hold the {leftclick} left mouse button while dragging the point to its new location."
+      delete_point_h: "Deleting Points"
+      delete_point: "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it."
+      delete_point_command: "To delete a point, {rightclick} right-click on the point to select it and show the edit menu, then use the {delete} **Delete** command."
+    lines:
+      title: Lines
+      intro: "*Lines* are used to represent features such as roads, railroads, and rivers. Lines should be drawn down the center of the feature that they represent."
+      add_line_h: "Adding Lines"
+      add_line: "To add a line, click the {line} **Line** button on the toolbar above the map, or press the shortcut key `2`. This will change the mouse cursor to a cross symbol."
+      add_line_draw: "Next, position the mouse cursor where the line should begin and {leftclick} left-click or press `Space` to begin placing nodes along the line. Continue placing more nodes by clicking or pressing `Space`. While drawing, you can zoom in or drag the map in order to add more detail."
+      add_line_finish: "To finish a line, press `{return}` or click again on the last node."
+      modify_line_h: "Modifying Lines"
+      modify_line_dragnode: "Often you'll see lines that aren't shaped correctly, for example a road that does not match up with the background imagery. To adjust the shape of a line, first {leftclick} left-click to select it. All nodes of the line will be drawn as small circles. You can then drag the nodes to better locations."
+      modify_line_addnode: "You can also create new nodes along a line either by {leftclick}**x2** double-clicking on the line or by dragging the small triangles at the midpoints between nodes."
+      connect_line_h: "Connecting Lines"
+      connect_line: "Having roads connected properly is important for the map and essential for providing driving directions."
+      connect_line_display: "The connections between roads are drawn with gray circles. The endpoints of a line are drawn with larger white circles if they don't connect to anything."
+      connect_line_drag: "To connect a line to another feature, drag one of the line's nodes onto the other feature until both features snap together. Tip: You can hold down the `{alt}` key to prevent nodes from connecting to other features."
+      connect_line_tag: "If you know that the connection has traffic lights or crosswalks, you can add them by selecting the connecting node and using the feature editor to select the correct feature's type."
+      disconnect_line_h: "Disconnecting Lines"
+      disconnect_line_command: "To disconnect a road from another feature, {rightclick} right-click the connecting node and select the {disconnect} **Disconnect** command from the editing menu."
+      move_line_h: "Moving Lines"
+      move_line_command: "To move an entire line, {rightclick} right-click the line and select the {move} **Move** command from the editing menu. Then move the mouse, and {leftclick} left-click to place the line in a new location."
+      move_line_connected: "Lines that are connected to other features will stay connected as you move the line to a new location. iD may prevent you from moving a line across another connected line."
+      delete_line_h: "Deleting Lines"
+      delete_line: "If a line is entirely incorrect, for example a road that doesn't exist in the real world, it's OK to delete it. Be careful when deleting features: the background imagery you are using might be outdated, and a road that looks wrong could simply be newly built."
+      delete_line_command: "To delete a line, {rightclick} right-click on the line to select it and show the edit menu, then use the {delete} **Delete** command."
+    areas:
+      title: Areas
+      intro: "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas. Areas should be traced around the edge of the feature that they represent, for example, around the base of a building."
+      point_or_area_h: "Points or Areas?"
+      point_or_area: "Many features can be represented as points or areas. You should map buildings and property outlines as areas whenever possible. Place points inside a building area to represent businesses, amenities, and other features located inside the building."
+      add_area_h: "Adding Areas"
+      add_area_command: "To add an area, click the {area} **Area** button on the toolbar above the map, or press the shortcut key `3`. This will change the mouse cursor to a cross symbol."
+      add_area_draw: "Next, position the mouse cursor at one of the corners of the feature and {leftclick} left-click or press `Space` to begin placing nodes around the outer edge of the area. Continue placing more nodes by clicking or pressing `Space`. While drawing, you can zoom in or drag the map in order to add more detail."
+      add_area_finish: "To finish an area, press `{return}` or click again on either the first or last node."
+      square_area_h: "Square Corners"
+      square_area_command: "Many area features like buildings have square corners. To square the corners of an area, {rightclick} right-click the edge of the area and select the {orthogonalize} **Square** command from the editing menu."
+      modify_area_h: "Modifying Areas"
+      modify_area_dragnode: "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first {leftclick} left-click to select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations."
+      modify_area_addnode: "You can also create new nodes along an area either by {leftclick}**x2** double-clicking on the edge of the area or by dragging the small triangles at the midpoints between nodes."
+      delete_area_h: "Deleting Areas"
+      delete_area: "If an area is entirely incorrect, for example a building that doesn't exist in the real world, it's OK to delete it. Be cautious when deleting features - the background imagery you are using might be outdated, and a building that looks wrong could simply be newly built."
+      delete_area_command: "To delete an area, {rightclick} right-click on the area to select it and show the edit menu, then use the {delete} **Delete** command."
+    relations:
+      title: Relations
+      intro: "A *relation* is a special type of feature in OpenStreetMap that groups together other features. The features that belong to a relation are called *members*, and each member can have a *role* in the relation."
+      edit_relation_h: "Editing Relations"
+      edit_relation: "At the bottom of the feature editor, you can expand the \"All relations\" section to see if the selected feature is a member of any relations. You can then click on the relation to select and edit it."
+      edit_relation_add: "To add a feature to a relation, select the feature, then click the {plus} add button in the \"All relations\" section of the feature editor. You can choose from a list of nearby relations, or choose the \"New relation...\" option."
+      edit_relation_delete: "You can also click the {delete} **Delete** button to remove the selected feature from the relation. If you remove all of the members from a relation, the relation will be deleted automatically."
+      maintain_relation_h: "Maintaining Relations"
+      maintain_relation: "For the most part, iD will maintain relations automatically as you edit. You should take care when replacing features that might be members of relations. For example if you delete a section of road and draw a new section of road to replace it, you should add the new section to the same relations (routes, turn restrictions, etc.) as the original."
+      relation_types_h: "Relation Types"
+      multipolygon_h: "Multipolygons"
+      multipolygon: "A *multipolygon* relation is a group of one or more *outer* features and one or more inner features. The outer features define the outer edges of the multipolygon, and the inner features define sub-areas or holes cut out from the inside of the multipolygon."
+      multipolygon_create: "To create a multipolygon, for example a building with a hole in it, draw the outer edge as an area and the inner edge as a line or different kind of area. Then `{shift}`+{leftclick} left-click to select both features, {rightclick} right-click to show the edit menu, and select the {merge} **Merge** command."
+      multipolygon_merge: "Merging several lines or areas will create a new multipolygon relation with all selected areas as members. iD will choose the inner and outer roles automatically, based on which features are contained inside other features."
+      turn_restriction_h: "Turn restrictions"
+      turn_restriction: "A *turn restriction* relation is a group of several road segments in an intersection. Turn restrictions consist of a *from* road, *via* node or roads, and a *to* road."
+      turn_restriction_field: "To edit turn restrictions, select a junction node where two or more roads meet. The feature editor will display a special \"Turn Restrictions\" field containing a model of the intersection."
+      turn_restriction_editing: "In the \"Turn Restrictions\" field, click to select a \"from\" road, and see whether turns are allowed or restricted to any of the \"to\" roads. You can click on the turn icons to toggle them between allowed and restricted. iD will create relations automatically and set the from, via, and to roles based on your choices."
+      route_h: "Routes"
+      route: "A *route* relation is a group of one or more line features that together form a route network, like a bus route, train route, or highway route."
+      route_add: "To add a feature to a route relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
+      boundary_h: "Boundaries"
+      boundary: "A *boundary* relation is a group of one or more line features that together form an administrative boundary."
+      boundary_add: "To add a feature to a boundary relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
+    imagery:
+      title: Background Imagery
+      intro: "The background imagery that appears beneath the map data is an important resource for mapping. This imagery can be aerial photos collected from satellites, airplanes, and drones, or it can be scanned historical maps or other freely available source data."
+      sources_h: "Imagery Sources"
+      choosing: "To see which imagery sources are available for editing, click the {layers} **Background settings** button on the side of the map."
+      sources: "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference."
+      offsets_h: "Adjusting Imagery Offset"
+      offset: "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"Adjust Imagery Offset\" section at the bottom of the Background Settings pane."
+      offset_change: "Click on the small triangles to adjust the imagery offset in small steps, or hold the left mouse button and drag within the gray square to slide the imagery into alignment."
+    streetlevel:
+      title: Street Level Photos
+      intro: "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org)."
+      using_h: "Using Street Level Photos"
+      using: "To use street level photos for mapping, click the {data} **Map data** panel on the side of the map to enable or disable the available photo layers."
+      photos: "When enabled, the photo layer displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken."
+      viewer: "When you click on one of the photo locations, a photo viewer appears in the bottom corner of the map. The photo viewer contains controls to step forward and backward in the image sequence. It also shows the username of the person who captured the image, the date it was captured, and a link to view the image on the original site."
+    gps:
+      title: GPS Traces
+      intro: "Collected GPS traces are a valuable source of data for OpenStreetMap. This editor supports *.gpx*, *.geojson*, and *.kml* files on your local computer. You can collect GPS traces with a smartphone, sports watch, or other GPS device."
+      survey: "For information on how to perform a GPS survey, read [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/)."
+      using_h: "Using GPS Traces"
+      using: "To use a GPS trace for mapping, drag and drop the data file onto the map editor. If it's recognized, it will be drawn on the map as a bright purple line. Click the {data} **Map data** panel on the side of the map to enable, disable, or zoom to your GPS data."
+      tracing: "The GPS track isn't sent to OpenStreetMap - the best way to use it is to draw on the map, using it as a guide for the new features that you add."
+      upload: "You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use."
   intro:
     done: done
     ok: OK
@@ -994,7 +877,7 @@ en:
       play: "Now that you know how to create and edit points, try creating a few more points for practice! **When you are ready to continue to the next chapter, click '{next}'.**"
     areas:
       title: "Areas"
-      add_playground: "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can be also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**"
+      add_playground: "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**"
       start_playground: "Let's add this playground to the map by drawing an area. Areas are drawn by placing *nodes* along the outer edge of the feature. **Click or press spacebar to place a starting node on one of the corners of the playground.**"
       continue_playground: "Continue drawing the area by placing more nodes along the playground's edge. It is OK to connect the area to the existing walking paths.{br}Tip: You can hold down the '{alt}' key to prevent nodes from connecting to other features. **Continue drawing an area for the playground.**"
       finish_playground: "Finish the area by pressing enter, or clicking again on either the first or last node. **Finish drawing an area for the playground.**"
@@ -1113,6 +996,7 @@ en:
         select_one: "Select a single feature"
         select_multi: "Select multiple features"
         lasso: "Draw a selection lasso around features"
+        search: "Find features matching search text"
       with_selected:
         title: "With feature selected"
         edit_menu: "Toggle edit menu"
diff --git a/data/imagery.json b/data/imagery.json
index fc6c8217c..218892fe4 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -8430,12 +8430,12 @@
         },
         {
             "id": "osm-cambodia_laos_thailand_vietnam-bilingual",
-            "name": "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual",
+            "name": "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual",
             "type": "tms",
-            "template": "http://{switch:a,b,c,d}.tile.osm-tools.org/osm_then/{zoom}/{x}/{y}.png",
+            "template": "http://{switch:a,b,c,d}.tile.osm-tools.org/osm/{zoom}/{x}/{y}.png",
             "scaleExtent": [
                 0,
-                19
+                20
             ],
             "polygon": [
                 [
@@ -14240,6 +14240,21 @@
             "description": "Premium DigitalGlobe satellite imagery.",
             "icon": "data:image/png;base64,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"
         },
+        {
+            "id": "DigitalGlobe-Premium-vintage",
+            "name": "DigitalGlobe Premium Imagery Vintage",
+            "type": "tms",
+            "template": "https://{switch:a,b,c,d}.tiles.mapbox.com/v4/digitalglobe.2850d66c/{zoom}/{x}/{y}.png?access_token=pk.eyJ1IjoiZGlnaXRhbGdsb2JlIiwiYSI6ImNqOTBkcmZjNzJ5ZnozNHF6NnVkOGd6ODYifQ.grAnqgpCjOaeq-ozqt4QNw",
+            "scaleExtent": [
+                0,
+                22
+            ],
+            "terms_url": "https://wiki.openstreetmap.org/wiki/DigitalGlobe",
+            "terms_text": "Terms & Feedback",
+            "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+            "icon": "data:image/png;base64,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",
+            "overlay": true
+        },
         {
             "id": "DigitalGlobe-Standard",
             "name": "DigitalGlobe Standard Imagery",
@@ -14255,6 +14270,21 @@
             "description": "Standard DigitalGlobe satellite imagery.",
             "icon": "data:image/png;base64,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"
         },
+        {
+            "id": "DigitalGlobe-Standard-vintage",
+            "name": "DigitalGlobe Standard Imagery Vintage",
+            "type": "tms",
+            "template": "https://{switch:a,b,c,d}.tiles.mapbox.com/v4/digitalglobe.1412531a/{zoom}/{x}/{y}.png?access_token=pk.eyJ1IjoiZGlnaXRhbGdsb2JlIiwiYSI6ImNqOTBlYWJ1ZDAza2YyeG14NWVodTA4OWUifQ.wVc8ZOuPuYVw39lhS2j3_g",
+            "scaleExtent": [
+                0,
+                22
+            ],
+            "terms_url": "https://wiki.openstreetmap.org/wiki/DigitalGlobe",
+            "terms_text": "Terms & Feedback",
+            "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+            "icon": "data:image/png;base64,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",
+            "overlay": true
+        },
         {
             "id": "EsriWorldImagery",
             "name": "Esri World Imagery",
@@ -14277,7 +14307,7 @@
             "template": "http://kaart.maakaart.ee/orto/{zoom}/{x}/{y}.jpeg",
             "scaleExtent": [
                 14,
-                20
+                18
             ],
             "polygon": [
                 [
@@ -19259,7 +19289,7 @@
             "template": "http://tms.cadastre.openstreetmap.fr/*/tout/{zoom}/{x}/{y}.png",
             "scaleExtent": [
                 12,
-                20
+                22
             ],
             "polygon": [
                 [
@@ -32123,1248 +32153,188 @@
             "polygon": [
                 [
                     [
-                        7.5546583,
-                        47.5643681
+                        7.6713752,
+                        47.5952248
                     ],
                     [
-                        7.5557966,
-                        47.5637596
+                        7.6799583,
+                        47.6007811
                     ],
                     [
-                        7.5579279,
-                        47.5626202
+                        7.6845073,
+                        47.6018228
                     ],
                     [
-                        7.5587206,
-                        47.5619588
+                        7.6943779,
+                        47.601707
                     ],
                     [
-                        7.5598704,
-                        47.5605319
+                        7.6939487,
+                        47.5966718
                     ],
                     [
-                        7.5615849,
-                        47.5591798
+                        7.6870823,
+                        47.5935462
                     ],
                     [
-                        7.5645616,
-                        47.5572174
+                        7.6788425,
+                        47.5871208
                     ],
                     [
-                        7.5645784,
-                        47.557036
+                        7.685709,
+                        47.585384
                     ],
                     [
-                        7.5630528,
-                        47.5549292
+                        7.6890564,
+                        47.5761205
                     ],
                     [
-                        7.5620633,
-                        47.5531755
+                        7.6941204,
+                        47.573399
                     ],
                     [
-                        7.562027,
-                        47.5531111
+                        7.6924038,
+                        47.5669132
                     ],
                     [
-                        7.5612437,
-                        47.5517228
+                        7.6847005,
+                        47.5617009
                     ],
                     [
-                        7.5609044,
-                        47.5518141
+                        7.6642513,
+                        47.5616429
                     ],
                     [
-                        7.5587527,
-                        47.5523533
+                        7.6487159,
+                        47.5568934
                     ],
                     [
-                        7.5560208,
-                        47.5447226
+                        7.6303482,
+                        47.558689
                     ],
                     [
-                        7.5558907,
-                        47.5443591
+                        7.6235675,
+                        47.5566617
                     ],
                     [
-                        7.5558822,
-                        47.5443356
+                        7.6278591,
+                        47.5514483
                     ],
                     [
-                        7.5565398,
-                        47.5443319
+                        7.6273763,
+                        47.5365801
                     ],
                     [
-                        7.557539,
-                        47.5443996
+                        7.6183319,
+                        47.5366163
                     ],
                     [
-                        7.5600937,
-                        47.5447993
+                        7.6133537,
+                        47.5326179
                     ],
                     [
-                        7.5617072,
-                        47.5451327
+                        7.5996208,
+                        47.5191137
                     ],
                     [
-                        7.563015,
-                        47.5453056
+                        7.5850296,
+                        47.5191717
                     ],
                     [
-                        7.5645168,
-                        47.5456579
+                        7.5840854,
+                        47.5263589
                     ],
                     [
-                        7.5647854,
-                        47.5456863
+                        7.5771331,
+                        47.5316327
                     ],
                     [
-                        7.5711158,
-                        47.5447363
+                        7.581253,
+                        47.5398612
                     ],
                     [
-                        7.5754994,
-                        47.5439857
+                        7.5718975,
+                        47.5414835
                     ],
                     [
-                        7.5756961,
-                        47.543952
+                        7.553873,
+                        47.5414835
                     ],
                     [
-                        7.5780942,
-                        47.5437915
+                        7.5537872,
+                        47.5512166
                     ],
                     [
-                        7.5784687,
-                        47.5437284
+                        7.5565338,
+                        47.5582836
                     ],
                     [
-                        7.5786289,
-                        47.5437885
+                        7.5537014,
+                        47.5603108
                     ],
                     [
-                        7.5791491,
-                        47.5438323
+                        7.5537872,
+                        47.5747308
                     ],
                     [
-                        7.5800676,
-                        47.5438339
+                        7.5643444,
+                        47.5812157
                     ],
                     [
-                        7.5805324,
-                        47.5437879
+                        7.5793647,
+                        47.579884
                     ],
                     [
-                        7.5809651,
-                        47.5436877
+                        7.583313,
+                        47.5901889
                     ],
                     [
-                        7.5814732,
-                        47.5438236
+                        7.5856304,
+                        47.5923306
                     ],
                     [
-                        7.5872631,
-                        47.5419007
+                        7.5920677,
+                        47.5923885
                     ],
                     [
-                        7.5868378,
-                        47.5412398
+                        7.598505,
+                        47.5907098
                     ],
                     [
-                        7.5865165,
-                        47.5405078
+                        7.609148,
+                        47.5864261
                     ],
                     [
-                        7.5857211,
-                        47.5391295
+                        7.6092338,
+                        47.5810999
                     ],
                     [
-                        7.5854825,
-                        47.5385844
+                        7.6191043,
+                        47.580463
                     ],
                     [
-                        7.5854664,
-                        47.5383935
+                        7.6368713,
+                        47.593141
                     ],
                     [
-                        7.5855306,
-                        47.5382072
+                        7.6378154,
+                        47.595572
                     ],
                     [
-                        7.5859696,
-                        47.5377431
+                        7.6416778,
+                        47.5988711
                     ],
                     [
-                        7.5859195,
-                        47.5374037
+                        7.6452827,
+                        47.6002602
                     ],
                     [
-                        7.5834651,
-                        47.5334598
+                        7.664938,
+                        47.5961798
                     ],
                     [
-                        7.5829999,
-                        47.5329428
-                    ],
-                    [
-                        7.5826885,
-                        47.5324682
-                    ],
-                    [
-                        7.5827807,
-                        47.531979
-                    ],
-                    [
-                        7.583173,
-                        47.5314823
-                    ],
-                    [
-                        7.5838511,
-                        47.5309137
-                    ],
-                    [
-                        7.5846792,
-                        47.5312277
-                    ],
-                    [
-                        7.5856831,
-                        47.5313229
-                    ],
-                    [
-                        7.5859049,
-                        47.5299585
-                    ],
-                    [
-                        7.5858669,
-                        47.5292755
-                    ],
-                    [
-                        7.588466,
-                        47.5290556
-                    ],
-                    [
-                        7.588387,
-                        47.5285066
-                    ],
-                    [
-                        7.588485,
-                        47.5282758
-                    ],
-                    [
-                        7.5889124,
-                        47.5280286
-                    ],
-                    [
-                        7.5894826,
-                        47.5279231
-                    ],
-                    [
-                        7.5898333,
-                        47.5270746
-                    ],
-                    [
-                        7.5899235,
-                        47.5266745
-                    ],
-                    [
-                        7.5899641,
-                        47.5257376
-                    ],
-                    [
-                        7.5896412,
-                        47.5251572
-                    ],
-                    [
-                        7.5896095,
-                        47.5244274
-                    ],
-                    [
-                        7.5893954,
-                        47.5237135
-                    ],
-                    [
-                        7.5893183,
-                        47.5229554
-                    ],
-                    [
-                        7.5894367,
-                        47.5222932
-                    ],
-                    [
-                        7.5896678,
-                        47.5218266
-                    ],
-                    [
-                        7.5899931,
-                        47.5205282
-                    ],
-                    [
-                        7.5900357,
-                        47.5204109
-                    ],
-                    [
-                        7.5902485,
-                        47.5197897
-                    ],
-                    [
-                        7.5907391,
-                        47.5196504
-                    ],
-                    [
-                        7.5927813,
-                        47.5194647
-                    ],
-                    [
-                        7.5947814,
-                        47.519294
-                    ],
-                    [
-                        7.601768,
-                        47.5253475
-                    ],
-                    [
-                        7.6047028,
-                        47.5292911
-                    ],
-                    [
-                        7.6046151,
-                        47.5297979
-                    ],
-                    [
-                        7.6055404,
-                        47.5297828
-                    ],
-                    [
-                        7.605482,
-                        47.5303019
-                    ],
-                    [
-                        7.6056805,
-                        47.5305547
-                    ],
-                    [
-                        7.6056425,
-                        47.530742
-                    ],
-                    [
-                        7.6060331,
-                        47.5307783
-                    ],
-                    [
-                        7.6060088,
-                        47.5309725
-                    ],
-                    [
-                        7.6091826,
-                        47.5350166
-                    ],
-                    [
-                        7.6102214,
-                        47.5356318
-                    ],
-                    [
-                        7.6104849,
-                        47.5352145
-                    ],
-                    [
-                        7.611379,
-                        47.5354467
-                    ],
-                    [
-                        7.6110278,
-                        47.5359604
-                    ],
-                    [
-                        7.6118152,
-                        47.5364265
-                    ],
-                    [
-                        7.6118411,
-                        47.5365771
-                    ],
-                    [
-                        7.6123623,
-                        47.5367419
-                    ],
-                    [
-                        7.6127143,
-                        47.5370225
-                    ],
-                    [
-                        7.6128464,
-                        47.5373008
-                    ],
-                    [
-                        7.6130129,
-                        47.5384451
-                    ],
-                    [
-                        7.6131744,
-                        47.5387477
-                    ],
-                    [
-                        7.6134307,
-                        47.5390187
-                    ],
-                    [
-                        7.6137808,
-                        47.539251
-                    ],
-                    [
-                        7.6141998,
-                        47.5394231
-                    ],
-                    [
-                        7.6165067,
-                        47.5399666
-                    ],
-                    [
-                        7.6169975,
-                        47.5401189
-                    ],
-                    [
-                        7.6175901,
-                        47.5404022
-                    ],
-                    [
-                        7.6181485,
-                        47.5408004
-                    ],
-                    [
-                        7.6190301,
-                        47.5404729
-                    ],
-                    [
-                        7.6197653,
-                        47.5402824
-                    ],
-                    [
-                        7.6223033,
-                        47.5397743
-                    ],
-                    [
-                        7.6224898,
-                        47.5424261
-                    ],
-                    [
-                        7.6229623,
-                        47.5492907
-                    ],
-                    [
-                        7.6228545,
-                        47.5500403
-                    ],
-                    [
-                        7.6226655,
-                        47.5505183
-                    ],
-                    [
-                        7.6223987,
-                        47.550975
-                    ],
-                    [
-                        7.6220535,
-                        47.551407
-                    ],
-                    [
-                        7.6216349,
-                        47.5518082
-                    ],
-                    [
-                        7.6207617,
-                        47.5524006
-                    ],
-                    [
-                        7.6185071,
-                        47.5535681
-                    ],
-                    [
-                        7.6180597,
-                        47.5539379
-                    ],
-                    [
-                        7.617741,
-                        47.5543666
-                    ],
-                    [
-                        7.6176167,
-                        47.5546487
-                    ],
-                    [
-                        7.6175802,
-                        47.5549522
-                    ],
-                    [
-                        7.6177985,
-                        47.5562634
-                    ],
-                    [
-                        7.6178338,
-                        47.5570769
-                    ],
-                    [
-                        7.6177686,
-                        47.5578613
-                    ],
-                    [
-                        7.6176173,
-                        47.5586485
-                    ],
-                    [
-                        7.6192664,
-                        47.5591127
-                    ],
-                    [
-                        7.6243822,
-                        47.5607532
-                    ],
-                    [
-                        7.6273612,
-                        47.5615165
-                    ],
-                    [
-                        7.6287755,
-                        47.5616815
-                    ],
-                    [
-                        7.6302053,
-                        47.5617061
-                    ],
-                    [
-                        7.6315166,
-                        47.5616482
-                    ],
-                    [
-                        7.6325943,
-                        47.5615064
-                    ],
-                    [
-                        7.6327278,
-                        47.5614888
-                    ],
-                    [
-                        7.6339558,
-                        47.5612235
-                    ],
-                    [
-                        7.6348135,
-                        47.5622913
-                    ],
-                    [
-                        7.6348945,
-                        47.5623925
-                    ],
-                    [
-                        7.6350685,
-                        47.5626091
-                    ],
-                    [
-                        7.6361189,
-                        47.5639171
-                    ],
-                    [
-                        7.6383303,
-                        47.563226
-                    ],
-                    [
-                        7.6400932,
-                        47.5619987
-                    ],
-                    [
-                        7.6406107,
-                        47.5616726
-                    ],
-                    [
-                        7.6412591,
-                        47.5612641
-                    ],
-                    [
-                        7.6440496,
-                        47.5612843
-                    ],
-                    [
-                        7.6460646,
-                        47.5607169
-                    ],
-                    [
-                        7.6465041,
-                        47.5604966
-                    ],
-                    [
-                        7.6482757,
-                        47.559931
-                    ],
-                    [
-                        7.6503486,
-                        47.5608971
-                    ],
-                    [
-                        7.6517514,
-                        47.561435
-                    ],
-                    [
-                        7.6526422,
-                        47.5617771
-                    ],
-                    [
-                        7.654536,
-                        47.5623665
-                    ],
-                    [
-                        7.6561556,
-                        47.562278
-                    ],
-                    [
-                        7.6567566,
-                        47.5631288
-                    ],
-                    [
-                        7.6587522,
-                        47.5644771
-                    ],
-                    [
-                        7.6642272,
-                        47.5653987
-                    ],
-                    [
-                        7.6655502,
-                        47.56506
-                    ],
-                    [
-                        7.6674872,
-                        47.5653049
-                    ],
-                    [
-                        7.6702191,
-                        47.5658319
-                    ],
-                    [
-                        7.6706995,
-                        47.5658147
-                    ],
-                    [
-                        7.6723599,
-                        47.5654399
-                    ],
-                    [
-                        7.6723096,
-                        47.5650023
-                    ],
-                    [
-                        7.6724486,
-                        47.5637255
-                    ],
-                    [
-                        7.6744535,
-                        47.563456
-                    ],
-                    [
-                        7.6756147,
-                        47.5634809
-                    ],
-                    [
-                        7.6773158,
-                        47.563745
-                    ],
-                    [
-                        7.6772795,
-                        47.5649333
-                    ],
-                    [
-                        7.6751444,
-                        47.5654226
-                    ],
-                    [
-                        7.6767437,
-                        47.5669837
-                    ],
-                    [
-                        7.6776819,
-                        47.5678061
-                    ],
-                    [
-                        7.678441,
-                        47.5689615
-                    ],
-                    [
-                        7.6791014,
-                        47.5695
-                    ],
-                    [
-                        7.6810223,
-                        47.5704327
-                    ],
-                    [
-                        7.6834998,
-                        47.571254
-                    ],
-                    [
-                        7.6837139,
-                        47.5705354
-                    ],
-                    [
-                        7.6834203,
-                        47.5684215
-                    ],
-                    [
-                        7.6837542,
-                        47.5683517
-                    ],
-                    [
-                        7.6859194,
-                        47.5656103
-                    ],
-                    [
-                        7.6870989,
-                        47.5683843
-                    ],
-                    [
-                        7.6888902,
-                        47.5702869
-                    ],
-                    [
-                        7.6896532,
-                        47.571398
-                    ],
-                    [
-                        7.6889131,
-                        47.572425
-                    ],
-                    [
-                        7.6855034,
-                        47.5730872
-                    ],
-                    [
-                        7.6843054,
-                        47.5737956
-                    ],
-                    [
-                        7.6836701,
-                        47.5739056
-                    ],
-                    [
-                        7.6838528,
-                        47.5766573
-                    ],
-                    [
-                        7.6825486,
-                        47.5772314
-                    ],
-                    [
-                        7.6818996,
-                        47.5774562
-                    ],
-                    [
-                        7.6819239,
-                        47.5777083
-                    ],
-                    [
-                        7.6816135,
-                        47.5794616
-                    ],
-                    [
-                        7.6815318,
-                        47.5799229
-                    ],
-                    [
-                        7.681473,
-                        47.5802552
-                    ],
-                    [
-                        7.681326,
-                        47.5809796
-                    ],
-                    [
-                        7.6808517,
-                        47.582684
-                    ],
-                    [
-                        7.6789268,
-                        47.5832644
-                    ],
-                    [
-                        7.6749356,
-                        47.5842336
-                    ],
-                    [
-                        7.672069,
-                        47.5852391
-                    ],
-                    [
-                        7.6717419,
-                        47.58727
-                    ],
-                    [
-                        7.6730805,
-                        47.5881644
-                    ],
-                    [
-                        7.6773805,
-                        47.5913618
-                    ],
-                    [
-                        7.6795811,
-                        47.5922467
-                    ],
-                    [
-                        7.681979,
-                        47.5942611
-                    ],
-                    [
-                        7.6836452,
-                        47.5960217
-                    ],
-                    [
-                        7.6847161,
-                        47.5966362
-                    ],
-                    [
-                        7.6901533,
-                        47.5975697
-                    ],
-                    [
-                        7.6919739,
-                        47.5986748
-                    ],
-                    [
-                        7.6930358,
-                        47.5994863
-                    ],
-                    [
-                        7.6937903,
-                        47.6007716
-                    ],
-                    [
-                        7.6933251,
-                        47.6009125
-                    ],
-                    [
-                        7.6916366,
-                        47.5995856
-                    ],
-                    [
-                        7.6893134,
-                        47.5988418
-                    ],
-                    [
-                        7.6879834,
-                        47.5986068
-                    ],
-                    [
-                        7.6870219,
-                        47.5986977
-                    ],
-                    [
-                        7.6848189,
-                        47.5987669
-                    ],
-                    [
-                        7.6830086,
-                        47.5984931
-                    ],
-                    [
-                        7.681551,
-                        47.5973332
-                    ],
-                    [
-                        7.680658,
-                        47.5971921
-                    ],
-                    [
-                        7.6797172,
-                        47.5963587
-                    ],
-                    [
-                        7.6780641,
-                        47.5953554
-                    ],
-                    [
-                        7.6767831,
-                        47.594313
-                    ],
-                    [
-                        7.6754987,
-                        47.5930445
-                    ],
-                    [
-                        7.6751713,
-                        47.5919819
-                    ],
-                    [
-                        7.6721918,
-                        47.5918984
-                    ],
-                    [
-                        7.6673301,
-                        47.5919456
-                    ],
-                    [
-                        7.6646206,
-                        47.5926653
-                    ],
-                    [
-                        7.6616899,
-                        47.5937021
-                    ],
-                    [
-                        7.6559609,
-                        47.5951739
-                    ],
-                    [
-                        7.6556715,
-                        47.5952499
-                    ],
-                    [
-                        7.655565,
-                        47.5952749
-                    ],
-                    [
-                        7.6555191,
-                        47.5952856
-                    ],
-                    [
-                        7.6553766,
-                        47.5953199
-                    ],
-                    [
-                        7.6552629,
-                        47.5953482
-                    ],
-                    [
-                        7.6550649,
-                        47.5953952
-                    ],
-                    [
-                        7.6510568,
-                        47.5957162
-                    ],
-                    [
-                        7.6493128,
-                        47.5961511
-                    ],
-                    [
-                        7.6490366,
-                        47.5962165
-                    ],
-                    [
-                        7.6466315,
-                        47.5967457
-                    ],
-                    [
-                        7.6456696,
-                        47.5969552
-                    ],
-                    [
-                        7.644405,
-                        47.5957399
-                    ],
-                    [
-                        7.6430459,
-                        47.5950447
-                    ],
-                    [
-                        7.6417835,
-                        47.5941917
-                    ],
-                    [
-                        7.6418572,
-                        47.592907
-                    ],
-                    [
-                        7.64324,
-                        47.5913407
-                    ],
-                    [
-                        7.6406364,
-                        47.5907759
-                    ],
-                    [
-                        7.6396302,
-                        47.5903641
-                    ],
-                    [
-                        7.638336,
-                        47.5895565
-                    ],
-                    [
-                        7.6364368,
-                        47.5883715
-                    ],
-                    [
-                        7.635398,
-                        47.587305
-                    ],
-                    [
-                        7.6348633,
-                        47.5867669
-                    ],
-                    [
-                        7.6341024,
-                        47.5858576
-                    ],
-                    [
-                        7.6280205,
-                        47.581365
-                    ],
-                    [
-                        7.6264356,
-                        47.5804007
-                    ],
-                    [
-                        7.625006,
-                        47.5796143
-                    ],
-                    [
-                        7.6245449,
-                        47.5794159
-                    ],
-                    [
-                        7.62395,
-                        47.5791597
-                    ],
-                    [
-                        7.6223873,
-                        47.5783561
-                    ],
-                    [
-                        7.6191343,
-                        47.5768697
-                    ],
-                    [
-                        7.6167075,
-                        47.5776795
-                    ],
-                    [
-                        7.6149736,
-                        47.5779929
-                    ],
-                    [
-                        7.613204,
-                        47.5781561
-                    ],
-                    [
-                        7.6094106,
-                        47.5781807
-                    ],
-                    [
-                        7.604882,
-                        47.5778737
-                    ],
-                    [
-                        7.6048883,
-                        47.5779017
-                    ],
-                    [
-                        7.6052433,
-                        47.5794848
-                    ],
-                    [
-                        7.6053326,
-                        47.5798829
-                    ],
-                    [
-                        7.604762,
-                        47.5804041
-                    ],
-                    [
-                        7.6047115,
-                        47.5811768
-                    ],
-                    [
-                        7.6046639,
-                        47.581201
-                    ],
-                    [
-                        7.6046233,
-                        47.5812217
-                    ],
-                    [
-                        7.6045335,
-                        47.5812704
-                    ],
-                    [
-                        7.6045173,
-                        47.5812792
-                    ],
-                    [
-                        7.6044627,
-                        47.581294
-                    ],
-                    [
-                        7.6044323,
-                        47.581297
-                    ],
-                    [
-                        7.6043491,
-                        47.581305
-                    ],
-                    [
-                        7.604305,
-                        47.5813093
-                    ],
-                    [
-                        7.6041536,
-                        47.581324
-                    ],
-                    [
-                        7.6040542,
-                        47.5813337
-                    ],
-                    [
-                        7.6045798,
-                        47.5828096
-                    ],
-                    [
-                        7.6048159,
-                        47.5849295
-                    ],
-                    [
-                        7.6025062,
-                        47.5859143
-                    ],
-                    [
-                        7.6022084,
-                        47.5860479
-                    ],
-                    [
-                        7.6020621,
-                        47.5861063
-                    ],
-                    [
-                        7.6020111,
-                        47.5861254
-                    ],
-                    [
-                        7.5984622,
-                        47.5876386
-                    ],
-                    [
-                        7.5939634,
-                        47.5887732
-                    ],
-                    [
-                        7.5932464,
-                        47.5889545
-                    ],
-                    [
-                        7.5931946,
-                        47.5889673
-                    ],
-                    [
-                        7.5931649,
-                        47.5889746
-                    ],
-                    [
-                        7.5931203,
-                        47.5889846
-                    ],
-                    [
-                        7.5890388,
-                        47.5898969
-                    ],
-                    [
-                        7.5882481,
-                        47.5885161
-                    ],
-                    [
-                        7.586964,
-                        47.5865465
-                    ],
-                    [
-                        7.5857191,
-                        47.5840853
-                    ],
-                    [
-                        7.5847329,
-                        47.5808519
-                    ],
-                    [
-                        7.5843906,
-                        47.5785769
-                    ],
-                    [
-                        7.5846534,
-                        47.5755163
-                    ],
-                    [
-                        7.578852,
-                        47.5766638
-                    ],
-                    [
-                        7.577513,
-                        47.5765468
-                    ],
-                    [
-                        7.5763967,
-                        47.5764492
-                    ],
-                    [
-                        7.5752663,
-                        47.5761289
-                    ],
-                    [
-                        7.5731353,
-                        47.5766938
-                    ],
-                    [
-                        7.5721192,
-                        47.5769631
-                    ],
-                    [
-                        7.5719434,
-                        47.5770082
-                    ],
-                    [
-                        7.5716273,
-                        47.5771012
-                    ],
-                    [
-                        7.5691231,
-                        47.5774024
-                    ],
-                    [
-                        7.5685402,
-                        47.5774607
-                    ],
-                    [
-                        7.5665034,
-                        47.5776581
-                    ],
-                    [
-                        7.5654501,
-                        47.576209
-                    ],
-                    [
-                        7.556895,
-                        47.5724666
-                    ],
-                    [
-                        7.5564665,
-                        47.5713866
-                    ],
-                    [
-                        7.5593479,
-                        47.5693783
-                    ],
-                    [
-                        7.5582775,
-                        47.567236
-                    ],
-                    [
-                        7.5573303,
-                        47.5651011
-                    ],
-                    [
-                        7.5573002,
-                        47.5650334
-                    ],
-                    [
-                        7.5560222,
-                        47.5647134
-                    ],
-                    [
-                        7.5546583,
-                        47.5643681
+                        7.6713752,
+                        47.5952248
                     ]
                 ]
             ],
@@ -47964,6 +46934,66 @@
             "description": "The emap from Taiwan National Land Surveying and Mapping Center",
             "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAAxJJREFUOI3tlF9oW2UYxn9f4nKW2ixfjJGYMnuctRUZ5mhEpjdJEEaHtmsZaKHq0qt6ZdtZL3Zhk3ilIKS9Ui806UStE7Edjln8kwzEwaB6IshsmJIqK1ttZ7Qlzel2eryQhqZrsDC8EHyuvu993+/53j+8D/yPfxtip4GqH1X1owLkdHI3RSwbkbFu1yAPdx4t3hpSS6YLAM05i/vCqcmzZwpj9T6pIZYOZNArNADhsQj3RVNjtyS1DcKtiHlPIb96PTn67nJiq8++cRgJicTpQ7Yz0oHc7cQZeakzPbTyqr9iKXUr0lfbqOx7LHJgbXrux5/X9M0+G0C8SySeeWTPQPSLxu4jn1vd4tE7m4euDNclrCEvt6E+25/e6H+VuKen57vEe1b8I29b8cKyo6j6Uece6I/VK387jC70crgjMFBDPDEx8aA5aOPkG+f7FhcX9YhGZLIUBSD7VAtSsZOKNpGKNgFU710tbiJ7G0lFm9DucCL2R7uCXjTpQFZbMV6wMu+EbWnpQOIJVKcvFTuDIR+az4nmc1Zt6h4HuV9XGHjIx1D2EvrCKtLnUgE+Pig+kQ6kDeDFc9YQwJdP2rLuBlfzRjklw7yh7JJh0vfZL6Tb70IqdqRSnT/5JfQTBcZfDom4HaBiUjn5k/Xh0VYRe85ztZ11QX53K4ZQyPxwFcO0yP+2Ste9bi6XrxPbfxuvnV9g6uIfPK/dTskwURbOFfPTM2PSIeTT99Bzw4KMhERi5ICIl667OOHuYNzdQV5p/ccBxi89kUmm5vveDou06kLddvNSibasbvZGXvj9fYJGgbldAaYaI+SVVoq7ApxtCNXEH7ZyhL8+Nho00YJeoT3+6Xp0W2KtBU07NpzNlHulem2ecHmGzpUcmlGg+dp83aynitbkK99ayfwSel2tiLUTo3M4lSn3ys12ub5MsFL4O4GGWZq/fyszfvrPsfwSNZtnpw70i+jMfjPdf//MfXf7UYtrASqWQkUoeNzLtHumS0buzePJD4zjV1a5vPX9jmRT9aNGNCKbZXMn0vnfwl+e9BTflqrxKAAAAABJRU5ErkJggg=="
         },
+        {
+            "id": "IBGE_Salvador_Streets",
+            "name": "Nomes de Ruas IBGE Salvador-BA",
+            "type": "tms",
+            "template": "https://api.mapbox.com/styles/v1/wille/cj8lp78dn62wl2rquim47qo0g/tiles/256/{zoom}/{x}/{y}?access_token=pk.eyJ1Ijoid2lsbGUiLCJhIjoicFNVWk5VWSJ9.hluCd0YGvYHNlFi_utWe2g",
+            "scaleExtent": [
+                0,
+                20
+            ],
+            "polygon": [
+                [
+                    [
+                        -38.489742279052734,
+                        -12.811131765117107
+                    ],
+                    [
+                        -38.54484558105469,
+                        -13.013924052026558
+                    ],
+                    [
+                        -38.47755432128906,
+                        -13.034662471471638
+                    ],
+                    [
+                        -38.33473205566406,
+                        -12.946846814654444
+                    ],
+                    [
+                        -38.30005645751953,
+                        -12.906692193510644
+                    ],
+                    [
+                        -38.33953857421875,
+                        -12.904349641337422
+                    ],
+                    [
+                        -38.35481643676758,
+                        -12.830213284310222
+                    ],
+                    [
+                        -38.38090896606445,
+                        -12.821844374997415
+                    ],
+                    [
+                        -38.40717315673828,
+                        -12.867535227819912
+                    ],
+                    [
+                        -38.46536636352539,
+                        -12.815985972925704
+                    ],
+                    [
+                        -38.489742279052734,
+                        -12.811131765117107
+                    ]
+                ]
+            ],
+            "description": "Streets geometry and names of Salvador, Bahia. Source: Faces de Logradouro - IBGE.",
+            "overlay": true
+        },
         {
             "id": "MAPNIK",
             "name": "OpenStreetMap (Standard)",
diff --git a/data/presets.yaml b/data/presets.yaml
index 1a4e1a4d5..774db7700 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -165,6 +165,9 @@ en:
       aeroway:
         # aeroway=*
         label: Type
+      agrarian:
+        # agrarian=*
+        label: Products
       amenity:
         # amenity=*
         label: Type
@@ -247,6 +250,9 @@ en:
       brand:
         # brand=*
         label: Brand
+      brewery:
+        # brewery=*
+        label: Draft Beers
       bridge:
         # bridge=*
         label: Type
@@ -261,6 +267,11 @@ en:
       bunker_type:
         # bunker_type=*
         label: Type
+      cables:
+        # cables=*
+        label: Cables
+        # cables field placeholder
+        placeholder: '1, 2, 3...'
       camera/direction:
         # 'camera:direction=*'
         label: Direction (Degrees Clockwise)
@@ -452,7 +463,7 @@ en:
         label: Description
       devices:
         # devices=*
-        label: Number of Devices
+        label: Devices
         # devices field placeholder
         placeholder: '1, 2, 3...'
       diaper:
@@ -592,6 +603,9 @@ en:
       generator/type:
         # 'generator:type=*'
         label: Type
+      government:
+        # government=*
+        label: Type
       grape_variety:
         # grape_variety=*
         label: Grape Varieties
@@ -806,6 +820,9 @@ en:
         label: Milestone Position
         # milestone_position field placeholder
         placeholder: Distance to one decimal (123.4)
+      monitoring_multi:
+        # 'monitoring:=*'
+        label: Monitoring
       mtb/scale:
         # 'mtb:scale=*'
         label: Mountain Biking Difficulty
@@ -990,7 +1007,7 @@ en:
         label: Payment Types
       phases:
         # phases=*
-        label: Number of Phases
+        label: Phases
         # phases field placeholder
         placeholder: '1, 2, 3...'
       phone:
@@ -1074,7 +1091,7 @@ en:
         # max_age=*
         label: Maximum Age
       playground/min_age:
-        # max_age=*
+        # min_age=*
         label: Minimum Age
       population:
         # population=*
@@ -1100,14 +1117,6 @@ en:
       recycling_accepts:
         # 'recycling:=*'
         label: Accepts
-      recycling_type:
-        # recycling_type=*
-        label: Recycling Type
-        options:
-          # recycling_type=centre
-          centre: Recycling Center
-          # recycling_type=container
-          container: Container
       ref:
         # ref=*
         label: Reference Code
@@ -1372,6 +1381,18 @@ en:
       surveillance/zone:
         # 'surveillance:zone=*'
         label: Surveillance Zone
+      switch:
+        # switch=*
+        label: Type
+        options:
+          # switch=circuit_breaker
+          circuit_breaker: Circuit Breaker
+          # switch=disconnector
+          disconnector: Disconnector
+          # switch=earthing
+          earthing: Earthing
+          # switch=mechanical
+          mechanical: Mechanical
       tactile_paving:
         # tactile_paving=*
         label: Tactile Paving
@@ -1464,7 +1485,7 @@ en:
         placeholder: 'Excellent, Good, Bad...'
       transformer:
         # transformer=*
-        label: Type of Transformer
+        label: Type
         options:
           # transformer=auto
           auto: Autotransformer
@@ -1523,6 +1544,9 @@ en:
           shield: Shield
           # 'volcano:type=stratovolcano'
           stratovolcano: Stratovolcano
+      voltage:
+        # voltage=*
+        label: Voltage
       voltage/primary:
         # 'voltage:primary=*'
         label: Primary Voltage
@@ -1563,7 +1587,7 @@ en:
         label: Wikipedia
       windings:
         # windings=*
-        label: Number of Windings
+        label: Windings
         # windings field placeholder
         placeholder: '1, 2, 3...'
       windings/configuration:
@@ -1642,7 +1666,6 @@ en:
       aerialway/station:
         # aerialway=station
         name: Aerialway Station
-        terms: '<translate with synonyms or related terms for ''Aerialway Station'', separated by commas>'
       aerialway/t-bar:
         # aerialway=t-bar
         name: T-bar Lift
@@ -1766,8 +1789,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Currency Exchange'', separated by commas>'
       amenity/bus_station:
         # amenity=bus_station
-        name: Bus Station
-        terms: '<translate with synonyms or related terms for ''Bus Station'', separated by commas>'
+        name: Bus Station / Terminal
       amenity/cafe:
         # amenity=cafe
         name: Cafe
@@ -1884,8 +1906,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Fast Food'', separated by commas>'
       amenity/ferry_terminal:
         # amenity=ferry_terminal
-        name: Ferry Terminal
-        terms: '<translate with synonyms or related terms for ''Ferry Terminal'', separated by commas>'
+        name: Ferry Station / Terminal
       amenity/fire_station:
         # amenity=fire_station
         name: Fire Station
@@ -1951,6 +1972,11 @@ en:
         # amenity=motorcycle_parking
         name: Motorcycle Parking
         terms: '<translate with synonyms or related terms for ''Motorcycle Parking'', separated by commas>'
+      amenity/music_school:
+        # amenity=music_school
+        name: Music School
+        # 'terms: school of music'
+        terms: '<translate with synonyms or related terms for ''Music School'', separated by commas>'
       amenity/nightclub:
         # amenity=nightclub
         name: Nightclub
@@ -2072,9 +2098,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Ranger Station'', separated by commas>'
       amenity/recycling:
         # amenity=recycling
-        name: Recycling
+        name: Recycling Container
         # 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
-        terms: '<translate with synonyms or related terms for ''Recycling'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Recycling Container'', separated by commas>'
       amenity/recycling_centre:
         # 'amenity=recycling, recycling_type=centre'
         name: Recycling Center
@@ -2504,6 +2530,10 @@ en:
         name: Preschool/Kindergarten Building
         # 'terms: kindergarden,pre-school'
         terms: '<translate with synonyms or related terms for ''Preschool/Kindergarten Building'', separated by commas>'
+      building/mosque:
+        # building=mosque
+        name: Mosque Building
+        terms: '<translate with synonyms or related terms for ''Mosque Building'', separated by commas>'
       building/public:
         # building=public
         name: Public Building
@@ -2612,6 +2642,10 @@ en:
         # craft=caterer
         name: Caterer
         terms: '<translate with synonyms or related terms for ''Caterer'', separated by commas>'
+      craft/chimney_sweeper:
+        # craft=chimney_sweeper
+        name: Chimney Sweeper
+        terms: '<translate with synonyms or related terms for ''Chimney Sweeper'', separated by commas>'
       craft/clockmaker:
         # craft=clockmaker
         name: Clockmaker
@@ -2732,10 +2766,10 @@ en:
         # craft=scaffolder
         name: Scaffolder
         terms: '<translate with synonyms or related terms for ''Scaffolder'', separated by commas>'
-      craft/sculpter:
-        # craft=sculpter
-        name: Sculpter
-        terms: '<translate with synonyms or related terms for ''Sculpter'', separated by commas>'
+      craft/sculptor:
+        # craft=sculptor
+        name: Sculptor
+        terms: '<translate with synonyms or related terms for ''Sculptor'', separated by commas>'
       craft/shoemaker:
         # craft=shoemaker
         name: Shoemaker
@@ -2746,10 +2780,6 @@ en:
         name: Stonemason
         # 'terms: masonry'
         terms: '<translate with synonyms or related terms for ''Stonemason'', separated by commas>'
-      craft/sweep:
-        # craft=sweep
-        name: Chimney Sweep
-        terms: '<translate with synonyms or related terms for ''Chimney Sweep'', separated by commas>'
       craft/tailor:
         # craft=tailor
         name: Tailor
@@ -2982,8 +3012,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Bridle Path'', separated by commas>'
       highway/bus_stop:
         # highway=bus_stop
-        name: Bus Stop
-        terms: '<translate with synonyms or related terms for ''Bus Stop'', separated by commas>'
+        name: Bus Stop / Platform
       highway/corridor:
         # highway=corridor
         name: Indoor Corridor
@@ -3055,9 +3084,15 @@ en:
         name: Path
         # 'terms: hike,hiking,trackway,trail,walk'
         terms: '<translate with synonyms or related terms for ''Path'', separated by commas>'
-      highway/pedestrian:
+      highway/pedestrian_area:
+        # 'highway=pedestrian, area=yes'
+        name: Pedestrian Area
+        # 'terms: center,centre,plaza,quad,square,walkway'
+        terms: '<translate with synonyms or related terms for ''Pedestrian Area'', separated by commas>'
+      highway/pedestrian_line:
         # highway=pedestrian
         name: Pedestrian Street
+        # 'terms: center,centre,plaza,quad,square,walkway'
         terms: '<translate with synonyms or related terms for ''Pedestrian Street'', separated by commas>'
       highway/primary:
         # highway=primary
@@ -3302,6 +3337,11 @@ en:
         # landuse=greenfield
         name: Greenfield
         terms: '<translate with synonyms or related terms for ''Greenfield'', separated by commas>'
+      landuse/greenhouse_horticulture:
+        # landuse=greenhouse_horticulture
+        name: Greenhouse Horticulture
+        # 'terms: flower,greenhouse,horticulture,grow,vivero'
+        terms: '<translate with synonyms or related terms for ''Greenhouse Horticulture'', separated by commas>'
       landuse/harbour:
         # landuse=harbour
         name: Harbor
@@ -3413,6 +3453,10 @@ en:
         name: Recreation Ground
         # 'terms: playing fields'
         terms: '<translate with synonyms or related terms for ''Recreation Ground'', separated by commas>'
+      landuse/religious:
+        # landuse=religious
+        name: Religious Area
+        terms: '<translate with synonyms or related terms for ''Religious Area'', separated by commas>'
       landuse/residential:
         # landuse=residential
         name: Residential Area
@@ -3761,6 +3805,11 @@ en:
         name: Mast
         # 'terms: antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower'
         terms: '<translate with synonyms or related terms for ''Mast'', separated by commas>'
+      man_made/monitoring_station:
+        # man_made=monitoring_station
+        name: Monitoring Station
+        # 'terms: weather,earthquake,seismology,air,gps'
+        terms: '<translate with synonyms or related terms for ''Monitoring Station'', separated by commas>'
       man_made/observation:
         # 'man_made=tower, tower:type=observation'
         name: Observation Tower
@@ -3996,16 +4045,34 @@ en:
         terms: '<translate with synonyms or related terms for ''Office'', separated by commas>'
       office/accountant:
         # office=accountant
-        name: Accountant
-        terms: '<translate with synonyms or related terms for ''Accountant'', separated by commas>'
+        name: Accountant Office
+        terms: '<translate with synonyms or related terms for ''Accountant Office'', separated by commas>'
       office/administrative:
         # office=administrative
         name: Administrative Office
-        terms: '<translate with synonyms or related terms for ''Administrative Office'', separated by commas>'
+      office/adoption_agency:
+        # office=adoption_agency
+        name: Adoption Agency
+        terms: '<translate with synonyms or related terms for ''Adoption Agency'', separated by commas>'
+      office/advertising_agency:
+        # office=advertising_agency
+        name: Advertising Agency
+        # 'terms: ad,ad agency,advert agency,advertising,marketing'
+        terms: '<translate with synonyms or related terms for ''Advertising Agency'', separated by commas>'
       office/architect:
         # office=architect
-        name: Architect
-        terms: '<translate with synonyms or related terms for ''Architect'', separated by commas>'
+        name: Architect Office
+        terms: '<translate with synonyms or related terms for ''Architect Office'', separated by commas>'
+      office/association:
+        # office=association
+        name: Nonprofit Organization Office
+        # 'terms: association,non-profit,nonprofit,organization,society'
+        terms: '<translate with synonyms or related terms for ''Nonprofit Organization Office'', separated by commas>'
+      office/charity:
+        # office=charity
+        name: Charity Office
+        # 'terms: charitable organization'
+        terms: '<translate with synonyms or related terms for ''Charity Office'', separated by commas>'
       office/company:
         # office=company
         name: Company Office
@@ -4024,6 +4091,11 @@ en:
         name: Employment Agency
         # 'terms: job'
         terms: '<translate with synonyms or related terms for ''Employment Agency'', separated by commas>'
+      office/energy_supplier:
+        # office=energy_supplier
+        name: Energy Supplier Office
+        # 'terms: electricity,energy company,energy utility,gas utility'
+        terms: '<translate with synonyms or related terms for ''Energy Supplier Office'', separated by commas>'
       office/estate_agent:
         # office=estate_agent
         name: Real Estate Office
@@ -4032,6 +4104,15 @@ en:
         # office=financial
         name: Financial Office
         terms: '<translate with synonyms or related terms for ''Financial Office'', separated by commas>'
+      office/forestry:
+        # office=forestry
+        name: Forestry Office
+        # 'terms: forest,ranger'
+        terms: '<translate with synonyms or related terms for ''Forestry Office'', separated by commas>'
+      office/foundation:
+        # office=foundation
+        name: Foundation Office
+        terms: '<translate with synonyms or related terms for ''Foundation Office'', separated by commas>'
       office/government:
         # office=government
         name: Government Office
@@ -4041,14 +4122,25 @@ en:
         name: Register Office
         # 'terms: clerk,marriage,death,birth,certificate'
         terms: '<translate with synonyms or related terms for ''Register Office'', separated by commas>'
+      office/government/tax:
+        # 'office=government, government=tax'
+        name: Tax and Revenue Office
+        # 'terms: fiscal authorities,revenue office,tax office'
+        terms: '<translate with synonyms or related terms for ''Tax and Revenue Office'', separated by commas>'
+      office/guide:
+        # office=guide
+        name: Tour Guide Office
+        # 'terms: dive guide,mountain guide,tour guide'
+        terms: '<translate with synonyms or related terms for ''Tour Guide Office'', separated by commas>'
       office/insurance:
         # office=insurance
         name: Insurance Office
         terms: '<translate with synonyms or related terms for ''Insurance Office'', separated by commas>'
       office/it:
         # office=it
-        name: IT Office
-        terms: '<translate with synonyms or related terms for ''IT Office'', separated by commas>'
+        name: Information Technology Office
+        # 'terms: computer,information,software,technology'
+        terms: '<translate with synonyms or related terms for ''Information Technology Office'', separated by commas>'
       office/lawyer:
         # office=lawyer
         name: Law Office
@@ -4058,14 +4150,24 @@ en:
         name: Notary Office
         # 'terms: clerk,signature,wills,deeds,estate'
         terms: '<translate with synonyms or related terms for ''Notary Office'', separated by commas>'
+      office/moving_company:
+        # office=moving_company
+        name: Moving Company Office
+        # 'terms: relocation'
+        terms: '<translate with synonyms or related terms for ''Moving Company Office'', separated by commas>'
       office/newspaper:
         # office=newspaper
-        name: Newspaper
-        terms: '<translate with synonyms or related terms for ''Newspaper'', separated by commas>'
+        name: Newspaper Office
+        terms: '<translate with synonyms or related terms for ''Newspaper Office'', separated by commas>'
       office/ngo:
         # office=ngo
         name: NGO Office
+        # 'terms: ngo,non government,non-government,organization,organisation'
         terms: '<translate with synonyms or related terms for ''NGO Office'', separated by commas>'
+      office/notary:
+        # office=notary
+        name: Notary Office
+        terms: '<translate with synonyms or related terms for ''Notary Office'', separated by commas>'
       office/physician:
         # office=physician
         name: Physician
@@ -4073,21 +4175,46 @@ en:
         # office=political_party
         name: Political Party
         terms: '<translate with synonyms or related terms for ''Political Party'', separated by commas>'
+      office/private_investigator:
+        # office=private_investigator
+        name: Private Investigator Office
+        # 'terms: PI,private eye,private detective'
+        terms: '<translate with synonyms or related terms for ''Private Investigator Office'', separated by commas>'
+      office/quango:
+        # office=quango
+        name: Quasi-NGO Office
+        # 'terms: ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous'
+        terms: '<translate with synonyms or related terms for ''Quasi-NGO Office'', separated by commas>'
       office/research:
         # office=research
         name: Research Office
         terms: '<translate with synonyms or related terms for ''Research Office'', separated by commas>'
+      office/surveyor:
+        # office=surveyor
+        name: Surveyor Office
+        terms: '<translate with synonyms or related terms for ''Surveyor Office'', separated by commas>'
+      office/tax_advisor:
+        # office=tax_advisor
+        name: Tax Advisor Office
+        # 'terms: tax,tax consultant'
+        terms: '<translate with synonyms or related terms for ''Tax Advisor Office'', separated by commas>'
       office/telecommunication:
         # office=telecommunication
         name: Telecom Office
         terms: '<translate with synonyms or related terms for ''Telecom Office'', separated by commas>'
       office/therapist:
         # office=therapist
-        name: Therapist
-        terms: '<translate with synonyms or related terms for ''Therapist'', separated by commas>'
+        name: Therapist Office
+        # 'terms: therapy'
+        terms: '<translate with synonyms or related terms for ''Therapist Office'', separated by commas>'
       office/travel_agent:
         # office=travel_agent
         name: Travel Agency
+      office/water_utility:
+        # office=water_utility
+        name: Water Utility Office
+        # 'terms: water board,utility'
+        terms: '<translate with synonyms or related terms for ''Water Utility Office'', separated by commas>'
       piste:
         # 'piste:type=*'
         name: Piste/Ski Trail
@@ -4262,6 +4389,10 @@ en:
         # power=substation
         name: Substation
         terms: '<translate with synonyms or related terms for ''Substation'', separated by commas>'
+      power/switch:
+        # power=switch
+        name: Power Switch
+        terms: '<translate with synonyms or related terms for ''Power Switch'', separated by commas>'
       power/tower:
         # power=tower
         name: High-Voltage Tower
@@ -4270,14 +4401,215 @@ en:
         # power=transformer
         name: Transformer
         terms: '<translate with synonyms or related terms for ''Transformer'', separated by commas>'
+      public_transport/linear_platform:
+        # public_transport=platform
+        name: Transit Stop / Platform
+        # 'terms: platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Transit Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_aerialway:
+        # 'public_transport=platform, aerialway=yes'
+        name: Aerialway Stop / Platform
+        # 'terms: aerialway,cable car,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Aerialway Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_bus:
+        # 'public_transport=platform, bus=yes'
+        name: Bus Stop / Platform
+        # 'terms: bus,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Bus Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_ferry:
+        # 'public_transport=platform, ferry=yes'
+        name: Ferry Stop / Platform
+        # 'terms: boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Ferry Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_light_rail:
+        # 'public_transport=platform, light_rail=yes'
+        name: Light Rail Stop / Platform
+        # 'terms: electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Light Rail Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_monorail:
+        # 'public_transport=platform, monorail=yes'
+        name: Monorail Stop / Platform
+        # 'terms: monorail,platform,public transit,public transportation,rail,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Monorail Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_subway:
+        # 'public_transport=platform, train=yes'
+        name: Subway Stop / Platform
+        # 'terms: metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground'
+        terms: '<translate with synonyms or related terms for ''Subway Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_train:
+        # 'public_transport=platform, train=yes'
+        name: Train Stop / Platform
+        # 'terms: platform,public transit,public transportation,rail,track,train,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_tram:
+        # 'public_transport=platform, tram=yes'
+        name: Tram Stop / Platform
+        # 'terms: electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Tram Stop / Platform'', separated by commas>'
+      public_transport/linear_platform_trolleybus:
+        # 'public_transport=platform, trolleybus=yes'
+        name: Trolleybus Stop / Platform
+        # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Trolleybus Stop / Platform'', separated by commas>'
       public_transport/platform:
         # public_transport=platform
-        name: Platform
-        terms: '<translate with synonyms or related terms for ''Platform'', separated by commas>'
+        name: Transit Stop / Platform
+        # 'terms: platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Transit Stop / Platform'', separated by commas>'
+      public_transport/platform_aerialway:
+        # 'public_transport=platform, aerialway=yes'
+        name: Aerialway Stop / Platform
+        # 'terms: aerialway,cable car,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Aerialway Stop / Platform'', separated by commas>'
+      public_transport/platform_bus:
+        # 'public_transport=platform, bus=yes'
+        name: Bus Stop / Platform
+        # 'terms: bus,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Bus Stop / Platform'', separated by commas>'
+      public_transport/platform_ferry:
+        # 'public_transport=platform, ferry=yes'
+        name: Ferry Stop / Platform
+        # 'terms: boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Ferry Stop / Platform'', separated by commas>'
+      public_transport/platform_light_rail:
+        # 'public_transport=platform, light_rail=yes'
+        name: Light Rail Stop / Platform
+        # 'terms: electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Light Rail Stop / Platform'', separated by commas>'
+      public_transport/platform_monorail:
+        # 'public_transport=platform, monorail=yes'
+        name: Monorail Stop / Platform
+        # 'terms: monorail,platform,public transit,public transportation,rail,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Monorail Stop / Platform'', separated by commas>'
+      public_transport/platform_subway:
+        # 'public_transport=platform, train=yes'
+        name: Subway Stop / Platform
+        # 'terms: metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground'
+        terms: '<translate with synonyms or related terms for ''Subway Stop / Platform'', separated by commas>'
+      public_transport/platform_train:
+        # 'public_transport=platform, train=yes'
+        name: Train Stop / Platform
+        # 'terms: platform,public transit,public transportation,rail,track,train,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Stop / Platform'', separated by commas>'
+      public_transport/platform_tram:
+        # 'public_transport=platform, tram=yes'
+        name: Tram Stop / Platform
+        # 'terms: electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Tram Stop / Platform'', separated by commas>'
+      public_transport/platform_trolleybus:
+        # 'public_transport=platform, trolleybus=yes'
+        name: Trolleybus Stop / Platform
+        # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Trolleybus Stop / Platform'', separated by commas>'
+      public_transport/station:
+        # public_transport=station
+        name: Transit Station
+        # 'terms: public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Transit Station'', separated by commas>'
+      public_transport/station_aerialway:
+        # 'public_transport=station, aerialway=yes'
+        name: Aerialway Station
+        # 'terms: aerialway,cable car,public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Aerialway Station'', separated by commas>'
+      public_transport/station_bus:
+        # 'public_transport=station, bus=yes'
+        name: Bus Station / Terminal
+        # 'terms: bus,public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Bus Station / Terminal'', separated by commas>'
+      public_transport/station_ferry:
+        # 'public_transport=station, ferry=yes'
+        name: Ferry Station / Terminal
+        # 'terms: boat,dock,ferry,pier,public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Ferry Station / Terminal'', separated by commas>'
+      public_transport/station_light_rail:
+        # 'public_transport=station, light_rail=yes'
+        name: Light Rail Station
+        # 'terms: electric,light rail,public transit,public transportation,rail,station,terminal,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Light Rail Station'', separated by commas>'
+      public_transport/station_monorail:
+        # 'public_transport=station, monorail=yes'
+        name: Monorail Station
+        # 'terms: monorail,public transit,public transportation,rail,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Monorail Station'', separated by commas>'
+      public_transport/station_subway:
+        # 'public_transport=station, subway=yes'
+        name: Subway Station
+        # 'terms: metro,public transit,public transportation,rail,station,subway,terminal,track,transit,transportation,underground'
+        terms: '<translate with synonyms or related terms for ''Subway Station'', separated by commas>'
+      public_transport/station_train:
+        # 'public_transport=station, train=yes'
+        name: Train Station
+        # 'terms: public transit,public transportation,rail,station,terminal,track,train,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Station'', separated by commas>'
+      public_transport/station_train_halt:
+        # 'public_transport=station, train=yes, railway=halt'
+        name: Train Station (Halt / Request)
+        # 'terms: halt,public transit,public transportation,rail,station,track,train,transit,transportation,whistle stop'
+        terms: '<translate with synonyms or related terms for ''Train Station (Halt / Request)'', separated by commas>'
+      public_transport/station_tram:
+        # 'public_transport=station, tram=yes'
+        name: Tram Station
+        # 'terms: electric,light rail,public transit,public transportation,rail,station,streetcar,terminal,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Tram Station'', separated by commas>'
+      public_transport/station_trolleybus:
+        # 'public_transport=station, trolleybus=yes'
+        name: Trolleybus Station / Terminal
+        # 'terms: bus,electric,public transit,public transportation,station,streetcar,terminal,trackless,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Trolleybus Station / Terminal'', separated by commas>'
+      public_transport/stop_area:
+        # 'type=public_transport, public_transport=stop_area'
+        name: Transit Stop Area
+        terms: '<translate with synonyms or related terms for ''Transit Stop Area'', separated by commas>'
       public_transport/stop_position:
         # public_transport=stop_position
-        name: Stop Position
-        terms: '<translate with synonyms or related terms for ''Stop Position'', separated by commas>'
+        name: Transit Stopping Location
+        # 'terms: public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Transit Stopping Location'', separated by commas>'
+      public_transport/stop_position_aerialway:
+        # 'public_transport=stop_position, aerialway=yes'
+        name: Aerialway Stopping Location
+        # 'terms: aerialway,cable car,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Aerialway Stopping Location'', separated by commas>'
+      public_transport/stop_position_bus:
+        # 'public_transport=stop_position, bus=yes'
+        name: Bus Stopping Location
+        # 'terms: bus,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Bus Stopping Location'', separated by commas>'
+      public_transport/stop_position_ferry:
+        # 'public_transport=stop_position, ferry=yes'
+        name: Ferry Stopping Location
+        # 'terms: boat,dock,ferry,pier,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Ferry Stopping Location'', separated by commas>'
+      public_transport/stop_position_light_rail:
+        # 'public_transport=stop_position, light_rail=yes'
+        name: Light Rail Stopping Location
+        # 'terms: electric,light rail,public transit,public transportation,rail,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Light Rail Stopping Location'', separated by commas>'
+      public_transport/stop_position_monorail:
+        # 'public_transport=stop_position, monorail=yes'
+        name: Monorail Stopping Location
+        # 'terms: monorail,public transit,public transportation,rail,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Monorail Stopping Location'', separated by commas>'
+      public_transport/stop_position_subway:
+        # 'public_transport=stop_position, subway=yes'
+        name: Subway Stopping Location
+        # 'terms: metro,public transit,public transportation,rail,subway,track,transit,transportation,underground'
+        terms: '<translate with synonyms or related terms for ''Subway Stopping Location'', separated by commas>'
+      public_transport/stop_position_train:
+        # 'public_transport=stop_position, train=yes'
+        name: Train Stopping Location
+        # 'terms: public transit,public transportation,rail,track,train,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Stopping Location'', separated by commas>'
+      public_transport/stop_position_tram:
+        # 'public_transport=stop_position, tram=yes'
+        name: Tram Stopping Location
+        # 'terms: electric,light rail,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Tram Stopping Location'', separated by commas>'
+      public_transport/stop_position_trolleybus:
+        # 'public_transport=stop_position, trolleybus=yes'
+        name: Trolleybus Stopping Location
+        # 'terms: bus,electric,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Trolleybus Stopping Location'', separated by commas>'
       railway:
         # railway=*
         name: Railway
@@ -4311,19 +4643,27 @@ en:
         terms: '<translate with synonyms or related terms for ''Funicular'', separated by commas>'
       railway/halt:
         # railway=halt
-        name: Railway Halt
-        # 'terms: break,interrupt,rest,wait,interruption'
-        terms: '<translate with synonyms or related terms for ''Railway Halt'', separated by commas>'
+        name: Train Station (Halt / Request)
       railway/level_crossing:
         # railway=level_crossing
         name: Railway Crossing (Road)
         # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
+      railway/light_rail:
+        # railway=light_rail
+        name: Light Rail
+        # 'terms: light rail,streetcar,trolley'
+        terms: '<translate with synonyms or related terms for ''Light Rail'', separated by commas>'
       railway/milestone:
         # railway=milestone
         name: Railway Milestone
         # 'terms: milestone,marker'
         terms: '<translate with synonyms or related terms for ''Railway Milestone'', separated by commas>'
+      railway/miniature:
+        # railway=miniature
+        name: Miniature Railway
+        # 'terms: rideable miniature railway,narrow gauge railway,minimum gauge railway'
+        terms: '<translate with synonyms or related terms for ''Miniature Railway'', separated by commas>'
       railway/monorail:
         # railway=monorail
         name: Monorail
@@ -4335,8 +4675,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Narrow Gauge Rail'', separated by commas>'
       railway/platform:
         # railway=platform
-        name: Railway Platform
-        terms: '<translate with synonyms or related terms for ''Railway Platform'', separated by commas>'
+        name: Train Stop / Platform
       railway/rail:
         # railway=rail
         name: Rail
@@ -4348,9 +4687,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Railway Signal'', separated by commas>'
       railway/station:
         # railway=station
-        name: Railway Station
-        # 'terms: train station,station'
-        terms: '<translate with synonyms or related terms for ''Railway Station'', separated by commas>'
+        name: Train Station
       railway/subway:
         # railway=subway
         name: Subway
@@ -4378,9 +4715,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Tram'', separated by commas>'
       railway/tram_stop:
         # railway=tram_stop
-        name: Tram Stop
-        # 'terms: light rail,streetcar,tram,trolley'
-        terms: '<translate with synonyms or related terms for ''Tram Stop'', separated by commas>'
+        name: Tram Stopping Position
       relation:
         name: Relation
         terms: '<translate with synonyms or related terms for ''Relation'', separated by commas>'
@@ -4395,6 +4730,11 @@ en:
         # shop=*
         name: Shop
         terms: '<translate with synonyms or related terms for ''Shop'', separated by commas>'
+      shop/agrarian:
+        # shop=agrarian
+        name: Agriculture Shop
+        # 'terms: agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools'
+        terms: '<translate with synonyms or related terms for ''Agriculture Shop'', separated by commas>'
       shop/alcohol:
         # shop=alcohol
         name: Liquor Store
@@ -4697,8 +5037,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Jeweler'', separated by commas>'
       shop/kiosk:
         # shop=kiosk
-        name: News Kiosk
-        terms: '<translate with synonyms or related terms for ''News Kiosk'', separated by commas>'
+        name: Kiosk
+        terms: '<translate with synonyms or related terms for ''Kiosk'', separated by commas>'
       shop/kitchen:
         # shop=kitchen
         name: Kitchen Design Store
@@ -4974,8 +5314,9 @@ en:
         terms: '<translate with synonyms or related terms for ''RV Park'', separated by commas>'
       tourism/chalet:
         # tourism=chalet
-        name: Chalet
-        terms: '<translate with synonyms or related terms for ''Chalet'', separated by commas>'
+        name: Holiday Cottage
+        # 'terms: holiday,holiday cottage,holiday home,vacation,vacation home'
+        terms: '<translate with synonyms or related terms for ''Holiday Cottage'', separated by commas>'
       tourism/gallery:
         # tourism=gallery
         name: Art Gallery
@@ -5037,6 +5378,11 @@ en:
         # tourism=viewpoint
         name: Viewpoint
         terms: '<translate with synonyms or related terms for ''Viewpoint'', separated by commas>'
+      tourism/wilderness_hut:
+        # tourism=wilderness_hut
+        name: Wilderness Hut
+        # 'terms: wilderness hut,backcountry hut,bothy'
+        terms: '<translate with synonyms or related terms for ''Wilderness Hut'', separated by commas>'
       tourism/zoo:
         # tourism=zoo
         name: Zoo
@@ -5167,10 +5513,18 @@ en:
         # 'type=route, route=horse'
         name: Riding Route
         terms: '<translate with synonyms or related terms for ''Riding Route'', separated by commas>'
+      type/route/light_rail:
+        # 'type=route, route=light_rail'
+        name: Light Rail Route
+        terms: '<translate with synonyms or related terms for ''Light Rail Route'', separated by commas>'
       type/route/pipeline:
         # 'type=route, route=pipeline'
         name: Pipeline Route
         terms: '<translate with synonyms or related terms for ''Pipeline Route'', separated by commas>'
+      type/route/piste:
+        # 'type=route, route=piste'
+        name: Piste/Ski Route
+        terms: '<translate with synonyms or related terms for ''Piste/Ski Route'', separated by commas>'
       type/route/power:
         # 'type=route, route=power'
         name: Power Route
@@ -5179,6 +5533,10 @@ en:
         # 'type=route, route=road'
         name: Road Route
         terms: '<translate with synonyms or related terms for ''Road Route'', separated by commas>'
+      type/route/subway:
+        # 'type=route, route=subway'
+        name: Subway Route
+        terms: '<translate with synonyms or related terms for ''Subway Route'', separated by commas>'
       type/route/train:
         # 'type=route, route=train'
         name: Train Route
diff --git a/data/presets/categories.json b/data/presets/categories.json
index 310781588..074b44b0c 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -21,6 +21,7 @@
                 "building",
                 "building/house",
                 "building/apartments",
+                "building/retail",
                 "building/commercial",
                 "building/industrial",
                 "building/residential"
@@ -55,7 +56,8 @@
                 "landuse/meadow",
                 "landuse/aquaculture",
                 "landuse/cemetery",
-                "landuse/military"
+                "landuse/military",
+                "landuse/religious"
             ]
         },
         "category-natural-area": {
@@ -107,7 +109,7 @@
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
-                "highway/pedestrian"
+                "highway/pedestrian_line"
             ]
         },
         "category-rail": {
@@ -171,9 +173,12 @@
                 "type/route/foot",
                 "type/route/hiking",
                 "type/route/horse",
+                "type/route/piste",
                 "type/route/bus",
                 "type/route/train",
+                "type/route/light_rail",
                 "type/route/tram",
+                "type/route/subway",
                 "type/route/ferry",
                 "type/route/power",
                 "type/route/pipeline",
diff --git a/data/presets/categories/building.json b/data/presets/categories/building.json
index 2c178a21c..d94ce516b 100644
--- a/data/presets/categories/building.json
+++ b/data/presets/categories/building.json
@@ -6,6 +6,7 @@
         "building",
         "building/house",
         "building/apartments",
+        "building/retail",
         "building/commercial",
         "building/industrial",
         "building/residential"
diff --git a/data/presets/categories/landuse.json b/data/presets/categories/landuse.json
index 80c5594aa..b67f1a803 100644
--- a/data/presets/categories/landuse.json
+++ b/data/presets/categories/landuse.json
@@ -13,6 +13,7 @@
         "landuse/meadow",
         "landuse/aquaculture",
         "landuse/cemetery",
-        "landuse/military"
+        "landuse/military",
+        "landuse/religious"
     ]
 }
diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json
index 5b15546dd..b675a430e 100644
--- a/data/presets/categories/path.json
+++ b/data/presets/categories/path.json
@@ -10,6 +10,6 @@
         "highway/footway",
         "highway/cycleway",
         "highway/bridleway",
-        "highway/pedestrian"
+        "highway/pedestrian_line"
     ]
 }
diff --git a/data/presets/categories/route.json b/data/presets/categories/route.json
index b9926d32a..f60c0d34b 100644
--- a/data/presets/categories/route.json
+++ b/data/presets/categories/route.json
@@ -8,9 +8,12 @@
         "type/route/foot",
         "type/route/hiking",
         "type/route/horse",
+        "type/route/piste",
         "type/route/bus",
         "type/route/train",
+        "type/route/light_rail",
         "type/route/tram",
+        "type/route/subway",
         "type/route/ferry",
         "type/route/power",
         "type/route/pipeline",
diff --git a/data/presets/defaults.json b/data/presets/defaults.json
index 14eab2d8e..92a8ff98d 100644
--- a/data/presets/defaults.json
+++ b/data/presets/defaults.json
@@ -50,6 +50,7 @@
         "relation": [
             "category-route",
             "category-restriction",
+            "public_transport/stop_area",
             "type/boundary",
             "type/waterway",
             "type/multipolygon",
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 53191bea8..803f6ca39 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -201,6 +201,11 @@
             "type": "typeCombo",
             "label": "Type"
         },
+        "agrarian": {
+            "key": "agrarian",
+            "type": "semiCombo",
+            "label": "Products"
+        },
         "amenity": {
             "key": "amenity",
             "type": "typeCombo",
@@ -326,6 +331,11 @@
             "type": "text",
             "label": "Brand"
         },
+        "brewery": {
+            "key": "brewery",
+            "type": "semiCombo",
+            "label": "Draft Beers"
+        },
         "bridge": {
             "key": "bridge",
             "type": "typeCombo",
@@ -349,6 +359,12 @@
             "type": "combo",
             "label": "Type"
         },
+        "cables": {
+            "key": "cables",
+            "type": "number",
+            "label": "Cables",
+            "placeholder": "1, 2, 3..."
+        },
         "camera/direction": {
             "key": "camera:direction",
             "type": "number",
@@ -597,7 +613,7 @@
         "devices": {
             "key": "devices",
             "type": "number",
-            "label": "Number of Devices",
+            "label": "Devices",
             "placeholder": "1, 2, 3..."
         },
         "diaper": {
@@ -809,6 +825,11 @@
             "type": "combo",
             "label": "Type"
         },
+        "government": {
+            "key": "government",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "grape_variety": {
             "key": "grape_variety",
             "type": "semiCombo",
@@ -1125,6 +1146,11 @@
             "placeholder": "Distance to one decimal (123.4)",
             "label": "Milestone Position"
         },
+        "monitoring_multi": {
+            "key": "monitoring:",
+            "type": "multiCombo",
+            "label": "Monitoring"
+        },
         "mtb/scale": {
             "key": "mtb:scale",
             "type": "combo",
@@ -1335,7 +1361,7 @@
         "phases": {
             "key": "phases",
             "type": "number",
-            "label": "Number of Phases",
+            "label": "Phases",
             "placeholder": "1, 2, 3..."
         },
         "phone": {
@@ -1423,7 +1449,7 @@
             "label": "Maximum Age"
         },
         "playground/min_age": {
-            "key": "max_age",
+            "key": "min_age",
             "type": "number",
             "label": "Minimum Age"
         },
@@ -1468,18 +1494,6 @@
             "type": "multiCombo",
             "label": "Accepts"
         },
-        "recycling_type": {
-            "key": "recycling_type",
-            "default": "container",
-            "type": "combo",
-            "label": "Recycling Type",
-            "strings": {
-                "options": {
-                    "container": "Container",
-                    "centre": "Recycling Center"
-                }
-            }
-        },
         "ref_aeroway_gate": {
             "key": "ref",
             "type": "text",
@@ -1722,6 +1736,7 @@
             "universal": true,
             "label": "Sources",
             "snake_case": false,
+            "caseSensitive": true,
             "options": [
                 "survey",
                 "local knowledge",
@@ -1882,6 +1897,19 @@
             "type": "combo",
             "label": "Surveillance Zone"
         },
+        "switch": {
+            "key": "switch",
+            "type": "combo",
+            "label": "Type",
+            "strings": {
+                "options": {
+                    "mechanical": "Mechanical",
+                    "circuit_breaker": "Circuit Breaker",
+                    "disconnector": "Disconnector",
+                    "earthing": "Earthing"
+                }
+            }
+        },
         "tactile_paving": {
             "key": "tactile_paving",
             "type": "check",
@@ -1996,7 +2024,7 @@
         "transformer": {
             "key": "transformer",
             "type": "combo",
-            "label": "Type of Transformer",
+            "label": "Type",
             "strings": {
                 "options": {
                     "distribution": "Distribution",
@@ -2062,6 +2090,11 @@
                 }
             }
         },
+        "voltage": {
+            "key": "voltage",
+            "type": "combo",
+            "label": "Voltage"
+        },
         "voltage/primary": {
             "key": "voltage:primary",
             "type": "combo",
@@ -2141,7 +2174,7 @@
         "windings": {
             "key": "windings",
             "type": "number",
-            "label": "Number of Windings",
+            "label": "Windings",
             "placeholder": "1, 2, 3..."
         },
         "windings/configuration": {
diff --git a/data/presets/fields/agrarian.json b/data/presets/fields/agrarian.json
new file mode 100644
index 000000000..d6072e167
--- /dev/null
+++ b/data/presets/fields/agrarian.json
@@ -0,0 +1,5 @@
+{
+    "key": "agrarian",
+    "type": "semiCombo",
+    "label": "Products"
+}
diff --git a/data/presets/fields/brewery.json b/data/presets/fields/brewery.json
new file mode 100644
index 000000000..cb0dc53eb
--- /dev/null
+++ b/data/presets/fields/brewery.json
@@ -0,0 +1,5 @@
+{
+    "key": "brewery",
+    "type": "semiCombo",
+    "label": "Draft Beers"
+}
diff --git a/data/presets/fields/cables.json b/data/presets/fields/cables.json
new file mode 100644
index 000000000..f6b18eb8a
--- /dev/null
+++ b/data/presets/fields/cables.json
@@ -0,0 +1,6 @@
+{
+    "key": "cables",
+    "type": "number",
+    "label": "Cables",
+    "placeholder": "1, 2, 3..."
+}
diff --git a/data/presets/fields/devices.json b/data/presets/fields/devices.json
index d2f35f22e..55d36db74 100644
--- a/data/presets/fields/devices.json
+++ b/data/presets/fields/devices.json
@@ -1,6 +1,6 @@
 {
     "key": "devices",
     "type": "number",
-    "label": "Number of Devices",
+    "label": "Devices",
     "placeholder": "1, 2, 3..."
 }
diff --git a/data/presets/fields/government.json b/data/presets/fields/government.json
new file mode 100644
index 000000000..0133a83d5
--- /dev/null
+++ b/data/presets/fields/government.json
@@ -0,0 +1,5 @@
+{
+    "key": "government",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/monitoring_multi.json b/data/presets/fields/monitoring_multi.json
new file mode 100644
index 000000000..dd9630bf4
--- /dev/null
+++ b/data/presets/fields/monitoring_multi.json
@@ -0,0 +1,5 @@
+{
+    "key": "monitoring:",
+    "type": "multiCombo",
+    "label": "Monitoring"
+}
diff --git a/data/presets/fields/phases.json b/data/presets/fields/phases.json
index 5b32604d5..5fa9aac95 100644
--- a/data/presets/fields/phases.json
+++ b/data/presets/fields/phases.json
@@ -1,6 +1,6 @@
 {
     "key": "phases",
     "type": "number",
-    "label": "Number of Phases",
+    "label": "Phases",
     "placeholder": "1, 2, 3..."
 }
diff --git a/data/presets/fields/playground/min_age.json b/data/presets/fields/playground/min_age.json
index 4616635b6..762005e62 100644
--- a/data/presets/fields/playground/min_age.json
+++ b/data/presets/fields/playground/min_age.json
@@ -1,5 +1,5 @@
 {
-    "key": "max_age",
+    "key": "min_age",
     "type": "number",
     "label": "Minimum Age"
 }
diff --git a/data/presets/fields/recycling_type.json b/data/presets/fields/recycling_type.json
deleted file mode 100644
index e8195f105..000000000
--- a/data/presets/fields/recycling_type.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "key": "recycling_type",
-    "default": "container",
-    "type": "combo",
-    "label": "Recycling Type",
-    "strings": {
-        "options": {
-            "container": "Container",
-            "centre": "Recycling Center"
-        }
-    }
-}
diff --git a/data/presets/fields/source.json b/data/presets/fields/source.json
index b4411e47e..0d953e6e4 100644
--- a/data/presets/fields/source.json
+++ b/data/presets/fields/source.json
@@ -5,6 +5,7 @@
     "universal": true,
     "label": "Sources",
     "snake_case": false,
+    "caseSensitive": true,
     "options": [
         "survey",
         "local knowledge",
diff --git a/data/presets/fields/switch.json b/data/presets/fields/switch.json
new file mode 100644
index 000000000..c17d9b75c
--- /dev/null
+++ b/data/presets/fields/switch.json
@@ -0,0 +1,13 @@
+{
+    "key": "switch",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "mechanical": "Mechanical",
+            "circuit_breaker": "Circuit Breaker",
+            "disconnector": "Disconnector",
+            "earthing": "Earthing"
+        }
+    }
+}
diff --git a/data/presets/fields/transformer.json b/data/presets/fields/transformer.json
index e811eb2a2..0c3720ed6 100644
--- a/data/presets/fields/transformer.json
+++ b/data/presets/fields/transformer.json
@@ -1,7 +1,7 @@
 {
     "key": "transformer",
     "type": "combo",
-    "label": "Type of Transformer",
+    "label": "Type",
     "strings": {
         "options": {
             "distribution": "Distribution",
diff --git a/data/presets/fields/voltage.json b/data/presets/fields/voltage.json
new file mode 100644
index 000000000..d297c9371
--- /dev/null
+++ b/data/presets/fields/voltage.json
@@ -0,0 +1,5 @@
+{
+    "key": "voltage",
+    "type": "combo",
+    "label": "Voltage"
+}
diff --git a/data/presets/fields/windings.json b/data/presets/fields/windings.json
index 2c123b0a7..106e67857 100644
--- a/data/presets/fields/windings.json
+++ b/data/presets/fields/windings.json
@@ -1,6 +1,6 @@
 {
     "key": "windings",
     "type": "number",
-    "label": "Number of Windings",
+    "label": "Windings",
     "placeholder": "1, 2, 3..."
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c83dc7585..139bfbd16 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -183,6 +183,25 @@
             },
             "name": "Billboard"
         },
+        "aerialway/station": {
+            "icon": "aerialway",
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "fields": [
+                "aerialway/access",
+                "aerialway/summer/access",
+                "elevation",
+                "building_area"
+            ],
+            "tags": {
+                "aerialway": "station"
+            },
+            "name": "Aerialway Station",
+            "searchable": false
+        },
         "aerialway/cable_car": {
             "geometry": [
                 "line"
@@ -346,24 +365,6 @@
             },
             "name": "Rope Tow Lift"
         },
-        "aerialway/station": {
-            "icon": "aerialway",
-            "geometry": [
-                "point",
-                "vertex",
-                "area"
-            ],
-            "fields": [
-                "aerialway/access",
-                "aerialway/summer/access",
-                "elevation",
-                "building_area"
-            ],
-            "tags": {
-                "aerialway": "station"
-            },
-            "name": "Aerialway Station"
-        },
         "aerialway/t-bar": {
             "geometry": [
                 "line"
@@ -520,6 +521,26 @@
             },
             "name": "Airport Terminal"
         },
+        "amenity/bus_station": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "building_area",
+                "operator",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "bus_station"
+            },
+            "name": "Bus Station / Terminal",
+            "searchable": false
+        },
         "amenity/coworking_space": {
             "icon": "commercial",
             "fields": [
@@ -541,6 +562,27 @@
             "name": "Coworking Space",
             "searchable": false
         },
+        "amenity/ferry_terminal": {
+            "icon": "ferry",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "ferry_terminal"
+            },
+            "name": "Ferry Station / Terminal",
+            "searchable": false
+        },
         "amenity/nursing_home": {
             "icon": "wheelchair",
             "fields": [
@@ -810,7 +852,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "geometry": [
                 "point",
@@ -937,7 +980,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "geometry": [
                 "point",
@@ -987,25 +1031,6 @@
             },
             "name": "Currency Exchange"
         },
-        "amenity/bus_station": {
-            "icon": "bus",
-            "fields": [
-                "name",
-                "building_area",
-                "operator",
-                "internet_access",
-                "internet_access/fee",
-                "internet_access/ssid"
-            ],
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "tags": {
-                "amenity": "bus_station"
-            },
-            "name": "Bus Station"
-        },
         "amenity/cafe": {
             "icon": "cafe",
             "fields": [
@@ -1548,26 +1573,6 @@
             ],
             "name": "Fast Food"
         },
-        "amenity/ferry_terminal": {
-            "icon": "ferry",
-            "fields": [
-                "name",
-                "network",
-                "operator",
-                "address",
-                "building_area"
-            ],
-            "geometry": [
-                "point",
-                "vertex",
-                "area"
-            ],
-            "terms": [],
-            "tags": {
-                "amenity": "ferry_terminal"
-            },
-            "name": "Ferry Terminal"
-        },
         "amenity/fire_station": {
             "icon": "fire-station",
             "fields": [
@@ -1855,7 +1860,7 @@
                 "name",
                 "operator",
                 "address",
-                "building_area",
+                "building",
                 "opening_hours"
             ],
             "geometry": [
@@ -1885,6 +1890,25 @@
             },
             "name": "Motorcycle Parking"
         },
+        "amenity/music_school": {
+            "icon": "school",
+            "fields": [
+                "name",
+                "operator",
+                "address"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "school of music"
+            ],
+            "tags": {
+                "amenity": "music_school"
+            },
+            "name": "Music School"
+        },
         "amenity/nightclub": {
             "icon": "bar",
             "fields": [
@@ -2427,7 +2451,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "geometry": [
                 "point",
@@ -2519,11 +2544,12 @@
             "name": "Ranger Station"
         },
         "amenity/recycling_centre": {
-            "icon": "waste-basket",
+            "icon": "recycling",
             "fields": [
                 "name",
                 "operator",
                 "address",
+                "building",
                 "opening_hours",
                 "recycling_accepts"
             ],
@@ -2545,12 +2571,15 @@
                 "amenity": "recycling",
                 "recycling_type": "centre"
             },
+            "reference": {
+                "key": "recycling_type",
+                "value": "*"
+            },
             "name": "Recycling Center"
         },
         "amenity/recycling": {
             "icon": "recycling",
             "fields": [
-                "recycling_type",
                 "recycling_accepts",
                 "collection_times"
             ],
@@ -2571,7 +2600,19 @@
             "tags": {
                 "amenity": "recycling"
             },
-            "name": "Recycling"
+            "addTags": {
+                "amenity": "recycling",
+                "recycling_type": "container"
+            },
+            "removeTags": {
+                "amenity": "recycling",
+                "recycling_type": "container"
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "recycling"
+            },
+            "name": "Recycling Container"
         },
         "amenity/restaurant": {
             "icon": "restaurant",
@@ -2902,6 +2943,14 @@
         },
         "amenity/telephone": {
             "icon": "telephone",
+            "fields": [
+                "operator",
+                "phone",
+                "fee",
+                "payment_multi",
+                "covered",
+                "indoor"
+            ],
             "geometry": [
                 "point",
                 "vertex"
@@ -4217,7 +4266,7 @@
             "name": "College Building"
         },
         "building/commercial": {
-            "icon": "commercial",
+            "icon": "suitcase",
             "fields": [
                 "name",
                 "address",
@@ -4439,6 +4488,22 @@
             "matchScore": 0.5,
             "name": "Preschool/Kindergarten Building"
         },
+        "building/mosque": {
+            "icon": "place-of-worship",
+            "fields": [
+                "name",
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "mosque"
+            },
+            "matchScore": 0.5,
+            "name": "Mosque Building"
+        },
         "building/public": {
             "icon": "building",
             "fields": [
@@ -4993,6 +5058,24 @@
             },
             "name": "Caterer"
         },
+        "craft/chimney_sweeper": {
+            "icon": "poi-chimney",
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "craft": "chimney_sweeper"
+            },
+            "name": "Chimney Sweeper"
+        },
         "craft/clockmaker": {
             "icon": "poi-clock",
             "fields": [
@@ -5501,7 +5584,7 @@
             },
             "name": "Scaffolder"
         },
-        "craft/sculpter": {
+        "craft/sculptor": {
             "icon": "art-gallery",
             "fields": [
                 "name",
@@ -5515,9 +5598,9 @@
                 "area"
             ],
             "tags": {
-                "craft": "sculpter"
+                "craft": "sculptor"
             },
-            "name": "Sculpter"
+            "name": "Sculptor"
         },
         "craft/shoemaker": {
             "icon": "poi-tool",
@@ -5561,24 +5644,6 @@
             },
             "name": "Stonemason"
         },
-        "craft/sweep": {
-            "icon": "poi-chimney",
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "tags": {
-                "craft": "sweep"
-            },
-            "name": "Chimney Sweep"
-        },
         "craft/tiler": {
             "icon": "poi-tool",
             "fields": [
@@ -5990,7 +6055,7 @@
                 "crossing": "zebra"
             },
             "reference": {
-                "key": "highway",
+                "key": "footway",
                 "value": "crossing"
             },
             "terms": [
@@ -6605,6 +6670,25 @@
             },
             "name": "Speech Therapist"
         },
+        "highway/bus_stop": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "highway": "bus_stop"
+            },
+            "name": "Bus Stop / Platform",
+            "searchable": false
+        },
         "highway/bridleway": {
             "fields": [
                 "name",
@@ -6627,25 +6711,6 @@
             ],
             "name": "Bridle Path"
         },
-        "highway/bus_stop": {
-            "icon": "bus",
-            "fields": [
-                "name",
-                "network",
-                "operator",
-                "bench",
-                "shelter"
-            ],
-            "geometry": [
-                "point",
-                "vertex"
-            ],
-            "tags": {
-                "highway": "bus_stop"
-            },
-            "terms": [],
-            "name": "Bus Stop"
-        },
         "highway/corridor": {
             "icon": "highway-footway",
             "fields": [
@@ -6708,7 +6773,7 @@
                 "highway": "crossing"
             },
             "reference": {
-                "key": "footway",
+                "key": "highway",
                 "value": "crossing"
             },
             "terms": [],
@@ -6993,7 +7058,34 @@
             },
             "name": "Path"
         },
-        "highway/pedestrian": {
+        "highway/pedestrian_area": {
+            "icon": "poi-foot",
+            "fields": [
+                "name",
+                "surface",
+                "lit",
+                "width",
+                "structure",
+                "access"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "highway": "pedestrian",
+                "area": "yes"
+            },
+            "terms": [
+                "center",
+                "centre",
+                "plaza",
+                "quad",
+                "square",
+                "walkway"
+            ],
+            "name": "Pedestrian Area"
+        },
+        "highway/pedestrian_line": {
             "icon": "highway-footway",
             "fields": [
                 "name",
@@ -7005,13 +7097,19 @@
                 "access"
             ],
             "geometry": [
-                "line",
-                "area"
+                "line"
             ],
             "tags": {
                 "highway": "pedestrian"
             },
-            "terms": [],
+            "terms": [
+                "center",
+                "centre",
+                "plaza",
+                "quad",
+                "square",
+                "walkway"
+            ],
             "name": "Pedestrian Street"
         },
         "highway/primary_link": {
@@ -7957,6 +8055,7 @@
                 "landuse": "brownfield"
             },
             "terms": [],
+            "matchScore": 0.9,
             "name": "Brownfield"
         },
         "landuse/cemetery": {
@@ -7991,7 +8090,7 @@
             "name": "Churchyard"
         },
         "landuse/commercial": {
-            "icon": "commercial",
+            "icon": "suitcase",
             "fields": [
                 "name"
             ],
@@ -8002,6 +8101,7 @@
                 "landuse": "commercial"
             },
             "terms": [],
+            "matchScore": 0.9,
             "name": "Commercial Area"
         },
         "landuse/construction": {
@@ -8113,8 +8213,31 @@
                 "landuse": "greenfield"
             },
             "terms": [],
+            "matchScore": 0.9,
             "name": "Greenfield"
         },
+        "landuse/greenhouse_horticulture": {
+            "icon": "garden",
+            "fields": [
+                "name",
+                "operator"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "terms": [
+                "flower",
+                "greenhouse",
+                "horticulture",
+                "grow",
+                "vivero"
+            ],
+            "tags": {
+                "landuse": "greenhouse_horticulture"
+            },
+            "matchScore": 0.9,
+            "name": "Greenhouse Horticulture"
+        },
         "landuse/harbour": {
             "icon": "harbor",
             "fields": [
@@ -8248,6 +8371,7 @@
             "name": "Landfill"
         },
         "landuse/meadow": {
+            "icon": "garden",
             "geometry": [
                 "area"
             ],
@@ -8758,6 +8882,19 @@
             ],
             "name": "Recreation Ground"
         },
+        "landuse/religious": {
+            "geometry": [
+                "area"
+            ],
+            "fields": [
+                "name"
+            ],
+            "tags": {
+                "landuse": "religious"
+            },
+            "terms": [],
+            "name": "Religious Area"
+        },
         "landuse/residential": {
             "icon": "building",
             "geometry": [
@@ -8767,10 +8904,11 @@
                 "landuse": "residential"
             },
             "terms": [],
+            "matchScore": 0.9,
             "name": "Residential Area"
         },
         "landuse/retail": {
-            "icon": "shop",
+            "icon": "commercial",
             "geometry": [
                 "area"
             ],
@@ -8780,6 +8918,7 @@
             "tags": {
                 "landuse": "retail"
             },
+            "matchScore": 0.9,
             "name": "Retail Area"
         },
         "landuse/vineyard": {
@@ -10482,6 +10621,28 @@
             },
             "name": "Mast"
         },
+        "man_made/monitoring_station": {
+            "icon": "poi-mast",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "monitoring_multi",
+                "operator"
+            ],
+            "terms": [
+                "weather",
+                "earthquake",
+                "seismology",
+                "air",
+                "gps"
+            ],
+            "tags": {
+                "man_made": "monitoring_station"
+            },
+            "name": "Monitoring Station"
+        },
         "man_made/observation": {
             "icon": "poi-tower",
             "geometry": [
@@ -11385,6 +11546,25 @@
             "terms": [],
             "name": "Office"
         },
+        "office/administrative": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "administrative"
+            },
+            "terms": [],
+            "searchable": false,
+            "name": "Administrative Office"
+        },
         "office/physician": {
             "icon": "commercial",
             "fields": [
@@ -11395,7 +11575,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11414,7 +11593,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11438,16 +11616,15 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "office": "accountant"
             },
             "terms": [],
-            "name": "Accountant"
+            "name": "Accountant Office"
         },
-        "office/administrative": {
+        "office/adoption_agency": {
             "icon": "commercial",
             "fields": [
                 "name",
@@ -11457,14 +11634,37 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
-                "office": "administrative"
+                "office": "adoption_agency"
             },
             "terms": [],
-            "name": "Administrative Office"
+            "name": "Adoption Agency"
+        },
+        "office/advertising_agency": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "advertising_agency"
+            },
+            "terms": [
+                "ad",
+                "ad agency",
+                "advert agency",
+                "advertising",
+                "marketing"
+            ],
+            "name": "Advertising Agency"
         },
         "office/architect": {
             "icon": "commercial",
@@ -11476,14 +11676,57 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "office": "architect"
             },
             "terms": [],
-            "name": "Architect"
+            "name": "Architect Office"
+        },
+        "office/association": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "association"
+            },
+            "terms": [
+                "association",
+                "non-profit",
+                "nonprofit",
+                "organization",
+                "society"
+            ],
+            "name": "Nonprofit Organization Office"
+        },
+        "office/charity": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "charity"
+            },
+            "terms": [
+                "charitable organization"
+            ],
+            "name": "Charity Office"
         },
         "office/company": {
             "icon": "commercial",
@@ -11496,7 +11739,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11543,7 +11785,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11562,7 +11803,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11573,6 +11813,29 @@
             ],
             "name": "Employment Agency"
         },
+        "office/energy_supplier": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "energy_supplier"
+            },
+            "terms": [
+                "electricity",
+                "energy company",
+                "energy utility",
+                "gas utility"
+            ],
+            "name": "Energy Supplier Office"
+        },
         "office/estate_agent": {
             "icon": "commercial",
             "fields": [
@@ -11583,7 +11846,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11602,7 +11864,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11611,7 +11872,7 @@
             "terms": [],
             "name": "Financial Office"
         },
-        "office/government": {
+        "office/forestry": {
             "icon": "commercial",
             "fields": [
                 "name",
@@ -11621,7 +11882,46 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "forestry"
+            },
+            "terms": [
+                "forest",
+                "ranger"
+            ],
+            "name": "Forestry Office"
+        },
+        "office/foundation": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "foundation"
+            },
+            "terms": [],
+            "name": "Foundation Office"
+        },
+        "office/government": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "government",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
                 "area"
             ],
             "tags": {
@@ -11660,6 +11960,56 @@
             },
             "name": "Register Office"
         },
+        "office/government/tax": {
+            "icon": "town-hall",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours",
+                "operator"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "fiscal authorities",
+                "revenue office",
+                "tax office"
+            ],
+            "tags": {
+                "office": "government",
+                "government": "tax"
+            },
+            "reference": {
+                "key": "government",
+                "value": "tax"
+            },
+            "name": "Tax and Revenue Office"
+        },
+        "office/guide": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "guide"
+            },
+            "terms": [
+                "dive guide",
+                "mountain guide",
+                "tour guide"
+            ],
+            "name": "Tour Guide Office"
+        },
         "office/insurance": {
             "icon": "commercial",
             "fields": [
@@ -11670,7 +12020,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11689,14 +12038,18 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "office": "it"
             },
-            "terms": [],
-            "name": "IT Office"
+            "terms": [
+                "computer",
+                "information",
+                "software",
+                "technology"
+            ],
+            "name": "Information Technology Office"
         },
         "office/lawyer": {
             "icon": "commercial",
@@ -11708,7 +12061,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11727,7 +12079,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11747,6 +12098,26 @@
             ],
             "name": "Notary Office"
         },
+        "office/moving_company": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "moving_company"
+            },
+            "terms": [
+                "relocation"
+            ],
+            "name": "Moving Company Office"
+        },
         "office/newspaper": {
             "icon": "commercial",
             "fields": [
@@ -11757,14 +12128,13 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "office": "newspaper"
             },
             "terms": [],
-            "name": "Newspaper"
+            "name": "Newspaper Office"
         },
         "office/ngo": {
             "icon": "commercial",
@@ -11777,15 +12147,38 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "office": "ngo"
             },
-            "terms": [],
+            "terms": [
+                "ngo",
+                "non government",
+                "non-government",
+                "organization",
+                "organisation"
+            ],
             "name": "NGO Office"
         },
+        "office/notary": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "notary"
+            },
+            "terms": [],
+            "name": "Notary Office"
+        },
         "office/political_party": {
             "icon": "commercial",
             "fields": [
@@ -11796,7 +12189,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11805,6 +12197,54 @@
             "terms": [],
             "name": "Political Party"
         },
+        "office/private_investigator": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "private_investigator"
+            },
+            "terms": [
+                "PI",
+                "private eye",
+                "private detective"
+            ],
+            "name": "Private Investigator Office"
+        },
+        "office/quango": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "quango"
+            },
+            "terms": [
+                "ngo",
+                "non government",
+                "non-government",
+                "organization",
+                "organisation",
+                "quasi autonomous",
+                "quasi-autonomous"
+            ],
+            "name": "Quasi-NGO Office"
+        },
         "office/research": {
             "icon": "commercial",
             "fields": [
@@ -11815,7 +12255,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11824,6 +12263,45 @@
             "terms": [],
             "name": "Research Office"
         },
+        "office/surveyor": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "surveyor"
+            },
+            "terms": [],
+            "name": "Surveyor Office"
+        },
+        "office/tax_advisor": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "tax_advisor"
+            },
+            "terms": [
+                "tax",
+                "tax consultant"
+            ],
+            "name": "Tax Advisor Office"
+        },
         "office/telecommunication": {
             "icon": "commercial",
             "fields": [
@@ -11834,7 +12312,6 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -11853,14 +12330,37 @@
             ],
             "geometry": [
                 "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "office": "therapist"
             },
-            "terms": [],
-            "name": "Therapist"
+            "terms": [
+                "therapy"
+            ],
+            "name": "Therapist Office"
+        },
+        "office/water_utility": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours",
+                "operator"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "office": "water_utility"
+            },
+            "terms": [
+                "water board",
+                "utility"
+            ],
+            "name": "Water Utility Office"
         },
         "piste": {
             "icon": "skiing",
@@ -12071,7 +12571,6 @@
             "name": "Sub-Borough / Quarter"
         },
         "place/square": {
-            "icon": "poi-foot",
             "geometry": [
                 "point",
                 "area"
@@ -12317,10 +12816,12 @@
             "matchScore": 0.1
         },
         "power/sub_station": {
+            "icon": "poi-power",
             "fields": [
                 "substation",
                 "operator",
-                "building"
+                "building",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12343,7 +12844,8 @@
                 "generator/source",
                 "generator/method",
                 "generator/type",
-                "generator/output/electricity"
+                "generator/output/electricity",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12368,7 +12870,8 @@
                 "generator/source",
                 "generator/method",
                 "generator/type",
-                "generator/output/electricity"
+                "generator/output/electricity",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12401,7 +12904,8 @@
                 "generator/method",
                 "generator/type",
                 "generator/output/electricity",
-                "height"
+                "height",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12427,6 +12931,12 @@
         },
         "power/line": {
             "icon": "power-line",
+            "fields": [
+                "name",
+                "operator",
+                "voltage",
+                "ref"
+            ],
             "geometry": [
                 "line"
             ],
@@ -12437,6 +12947,12 @@
         },
         "power/minor_line": {
             "icon": "power-line",
+            "fields": [
+                "name",
+                "operator",
+                "voltage",
+                "ref"
+            ],
             "geometry": [
                 "line"
             ],
@@ -12480,6 +12996,9 @@
             "name": "Power Station Grounds"
         },
         "power/pole": {
+            "fields": [
+                "ref"
+            ],
             "geometry": [
                 "vertex"
             ],
@@ -12493,7 +13012,8 @@
             "fields": [
                 "substation",
                 "operator",
-                "building"
+                "building",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12504,7 +13024,30 @@
             },
             "name": "Substation"
         },
+        "power/switch": {
+            "icon": "poi-power",
+            "fields": [
+                "switch",
+                "operator",
+                "location",
+                "cables",
+                "voltage",
+                "ref"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "power": "switch"
+            },
+            "name": "Power Switch"
+        },
         "power/tower": {
+            "fields": [
+                "ref"
+            ],
             "geometry": [
                 "vertex"
             ],
@@ -12517,6 +13060,7 @@
             "icon": "poi-power",
             "fields": [
                 "transformer",
+                "operator",
                 "location",
                 "rating",
                 "devices",
@@ -12526,7 +13070,8 @@
                 "voltage/secondary",
                 "voltage/tertiary",
                 "windings",
-                "windings/configuration"
+                "windings/configuration",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12538,6 +13083,831 @@
             },
             "name": "Transformer"
         },
+        "public_transport/linear_platform_aerialway": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "aerialway": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "aerialway",
+                "cable car",
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Aerialway Stop / Platform"
+        },
+        "public_transport/linear_platform_bus": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "bus": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "bus": "yes",
+                "highway": "bus_stop"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "bus": "yes",
+                "highway": "bus_stop"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "bus",
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Bus Stop / Platform"
+        },
+        "public_transport/linear_platform_ferry": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "ferry": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "boat",
+                "dock",
+                "ferry",
+                "pier",
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Ferry Stop / Platform"
+        },
+        "public_transport/linear_platform_light_rail": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "light_rail": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "light_rail": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "light_rail": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Light Rail Stop / Platform"
+        },
+        "public_transport/linear_platform_monorail": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "monorail": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "monorail": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "monorail": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "monorail",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "transit",
+                "transportation"
+            ],
+            "name": "Monorail Stop / Platform"
+        },
+        "public_transport/linear_platform_subway": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "metro",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "subway",
+                "track",
+                "transit",
+                "transportation",
+                "underground"
+            ],
+            "name": "Subway Stop / Platform"
+        },
+        "public_transport/linear_platform_train": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "track",
+                "train",
+                "transit",
+                "transportation"
+            ],
+            "name": "Train Stop / Platform"
+        },
+        "public_transport/linear_platform_tram": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "tram": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "tram": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "tram": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "streetcar",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Tram Stop / Platform"
+        },
+        "public_transport/linear_platform_trolleybus": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "trolleybus": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "trolleybus": "yes",
+                "highway": "bus_stop"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "trolleybus": "yes",
+                "highway": "bus_stop"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "bus",
+                "electric",
+                "platform",
+                "public transit",
+                "public transportation",
+                "streetcar",
+                "trackless",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Trolleybus Stop / Platform"
+        },
+        "public_transport/linear_platform": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "public_transport": "platform"
+            },
+            "terms": [
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Transit Stop / Platform",
+            "matchScore": 0.2
+        },
+        "public_transport/platform_aerialway": {
+            "icon": "aerialway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "aerialway": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "aerialway",
+                "cable car",
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Aerialway Stop / Platform"
+        },
+        "public_transport/platform_bus": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "bus": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "bus": "yes",
+                "highway": "bus_stop"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "bus": "yes",
+                "highway": "bus_stop"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "bus",
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Bus Stop / Platform"
+        },
+        "public_transport/platform_ferry": {
+            "icon": "ferry",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "ferry": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "boat",
+                "dock",
+                "ferry",
+                "pier",
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Ferry Stop / Platform"
+        },
+        "public_transport/platform_light_rail": {
+            "icon": "poi-light-rail",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "light_rail": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "light_rail": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "light_rail": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Light Rail Stop / Platform"
+        },
+        "public_transport/platform_monorail": {
+            "icon": "poi-monorail",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "monorail": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "monorail": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "monorail": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "monorail",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "transit",
+                "transportation"
+            ],
+            "name": "Monorail Stop / Platform"
+        },
+        "public_transport/platform_subway": {
+            "icon": "poi-subway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "metro",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "subway",
+                "track",
+                "transit",
+                "transportation",
+                "underground"
+            ],
+            "name": "Subway Stop / Platform"
+        },
+        "public_transport/platform_train": {
+            "icon": "rail",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "track",
+                "train",
+                "transit",
+                "transportation"
+            ],
+            "name": "Train Stop / Platform"
+        },
+        "public_transport/platform_tram": {
+            "icon": "poi-tram",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "tram": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "tram": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "tram": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "streetcar",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Tram Stop / Platform"
+        },
+        "public_transport/platform_trolleybus": {
+            "icon": "poi-trolleybus",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "trolleybus": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "trolleybus": "yes",
+                "highway": "bus_stop"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "trolleybus": "yes",
+                "highway": "bus_stop"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "platform"
+            },
+            "terms": [
+                "bus",
+                "electric",
+                "platform",
+                "public transit",
+                "public transportation",
+                "streetcar",
+                "trackless",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Trolleybus Stop / Platform"
+        },
         "public_transport/platform": {
             "icon": "bus",
             "fields": [
@@ -12545,18 +13915,874 @@
                 "ref_platform",
                 "network",
                 "operator",
+                "surface",
+                "lit",
+                "bench",
                 "shelter"
             ],
             "geometry": [
                 "point",
-                "vertex",
-                "line",
                 "area"
             ],
             "tags": {
                 "public_transport": "platform"
             },
-            "name": "Platform"
+            "terms": [
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Transit Stop / Platform",
+            "matchScore": 0.2
+        },
+        "public_transport/station_aerialway": {
+            "icon": "aerialway",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "aerialway/access",
+                "aerialway/summer/access",
+                "elevation",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "aerialway": "yes"
+            },
+            "reference": {
+                "key": "aerialway",
+                "value": "station"
+            },
+            "terms": [
+                "aerialway",
+                "cable car",
+                "public transit",
+                "public transportation",
+                "station",
+                "terminal",
+                "transit",
+                "transportation"
+            ],
+            "name": "Aerialway Station"
+        },
+        "public_transport/station_bus": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "bus": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "bus": "yes",
+                "amenity": "bus_station"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "bus": "yes",
+                "amenity": "bus_station"
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "bus_station"
+            },
+            "terms": [
+                "bus",
+                "public transit",
+                "public transportation",
+                "station",
+                "terminal",
+                "transit",
+                "transportation"
+            ],
+            "name": "Bus Station / Terminal"
+        },
+        "public_transport/station_ferry": {
+            "icon": "ferry",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "ferry": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "ferry": "yes",
+                "amenity": "ferry_terminal"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "ferry": "yes",
+                "amenity": "ferry_terminal"
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "ferry_terminal"
+            },
+            "terms": [
+                "boat",
+                "dock",
+                "ferry",
+                "pier",
+                "public transit",
+                "public transportation",
+                "station",
+                "terminal",
+                "transit",
+                "transportation"
+            ],
+            "name": "Ferry Station / Terminal"
+        },
+        "public_transport/station_light_rail": {
+            "icon": "poi-light-rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "light_rail": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "light_rail": "yes",
+                "railway": "station",
+                "station": "light_rail"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "light_rail": "yes",
+                "railway": "station",
+                "station": "light_rail"
+            },
+            "reference": {
+                "key": "station",
+                "value": "light_rail"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "public transit",
+                "public transportation",
+                "rail",
+                "station",
+                "terminal",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Light Rail Station"
+        },
+        "public_transport/station_monorail": {
+            "icon": "poi-monorail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "monorail": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "monorail": "yes",
+                "railway": "station"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "monorail": "yes",
+                "railway": "station"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "station"
+            },
+            "terms": [
+                "monorail",
+                "public transit",
+                "public transportation",
+                "rail",
+                "station",
+                "terminal",
+                "transit",
+                "transportation"
+            ],
+            "name": "Monorail Station"
+        },
+        "public_transport/station_subway": {
+            "icon": "poi-subway",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "subway": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "subway": "yes",
+                "railway": "station",
+                "station": "subway"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "subway": "yes",
+                "railway": "station",
+                "station": "subway"
+            },
+            "reference": {
+                "key": "station",
+                "value": "subway"
+            },
+            "terms": [
+                "metro",
+                "public transit",
+                "public transportation",
+                "rail",
+                "station",
+                "subway",
+                "terminal",
+                "track",
+                "transit",
+                "transportation",
+                "underground"
+            ],
+            "name": "Subway Station"
+        },
+        "public_transport/station_train_halt": {
+            "icon": "rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "train": "yes",
+                "railway": "halt"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "halt"
+            },
+            "terms": [
+                "halt",
+                "public transit",
+                "public transportation",
+                "rail",
+                "station",
+                "track",
+                "train",
+                "transit",
+                "transportation",
+                "whistle stop"
+            ],
+            "name": "Train Station (Halt / Request)"
+        },
+        "public_transport/station_train": {
+            "icon": "rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "train": "yes",
+                "railway": "station"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "train": "yes",
+                "railway": "station"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "station"
+            },
+            "terms": [
+                "public transit",
+                "public transportation",
+                "rail",
+                "station",
+                "terminal",
+                "track",
+                "train",
+                "transit",
+                "transportation"
+            ],
+            "name": "Train Station"
+        },
+        "public_transport/station_tram": {
+            "icon": "poi-tram",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "tram": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "station"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "public transit",
+                "public transportation",
+                "rail",
+                "station",
+                "streetcar",
+                "terminal",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Tram Station"
+        },
+        "public_transport/station_trolleybus": {
+            "icon": "poi-trolleybus",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "trolleybus": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "trolleybus": "yes",
+                "amenity": "bus_station"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "trolleybus": "yes",
+                "amenity": "bus_station"
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "bus_station"
+            },
+            "terms": [
+                "bus",
+                "electric",
+                "public transit",
+                "public transportation",
+                "station",
+                "streetcar",
+                "terminal",
+                "trackless",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Trolleybus Station / Terminal"
+        },
+        "public_transport/station": {
+            "icon": "rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station"
+            },
+            "terms": [
+                "public transit",
+                "public transportation",
+                "station",
+                "terminal",
+                "transit",
+                "transportation"
+            ],
+            "name": "Transit Station",
+            "matchScore": 0.2
+        },
+        "public_transport/stop_area": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "ref",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "relation"
+            ],
+            "tags": {
+                "type": "public_transport",
+                "public_transport": "stop_area"
+            },
+            "addTags": {
+                "type": "public_transport",
+                "public_transport": "stop_area",
+                "public_transport:version": "2"
+            },
+            "removeTags": {
+                "type": "public_transport",
+                "public_transport": "stop_area",
+                "public_transport:version": "2"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "stop_area"
+            },
+            "name": "Transit Stop Area"
+        },
+        "public_transport/stop_position_aerialway": {
+            "icon": "aerialway",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "aerialway": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "stop_position"
+            },
+            "terms": [
+                "aerialway",
+                "cable car",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Aerialway Stopping Location"
+        },
+        "public_transport/stop_position_bus": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "bus": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "stop_position"
+            },
+            "terms": [
+                "bus",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Bus Stopping Location"
+        },
+        "public_transport/stop_position_ferry": {
+            "icon": "ferry",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "ferry": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "stop_position"
+            },
+            "terms": [
+                "boat",
+                "dock",
+                "ferry",
+                "pier",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Ferry Stopping Location"
+        },
+        "public_transport/stop_position_light_rail": {
+            "icon": "poi-light-rail",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "light_rail": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "light_rail": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "public_transport": "stop_position",
+                "light_rail": "yes",
+                "railway": "stop"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "stop"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "public transit",
+                "public transportation",
+                "rail",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Light Rail Stopping Location"
+        },
+        "public_transport/stop_position_monorail": {
+            "icon": "poi-monorail",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "monorail": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "monorail": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "public_transport": "stop_position",
+                "monorail": "yes",
+                "railway": "stop"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "stop"
+            },
+            "terms": [
+                "monorail",
+                "public transit",
+                "public transportation",
+                "rail",
+                "transit",
+                "transportation"
+            ],
+            "name": "Monorail Stopping Location"
+        },
+        "public_transport/stop_position_subway": {
+            "icon": "poi-subway",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "subway": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "subway": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "public_transport": "stop_position",
+                "subway": "yes",
+                "railway": "stop"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "stop"
+            },
+            "terms": [
+                "metro",
+                "public transit",
+                "public transportation",
+                "rail",
+                "subway",
+                "track",
+                "transit",
+                "transportation",
+                "underground"
+            ],
+            "name": "Subway Stopping Location"
+        },
+        "public_transport/stop_position_train": {
+            "icon": "rail",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "train": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "public_transport": "stop_position",
+                "train": "yes",
+                "railway": "stop"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "stop"
+            },
+            "terms": [
+                "public transit",
+                "public transportation",
+                "rail",
+                "track",
+                "train",
+                "transit",
+                "transportation"
+            ],
+            "name": "Train Stopping Location"
+        },
+        "public_transport/stop_position_tram": {
+            "icon": "poi-tram",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "tram": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "tram": "yes",
+                "railway": "tram_stop"
+            },
+            "removeTags": {
+                "public_transport": "stop_position",
+                "tram": "yes",
+                "railway": "tram_stop"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "stop_position"
+            },
+            "terms": [
+                "electric",
+                "light rail",
+                "public transit",
+                "public transportation",
+                "rail",
+                "streetcar",
+                "track",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Tram Stopping Location"
+        },
+        "public_transport/stop_position_trolleybus": {
+            "icon": "poi-trolleybus",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "trolleybus": "yes"
+            },
+            "reference": {
+                "key": "public_transport",
+                "value": "stop_position"
+            },
+            "terms": [
+                "bus",
+                "electric",
+                "public transit",
+                "public transportation",
+                "streetcar",
+                "trackless",
+                "tram",
+                "trolley",
+                "transit",
+                "transportation"
+            ],
+            "name": "Trolleybus Stopping Location"
         },
         "public_transport/stop_position": {
             "icon": "bus",
@@ -12572,7 +14798,101 @@
             "tags": {
                 "public_transport": "stop_position"
             },
-            "name": "Stop Position"
+            "terms": [
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Transit Stopping Location",
+            "matchScore": 0.2
+        },
+        "railway/halt": {
+            "icon": "rail",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "railway": "halt"
+            },
+            "terms": [
+                "break",
+                "interrupt",
+                "rest",
+                "wait",
+                "interruption"
+            ],
+            "name": "Train Station (Halt / Request)",
+            "searchable": false
+        },
+        "railway/platform": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "surface",
+                "lit",
+                "shelter"
+            ],
+            "geometry": [
+                "line",
+                "area"
+            ],
+            "tags": {
+                "railway": "platform"
+            },
+            "name": "Train Stop / Platform",
+            "searchable": false
+        },
+        "railway/station": {
+            "icon": "rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "railway": "station"
+            },
+            "terms": [
+                "train station",
+                "station"
+            ],
+            "name": "Train Station",
+            "searchable": false
+        },
+        "railway/tram_stop": {
+            "icon": "poi-tram",
+            "fields": [
+                "name",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "tram_stop"
+            },
+            "terms": [
+                "light rail",
+                "streetcar",
+                "tram",
+                "trolley"
+            ],
+            "name": "Tram Stopping Position",
+            "searchable": false
         },
         "railway/abandoned": {
             "icon": "railway-abandoned",
@@ -12674,24 +14994,6 @@
             },
             "name": "Funicular"
         },
-        "railway/halt": {
-            "icon": "rail",
-            "geometry": [
-                "point",
-                "vertex"
-            ],
-            "tags": {
-                "railway": "halt"
-            },
-            "name": "Railway Halt",
-            "terms": [
-                "break",
-                "interrupt",
-                "rest",
-                "wait",
-                "interruption"
-            ]
-        },
         "railway/level_crossing": {
             "icon": "cross",
             "geometry": [
@@ -12710,6 +15012,28 @@
             ],
             "name": "Railway Crossing (Road)"
         },
+        "railway/light_rail": {
+            "icon": "railway-light-rail",
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "railway": "light_rail"
+            },
+            "fields": [
+                "name",
+                "structure",
+                "gauge",
+                "electrified",
+                "service_rail"
+            ],
+            "terms": [
+                "light rail",
+                "streetcar",
+                "trolley"
+            ],
+            "name": "Light Rail"
+        },
         "railway/milestone": {
             "icon": "poi-milestone",
             "geometry": [
@@ -12728,6 +15052,28 @@
             ],
             "name": "Railway Milestone"
         },
+        "railway/miniature": {
+            "icon": "railway-rail",
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "railway": "miniature"
+            },
+            "fields": [
+                "name",
+                "structure",
+                "gauge",
+                "electrified",
+                "service_rail"
+            ],
+            "terms": [
+                "rideable miniature railway",
+                "narrow gauge railway",
+                "minimum gauge railway"
+            ],
+            "name": "Miniature Railway"
+        },
         "railway/monorail": {
             "icon": "railway-monorail",
             "geometry": [
@@ -12766,24 +15112,6 @@
             ],
             "name": "Narrow Gauge Rail"
         },
-        "railway/platform": {
-            "icon": "highway-footway",
-            "fields": [
-                "name",
-                "ref_platform",
-                "surface",
-                "lit",
-                "shelter"
-            ],
-            "geometry": [
-                "line",
-                "area"
-            ],
-            "tags": {
-                "railway": "platform"
-            },
-            "name": "Railway Platform"
-        },
         "railway/rail": {
             "icon": "railway-rail",
             "geometry": [
@@ -12818,32 +15146,6 @@
             ],
             "name": "Railway Signal"
         },
-        "railway/station": {
-            "icon": "rail",
-            "fields": [
-                "name",
-                "network",
-                "operator",
-                "address",
-                "building_area",
-                "internet_access",
-                "internet_access/fee",
-                "internet_access/ssid"
-            ],
-            "geometry": [
-                "point",
-                "vertex",
-                "area"
-            ],
-            "tags": {
-                "railway": "station"
-            },
-            "terms": [
-                "train station",
-                "station"
-            ],
-            "name": "Railway Station"
-        },
         "railway/subway_entrance": {
             "icon": "entrance",
             "geometry": [
@@ -12917,27 +15219,6 @@
             ],
             "name": "Train Wash"
         },
-        "railway/tram_stop": {
-            "icon": "rail-light",
-            "fields": [
-                "name",
-                "network",
-                "operator"
-            ],
-            "geometry": [
-                "vertex"
-            ],
-            "tags": {
-                "railway": "tram_stop"
-            },
-            "terms": [
-                "light rail",
-                "streetcar",
-                "tram",
-                "trolley"
-            ],
-            "name": "Tram Stop"
-        },
         "railway/tram": {
             "icon": "railway-light-rail",
             "geometry": [
@@ -13072,6 +15353,33 @@
             "name": "Vacant Shop",
             "searchable": false
         },
+        "shop/agrarian": {
+            "icon": "shop",
+            "fields": [
+                "name",
+                "operator",
+                "agrarian",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "agricultural inputs",
+                "agricultural machines",
+                "seeds",
+                "pesticides",
+                "fertilizer",
+                "agricultural tools"
+            ],
+            "tags": {
+                "shop": "agrarian"
+            },
+            "name": "Agriculture Shop"
+        },
         "shop/alcohol": {
             "icon": "alcohol-shop",
             "fields": [
@@ -14449,7 +16757,7 @@
             "tags": {
                 "shop": "kiosk"
             },
-            "name": "News Kiosk"
+            "name": "Kiosk"
         },
         "shop/kitchen": {
             "icon": "shop",
@@ -15612,7 +17920,7 @@
             "name": "Artwork"
         },
         "tourism/attraction": {
-            "icon": "monument",
+            "icon": "star",
             "fields": [
                 "name",
                 "operator",
@@ -15698,10 +18006,17 @@
                 "point",
                 "area"
             ],
+            "terms": [
+                "holiday",
+                "holiday cottage",
+                "holiday home",
+                "vacation",
+                "vacation home"
+            ],
             "tags": {
                 "tourism": "chalet"
             },
-            "name": "Chalet"
+            "name": "Holiday Cottage"
         },
         "tourism/gallery": {
             "icon": "art-gallery",
@@ -16005,6 +18320,28 @@
             },
             "name": "Viewpoint"
         },
+        "tourism/wilderness_hut": {
+            "icon": "lodging",
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "wilderness hut",
+                "backcountry hut",
+                "bothy"
+            ],
+            "tags": {
+                "tourism": "wilderness_hut"
+            },
+            "name": "Wilderness Hut"
+        },
         "tourism/zoo": {
             "icon": "zoo",
             "fields": [
@@ -16527,6 +18864,23 @@
             },
             "name": "Riding Route"
         },
+        "type/route/light_rail": {
+            "icon": "route-light-rail",
+            "fields": [
+                "name",
+                "ref_route",
+                "operator",
+                "network"
+            ],
+            "geometry": [
+                "relation"
+            ],
+            "tags": {
+                "type": "route",
+                "route": "light_rail"
+            },
+            "name": "Light Rail Route"
+        },
         "type/route/pipeline": {
             "icon": "route-pipeline",
             "fields": [
@@ -16543,6 +18897,23 @@
             },
             "name": "Pipeline Route"
         },
+        "type/route/piste": {
+            "icon": "route-piste",
+            "fields": [
+                "name",
+                "ref_route",
+                "operator",
+                "network"
+            ],
+            "geometry": [
+                "relation"
+            ],
+            "tags": {
+                "type": "route",
+                "route": "piste"
+            },
+            "name": "Piste/Ski Route"
+        },
         "type/route/power": {
             "icon": "route-power",
             "fields": [
@@ -16575,6 +18946,23 @@
             },
             "name": "Road Route"
         },
+        "type/route/subway": {
+            "icon": "route-subway",
+            "fields": [
+                "name",
+                "ref_route",
+                "operator",
+                "network"
+            ],
+            "geometry": [
+                "relation"
+            ],
+            "tags": {
+                "type": "route",
+                "route": "subway"
+            },
+            "name": "Subway Route"
+        },
         "type/route/train": {
             "icon": "route-train",
             "fields": [
@@ -27942,7 +30330,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -27964,7 +30353,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -27986,7 +30376,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -28008,7 +30399,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45571,7 +47963,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45592,7 +47985,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45613,7 +48007,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45634,7 +48029,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45655,7 +48051,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45676,7 +48073,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45697,7 +48095,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45718,7 +48117,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45739,7 +48139,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45760,7 +48161,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45781,7 +48183,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45802,7 +48205,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45823,7 +48227,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45844,7 +48249,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45865,7 +48271,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45886,7 +48293,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45907,7 +48315,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45928,7 +48337,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45949,7 +48359,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45970,7 +48381,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -45991,7 +48403,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46012,7 +48425,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46033,7 +48447,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46054,7 +48469,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46075,7 +48491,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46096,7 +48513,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46117,7 +48535,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46138,7 +48557,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46159,7 +48579,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46180,7 +48601,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46201,7 +48623,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46222,7 +48645,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46243,7 +48667,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46264,7 +48689,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46285,7 +48711,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46306,7 +48733,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46327,7 +48755,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46348,7 +48777,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46369,7 +48799,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46390,7 +48821,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46411,7 +48843,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46432,7 +48865,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46453,7 +48887,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46474,7 +48909,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46495,7 +48931,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46516,7 +48953,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46537,7 +48975,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46558,7 +48997,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46579,7 +49019,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46600,7 +49041,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46621,7 +49063,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46642,7 +49085,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46663,7 +49107,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46684,7 +49129,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46705,7 +49151,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -46726,7 +49173,8 @@
                 "building_area",
                 "opening_hours",
                 "smoking",
-                "outdoor_seating"
+                "outdoor_seating",
+                "brewery"
             ],
             "suggestion": true
         },
@@ -88568,7 +91016,7 @@
                 "tourism": "attraction"
             },
             "name": "Arch",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88587,7 +91035,7 @@
                 "tourism": "attraction"
             },
             "name": "Kursächsische Postmeilensäule",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88606,7 +91054,7 @@
                 "tourism": "attraction"
             },
             "name": "Lavoir",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88625,7 +91073,7 @@
                 "tourism": "attraction"
             },
             "name": "Maibaum",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88644,7 +91092,7 @@
                 "tourism": "attraction"
             },
             "name": "Moab trail",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88663,7 +91111,7 @@
                 "tourism": "attraction"
             },
             "name": "Moai",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88682,7 +91130,7 @@
                 "tourism": "attraction"
             },
             "name": "OWŚ",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88701,7 +91149,7 @@
                 "tourism": "attraction"
             },
             "name": "Sommerrodelbahn",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88720,7 +91168,7 @@
                 "tourism": "attraction"
             },
             "name": "path continues",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88739,7 +91187,7 @@
                 "tourism": "attraction"
             },
             "name": "path contiunes",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88758,7 +91206,7 @@
                 "tourism": "attraction"
             },
             "name": "white blaze",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88777,7 +91225,7 @@
                 "tourism": "attraction"
             },
             "name": "Кладбище еврейское",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88796,7 +91244,7 @@
                 "tourism": "attraction"
             },
             "name": "Колесо обозрения",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88815,7 +91263,7 @@
                 "tourism": "attraction"
             },
             "name": "Приусадебный парк",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88834,7 +91282,7 @@
                 "tourism": "attraction"
             },
             "name": "Усадьба",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88853,7 +91301,7 @@
                 "tourism": "attraction"
             },
             "name": "Хозяйственный двор",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88872,7 +91320,7 @@
                 "tourism": "attraction"
             },
             "name": "Часовня",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -88891,7 +91339,7 @@
                 "tourism": "attraction"
             },
             "name": "дольмен",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
diff --git a/data/presets/presets/aerialway/station.json b/data/presets/presets/aerialway/_station.json
similarity index 83%
rename from data/presets/presets/aerialway/station.json
rename to data/presets/presets/aerialway/_station.json
index 690a357ae..c31df230b 100644
--- a/data/presets/presets/aerialway/station.json
+++ b/data/presets/presets/aerialway/_station.json
@@ -14,5 +14,6 @@
     "tags": {
         "aerialway": "station"
     },
-    "name": "Aerialway Station"
+    "name": "Aerialway Station",
+    "searchable": false
 }
diff --git a/data/presets/presets/amenity/bus_station.json b/data/presets/presets/amenity/_bus_station.json
similarity index 83%
rename from data/presets/presets/amenity/bus_station.json
rename to data/presets/presets/amenity/_bus_station.json
index a533f4f6d..0111a1fb2 100644
--- a/data/presets/presets/amenity/bus_station.json
+++ b/data/presets/presets/amenity/_bus_station.json
@@ -15,5 +15,6 @@
     "tags": {
         "amenity": "bus_station"
     },
-    "name": "Bus Station"
+    "name": "Bus Station / Terminal",
+    "searchable": false
 }
diff --git a/data/presets/presets/amenity/ferry_terminal.json b/data/presets/presets/amenity/_ferry_terminal.json
similarity index 82%
rename from data/presets/presets/amenity/ferry_terminal.json
rename to data/presets/presets/amenity/_ferry_terminal.json
index aad03b6cb..1bc720685 100644
--- a/data/presets/presets/amenity/ferry_terminal.json
+++ b/data/presets/presets/amenity/_ferry_terminal.json
@@ -16,5 +16,6 @@
     "tags": {
         "amenity": "ferry_terminal"
     },
-    "name": "Ferry Terminal"
+    "name": "Ferry Station / Terminal",
+    "searchable": false
 }
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index 02ca5c24b..80911f2e5 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -7,7 +7,8 @@
         "building_area",
         "opening_hours",
         "smoking",
-        "outdoor_seating"
+        "outdoor_seating",
+        "brewery"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/biergarten.json b/data/presets/presets/amenity/biergarten.json
index 334edbaea..e50e8d318 100644
--- a/data/presets/presets/amenity/biergarten.json
+++ b/data/presets/presets/amenity/biergarten.json
@@ -6,7 +6,8 @@
         "building_area",
         "opening_hours",
         "smoking",
-        "outdoor_seating"
+        "outdoor_seating",
+        "brewery"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index 3b2628767..503564095 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -4,7 +4,7 @@
         "name",
         "operator",
         "address",
-        "building_area",
+        "building",
         "opening_hours"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/music_school.json b/data/presets/presets/amenity/music_school.json
new file mode 100644
index 000000000..34f14484a
--- /dev/null
+++ b/data/presets/presets/amenity/music_school.json
@@ -0,0 +1,19 @@
+{
+    "icon": "school",
+    "fields": [
+        "name",
+        "operator",
+        "address"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "school of music"
+    ],
+    "tags": {
+        "amenity": "music_school"
+    },
+    "name": "Music School"
+}
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index 102409d68..935807ae1 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -6,7 +6,8 @@
         "building_area",
         "opening_hours",
         "smoking",
-        "outdoor_seating"
+        "outdoor_seating",
+        "brewery"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index 4648e3b62..f2000bab7 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -1,7 +1,6 @@
 {
     "icon": "recycling",
     "fields": [
-        "recycling_type",
         "recycling_accepts",
         "collection_times"
     ],
@@ -22,5 +21,17 @@
     "tags": {
         "amenity": "recycling"
     },
-    "name": "Recycling"
+    "addTags": {
+        "amenity": "recycling",
+        "recycling_type": "container"
+    },
+    "removeTags": {
+        "amenity": "recycling",
+        "recycling_type": "container"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "recycling"
+    },
+    "name": "Recycling Container"
 }
diff --git a/data/presets/presets/amenity/recycling_centre.json b/data/presets/presets/amenity/recycling_centre.json
index 3ab57bd17..aa5abdc5c 100644
--- a/data/presets/presets/amenity/recycling_centre.json
+++ b/data/presets/presets/amenity/recycling_centre.json
@@ -1,9 +1,10 @@
 {
-    "icon": "waste-basket",
+    "icon": "recycling",
     "fields": [
         "name",
         "operator",
         "address",
+        "building",
         "opening_hours",
         "recycling_accepts"
     ],
@@ -25,5 +26,9 @@
         "amenity": "recycling",
         "recycling_type": "centre"
     },
+    "reference": {
+        "key": "recycling_type",
+        "value": "*"
+    },
     "name": "Recycling Center"
 }
diff --git a/data/presets/presets/amenity/telephone.json b/data/presets/presets/amenity/telephone.json
index 8229c6f9f..037a399e0 100644
--- a/data/presets/presets/amenity/telephone.json
+++ b/data/presets/presets/amenity/telephone.json
@@ -1,5 +1,13 @@
 {
     "icon": "telephone",
+    "fields": [
+        "operator",
+        "phone",
+        "fee",
+        "payment_multi",
+        "covered",
+        "indoor"
+    ],
     "geometry": [
         "point",
         "vertex"
@@ -11,4 +19,4 @@
         "phone"
     ],
     "name": "Telephone"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building/_train_station.json b/data/presets/presets/building/_train_station.json
index f83e337a8..81d7eda0a 100644
--- a/data/presets/presets/building/_train_station.json
+++ b/data/presets/presets/building/_train_station.json
@@ -15,5 +15,5 @@
     },
     "matchScore": 0.5,
     "name": "Train Station",
-    "searchable":false
+    "searchable": false
 }
diff --git a/data/presets/presets/building/commercial.json b/data/presets/presets/building/commercial.json
index 2c548315a..2b115101b 100644
--- a/data/presets/presets/building/commercial.json
+++ b/data/presets/presets/building/commercial.json
@@ -1,5 +1,5 @@
 {
-    "icon": "commercial",
+    "icon": "suitcase",
     "fields": [
         "name",
         "address",
diff --git a/data/presets/presets/building/mosque.json b/data/presets/presets/building/mosque.json
new file mode 100644
index 000000000..5853f4c51
--- /dev/null
+++ b/data/presets/presets/building/mosque.json
@@ -0,0 +1,16 @@
+{
+    "icon": "place-of-worship",
+    "fields": [
+        "name",
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "mosque"
+    },
+    "matchScore": 0.5,
+    "name": "Mosque Building"
+}
diff --git a/data/presets/presets/craft/sweep.json b/data/presets/presets/craft/chimney_sweeper.json
similarity index 78%
rename from data/presets/presets/craft/sweep.json
rename to data/presets/presets/craft/chimney_sweeper.json
index fbc3f164e..92f1ac592 100644
--- a/data/presets/presets/craft/sweep.json
+++ b/data/presets/presets/craft/chimney_sweeper.json
@@ -12,7 +12,7 @@
         "area"
     ],
     "tags": {
-        "craft": "sweep"
+        "craft": "chimney_sweeper"
     },
-    "name": "Chimney Sweep"
+    "name": "Chimney Sweeper"
 }
diff --git a/data/presets/presets/craft/sculpter.json b/data/presets/presets/craft/sculptor.json
similarity index 82%
rename from data/presets/presets/craft/sculpter.json
rename to data/presets/presets/craft/sculptor.json
index 6e13b2042..81f2d6a49 100644
--- a/data/presets/presets/craft/sculpter.json
+++ b/data/presets/presets/craft/sculptor.json
@@ -12,7 +12,7 @@
         "area"
     ],
     "tags": {
-        "craft": "sculpter"
+        "craft": "sculptor"
     },
-    "name": "Sculpter"
+    "name": "Sculptor"
 }
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
index b4daf5f29..61cffbad7 100644
--- a/data/presets/presets/footway/crosswalk.json
+++ b/data/presets/presets/footway/crosswalk.json
@@ -16,7 +16,7 @@
         "crossing": "zebra"
     },
     "reference": {
-        "key": "highway",
+        "key": "footway",
         "value": "crossing"
     },
     "terms": [
diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/_bus_stop.json
similarity index 80%
rename from data/presets/presets/highway/bus_stop.json
rename to data/presets/presets/highway/_bus_stop.json
index 346e46853..87d0a5c01 100644
--- a/data/presets/presets/highway/bus_stop.json
+++ b/data/presets/presets/highway/_bus_stop.json
@@ -14,6 +14,6 @@
     "tags": {
         "highway": "bus_stop"
     },
-    "terms": [],
-    "name": "Bus Stop"
+    "name": "Bus Stop / Platform",
+    "searchable": false
 }
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index 971062c98..08c81d23e 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -11,7 +11,7 @@
         "highway": "crossing"
     },
     "reference": {
-        "key": "footway",
+        "key": "highway",
         "value": "crossing"
     },
     "terms": [],
diff --git a/data/presets/presets/highway/pedestrian_area.json b/data/presets/presets/highway/pedestrian_area.json
new file mode 100644
index 000000000..1f305b3b6
--- /dev/null
+++ b/data/presets/presets/highway/pedestrian_area.json
@@ -0,0 +1,27 @@
+{
+    "icon": "poi-foot",
+    "fields": [
+        "name",
+        "surface",
+        "lit",
+        "width",
+        "structure",
+        "access"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "highway": "pedestrian",
+        "area": "yes"
+    },
+    "terms": [
+        "center",
+        "centre",
+        "plaza",
+        "quad",
+        "square",
+        "walkway"
+    ],
+    "name": "Pedestrian Area"
+}
diff --git a/data/presets/presets/highway/pedestrian.json b/data/presets/presets/highway/pedestrian_line.json
similarity index 67%
rename from data/presets/presets/highway/pedestrian.json
rename to data/presets/presets/highway/pedestrian_line.json
index fece5f82b..1f98db37f 100644
--- a/data/presets/presets/highway/pedestrian.json
+++ b/data/presets/presets/highway/pedestrian_line.json
@@ -10,12 +10,18 @@
         "access"
     ],
     "geometry": [
-        "line",
-        "area"
+        "line"
     ],
     "tags": {
         "highway": "pedestrian"
     },
-    "terms": [],
+    "terms": [
+        "center",
+        "centre",
+        "plaza",
+        "quad",
+        "square",
+        "walkway"
+    ],
     "name": "Pedestrian Street"
 }
diff --git a/data/presets/presets/landuse/brownfield.json b/data/presets/presets/landuse/brownfield.json
index b92907a93..9fb617e35 100644
--- a/data/presets/presets/landuse/brownfield.json
+++ b/data/presets/presets/landuse/brownfield.json
@@ -9,5 +9,6 @@
         "landuse": "brownfield"
     },
     "terms": [],
+    "matchScore": 0.9,
     "name": "Brownfield"
 }
diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json
index ab4d5ee56..81ca39881 100644
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -1,5 +1,5 @@
 {
-    "icon": "commercial",
+    "icon": "suitcase",
     "fields": [
         "name"
     ],
@@ -10,5 +10,6 @@
         "landuse": "commercial"
     },
     "terms": [],
+    "matchScore": 0.9,
     "name": "Commercial Area"
 }
diff --git a/data/presets/presets/landuse/greenfield.json b/data/presets/presets/landuse/greenfield.json
index 44940454f..1fee223ed 100644
--- a/data/presets/presets/landuse/greenfield.json
+++ b/data/presets/presets/landuse/greenfield.json
@@ -9,5 +9,6 @@
         "landuse": "greenfield"
     },
     "terms": [],
+    "matchScore": 0.9,
     "name": "Greenfield"
 }
diff --git a/data/presets/presets/landuse/greenhouse_horticulture.json b/data/presets/presets/landuse/greenhouse_horticulture.json
new file mode 100644
index 000000000..1a8a8b4bb
--- /dev/null
+++ b/data/presets/presets/landuse/greenhouse_horticulture.json
@@ -0,0 +1,22 @@
+{
+    "icon": "garden",
+    "fields": [
+        "name",
+        "operator"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "terms": [
+        "flower",
+        "greenhouse",
+        "horticulture",
+        "grow",
+        "vivero"
+    ],
+    "tags": {
+        "landuse": "greenhouse_horticulture"
+    },
+    "matchScore": 0.9,
+    "name": "Greenhouse Horticulture"
+}
diff --git a/data/presets/presets/landuse/meadow.json b/data/presets/presets/landuse/meadow.json
index b2f29cea1..780c4f5b1 100644
--- a/data/presets/presets/landuse/meadow.json
+++ b/data/presets/presets/landuse/meadow.json
@@ -1,4 +1,5 @@
 {
+    "icon": "garden",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/religious.json b/data/presets/presets/landuse/religious.json
new file mode 100644
index 000000000..97677b50a
--- /dev/null
+++ b/data/presets/presets/landuse/religious.json
@@ -0,0 +1,13 @@
+{
+  "geometry": [
+    "area"
+  ],
+  "fields": [
+    "name"
+  ],
+  "tags": {
+    "landuse": "religious"
+  },
+  "terms": [],
+  "name": "Religious Area"
+}
diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json
index 4048c3200..564ebec4f 100644
--- a/data/presets/presets/landuse/residential.json
+++ b/data/presets/presets/landuse/residential.json
@@ -7,5 +7,6 @@
         "landuse": "residential"
     },
     "terms": [],
+    "matchScore": 0.9,
     "name": "Residential Area"
 }
diff --git a/data/presets/presets/landuse/retail.json b/data/presets/presets/landuse/retail.json
index 8af7e2fc5..06ac3ee59 100644
--- a/data/presets/presets/landuse/retail.json
+++ b/data/presets/presets/landuse/retail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "commercial",
     "geometry": [
         "area"
     ],
@@ -9,5 +9,6 @@
     "tags": {
         "landuse": "retail"
     },
+    "matchScore": 0.9,
     "name": "Retail Area"
 }
diff --git a/data/presets/presets/man_made/monitoring_station.json b/data/presets/presets/man_made/monitoring_station.json
new file mode 100644
index 000000000..3b24481bf
--- /dev/null
+++ b/data/presets/presets/man_made/monitoring_station.json
@@ -0,0 +1,22 @@
+{
+    "icon": "poi-mast",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "fields": [
+        "monitoring_multi",
+        "operator"
+    ],
+    "terms": [
+        "weather",
+        "earthquake",
+        "seismology",
+        "air",
+        "gps"
+    ],
+    "tags": {
+        "man_made": "monitoring_station"
+    },
+    "name": "Monitoring Station"
+}
diff --git a/data/presets/presets/office/administrative.json b/data/presets/presets/office/_administrative.json
similarity index 92%
rename from data/presets/presets/office/administrative.json
rename to data/presets/presets/office/_administrative.json
index 42c739aa7..9db4dbaf4 100644
--- a/data/presets/presets/office/administrative.json
+++ b/data/presets/presets/office/_administrative.json
@@ -8,12 +8,12 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "office": "administrative"
     },
     "terms": [],
+    "searchable": false,
     "name": "Administrative Office"
 }
diff --git a/data/presets/presets/office/_physician.json b/data/presets/presets/office/_physician.json
index 42113ef36..5bf47fc27 100644
--- a/data/presets/presets/office/_physician.json
+++ b/data/presets/presets/office/_physician.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/_travel_agent.json b/data/presets/presets/office/_travel_agent.json
index 66642b741..ca0942908 100644
--- a/data/presets/presets/office/_travel_agent.json
+++ b/data/presets/presets/office/_travel_agent.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/accountant.json b/data/presets/presets/office/accountant.json
index d533bd0f7..874525af9 100644
--- a/data/presets/presets/office/accountant.json
+++ b/data/presets/presets/office/accountant.json
@@ -8,12 +8,11 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "office": "accountant"
     },
     "terms": [],
-    "name": "Accountant"
+    "name": "Accountant Office"
 }
diff --git a/data/presets/presets/office/adoption_agency.json b/data/presets/presets/office/adoption_agency.json
new file mode 100644
index 000000000..549b3293a
--- /dev/null
+++ b/data/presets/presets/office/adoption_agency.json
@@ -0,0 +1,18 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "adoption_agency"
+  },
+  "terms": [],
+  "name": "Adoption Agency"
+}
diff --git a/data/presets/presets/office/advertising_agency.json b/data/presets/presets/office/advertising_agency.json
new file mode 100644
index 000000000..55d7f7d55
--- /dev/null
+++ b/data/presets/presets/office/advertising_agency.json
@@ -0,0 +1,24 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "advertising_agency"
+  },
+  "terms": [
+      "ad",
+      "ad agency",
+      "advert agency",
+      "advertising",
+      "marketing"
+  ],
+  "name": "Advertising Agency"
+}
diff --git a/data/presets/presets/office/architect.json b/data/presets/presets/office/architect.json
index 70e660c0a..b40eaf8bb 100644
--- a/data/presets/presets/office/architect.json
+++ b/data/presets/presets/office/architect.json
@@ -8,12 +8,11 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "office": "architect"
     },
     "terms": [],
-    "name": "Architect"
+    "name": "Architect Office"
 }
diff --git a/data/presets/presets/office/association.json b/data/presets/presets/office/association.json
new file mode 100644
index 000000000..1a24364ae
--- /dev/null
+++ b/data/presets/presets/office/association.json
@@ -0,0 +1,24 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "association"
+  },
+  "terms": [
+      "association",
+      "non-profit",
+      "nonprofit",
+      "organization",
+      "society"
+  ],
+  "name": "Nonprofit Organization Office"
+}
diff --git a/data/presets/presets/office/charity.json b/data/presets/presets/office/charity.json
new file mode 100644
index 000000000..6b4e4d38e
--- /dev/null
+++ b/data/presets/presets/office/charity.json
@@ -0,0 +1,20 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "charity"
+  },
+  "terms": [
+      "charitable organization"
+  ],
+  "name": "Charity Office"
+}
diff --git a/data/presets/presets/office/company.json b/data/presets/presets/office/company.json
index 6bb94fdb2..bb86e90df 100644
--- a/data/presets/presets/office/company.json
+++ b/data/presets/presets/office/company.json
@@ -9,7 +9,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/educational_institution.json b/data/presets/presets/office/educational_institution.json
index dc634c628..4e9e6d8ab 100644
--- a/data/presets/presets/office/educational_institution.json
+++ b/data/presets/presets/office/educational_institution.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/employment_agency.json b/data/presets/presets/office/employment_agency.json
index 293f282ed..8753fb5e4 100644
--- a/data/presets/presets/office/employment_agency.json
+++ b/data/presets/presets/office/employment_agency.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/energy_supplier.json b/data/presets/presets/office/energy_supplier.json
new file mode 100644
index 000000000..41a2a6387
--- /dev/null
+++ b/data/presets/presets/office/energy_supplier.json
@@ -0,0 +1,23 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "energy_supplier"
+  },
+  "terms": [
+      "electricity",
+      "energy company",
+      "energy utility",
+      "gas utility"
+  ],
+  "name": "Energy Supplier Office"
+}
diff --git a/data/presets/presets/office/estate_agent.json b/data/presets/presets/office/estate_agent.json
index 649eeb378..d9655383c 100644
--- a/data/presets/presets/office/estate_agent.json
+++ b/data/presets/presets/office/estate_agent.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/financial.json b/data/presets/presets/office/financial.json
index d72cfca03..9072123ed 100644
--- a/data/presets/presets/office/financial.json
+++ b/data/presets/presets/office/financial.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/forestry.json b/data/presets/presets/office/forestry.json
new file mode 100644
index 000000000..160968fd4
--- /dev/null
+++ b/data/presets/presets/office/forestry.json
@@ -0,0 +1,21 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "forestry"
+  },
+  "terms": [
+      "forest",
+      "ranger"
+  ],
+  "name": "Forestry Office"
+}
diff --git a/data/presets/presets/office/foundation.json b/data/presets/presets/office/foundation.json
new file mode 100644
index 000000000..29a1ba326
--- /dev/null
+++ b/data/presets/presets/office/foundation.json
@@ -0,0 +1,18 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "foundation"
+  },
+  "terms": [],
+  "name": "Foundation Office"
+}
diff --git a/data/presets/presets/office/government.json b/data/presets/presets/office/government.json
index 6a6c32dbd..31050bd31 100644
--- a/data/presets/presets/office/government.json
+++ b/data/presets/presets/office/government.json
@@ -2,13 +2,13 @@
     "icon": "commercial",
     "fields": [
         "name",
+        "government",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/government/tax.json b/data/presets/presets/office/government/tax.json
new file mode 100644
index 000000000..87e9a8854
--- /dev/null
+++ b/data/presets/presets/office/government/tax.json
@@ -0,0 +1,28 @@
+{
+  "icon": "town-hall",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours",
+      "operator"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "terms": [
+      "fiscal authorities",
+      "revenue office",
+      "tax office"
+  ],
+  "tags": {
+      "office": "government",
+      "government": "tax"
+  },
+  "reference": {
+      "key": "government",
+      "value": "tax"
+  },
+  "name": "Tax and Revenue Office"
+}
diff --git a/data/presets/presets/office/guide.json b/data/presets/presets/office/guide.json
new file mode 100644
index 000000000..6f76a9957
--- /dev/null
+++ b/data/presets/presets/office/guide.json
@@ -0,0 +1,22 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "guide"
+  },
+  "terms": [
+      "dive guide",
+      "mountain guide",
+      "tour guide"
+  ],
+  "name": "Tour Guide Office"
+}
diff --git a/data/presets/presets/office/insurance.json b/data/presets/presets/office/insurance.json
index 8373b69ef..81ce7ff14 100644
--- a/data/presets/presets/office/insurance.json
+++ b/data/presets/presets/office/insurance.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/it.json b/data/presets/presets/office/it.json
index 937b332e8..157915952 100644
--- a/data/presets/presets/office/it.json
+++ b/data/presets/presets/office/it.json
@@ -8,12 +8,16 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "office": "it"
     },
-    "terms": [],
-    "name": "IT Office"
+    "terms": [
+        "computer",
+        "information",
+        "software",
+        "technology"
+    ],
+    "name": "Information Technology Office"
 }
diff --git a/data/presets/presets/office/lawyer.json b/data/presets/presets/office/lawyer.json
index ea6b4391c..40efd07b1 100644
--- a/data/presets/presets/office/lawyer.json
+++ b/data/presets/presets/office/lawyer.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/lawyer/notary.json b/data/presets/presets/office/lawyer/notary.json
index cd65abc10..baec068e0 100644
--- a/data/presets/presets/office/lawyer/notary.json
+++ b/data/presets/presets/office/lawyer/notary.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/moving_company.json b/data/presets/presets/office/moving_company.json
new file mode 100644
index 000000000..624d2d3f9
--- /dev/null
+++ b/data/presets/presets/office/moving_company.json
@@ -0,0 +1,20 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "moving_company"
+  },
+  "terms": [
+      "relocation"
+  ],
+  "name": "Moving Company Office"
+}
diff --git a/data/presets/presets/office/newspaper.json b/data/presets/presets/office/newspaper.json
index 91d71e146..5993e6a9c 100644
--- a/data/presets/presets/office/newspaper.json
+++ b/data/presets/presets/office/newspaper.json
@@ -8,12 +8,11 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "office": "newspaper"
     },
     "terms": [],
-    "name": "Newspaper"
+    "name": "Newspaper Office"
 }
diff --git a/data/presets/presets/office/ngo.json b/data/presets/presets/office/ngo.json
index 9128f0130..ffb802ccc 100644
--- a/data/presets/presets/office/ngo.json
+++ b/data/presets/presets/office/ngo.json
@@ -9,12 +9,17 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "office": "ngo"
     },
-    "terms": [],
+    "terms": [
+        "ngo",
+        "non government",
+        "non-government",
+        "organization",
+        "organisation"
+    ],
     "name": "NGO Office"
 }
diff --git a/data/presets/presets/office/notary.json b/data/presets/presets/office/notary.json
new file mode 100644
index 000000000..1ad973630
--- /dev/null
+++ b/data/presets/presets/office/notary.json
@@ -0,0 +1,18 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "notary"
+  },
+  "terms": [],
+  "name": "Notary Office"
+}
diff --git a/data/presets/presets/office/political_party.json b/data/presets/presets/office/political_party.json
index 0c94c88fd..d5bdaff9f 100644
--- a/data/presets/presets/office/political_party.json
+++ b/data/presets/presets/office/political_party.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/private_investigator.json b/data/presets/presets/office/private_investigator.json
new file mode 100644
index 000000000..a0d40d575
--- /dev/null
+++ b/data/presets/presets/office/private_investigator.json
@@ -0,0 +1,22 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "private_investigator"
+  },
+  "terms": [
+      "PI",
+      "private eye",
+      "private detective"
+  ],
+  "name": "Private Investigator Office"
+}
diff --git a/data/presets/presets/office/quango.json b/data/presets/presets/office/quango.json
new file mode 100644
index 000000000..23e3e3a09
--- /dev/null
+++ b/data/presets/presets/office/quango.json
@@ -0,0 +1,26 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "quango"
+  },
+  "terms": [
+      "ngo",
+      "non government",
+      "non-government",
+      "organization",
+      "organisation",
+      "quasi autonomous",
+      "quasi-autonomous"
+  ],
+  "name": "Quasi-NGO Office"
+}
diff --git a/data/presets/presets/office/research.json b/data/presets/presets/office/research.json
index 1a21796d9..e7777f9e6 100644
--- a/data/presets/presets/office/research.json
+++ b/data/presets/presets/office/research.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/surveyor.json b/data/presets/presets/office/surveyor.json
new file mode 100644
index 000000000..3b51c5f68
--- /dev/null
+++ b/data/presets/presets/office/surveyor.json
@@ -0,0 +1,18 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "surveyor"
+  },
+  "terms": [],
+  "name": "Surveyor Office"
+}
diff --git a/data/presets/presets/office/tax_advisor.json b/data/presets/presets/office/tax_advisor.json
new file mode 100644
index 000000000..26b67738a
--- /dev/null
+++ b/data/presets/presets/office/tax_advisor.json
@@ -0,0 +1,21 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "tax_advisor"
+  },
+  "terms": [
+    "tax",
+    "tax consultant"
+  ],
+  "name": "Tax Advisor Office"
+}
diff --git a/data/presets/presets/office/telecommunication.json b/data/presets/presets/office/telecommunication.json
index ee3146448..fce97305f 100644
--- a/data/presets/presets/office/telecommunication.json
+++ b/data/presets/presets/office/telecommunication.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/office/therapist.json b/data/presets/presets/office/therapist.json
index 337aea2b5..0c21e3553 100644
--- a/data/presets/presets/office/therapist.json
+++ b/data/presets/presets/office/therapist.json
@@ -8,12 +8,13 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "office": "therapist"
     },
-    "terms": [],
-    "name": "Therapist"
+    "terms": [
+        "therapy"
+    ],
+    "name": "Therapist Office"
 }
diff --git a/data/presets/presets/office/water_utility.json b/data/presets/presets/office/water_utility.json
new file mode 100644
index 000000000..accfa5651
--- /dev/null
+++ b/data/presets/presets/office/water_utility.json
@@ -0,0 +1,22 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours",
+      "operator"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "tags": {
+      "office": "water_utility"
+  },
+  "terms": [
+      "water board",
+      "utility"
+  ],
+  "name": "Water Utility Office"
+}
diff --git a/data/presets/presets/place/square.json b/data/presets/presets/place/square.json
index 3e453cca9..fae8314d8 100644
--- a/data/presets/presets/place/square.json
+++ b/data/presets/presets/place/square.json
@@ -1,5 +1,4 @@
 {
-    "icon": "poi-foot",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/power/_sub_station.json b/data/presets/presets/power/_sub_station.json
index 05c8f1f2a..6f75de3f5 100644
--- a/data/presets/presets/power/_sub_station.json
+++ b/data/presets/presets/power/_sub_station.json
@@ -1,8 +1,10 @@
 {
+    "icon": "poi-power",
     "fields": [
         "substation",
         "operator",
-        "building"
+        "building",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index 1ff06547e..f52fef86d 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -5,7 +5,8 @@
         "generator/source",
         "generator/method",
         "generator/type",
-        "generator/output/electricity"
+        "generator/output/electricity",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/generator/source_nuclear.json b/data/presets/presets/power/generator/source_nuclear.json
index 753a3eda4..8d83e6f6c 100644
--- a/data/presets/presets/power/generator/source_nuclear.json
+++ b/data/presets/presets/power/generator/source_nuclear.json
@@ -5,7 +5,8 @@
         "generator/source",
         "generator/method",
         "generator/type",
-        "generator/output/electricity"
+        "generator/output/electricity",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/generator/source_wind.json b/data/presets/presets/power/generator/source_wind.json
index 1c62b7e1b..4cf6ca95d 100644
--- a/data/presets/presets/power/generator/source_wind.json
+++ b/data/presets/presets/power/generator/source_wind.json
@@ -6,7 +6,8 @@
         "generator/method",
         "generator/type",
         "generator/output/electricity",
-        "height"
+        "height",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json
index c446480e0..eded63610 100644
--- a/data/presets/presets/power/line.json
+++ b/data/presets/presets/power/line.json
@@ -1,5 +1,11 @@
 {
     "icon": "power-line",
+    "fields": [
+        "name",
+        "operator",
+        "voltage",
+        "ref"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/power/minor_line.json b/data/presets/presets/power/minor_line.json
index 9ca424a31..bcf793508 100644
--- a/data/presets/presets/power/minor_line.json
+++ b/data/presets/presets/power/minor_line.json
@@ -1,6 +1,12 @@
 {
     "icon": "power-line",
-    "geometry": [
+    "fields": [
+        "name",
+        "operator",
+        "voltage",
+        "ref"
+    ],
+   "geometry": [
         "line"
     ],
     "tags": {
diff --git a/data/presets/presets/power/pole.json b/data/presets/presets/power/pole.json
index 129f6c11d..c5fdc58b2 100644
--- a/data/presets/presets/power/pole.json
+++ b/data/presets/presets/power/pole.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "ref"
+    ],
     "geometry": [
         "vertex"
     ],
@@ -6,4 +9,4 @@
         "power": "pole"
     },
     "name": "Power Pole"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power/substation.json b/data/presets/presets/power/substation.json
index 451a9b4c6..eb7544814 100644
--- a/data/presets/presets/power/substation.json
+++ b/data/presets/presets/power/substation.json
@@ -3,7 +3,8 @@
     "fields": [
         "substation",
         "operator",
-        "building"
+        "building",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/switch.json b/data/presets/presets/power/switch.json
new file mode 100644
index 000000000..734b18f48
--- /dev/null
+++ b/data/presets/presets/power/switch.json
@@ -0,0 +1,20 @@
+{
+    "icon": "poi-power",
+    "fields": [
+        "switch",
+        "operator",
+        "location",
+        "cables",
+        "voltage",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "power": "switch"
+    },
+    "name": "Power Switch"
+}
diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json
index e745313c6..09ce2afe4 100644
--- a/data/presets/presets/power/tower.json
+++ b/data/presets/presets/power/tower.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "ref"
+    ],
     "geometry": [
         "vertex"
     ],
@@ -6,4 +9,4 @@
         "power": "tower"
     },
     "name": "High-Voltage Tower"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json
index f1af8a2ec..a5a851135 100644
--- a/data/presets/presets/power/transformer.json
+++ b/data/presets/presets/power/transformer.json
@@ -2,6 +2,7 @@
     "icon": "poi-power",
     "fields": [
         "transformer",
+        "operator",
         "location",
         "rating",
         "devices",
@@ -11,7 +12,8 @@
         "voltage/secondary",
         "voltage/tertiary",
         "windings",
-        "windings/configuration"
+        "windings/configuration",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/public_transport/linear_platform.json b/data/presets/presets/public_transport/linear_platform.json
new file mode 100644
index 000000000..3c148919f
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform.json
@@ -0,0 +1,28 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform"
+    },
+    "terms": [
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Transit Stop / Platform",
+    "matchScore": 0.2
+}
diff --git a/data/presets/presets/public_transport/linear_platform_aerialway.json b/data/presets/presets/public_transport/linear_platform_aerialway.json
new file mode 100644
index 000000000..cf2a7ffaa
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_aerialway.json
@@ -0,0 +1,34 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "aerialway": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "aerialway",
+        "cable car",
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Aerialway Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_bus.json b/data/presets/presets/public_transport/linear_platform_bus.json
new file mode 100644
index 000000000..ab9db4a70
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_bus.json
@@ -0,0 +1,43 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "bus": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "highway": "bus_stop"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "highway": "bus_stop"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "bus",
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Bus Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_ferry.json b/data/presets/presets/public_transport/linear_platform_ferry.json
new file mode 100644
index 000000000..c10fafb67
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_ferry.json
@@ -0,0 +1,36 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "ferry": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "boat",
+        "dock",
+        "ferry",
+        "pier",
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Ferry Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_light_rail.json b/data/presets/presets/public_transport/linear_platform_light_rail.json
new file mode 100644
index 000000000..b131b51dd
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_light_rail.json
@@ -0,0 +1,48 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "light_rail": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "light_rail": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "light_rail": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Light Rail Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_monorail.json b/data/presets/presets/public_transport/linear_platform_monorail.json
new file mode 100644
index 000000000..de25f2e75
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_monorail.json
@@ -0,0 +1,44 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "monorail": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "monorail": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "monorail": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "monorail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "transit",
+        "transportation"
+    ],
+    "name": "Monorail Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_subway.json b/data/presets/presets/public_transport/linear_platform_subway.json
new file mode 100644
index 000000000..37691ebbf
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_subway.json
@@ -0,0 +1,47 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "metro",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "subway",
+        "track",
+        "transit",
+        "transportation",
+        "underground"
+    ],
+    "name": "Subway Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_train.json b/data/presets/presets/public_transport/linear_platform_train.json
new file mode 100644
index 000000000..a88238117
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_train.json
@@ -0,0 +1,45 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "track",
+        "train",
+        "transit",
+        "transportation"
+    ],
+    "name": "Train Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_tram.json b/data/presets/presets/public_transport/linear_platform_tram.json
new file mode 100644
index 000000000..aa9bb7119
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_tram.json
@@ -0,0 +1,49 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "tram": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "tram": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "tram": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "streetcar",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Tram Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/linear_platform_trolleybus.json b/data/presets/presets/public_transport/linear_platform_trolleybus.json
new file mode 100644
index 000000000..4ecd1ca57
--- /dev/null
+++ b/data/presets/presets/public_transport/linear_platform_trolleybus.json
@@ -0,0 +1,48 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "trolleybus": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "trolleybus": "yes",
+        "highway": "bus_stop"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "trolleybus": "yes",
+        "highway": "bus_stop"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "bus",
+        "electric",
+        "platform",
+        "public transit",
+        "public transportation",
+        "streetcar",
+        "trackless",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Trolleybus Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json
index 5626b2557..048d2ecab 100644
--- a/data/presets/presets/public_transport/platform.json
+++ b/data/presets/presets/public_transport/platform.json
@@ -5,16 +5,25 @@
         "ref_platform",
         "network",
         "operator",
+        "surface",
+        "lit",
+        "bench",
         "shelter"
     ],
     "geometry": [
         "point",
-        "vertex",
-        "line",
         "area"
     ],
     "tags": {
         "public_transport": "platform"
     },
-    "name": "Platform"
+    "terms": [
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Transit Stop / Platform",
+    "matchScore": 0.2
 }
diff --git a/data/presets/presets/public_transport/platform_aerialway.json b/data/presets/presets/public_transport/platform_aerialway.json
new file mode 100644
index 000000000..dcd1f76b1
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_aerialway.json
@@ -0,0 +1,35 @@
+{
+    "icon": "aerialway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "aerialway": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "aerialway",
+        "cable car",
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Aerialway Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_bus.json b/data/presets/presets/public_transport/platform_bus.json
new file mode 100644
index 000000000..1116ac209
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_bus.json
@@ -0,0 +1,44 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "bus": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "highway": "bus_stop"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "highway": "bus_stop"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "bus",
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Bus Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_ferry.json b/data/presets/presets/public_transport/platform_ferry.json
new file mode 100644
index 000000000..dec204e36
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_ferry.json
@@ -0,0 +1,37 @@
+{
+    "icon": "ferry",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "ferry": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "boat",
+        "dock",
+        "ferry",
+        "pier",
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Ferry Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_light_rail.json b/data/presets/presets/public_transport/platform_light_rail.json
new file mode 100644
index 000000000..6b376861a
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_light_rail.json
@@ -0,0 +1,49 @@
+{
+    "icon": "poi-light-rail",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "light_rail": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "light_rail": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "light_rail": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Light Rail Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_monorail.json b/data/presets/presets/public_transport/platform_monorail.json
new file mode 100644
index 000000000..3505e6c3d
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_monorail.json
@@ -0,0 +1,45 @@
+{
+    "icon": "poi-monorail",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "monorail": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "monorail": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "monorail": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "monorail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "transit",
+        "transportation"
+    ],
+    "name": "Monorail Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_subway.json b/data/presets/presets/public_transport/platform_subway.json
new file mode 100644
index 000000000..716740982
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_subway.json
@@ -0,0 +1,48 @@
+{
+    "icon": "poi-subway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "metro",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "subway",
+        "track",
+        "transit",
+        "transportation",
+        "underground"
+    ],
+    "name": "Subway Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_train.json b/data/presets/presets/public_transport/platform_train.json
new file mode 100644
index 000000000..fc5b4f26a
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_train.json
@@ -0,0 +1,46 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "track",
+        "train",
+        "transit",
+        "transportation"
+    ],
+    "name": "Train Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_tram.json b/data/presets/presets/public_transport/platform_tram.json
new file mode 100644
index 000000000..2677ab543
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_tram.json
@@ -0,0 +1,50 @@
+{
+    "icon": "poi-tram",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "tram": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "tram": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "tram": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "streetcar",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Tram Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_trolleybus.json b/data/presets/presets/public_transport/platform_trolleybus.json
new file mode 100644
index 000000000..b897aba99
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_trolleybus.json
@@ -0,0 +1,49 @@
+{
+    "icon": "poi-trolleybus",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "trolleybus": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "trolleybus": "yes",
+        "highway": "bus_stop"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "trolleybus": "yes",
+        "highway": "bus_stop"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "bus",
+        "electric",
+        "platform",
+        "public transit",
+        "public transportation",
+        "streetcar",
+        "trackless",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Trolleybus Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/station.json b/data/presets/presets/public_transport/station.json
new file mode 100644
index 000000000..19ef56308
--- /dev/null
+++ b/data/presets/presets/public_transport/station.json
@@ -0,0 +1,30 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station"
+    },
+    "terms": [
+        "public transit",
+        "public transportation",
+        "station",
+        "terminal",
+        "transit",
+        "transportation"
+    ],
+    "name": "Transit Station",
+    "matchScore": 0.2
+}
diff --git a/data/presets/presets/public_transport/station_aerialway.json b/data/presets/presets/public_transport/station_aerialway.json
new file mode 100644
index 000000000..8d9e1ef21
--- /dev/null
+++ b/data/presets/presets/public_transport/station_aerialway.json
@@ -0,0 +1,38 @@
+{
+    "icon": "aerialway",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "aerialway/access",
+        "aerialway/summer/access",
+        "elevation",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "aerialway": "yes"
+    },
+    "reference": {
+        "key": "aerialway",
+        "value": "station"
+    },
+    "terms": [
+        "aerialway",
+        "cable car",
+        "public transit",
+        "public transportation",
+        "station",
+        "terminal",
+        "transit",
+        "transportation"
+    ],
+    "name": "Aerialway Station"
+}
diff --git a/data/presets/presets/public_transport/station_bus.json b/data/presets/presets/public_transport/station_bus.json
new file mode 100644
index 000000000..8f5ec99e2
--- /dev/null
+++ b/data/presets/presets/public_transport/station_bus.json
@@ -0,0 +1,45 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "bus": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "bus": "yes",
+        "amenity": "bus_station"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "bus": "yes",
+        "amenity": "bus_station"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "bus_station"
+    },
+    "terms": [
+        "bus",
+        "public transit",
+        "public transportation",
+        "station",
+        "terminal",
+        "transit",
+        "transportation"
+    ],
+    "name": "Bus Station / Terminal"
+}
diff --git a/data/presets/presets/public_transport/station_ferry.json b/data/presets/presets/public_transport/station_ferry.json
new file mode 100644
index 000000000..e1050b96c
--- /dev/null
+++ b/data/presets/presets/public_transport/station_ferry.json
@@ -0,0 +1,48 @@
+{
+    "icon": "ferry",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "ferry": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "ferry": "yes",
+        "amenity": "ferry_terminal"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "ferry": "yes",
+        "amenity": "ferry_terminal"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "ferry_terminal"
+    },
+    "terms": [
+        "boat",
+        "dock",
+        "ferry",
+        "pier",
+        "public transit",
+        "public transportation",
+        "station",
+        "terminal",
+        "transit",
+        "transportation"
+    ],
+    "name": "Ferry Station / Terminal"
+}
diff --git a/data/presets/presets/public_transport/station_light_rail.json b/data/presets/presets/public_transport/station_light_rail.json
new file mode 100644
index 000000000..a1181aba9
--- /dev/null
+++ b/data/presets/presets/public_transport/station_light_rail.json
@@ -0,0 +1,52 @@
+{
+    "icon": "poi-light-rail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "light_rail": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "light_rail": "yes",
+        "railway": "station",
+        "station": "light_rail"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "light_rail": "yes",
+        "railway": "station",
+        "station": "light_rail"
+    },
+    "reference": {
+        "key": "station",
+        "value": "light_rail"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "public transit",
+        "public transportation",
+        "rail",
+        "station",
+        "terminal",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Light Rail Station"
+}
diff --git a/data/presets/presets/public_transport/station_monorail.json b/data/presets/presets/public_transport/station_monorail.json
new file mode 100644
index 000000000..6b6d1aac6
--- /dev/null
+++ b/data/presets/presets/public_transport/station_monorail.json
@@ -0,0 +1,46 @@
+{
+    "icon": "poi-monorail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "monorail": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "monorail": "yes",
+        "railway": "station"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "monorail": "yes",
+        "railway": "station"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "station"
+    },
+    "terms": [
+        "monorail",
+        "public transit",
+        "public transportation",
+        "rail",
+        "station",
+        "terminal",
+        "transit",
+        "transportation"
+    ],
+    "name": "Monorail Station"
+}
diff --git a/data/presets/presets/public_transport/station_subway.json b/data/presets/presets/public_transport/station_subway.json
new file mode 100644
index 000000000..526c003d6
--- /dev/null
+++ b/data/presets/presets/public_transport/station_subway.json
@@ -0,0 +1,51 @@
+{
+    "icon": "poi-subway",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "subway": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "subway": "yes",
+        "railway": "station",
+        "station": "subway"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "subway": "yes",
+        "railway": "station",
+        "station": "subway"
+    },
+    "reference": {
+        "key": "station",
+        "value": "subway"
+    },
+    "terms": [
+        "metro",
+        "public transit",
+        "public transportation",
+        "rail",
+        "station",
+        "subway",
+        "terminal",
+        "track",
+        "transit",
+        "transportation",
+        "underground"
+    ],
+    "name": "Subway Station"
+}
diff --git a/data/presets/presets/public_transport/station_train.json b/data/presets/presets/public_transport/station_train.json
new file mode 100644
index 000000000..3f7a11b58
--- /dev/null
+++ b/data/presets/presets/public_transport/station_train.json
@@ -0,0 +1,47 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "train": "yes",
+        "railway": "station"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "train": "yes",
+        "railway": "station"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "station"
+    },
+    "terms": [
+        "public transit",
+        "public transportation",
+        "rail",
+        "station",
+        "terminal",
+        "track",
+        "train",
+        "transit",
+        "transportation"
+    ],
+    "name": "Train Station"
+}
diff --git a/data/presets/presets/public_transport/station_train_halt.json b/data/presets/presets/public_transport/station_train_halt.json
new file mode 100644
index 000000000..0cbad9602
--- /dev/null
+++ b/data/presets/presets/public_transport/station_train_halt.json
@@ -0,0 +1,39 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "train": "yes",
+        "railway": "halt"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "halt"
+    },
+    "terms": [
+        "halt",
+        "public transit",
+        "public transportation",
+        "rail",
+        "station",
+        "track",
+        "train",
+        "transit",
+        "transportation",
+        "whistle stop"
+    ],
+    "name": "Train Station (Halt / Request)"
+}
diff --git a/data/presets/presets/public_transport/station_tram.json b/data/presets/presets/public_transport/station_tram.json
new file mode 100644
index 000000000..dc8efbce1
--- /dev/null
+++ b/data/presets/presets/public_transport/station_tram.json
@@ -0,0 +1,41 @@
+{
+    "icon": "poi-tram",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "tram": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "station"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "public transit",
+        "public transportation",
+        "rail",
+        "station",
+        "streetcar",
+        "terminal",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Tram Station"
+}
diff --git a/data/presets/presets/public_transport/station_trolleybus.json b/data/presets/presets/public_transport/station_trolleybus.json
new file mode 100644
index 000000000..519e2eeb6
--- /dev/null
+++ b/data/presets/presets/public_transport/station_trolleybus.json
@@ -0,0 +1,50 @@
+{
+    "icon": "poi-trolleybus",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "trolleybus": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "trolleybus": "yes",
+        "amenity": "bus_station"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "trolleybus": "yes",
+        "amenity": "bus_station"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "bus_station"
+    },
+    "terms": [
+        "bus",
+        "electric",
+        "public transit",
+        "public transportation",
+        "station",
+        "streetcar",
+        "terminal",
+        "trackless",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Trolleybus Station / Terminal"
+}
diff --git a/data/presets/presets/public_transport/stop_area.json b/data/presets/presets/public_transport/stop_area.json
new file mode 100644
index 000000000..b95404e55
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_area.json
@@ -0,0 +1,31 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "ref",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "public_transport",
+        "public_transport": "stop_area"
+    },
+    "addTags": {
+        "type": "public_transport",
+        "public_transport": "stop_area",
+        "public_transport:version": "2"
+    },
+    "removeTags": {
+        "type": "public_transport",
+        "public_transport": "stop_area",
+        "public_transport:version": "2"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "stop_area"
+    },
+    "name": "Transit Stop Area"
+}
diff --git a/data/presets/presets/public_transport/stop_position.json b/data/presets/presets/public_transport/stop_position.json
index cfb163244..b2e3f2bad 100644
--- a/data/presets/presets/public_transport/stop_position.json
+++ b/data/presets/presets/public_transport/stop_position.json
@@ -12,5 +12,12 @@
     "tags": {
         "public_transport": "stop_position"
     },
-    "name": "Stop Position"
+    "terms": [
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Transit Stopping Location",
+    "matchScore": 0.2
 }
diff --git a/data/presets/presets/public_transport/stop_position_aerialway.json b/data/presets/presets/public_transport/stop_position_aerialway.json
new file mode 100644
index 000000000..79b6e149d
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_aerialway.json
@@ -0,0 +1,29 @@
+{
+    "icon": "aerialway",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "aerialway": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "stop_position"
+    },
+    "terms": [
+        "aerialway",
+        "cable car",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Aerialway Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_bus.json b/data/presets/presets/public_transport/stop_position_bus.json
new file mode 100644
index 000000000..b1977c4ee
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_bus.json
@@ -0,0 +1,28 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "bus": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "stop_position"
+    },
+    "terms": [
+        "bus",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Bus Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_ferry.json b/data/presets/presets/public_transport/stop_position_ferry.json
new file mode 100644
index 000000000..01e639ca7
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_ferry.json
@@ -0,0 +1,31 @@
+{
+    "icon": "ferry",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "ferry": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "stop_position"
+    },
+    "terms": [
+        "boat",
+        "dock",
+        "ferry",
+        "pier",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Ferry Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_light_rail.json b/data/presets/presets/public_transport/stop_position_light_rail.json
new file mode 100644
index 000000000..c1e8a9eab
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_light_rail.json
@@ -0,0 +1,43 @@
+{
+    "icon": "poi-light-rail",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "light_rail": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "light_rail": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "public_transport": "stop_position",
+        "light_rail": "yes",
+        "railway": "stop"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "stop"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "public transit",
+        "public transportation",
+        "rail",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Light Rail Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_monorail.json b/data/presets/presets/public_transport/stop_position_monorail.json
new file mode 100644
index 000000000..8c23674a1
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_monorail.json
@@ -0,0 +1,39 @@
+{
+    "icon": "poi-monorail",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "monorail": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "monorail": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "public_transport": "stop_position",
+        "monorail": "yes",
+        "railway": "stop"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "stop"
+    },
+    "terms": [
+        "monorail",
+        "public transit",
+        "public transportation",
+        "rail",
+        "transit",
+        "transportation"
+    ],
+    "name": "Monorail Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_subway.json b/data/presets/presets/public_transport/stop_position_subway.json
new file mode 100644
index 000000000..046b412ef
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_subway.json
@@ -0,0 +1,42 @@
+{
+    "icon": "poi-subway",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "subway": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "subway": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "public_transport": "stop_position",
+        "subway": "yes",
+        "railway": "stop"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "stop"
+    },
+    "terms": [
+        "metro",
+        "public transit",
+        "public transportation",
+        "rail",
+        "subway",
+        "track",
+        "transit",
+        "transportation",
+        "underground"
+    ],
+    "name": "Subway Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_train.json b/data/presets/presets/public_transport/stop_position_train.json
new file mode 100644
index 000000000..fb3b651d7
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_train.json
@@ -0,0 +1,40 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "train": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "public_transport": "stop_position",
+        "train": "yes",
+        "railway": "stop"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "stop"
+    },
+    "terms": [
+        "public transit",
+        "public transportation",
+        "rail",
+        "track",
+        "train",
+        "transit",
+        "transportation"
+    ],
+    "name": "Train Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_tram.json b/data/presets/presets/public_transport/stop_position_tram.json
new file mode 100644
index 000000000..58fe6fbb6
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_tram.json
@@ -0,0 +1,44 @@
+{
+    "icon": "poi-tram",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "tram": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "tram": "yes",
+        "railway": "tram_stop"
+    },
+    "removeTags": {
+        "public_transport": "stop_position",
+        "tram": "yes",
+        "railway": "tram_stop"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "stop_position"
+    },
+    "terms": [
+        "electric",
+        "light rail",
+        "public transit",
+        "public transportation",
+        "rail",
+        "streetcar",
+        "track",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Tram Stopping Location"
+}
diff --git a/data/presets/presets/public_transport/stop_position_trolleybus.json b/data/presets/presets/public_transport/stop_position_trolleybus.json
new file mode 100644
index 000000000..39b79dcb1
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_trolleybus.json
@@ -0,0 +1,33 @@
+{
+    "icon": "poi-trolleybus",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "trolleybus": "yes"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "stop_position"
+    },
+    "terms": [
+        "bus",
+        "electric",
+        "public transit",
+        "public transportation",
+        "streetcar",
+        "trackless",
+        "tram",
+        "trolley",
+        "transit",
+        "transportation"
+    ],
+    "name": "Trolleybus Stopping Location"
+}
diff --git a/data/presets/presets/railway/halt.json b/data/presets/presets/railway/_halt.json
similarity index 75%
rename from data/presets/presets/railway/halt.json
rename to data/presets/presets/railway/_halt.json
index 20d556396..ad3a5bb61 100644
--- a/data/presets/presets/railway/halt.json
+++ b/data/presets/presets/railway/_halt.json
@@ -7,12 +7,13 @@
     "tags": {
         "railway": "halt"
     },
-    "name": "Railway Halt",
     "terms": [
         "break",
         "interrupt",
         "rest",
         "wait",
         "interruption"
-    ]
+    ],
+    "name": "Train Station (Halt / Request)",
+    "searchable": false
 }
diff --git a/data/presets/presets/railway/platform.json b/data/presets/presets/railway/_platform.json
similarity index 80%
rename from data/presets/presets/railway/platform.json
rename to data/presets/presets/railway/_platform.json
index 449c221a0..77aae430a 100644
--- a/data/presets/presets/railway/platform.json
+++ b/data/presets/presets/railway/_platform.json
@@ -14,5 +14,6 @@
     "tags": {
         "railway": "platform"
     },
-    "name": "Railway Platform"
+    "name": "Train Stop / Platform",
+    "searchable": false
 }
diff --git a/data/presets/presets/railway/station.json b/data/presets/presets/railway/_station.json
similarity index 88%
rename from data/presets/presets/railway/station.json
rename to data/presets/presets/railway/_station.json
index d6c868a02..3229fa4aa 100644
--- a/data/presets/presets/railway/station.json
+++ b/data/presets/presets/railway/_station.json
@@ -22,5 +22,6 @@
         "train station",
         "station"
     ],
-    "name": "Railway Station"
+    "name": "Train Station",
+    "searchable": false
 }
diff --git a/data/presets/presets/railway/tram_stop.json b/data/presets/presets/railway/_tram_stop.json
similarity index 76%
rename from data/presets/presets/railway/tram_stop.json
rename to data/presets/presets/railway/_tram_stop.json
index 636c6811b..e78912aa3 100644
--- a/data/presets/presets/railway/tram_stop.json
+++ b/data/presets/presets/railway/_tram_stop.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-tram",
     "fields": [
         "name",
         "network",
@@ -17,5 +17,6 @@
         "tram",
         "trolley"
     ],
-    "name": "Tram Stop"
+    "name": "Tram Stopping Position",
+    "searchable": false
 }
diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json
new file mode 100644
index 000000000..462b8f0e4
--- /dev/null
+++ b/data/presets/presets/railway/light_rail.json
@@ -0,0 +1,22 @@
+{
+    "icon": "railway-light-rail",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "railway": "light_rail"
+    },
+    "fields": [
+        "name",
+        "structure",
+        "gauge",
+        "electrified",
+        "service_rail"
+    ],
+    "terms": [
+        "light rail",
+        "streetcar",
+        "trolley"
+    ],
+    "name": "Light Rail"
+}
diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json
new file mode 100644
index 000000000..cabbc299e
--- /dev/null
+++ b/data/presets/presets/railway/miniature.json
@@ -0,0 +1,22 @@
+{
+    "icon": "railway-rail",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "railway": "miniature"
+    },
+    "fields": [
+        "name",
+        "structure",
+        "gauge",
+        "electrified",
+        "service_rail"
+    ],
+    "terms": [
+        "rideable miniature railway",
+        "narrow gauge railway",
+        "minimum gauge railway"
+    ],
+    "name": "Miniature Railway"
+}
diff --git a/data/presets/presets/shop/agrarian.json b/data/presets/presets/shop/agrarian.json
new file mode 100644
index 000000000..8696682aa
--- /dev/null
+++ b/data/presets/presets/shop/agrarian.json
@@ -0,0 +1,27 @@
+{
+    "icon": "shop",
+    "fields": [
+        "name",
+        "operator",
+        "agrarian",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "agricultural inputs",
+        "agricultural machines",
+        "seeds",
+        "pesticides",
+        "fertilizer",
+        "agricultural tools"
+    ],
+    "tags": {
+        "shop": "agrarian"
+    },
+    "name": "Agriculture Shop"
+}
diff --git a/data/presets/presets/shop/kiosk.json b/data/presets/presets/shop/kiosk.json
index ebbbb0031..eebbfc091 100644
--- a/data/presets/presets/shop/kiosk.json
+++ b/data/presets/presets/shop/kiosk.json
@@ -14,5 +14,5 @@
     "tags": {
         "shop": "kiosk"
     },
-    "name": "News Kiosk"
+    "name": "Kiosk"
 }
diff --git a/data/presets/presets/tourism/attraction.json b/data/presets/presets/tourism/attraction.json
index 431d22b50..742055550 100644
--- a/data/presets/presets/tourism/attraction.json
+++ b/data/presets/presets/tourism/attraction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "monument",
+    "icon": "star",
     "fields": [
         "name",
         "operator",
@@ -14,4 +14,4 @@
         "tourism": "attraction"
     },
     "name": "Tourist Attraction"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index 41b16490a..22ba2ad2e 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -14,8 +14,15 @@
         "point",
         "area"
     ],
+    "terms": [
+        "holiday",
+        "holiday cottage",
+        "holiday home",
+        "vacation",
+        "vacation home"
+    ],
     "tags": {
         "tourism": "chalet"
     },
-    "name": "Chalet"
+    "name": "Holiday Cottage"
 }
diff --git a/data/presets/presets/tourism/wilderness_hut.json b/data/presets/presets/tourism/wilderness_hut.json
new file mode 100644
index 000000000..5b06419c7
--- /dev/null
+++ b/data/presets/presets/tourism/wilderness_hut.json
@@ -0,0 +1,22 @@
+{
+  "icon": "lodging",
+  "fields": [
+    "name",
+    "operator",
+    "address",
+    "building_area"
+  ],
+  "geometry": [
+    "point",
+    "area"
+  ],
+  "terms": [
+    "wilderness hut",
+    "backcountry hut",
+    "bothy"
+  ],
+  "tags": {
+    "tourism": "wilderness_hut"
+  },
+  "name": "Wilderness Hut"
+}
diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json
new file mode 100644
index 000000000..ba5bf2de0
--- /dev/null
+++ b/data/presets/presets/type/route/light_rail.json
@@ -0,0 +1,17 @@
+{
+    "icon": "route-light-rail",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network"
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "route",
+        "route": "light_rail"
+    },
+    "name": "Light Rail Route"
+}
diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json
new file mode 100644
index 000000000..bb180f302
--- /dev/null
+++ b/data/presets/presets/type/route/piste.json
@@ -0,0 +1,17 @@
+{
+    "icon": "route-piste",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network"
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "route",
+        "route": "piste"
+    },
+    "name": "Piste/Ski Route"
+}
diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json
new file mode 100644
index 000000000..c9258a8c9
--- /dev/null
+++ b/data/presets/presets/type/route/subway.json
@@ -0,0 +1,17 @@
+{
+    "icon": "route-subway",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network"
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "route",
+        "route": "subway"
+    },
+    "name": "Subway Route"
+}
diff --git a/data/presets/schema/field.json b/data/presets/schema/field.json
index 504bdc442..df4ef642d 100644
--- a/data/presets/schema/field.json
+++ b/data/presets/schema/field.json
@@ -115,6 +115,11 @@
             "description": "If true, replace spaces with underscores in the tag value (combo type fields)",
             "type": "boolean",
             "default": true
+        },
+        "caseSensitive": {
+            "description": "If true, allow case sensitive field values (combo type fields)",
+            "type": "boolean",
+            "default": false
         }
     },
     "additionalProperties": false
diff --git a/data/shortcuts.json b/data/shortcuts.json
index e1871dac3..2b562181c 100644
--- a/data/shortcuts.json
+++ b/data/shortcuts.json
@@ -82,8 +82,9 @@
                         "gesture": "shortcuts.gesture.drag",
                         "text": "shortcuts.browsing.selecting.lasso"
                     }, {
-                        "shortcuts": [],
-                        "text": ""
+                        "modifiers": ["⌘"],
+                        "shortcuts": ["F"],
+                        "text": "shortcuts.browsing.selecting.search"
                     },
 
                     {
diff --git a/data/taginfo.json b/data/taginfo.json
index 7c5ca5fd5..64c92eeb2 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -47,6 +47,10 @@
             "key": "advertising",
             "value": "billboard"
         },
+        {
+            "key": "aerialway",
+            "value": "station"
+        },
         {
             "key": "aerialway",
             "value": "cable_car"
@@ -87,10 +91,6 @@
             "key": "aerialway",
             "value": "rope_tow"
         },
-        {
-            "key": "aerialway",
-            "value": "station"
-        },
         {
             "key": "aerialway",
             "value": "t-bar"
@@ -127,10 +127,18 @@
             "key": "aeroway",
             "value": "terminal"
         },
+        {
+            "key": "amenity",
+            "value": "bus_station"
+        },
         {
             "key": "amenity",
             "value": "coworking_space"
         },
+        {
+            "key": "amenity",
+            "value": "ferry_terminal"
+        },
         {
             "key": "amenity",
             "value": "nursing_home"
@@ -207,10 +215,6 @@
             "key": "amenity",
             "value": "bureau_de_change"
         },
-        {
-            "key": "amenity",
-            "value": "bus_station"
-        },
         {
             "key": "amenity",
             "value": "cafe"
@@ -307,10 +311,6 @@
             "key": "amenity",
             "value": "fast_food"
         },
-        {
-            "key": "amenity",
-            "value": "ferry_terminal"
-        },
         {
             "key": "amenity",
             "value": "fire_station"
@@ -367,6 +367,10 @@
             "key": "amenity",
             "value": "motorcycle_parking"
         },
+        {
+            "key": "amenity",
+            "value": "music_school"
+        },
         {
             "key": "amenity",
             "value": "nightclub"
@@ -844,6 +848,10 @@
             "key": "building",
             "value": "kindergarten"
         },
+        {
+            "key": "building",
+            "value": "mosque"
+        },
         {
             "key": "building",
             "value": "public"
@@ -954,6 +962,10 @@
             "key": "craft",
             "value": "caterer"
         },
+        {
+            "key": "craft",
+            "value": "chimney_sweeper"
+        },
         {
             "key": "craft",
             "value": "clockmaker"
@@ -1056,7 +1068,7 @@
         },
         {
             "key": "craft",
-            "value": "sculpter"
+            "value": "sculptor"
         },
         {
             "key": "craft",
@@ -1066,10 +1078,6 @@
             "key": "craft",
             "value": "stonemason"
         },
-        {
-            "key": "craft",
-            "value": "sweep"
-        },
         {
             "key": "craft",
             "value": "tiler"
@@ -1270,11 +1278,11 @@
         },
         {
             "key": "highway",
-            "value": "bridleway"
+            "value": "bus_stop"
         },
         {
             "key": "highway",
-            "value": "bus_stop"
+            "value": "bridleway"
         },
         {
             "key": "highway",
@@ -1336,6 +1344,10 @@
             "key": "highway",
             "value": "path"
         },
+        {
+            "key": "area",
+            "value": "yes"
+        },
         {
             "key": "highway",
             "value": "pedestrian"
@@ -1562,6 +1574,10 @@
             "key": "landuse",
             "value": "greenfield"
         },
+        {
+            "key": "landuse",
+            "value": "greenhouse_horticulture"
+        },
         {
             "key": "landuse",
             "value": "harbour"
@@ -1654,6 +1670,10 @@
             "key": "landuse",
             "value": "recreation_ground"
         },
+        {
+            "key": "landuse",
+            "value": "religious"
+        },
         {
             "key": "landuse",
             "value": "residential"
@@ -1952,6 +1972,10 @@
             "key": "man_made",
             "value": "mast"
         },
+        {
+            "key": "man_made",
+            "value": "monitoring_station"
+        },
         {
             "key": "tower:type",
             "value": "observation"
@@ -2149,6 +2173,10 @@
         {
             "key": "office"
         },
+        {
+            "key": "office",
+            "value": "administrative"
+        },
         {
             "key": "office",
             "value": "physician"
@@ -2163,12 +2191,24 @@
         },
         {
             "key": "office",
-            "value": "administrative"
+            "value": "adoption_agency"
+        },
+        {
+            "key": "office",
+            "value": "advertising_agency"
         },
         {
             "key": "office",
             "value": "architect"
         },
+        {
+            "key": "office",
+            "value": "association"
+        },
+        {
+            "key": "office",
+            "value": "charity"
+        },
         {
             "key": "office",
             "value": "company"
@@ -2185,6 +2225,10 @@
             "key": "office",
             "value": "employment_agency"
         },
+        {
+            "key": "office",
+            "value": "energy_supplier"
+        },
         {
             "key": "office",
             "value": "estate_agent"
@@ -2193,6 +2237,14 @@
             "key": "office",
             "value": "financial"
         },
+        {
+            "key": "office",
+            "value": "forestry"
+        },
+        {
+            "key": "office",
+            "value": "foundation"
+        },
         {
             "key": "office",
             "value": "government"
@@ -2201,6 +2253,14 @@
             "key": "government",
             "value": "register_office"
         },
+        {
+            "key": "government",
+            "value": "tax"
+        },
+        {
+            "key": "office",
+            "value": "guide"
+        },
         {
             "key": "office",
             "value": "insurance"
@@ -2217,6 +2277,10 @@
             "key": "lawyer",
             "value": "notary"
         },
+        {
+            "key": "office",
+            "value": "moving_company"
+        },
         {
             "key": "office",
             "value": "newspaper"
@@ -2225,14 +2289,34 @@
             "key": "office",
             "value": "ngo"
         },
+        {
+            "key": "office",
+            "value": "notary"
+        },
         {
             "key": "office",
             "value": "political_party"
         },
+        {
+            "key": "office",
+            "value": "private_investigator"
+        },
+        {
+            "key": "office",
+            "value": "quango"
+        },
         {
             "key": "office",
             "value": "research"
         },
+        {
+            "key": "office",
+            "value": "surveyor"
+        },
+        {
+            "key": "office",
+            "value": "tax_advisor"
+        },
         {
             "key": "office",
             "value": "telecommunication"
@@ -2241,6 +2325,10 @@
             "key": "office",
             "value": "therapist"
         },
+        {
+            "key": "office",
+            "value": "water_utility"
+        },
         {
             "key": "piste:type"
         },
@@ -2392,6 +2480,10 @@
             "key": "power",
             "value": "substation"
         },
+        {
+            "key": "power",
+            "value": "switch"
+        },
         {
             "key": "power",
             "value": "tower"
@@ -2400,14 +2492,190 @@
             "key": "power",
             "value": "transformer"
         },
+        {
+            "key": "aerialway",
+            "value": "yes"
+        },
+        {
+            "key": "bus",
+            "value": "yes"
+        },
+        {
+            "key": "ferry",
+            "value": "yes"
+        },
+        {
+            "key": "light_rail",
+            "value": "yes"
+        },
+        {
+            "key": "monorail",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "tram",
+            "value": "yes"
+        },
+        {
+            "key": "trolleybus",
+            "value": "yes"
+        },
         {
             "key": "public_transport",
             "value": "platform"
         },
+        {
+            "key": "aerialway",
+            "value": "yes"
+        },
+        {
+            "key": "bus",
+            "value": "yes"
+        },
+        {
+            "key": "ferry",
+            "value": "yes"
+        },
+        {
+            "key": "light_rail",
+            "value": "yes"
+        },
+        {
+            "key": "monorail",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "tram",
+            "value": "yes"
+        },
+        {
+            "key": "trolleybus",
+            "value": "yes"
+        },
+        {
+            "key": "public_transport",
+            "value": "platform"
+        },
+        {
+            "key": "aerialway",
+            "value": "yes"
+        },
+        {
+            "key": "bus",
+            "value": "yes"
+        },
+        {
+            "key": "ferry",
+            "value": "yes"
+        },
+        {
+            "key": "light_rail",
+            "value": "yes"
+        },
+        {
+            "key": "monorail",
+            "value": "yes"
+        },
+        {
+            "key": "subway",
+            "value": "yes"
+        },
+        {
+            "key": "railway",
+            "value": "halt"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "tram",
+            "value": "yes"
+        },
+        {
+            "key": "trolleybus",
+            "value": "yes"
+        },
+        {
+            "key": "public_transport",
+            "value": "station"
+        },
+        {
+            "key": "public_transport",
+            "value": "stop_area"
+        },
+        {
+            "key": "aerialway",
+            "value": "yes"
+        },
+        {
+            "key": "bus",
+            "value": "yes"
+        },
+        {
+            "key": "ferry",
+            "value": "yes"
+        },
+        {
+            "key": "light_rail",
+            "value": "yes"
+        },
+        {
+            "key": "monorail",
+            "value": "yes"
+        },
+        {
+            "key": "subway",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "tram",
+            "value": "yes"
+        },
+        {
+            "key": "trolleybus",
+            "value": "yes"
+        },
         {
             "key": "public_transport",
             "value": "stop_position"
         },
+        {
+            "key": "railway",
+            "value": "halt"
+        },
+        {
+            "key": "railway",
+            "value": "platform"
+        },
+        {
+            "key": "railway",
+            "value": "station"
+        },
+        {
+            "key": "railway",
+            "value": "tram_stop"
+        },
         {
             "key": "railway",
             "value": "abandoned"
@@ -2432,18 +2700,22 @@
             "key": "railway",
             "value": "funicular"
         },
-        {
-            "key": "railway",
-            "value": "halt"
-        },
         {
             "key": "railway",
             "value": "level_crossing"
         },
+        {
+            "key": "railway",
+            "value": "light_rail"
+        },
         {
             "key": "railway",
             "value": "milestone"
         },
+        {
+            "key": "railway",
+            "value": "miniature"
+        },
         {
             "key": "railway",
             "value": "monorail"
@@ -2452,10 +2724,6 @@
             "key": "railway",
             "value": "narrow_gauge"
         },
-        {
-            "key": "railway",
-            "value": "platform"
-        },
         {
             "key": "railway",
             "value": "rail"
@@ -2464,10 +2732,6 @@
             "key": "railway",
             "value": "signal"
         },
-        {
-            "key": "railway",
-            "value": "station"
-        },
         {
             "key": "railway",
             "value": "subway_entrance"
@@ -2484,10 +2748,6 @@
             "key": "railway",
             "value": "wash"
         },
-        {
-            "key": "railway",
-            "value": "tram_stop"
-        },
         {
             "key": "railway",
             "value": "tram"
@@ -2511,6 +2771,10 @@
             "key": "shop",
             "value": "vacant"
         },
+        {
+            "key": "shop",
+            "value": "agrarian"
+        },
         {
             "key": "shop",
             "value": "alcohol"
@@ -3078,6 +3342,10 @@
             "key": "tourism",
             "value": "viewpoint"
         },
+        {
+            "key": "tourism",
+            "value": "wilderness_hut"
+        },
         {
             "key": "tourism",
             "value": "zoo"
@@ -3201,10 +3469,18 @@
             "key": "route",
             "value": "horse"
         },
+        {
+            "key": "route",
+            "value": "light_rail"
+        },
         {
             "key": "route",
             "value": "pipeline"
         },
+        {
+            "key": "route",
+            "value": "piste"
+        },
         {
             "key": "route",
             "value": "power"
@@ -3213,6 +3489,10 @@
             "key": "route",
             "value": "road"
         },
+        {
+            "key": "route",
+            "value": "subway"
+        },
         {
             "key": "route",
             "value": "train"
diff --git a/data/update_imagery.js b/data/update_imagery.js
index af1d02774..a3c291fdb 100644
--- a/data/update_imagery.js
+++ b/data/update_imagery.js
@@ -72,7 +72,7 @@ sources.concat(whitelist).forEach(function(source) {
     if (extent.min_zoom || extent.max_zoom) {
         im.scaleExtent = [
             extent.min_zoom || 0,
-            extent.max_zoom || 20
+            extent.max_zoom || 22
         ];
     }
 
diff --git a/development_server.js b/development_server.js
index 7b8871a23..b8ce39eec 100644
--- a/development_server.js
+++ b/development_server.js
@@ -28,6 +28,7 @@ if (isDevelopment) {
     gaze(
         [
             'data/**/*.{js,json}',
+            'data/core.yaml',
             // ignore the output files of `buildData`
             '!data/presets/categories.json',
             '!data/presets/fields.json',
diff --git a/dist/img/arrow-icon.png b/dist/img/arrow-icon.png
index 891492c1b..f1a751657 100644
Binary files a/dist/img/arrow-icon.png and b/dist/img/arrow-icon.png differ
diff --git a/dist/img/background-pattern-1.png b/dist/img/background-pattern-1.png
index d2f2bcb12..e3cbe8179 100644
Binary files a/dist/img/background-pattern-1.png and b/dist/img/background-pattern-1.png differ
diff --git a/dist/img/background-pattern-opacity.png b/dist/img/background-pattern-opacity.png
index f24376283..4ca1ff201 100644
Binary files a/dist/img/background-pattern-opacity.png and b/dist/img/background-pattern-opacity.png differ
diff --git a/dist/img/cursor-draw-connect-line.png b/dist/img/cursor-draw-connect-line.png
index 122870729..d106a46e5 100644
Binary files a/dist/img/cursor-draw-connect-line.png and b/dist/img/cursor-draw-connect-line.png differ
diff --git a/dist/img/cursor-draw-connect-line2x.png b/dist/img/cursor-draw-connect-line2x.png
index 9e45b4011..c884e568b 100644
Binary files a/dist/img/cursor-draw-connect-line2x.png and b/dist/img/cursor-draw-connect-line2x.png differ
diff --git a/dist/img/cursor-draw-connect-vertex.png b/dist/img/cursor-draw-connect-vertex.png
index bd2766bde..409c294db 100644
Binary files a/dist/img/cursor-draw-connect-vertex.png and b/dist/img/cursor-draw-connect-vertex.png differ
diff --git a/dist/img/cursor-draw-connect-vertex2x.png b/dist/img/cursor-draw-connect-vertex2x.png
index e2c88221b..5e5d3ca1c 100644
Binary files a/dist/img/cursor-draw-connect-vertex2x.png and b/dist/img/cursor-draw-connect-vertex2x.png differ
diff --git a/dist/img/cursor-draw.png b/dist/img/cursor-draw.png
index 27ccf75e8..c03dcfc7d 100644
Binary files a/dist/img/cursor-draw.png and b/dist/img/cursor-draw.png differ
diff --git a/dist/img/cursor-grab2x.png b/dist/img/cursor-grab2x.png
index 13ed46442..033c6c4c5 100644
Binary files a/dist/img/cursor-grab2x.png and b/dist/img/cursor-grab2x.png differ
diff --git a/dist/img/cursor-grabbing.png b/dist/img/cursor-grabbing.png
index 8875f1a21..a6e8370d2 100644
Binary files a/dist/img/cursor-grabbing.png and b/dist/img/cursor-grabbing.png differ
diff --git a/dist/img/cursor-grabbing2x.png b/dist/img/cursor-grabbing2x.png
index 9db25bcc7..e32cb6c9c 100644
Binary files a/dist/img/cursor-grabbing2x.png and b/dist/img/cursor-grabbing2x.png differ
diff --git a/dist/img/cursor-pointing.png b/dist/img/cursor-pointing.png
index 910bc7f19..935cff02a 100644
Binary files a/dist/img/cursor-pointing.png and b/dist/img/cursor-pointing.png differ
diff --git a/dist/img/cursor-pointing2x.png b/dist/img/cursor-pointing2x.png
index dce3793f5..e1dfda2c8 100644
Binary files a/dist/img/cursor-pointing2x.png and b/dist/img/cursor-pointing2x.png differ
diff --git a/dist/img/cursor-select-acting.png b/dist/img/cursor-select-acting.png
index f0d3756ac..3b8c53890 100644
Binary files a/dist/img/cursor-select-acting.png and b/dist/img/cursor-select-acting.png differ
diff --git a/dist/img/cursor-select-acting2x.png b/dist/img/cursor-select-acting2x.png
index 7611328eb..bb3e24c40 100644
Binary files a/dist/img/cursor-select-acting2x.png and b/dist/img/cursor-select-acting2x.png differ
diff --git a/dist/img/cursor-select-add.png b/dist/img/cursor-select-add.png
index 3dcfe5315..d9b9d8e6a 100644
Binary files a/dist/img/cursor-select-add.png and b/dist/img/cursor-select-add.png differ
diff --git a/dist/img/cursor-select-area.png b/dist/img/cursor-select-area.png
index 07a7a11ab..d17fc22ac 100644
Binary files a/dist/img/cursor-select-area.png and b/dist/img/cursor-select-area.png differ
diff --git a/dist/img/cursor-select-area2x.png b/dist/img/cursor-select-area2x.png
index 84efbe929..63d094e28 100644
Binary files a/dist/img/cursor-select-area2x.png and b/dist/img/cursor-select-area2x.png differ
diff --git a/dist/img/cursor-select-line.png b/dist/img/cursor-select-line.png
index bdd39986e..38a0b015f 100644
Binary files a/dist/img/cursor-select-line.png and b/dist/img/cursor-select-line.png differ
diff --git a/dist/img/cursor-select-line2x.png b/dist/img/cursor-select-line2x.png
index 726ca11c8..4dbc5e0e5 100644
Binary files a/dist/img/cursor-select-line2x.png and b/dist/img/cursor-select-line2x.png differ
diff --git a/dist/img/cursor-select-mapillary.png b/dist/img/cursor-select-mapillary.png
index 5bf5c3feb..eeed38d0d 100644
Binary files a/dist/img/cursor-select-mapillary.png and b/dist/img/cursor-select-mapillary.png differ
diff --git a/dist/img/cursor-select-mapillary2x.png b/dist/img/cursor-select-mapillary2x.png
index a21d86883..d7d388ee1 100644
Binary files a/dist/img/cursor-select-mapillary2x.png and b/dist/img/cursor-select-mapillary2x.png differ
diff --git a/dist/img/cursor-select-point.png b/dist/img/cursor-select-point.png
index bb8873655..d6fee319d 100644
Binary files a/dist/img/cursor-select-point.png and b/dist/img/cursor-select-point.png differ
diff --git a/dist/img/cursor-select-point2x.png b/dist/img/cursor-select-point2x.png
index 99bf39fa4..020df5b9c 100644
Binary files a/dist/img/cursor-select-point2x.png and b/dist/img/cursor-select-point2x.png differ
diff --git a/dist/img/cursor-select-remove.png b/dist/img/cursor-select-remove.png
index f5f012606..f3f03dd1a 100644
Binary files a/dist/img/cursor-select-remove.png and b/dist/img/cursor-select-remove.png differ
diff --git a/dist/img/cursor-select-split.png b/dist/img/cursor-select-split.png
index 1d2b82ed2..2a6120ddb 100644
Binary files a/dist/img/cursor-select-split.png and b/dist/img/cursor-select-split.png differ
diff --git a/dist/img/cursor-select-split2x.png b/dist/img/cursor-select-split2x.png
index 44f949bf7..37a3d07e5 100644
Binary files a/dist/img/cursor-select-split2x.png and b/dist/img/cursor-select-split2x.png differ
diff --git a/dist/img/cursor-select-vertex.png b/dist/img/cursor-select-vertex.png
index 781d8b4d7..bf6efeedb 100644
Binary files a/dist/img/cursor-select-vertex.png and b/dist/img/cursor-select-vertex.png differ
diff --git a/dist/img/logo.png b/dist/img/logo.png
index 6afa01f1b..9c2a2687a 100644
Binary files a/dist/img/logo.png and b/dist/img/logo.png differ
diff --git a/dist/img/mini-loader.gif b/dist/img/mini-loader.gif
index 89250511d..6bd588138 100644
Binary files a/dist/img/mini-loader.gif and b/dist/img/mini-loader.gif differ
diff --git a/dist/img/pattern/cemetery.png b/dist/img/pattern/cemetery.png
index 783d1b8be..89ae70bbd 100644
Binary files a/dist/img/pattern/cemetery.png and b/dist/img/pattern/cemetery.png differ
diff --git a/dist/img/pattern/construction.png b/dist/img/pattern/construction.png
index 4f70cdf7a..e2d89f0e7 100644
Binary files a/dist/img/pattern/construction.png and b/dist/img/pattern/construction.png differ
diff --git a/dist/img/pattern/dots.png b/dist/img/pattern/dots.png
index e57beaaa6..c69b99fd6 100644
Binary files a/dist/img/pattern/dots.png and b/dist/img/pattern/dots.png differ
diff --git a/dist/img/pattern/farmland.png b/dist/img/pattern/farmland.png
index 4e3eb765d..5c0a8804f 100644
Binary files a/dist/img/pattern/farmland.png and b/dist/img/pattern/farmland.png differ
diff --git a/dist/img/pattern/orchard.png b/dist/img/pattern/orchard.png
index d0b751487..e45b36841 100644
Binary files a/dist/img/pattern/orchard.png and b/dist/img/pattern/orchard.png differ
diff --git a/dist/img/pattern/vineyard.png b/dist/img/pattern/vineyard.png
index f8e17178e..b1938c9e8 100644
Binary files a/dist/img/pattern/vineyard.png and b/dist/img/pattern/vineyard.png differ
diff --git a/dist/img/pattern/wetland.png b/dist/img/pattern/wetland.png
index a91767fc5..c9df1a23d 100644
Binary files a/dist/img/pattern/wetland.png and b/dist/img/pattern/wetland.png differ
diff --git a/dist/img/traffic-signs/traffic-signs.png b/dist/img/traffic-signs/traffic-signs.png
index 20322183b..77f787a6f 100644
Binary files a/dist/img/traffic-signs/traffic-signs.png and b/dist/img/traffic-signs/traffic-signs.png differ
diff --git a/dist/index.html b/dist/index.html
index d8fa8ab1b..0246a2cf5 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -46,7 +46,23 @@
                     id.features().disable('boundaries');
                 }
 
-                id.ui()(document.getElementById('id-container'));
+                id.ui()(document.getElementById('id-container'), function() {
+                    id.container().select('#about-list')
+                        .insert('li', '.user-list')
+                        .attr('class', 'source-switch')
+                        .call(iD.uiSourceSwitch(id)
+                            .keys([{
+                                    'urlroot': 'https://www.openstreetmap.org',
+                                    'oauth_consumer_key': '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
+                                    'oauth_secret': 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL'
+                                }, {
+                                    'urlroot': 'https://api06.dev.openstreetmap.org',
+                                    'oauth_consumer_key': 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R',
+                                    'oauth_secret': 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p'
+                                }
+                            ])
+                        );
+                });
             }
         </script>
     </body>
diff --git a/dist/locales/af.json b/dist/locales/af.json
index 245e66978..d6f9873a3 100644
--- a/dist/locales/af.json
+++ b/dist/locales/af.json
@@ -189,8 +189,7 @@
         },
         "splash": {
             "welcome": "Welkom by die iD OpenStreetMap program",
-            "walkthrough": "Begin die Deurloop",
-            "start": "Verander Nou"
+            "walkthrough": "Begin die Deurloop"
         },
         "source_switch": {
             "live": "lewendig",
@@ -209,10 +208,6 @@
             "tag_suggests_area": "Die kenmerk {tag} is geoormerk vir 'n area nie vir 'n lyn nie.",
             "deprecated_tags": "Vervalde kenmerke: {tags}"
         },
-        "zoom": {
-            "in": "Zoom in",
-            "out": "Zoom uit"
-        },
         "cannot_zoom": "Kan nie verder uitzoom in die huidige mode nie.",
         "help": {
             "title": "Help"
@@ -1307,9 +1302,6 @@
                 "tourism/caravan_site": {
                     "name": "RV Park"
                 },
-                "tourism/chalet": {
-                    "name": "Chalet"
-                },
                 "tourism/guest_house": {
                     "name": "Gastehuis"
                 },
diff --git a/dist/locales/ar-AA.json b/dist/locales/ar-AA.json
index 30ba7cae9..2adf4a7f1 100644
--- a/dist/locales/ar-AA.json
+++ b/dist/locales/ar-AA.json
@@ -116,7 +116,6 @@
                 "title": "تقسيم"
             }
         },
-        "zoom_in_edit": ".كبِّر للتعديل",
         "logout": "تسجيل الخروج",
         "commit": {
             "upload_explanation": "التغييرات التي قمتم بتحميلها ستكون مرئية على جميع الخرائط التي تستخدم بيانات خريطة الشارع المفتوح.",
diff --git a/dist/locales/ar.json b/dist/locales/ar.json
index 813f83663..62bd447aa 100644
--- a/dist/locales/ar.json
+++ b/dist/locales/ar.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "اختر لغة",
             "localized_translation_name": "الاسم"
         },
-        "zoom_in_edit": "كبّر للتحرير",
+        "zoom_in_edit": "كبّر للتعديل",
         "login": "تسجيل دخول",
         "logout": "تسجيل خروج",
         "loading_auth": "جار الإتصال بـ OpenStreetMap ...",
@@ -601,8 +601,7 @@
         "splash": {
             "welcome": "مرحبا بك في محرر iD لخريطة الشارع المفتوحة OpenStreetMap.",
             "text": "محرر الخرائط ID هو محرر سهل وجذاب ولكنه أيضًا أداة قوية جدا وفعالة للمساهمة في أفضل خرائط حُرة ومجانية في العالم. هذا هو الإصدار رقم {version}. لمزيد من المعلومات انظر {website} ، كما يمكنك الإبلاغ عن العلل والمشاكل على {github}.",
-            "walkthrough": "بدء جولة تعليم",
-            "start": "حرّر الآن"
+            "walkthrough": "بدء جولة تعليم"
         },
         "source_switch": {
             "live": "حي",
@@ -817,10 +816,12 @@
                 "start_drag_midpoint": "تظهر مثلثات صغيرة عند *نقاط المنتصف* بين كل نقطتين. ومن الطرق الأخرى لإنشاء نقطة جديدة هو سحب هذه المثلثات الصغيرة إلى مكان مختلف. **اسحب مثلث نقطة الوسط لإنشاء نقطة جديدة على طول منحنى الطريق.**",
                 "continue_drag_midpoint": "هذا الخط يبدو أفضل بكثير! استمر بتعديل هذا الخط عن طريق النقر المزدوج عليه أو سحب مثلثات المنتصف لإنشاء نقط جديدة ومطابقة هذه النقط على الطريق ليأخذ المنحنى نفس شكل الطريق. **عند رضائك عن شكل المنحنى ومطابقته لشكل الطريق، انقر \"موافق\".**",
                 "split_intersection": "**انقر على زرّ {button} لفصل {street}.**",
-                "retry_split": "لم تقم بالنقر على زر الفصل. حاول مجددا."
+                "retry_split": "لم تقم بالنقر على زر الفصل. حاول مجددا.",
+                "retry_delete": "أنت لم تضغط على زرّ الحذف. حاول مجددا"
             },
             "buildings": {
                 "title": "المباني",
+                "choose_category_building": "**اختر {category} من القائمة.**",
                 "close": "**اضغط زرّ الهروب \"Esc\" أو انقر على زرّ {button} لإغلاق محرر العناصر.**",
                 "rightclick_building": "**انقر بالزرّ الأيمن لاختيار المبنى الذي أنشأته وعرض قائعة التحرير.**"
             },
@@ -835,9 +836,23 @@
         "shortcuts": {
             "title": "اختصارات لوحة المفاتيح",
             "tooltip": "عرض شاشة اختصارات لوحة المفاتيح",
+            "toggle": {
+                "key": "?"
+            },
             "key": {
+                "alt": "Alt",
+                "ctrl": "Ctrl",
+                "delete": "Delete",
+                "del": "Del",
+                "end": "End",
+                "enter": "Enter",
+                "esc": "Esc",
                 "home": "الرئيسية",
-                "return": "رجوع"
+                "pgdn": "PgDn",
+                "pgup": "PgUp",
+                "return": "رجوع",
+                "shift": "Shift",
+                "space": "Space"
             },
             "gesture": {
                 "drag": "سحب"
@@ -1351,6 +1366,9 @@
                 "historic": {
                     "label": "النوع"
                 },
+                "historic/civilization": {
+                    "label": "الحضارة التاريخية"
+                },
                 "hoops": {
                     "placeholder": "1، 2، 4..."
                 },
@@ -1745,9 +1763,17 @@
                     },
                     "placeholder": "غير معروف"
                 },
+                "structure_waterway": {
+                    "options": {
+                        "tunnel": "نفق"
+                    }
+                },
                 "studio": {
                     "label": "النوع"
                 },
+                "substance": {
+                    "label": "مادة"
+                },
                 "substation": {
                     "label": "النوع"
                 },
@@ -1836,6 +1862,10 @@
                     "name": "العنوان",
                     "terms": "عنوان"
                 },
+                "aerialway/cable_car": {
+                    "name": "تلفريك",
+                    "terms": "تلفريك، معبر هوائي"
+                },
                 "aeroway": {
                     "name": "جوي"
                 },
@@ -1965,6 +1995,9 @@
                     "name": "مياه شرب",
                     "terms": "ماء الشرب"
                 },
+                "amenity/driving_school": {
+                    "name": "مدرسة تعليم السياقة"
+                },
                 "amenity/embassy": {
                     "name": "سفارة",
                     "terms": "سفارة"
@@ -1977,6 +2010,9 @@
                     "name": "محطة إطفاء حريق",
                     "terms": "محطة إطفاء"
                 },
+                "amenity/food_court": {
+                    "name": "قاعة طعام"
+                },
                 "amenity/fountain": {
                     "name": "نافورة",
                     "terms": "نافورة"
@@ -1996,6 +2032,9 @@
                 "amenity/internet_cafe": {
                     "name": "مقهى إنترنت"
                 },
+                "amenity/kindergarten": {
+                    "name": "روضة أطفال"
+                },
                 "amenity/library": {
                     "name": "مكتبة",
                     "terms": "مكتبة"
@@ -2079,6 +2118,9 @@
                 "amenity/school": {
                     "name": "أرض مدرسة"
                 },
+                "amenity/scrapyard": {
+                    "name": "مقبرة السيارات"
+                },
                 "amenity/shelter": {
                     "name": "مأوى",
                     "terms": "مأوى, ملجأ, ملاذ, سقيفة, وقاء"
@@ -2320,6 +2362,22 @@
                 "building/university": {
                     "name": "مبنى جامعي"
                 },
+                "craft/beekeeper": {
+                    "name": "مربي النحل",
+                    "terms": "مربي النحل, نحال"
+                },
+                "craft/blacksmith": {
+                    "name": "حدّاد",
+                    "terms": "حدّاد"
+                },
+                "craft/boatbuilder": {
+                    "name": "بنّاء السفن",
+                    "terms": "بنّاء السفن"
+                },
+                "craft/bookbinder": {
+                    "name": "مجلد الكتب",
+                    "terms": "مجلد الكتب"
+                },
                 "craft/brewery": {
                     "name": "مصنع بيرة",
                     "terms": "بيرة; جعة"
@@ -2331,6 +2389,14 @@
                     "name": "منظم حفلات",
                     "terms": "منظم حفلات; متعهد حفلات;حفلة;حفلات"
                 },
+                "craft/clockmaker": {
+                    "name": "ساعاتي",
+                    "terms": "ساعاتي"
+                },
+                "craft/confectionery": {
+                    "name": "حلواني",
+                    "terms": "حلواني"
+                },
                 "craft/electrician": {
                     "name": "كهربائي",
                     "terms": "كهربائي"
@@ -2360,6 +2426,12 @@
                 "craft/shoemaker": {
                     "name": "إسكافي"
                 },
+                "craft/tailor": {
+                    "name": "خياط"
+                },
+                "craft/tiler": {
+                    "name": "خياط"
+                },
                 "emergency/ambulance_station": {
                     "name": "محطة إسعاف",
                     "terms": "محطة إسعاف, محطة اسعاف"
@@ -2687,6 +2759,10 @@
                     "name": "موقد نار",
                     "terms": "موقد"
                 },
+                "leisure/fitness_centre": {
+                    "name": "مركز اللياقة البدنية",
+                    "terms": "مركز اللياقة البدنية، نادي صحي"
+                },
                 "leisure/garden": {
                     "name": "حديقة",
                     "terms": "حديقة"
@@ -2762,6 +2838,10 @@
                     "name": "مزلقة سفن",
                     "terms": "مزلقة سفن"
                 },
+                "leisure/sports_centre": {
+                    "name": "مركز رياضي",
+                    "terms": " مركز رياضي، نادي رياضي "
+                },
                 "leisure/sports_centre/swimming": {
                     "name": "مبنى حوض سباحة",
                     "terms": "حمام سباحة; حوض سباحة; حمام; حوض; سباحة; مسبح"
@@ -2774,6 +2854,10 @@
                     "name": "حوض سباحة",
                     "terms": "حمام سباحة; حوض سباحة; حمام; حوض; سباحة; مسبح"
                 },
+                "leisure/track": {
+                    "name": "مضمار سباق",
+                    "terms": "مضمار سباق"
+                },
                 "leisure/water_park": {
                     "name": "ملاهي مائية",
                     "terms": "ملاهي مائية"
@@ -2863,6 +2947,10 @@
                     "name": "محطة مياه",
                     "terms": "محطة مياه"
                 },
+                "man_made/watermill": {
+                    "name": "طاحونة مائية",
+                    "terms": "طاحونة مائية"
+                },
                 "man_made/works": {
                     "name": "مصنع",
                     "terms": "مصنع"
@@ -2973,16 +3061,28 @@
                     "terms": "مكتب"
                 },
                 "office/accountant": {
-                    "name": "المحاسب",
-                    "terms": "المحاسب القانوني، المدقق، الحسابات "
+                    "name": " المحاسب ",
+                    "terms": " المحاسب القانوني، المدقق، الحسابات "
                 },
                 "office/administrative": {
                     "name": "مكتب الإداري ",
                     "terms": "إدارة، إدارة عامة، مكتب تنظيمي"
                 },
+                "office/advertising_agency": {
+                    "name": "وكالة إعلانية",
+                    "terms": "وكالة الإشهار، وكالة إعلانية"
+                },
                 "office/architect": {
-                    "name": "مهندس معماري ",
-                    "terms": "بناء، مباني، مدينة، تعمير"
+                    "name": " مهندس معماري ",
+                    "terms": " بناء، مباني، مدينة، تعمير "
+                },
+                "office/association": {
+                    "name": "جمعية ",
+                    "terms": "جمعية، منظمة غير ربحية "
+                },
+                "office/charity": {
+                    "name": "منظمة خيرية",
+                    "terms": "منظمة خيرية"
                 },
                 "office/company": {
                     "name": "مكتب شركة",
@@ -3004,30 +3104,46 @@
                     "name": "مكتب مالي",
                     "terms": "وزارة المالية، المكتب المالي والضريبي، "
                 },
+                "office/forestry": {
+                    "name": "إدارة الغابات",
+                    "terms": "إدارة الغابات"
+                },
                 "office/government": {
                     "name": "مكتب حكومي",
                     "terms": "رئاسة الوزراء، إدارة الدولة، المكتب العام، "
                 },
+                "office/government/register_office": {
+                    "name": "مكتب تسجيل",
+                    "terms": "مكتب تسجيل"
+                },
+                "office/government/tax": {
+                    "name": "مكتب الضرائب",
+                    "terms": "مكتب الضرائب"
+                },
                 "office/insurance": {
                     "name": "مكتب تأمينات",
                     "terms": "مديرية المعاشات، دائرة التأمينات الاجتماعية، إدارة التأمين"
                 },
-                "office/it": {
-                    "name": "مكتب تقنية المعلومات",
-                    "terms": "المكتب التقني، إدارة المعلوماتية، إدارة المعلومات ، هيئة التقانة"
-                },
                 "office/lawyer": {
                     "name": "مكتب قانوني ",
                     "terms": "مكتب محاماة، اﻹدارة القانونية، المحكمة،"
                 },
+                "office/lawyer/notary": {
+                    "name": "كاتب عدل / موثق",
+                    "terms": "كاتب عدل، موثق"
+                },
                 "office/newspaper": {
                     "name": "صحيفة",
-                    "terms": "جريدة، صفحة أخبار، يومية"
+                    "terms": " جريدة، صفحة أخبار، يومية "
                 },
                 "office/ngo": {
                     "name": "مكتب المنظمات الغير حكومية",
                     "terms": "مكتب الجمعيات الخيرية، هيئات العمل اﻹغائي، "
                 },
+                "office/notary": {
+                    "name": "كاتب عدل / موثق",
+                    "terms": "كاتب عدل، موثق"
+                },
                 "office/physician": {
                     "name": "طبيب"
                 },
@@ -3035,21 +3151,41 @@
                     "name": "الحزب السياسي ",
                     "terms": "حزب سياسي، الحزب السياسي، المكتب السياسي، مكتب سياسي"
                 },
+                "office/private_investigator": {
+                    "name": "مكتب محقق",
+                    "terms": "مكتب محقق"
+                },
+                "office/quango": {
+                    "name": "السلطة الإدارية المستقلة",
+                    "terms": "السلطة الإدارية المستقلة"
+                },
                 "office/research": {
                     "name": "مكتب بحوث",
                     "terms": "مكتب البحوث، مكتب اﻷبحاث، هيئة اﻷبحاث"
                 },
+                "office/surveyor": {
+                    "name": "مساح",
+                    "terms": "مساح"
+                },
+                "office/tax_advisor": {
+                    "name": "مستشار الضرائب",
+                    "terms": "مستشار الضرائب"
+                },
                 "office/telecommunication": {
                     "name": "مكتب اتصالات",
                     "terms": "مكتب الاتصالات، إدارة الاتصال، هيئة الاتصالات العامة"
                 },
                 "office/therapist": {
                     "name": "المعالج",
-                    "terms": "معالج، معالج فيزيائي، طبيب، مُمرض"
+                    "terms": " معالج، معالج فيزيائي، طبيب، مُمرض "
                 },
                 "office/travel_agent": {
                     "name": "وكالة السفر"
                 },
+                "office/water_utility": {
+                    "name": "شركة المياه",
+                    "terms": "شركة المياه"
+                },
                 "place": {
                     "name": "قصر"
                 },
@@ -3079,6 +3215,14 @@
                 "place/neighbourhood": {
                     "name": "حي سكني"
                 },
+                "place/square": {
+                    "name": "ساحة",
+                    "terms": "ساحة"
+                },
+                "place/suburb": {
+                    "name": "ضاحية",
+                    "terms": "ضاحية"
+                },
                 "place/town": {
                     "name": "بلدة",
                     "terms": "بلدة"
@@ -3098,6 +3242,14 @@
                     "name": "مولد طاقة",
                     "terms": "مولد الطاقة"
                 },
+                "power/generator/source_nuclear": {
+                    "name": " محطة طاقة نووية ",
+                    "terms": " محطة طاقة نووية "
+                },
+                "power/generator/source_wind": {
+                    "name": "عنفة رياح",
+                    "terms": "عنفة رياح"
+                },
                 "power/line": {
                     "name": "خط الطاقة",
                     "terms": "خط الكهرباء , خط الطاقة"
@@ -3106,6 +3258,10 @@
                     "name": "خط كهربائي ثانوي",
                     "terms": "خط كهربائي صغير، خط طاقة صغير"
                 },
+                "power/plant": {
+                    "name": "محطة توليد الكهرباء",
+                    "terms": "محطة توليد الكهرباء، الطاقة الكهربائية"
+                },
                 "power/pole": {
                     "name": "برج كهربائي",
                     "terms": "برج كهربائي"
@@ -3135,6 +3291,10 @@
                     "name": "سكة حديدية مهجورة",
                     "terms": "سكة حديد مهجورة"
                 },
+                "railway/buffer_stop": {
+                    "name": "مصد",
+                    "terms": "مصد"
+                },
                 "railway/crossing": {
                     "name": "معبر سكة حديد (مسار)",
                     "terms": "معبر سكة حديد; معبر"
@@ -3143,6 +3303,10 @@
                     "name": "سكة حديدة مهجورة",
                     "terms": "سكة حديد غير مستعملة"
                 },
+                "railway/funicular": {
+                    "name": "قطار جبلي مائل",
+                    "terms": "قطار جبلي مائل"
+                },
                 "railway/halt": {
                     "name": "موقف سكة حديد",
                     "terms": "موقف إجباري خاص بسكك الحديد، موقف السكة الحديدية"
@@ -3440,10 +3604,6 @@
                     "name": "موقف عربات كبيرة",
                     "terms": "موقف عربات كبيرة"
                 },
-                "tourism/chalet": {
-                    "name": "شاليه",
-                    "terms": "شاليه"
-                },
                 "tourism/gallery": {
                     "name": "رواق فنون"
                 },
diff --git a/dist/locales/ast.json b/dist/locales/ast.json
index 73e07de3a..423bb62d1 100644
--- a/dist/locales/ast.json
+++ b/dist/locales/ast.json
@@ -280,7 +280,6 @@
             "localized_translation_language": "Escoyer idioma",
             "localized_translation_name": "Nome"
         },
-        "zoom_in_edit": "Averar pa editar",
         "login": "aniciu de sesión",
         "logout": "zarrar sesión",
         "loading_auth": "Coneutando con OpenStreetMap...",
@@ -520,8 +519,7 @@
         "splash": {
             "welcome": "Bienllegáu al editor d'OpenStreetMap iD",
             "text": "iD ye una ferramienta amistosa pero potente pa collaborar col meyor mapamundi llibre del mundu. Esta ye la versión {version}. Pa más información visite {website} ya informe de fallos en {github}.",
-            "walkthrough": "Aniciar la Visita guiada",
-            "start": "Editar yá"
+            "walkthrough": "Aniciar la Visita guiada"
         },
         "source_switch": {
             "live": "en vivo",
@@ -545,10 +543,6 @@
             "tag_suggests_area": "La etiqueta {tag} suxer que la llinia tendría de ser un área, pero nun ye un area",
             "deprecated_tags": "Etiquetes anticuaes: {tags}"
         },
-        "zoom": {
-            "in": "Averar",
-            "out": "Alloñar"
-        },
         "full_screen": "Conmutar pantalla completa",
         "gpx": {
             "local_layer": "Ficheru llocal",
@@ -2309,18 +2303,12 @@
                 "craft/scaffolder": {
                     "name": "Montaxe d'andamios"
                 },
-                "craft/sculpter": {
-                    "name": "Escultor"
-                },
                 "craft/shoemaker": {
                     "name": "Zapateru"
                 },
                 "craft/stonemason": {
                     "name": "Canteru"
                 },
-                "craft/sweep": {
-                    "name": "Llimpieza de chimenees"
-                },
                 "craft/tailor": {
                     "name": "Sastre"
                 },
@@ -2478,9 +2466,6 @@
                 "highway/path": {
                     "name": "Camín"
                 },
-                "highway/pedestrian": {
-                    "name": "Cai peatonal"
-                },
                 "highway/primary": {
                     "name": "Carretera autonómica"
                 },
@@ -2926,17 +2911,10 @@
                     "name": "Oficina",
                     "terms": "Despachu"
                 },
-                "office/accountant": {
-                    "name": "Contable"
-                },
                 "office/administrative": {
                     "name": "Oficina alministrativa",
                     "terms": "Alministración,Centru municipal"
                 },
-                "office/architect": {
-                    "name": "Arquitectu",
-                    "terms": "Arquitectura,Construcción"
-                },
                 "office/company": {
                     "name": "Oficina d'empresa",
                     "terms": "Delegación,Sucursal"
@@ -2963,16 +2941,9 @@
                     "name": "Oficina de seguros",
                     "terms": "Aseguradora,Seguros,Riesgu"
                 },
-                "office/it": {
-                    "name": "Despachu de teunoloxía de la información"
-                },
                 "office/lawyer": {
                     "name": "Despachu d'abogaos"
                 },
-                "office/newspaper": {
-                    "name": "Periódicu",
-                    "terms": "Revista, Boletín"
-                },
                 "office/ngo": {
                     "name": "ONG",
                     "terms": "Organización nun gubernamental"
@@ -2989,9 +2960,6 @@
                 "office/telecommunication": {
                     "name": "Oficina de telecomunicaciones"
                 },
-                "office/therapist": {
-                    "name": "Terapeuta"
-                },
                 "office/travel_agent": {
                     "name": "Axencia de viaxes"
                 },
@@ -3470,9 +3438,6 @@
                 "tourism/caravan_site": {
                     "name": "Aparcaderu d'autocaravanes"
                 },
-                "tourism/chalet": {
-                    "name": "Casa d'aldea"
-                },
                 "tourism/gallery": {
                     "name": "Galería d'arte"
                 },
diff --git a/dist/locales/bg-BG.json b/dist/locales/bg-BG.json
index 7f00b9ae8..f750867a0 100644
--- a/dist/locales/bg-BG.json
+++ b/dist/locales/bg-BG.json
@@ -212,7 +212,6 @@
             "localized_translation_language": "Изберете език",
             "localized_translation_name": "Име"
         },
-        "zoom_in_edit": "Приближаване за редакция",
         "logout": "изход",
         "loading_auth": "Свързване с OpenStreetMap...",
         "report_a_bug": "Докладвай грешка",
@@ -399,8 +398,7 @@
         "splash": {
             "welcome": "Добре дошли в iD редактора за OpenStreetMap",
             "text": "iD e лесен, но мощен инструмент за попълване на най-добрата свободна карта на света. Това е версия {version}. За повече информация вижте {website} и докладвайте за бъгове в {github}.",
-            "walkthrough": "Започнете опознавателната обиколка",
-            "start": "Редактирайте сега"
+            "walkthrough": "Започнете опознавателната обиколка"
         },
         "source_switch": {
             "live": "live",
@@ -422,10 +420,6 @@
             "tag_suggests_area": "Тагът {tag} предполага линията да е площен обект, но тя не е",
             "deprecated_tags": "Отхвърлени тагове: {tags}"
         },
-        "zoom": {
-            "in": "Увеличи",
-            "out": "Намали"
-        },
         "cannot_zoom": "Не можете да намалявате повече в текущия режим.",
         "full_screen": "Превключи на Цял Екран",
         "mapillary_images": {
@@ -1542,9 +1536,6 @@
                 "tourism/caravan_site": {
                     "name": "Паркинг за каравани"
                 },
-                "tourism/chalet": {
-                    "name": "Бунгала"
-                },
                 "tourism/guest_house": {
                     "name": "Къща за гости"
                 },
diff --git a/dist/locales/bn.json b/dist/locales/bn.json
index d9d944f2f..09def562c 100644
--- a/dist/locales/bn.json
+++ b/dist/locales/bn.json
@@ -184,7 +184,6 @@
             "localized_translation_language": "ভাষা বেছে নিন",
             "localized_translation_name": "নাম"
         },
-        "zoom_in_edit": "সম্পাদনার জন্য জুম ইন করুন",
         "login": "প্রবেশ করুন",
         "logout": "বেরিয়ে যান",
         "loading_auth": "ওপেনস্ট্রীটম্যাপে সংযোগ করা হচ্ছে ...",
@@ -313,8 +312,7 @@
         },
         "splash": {
             "welcome": "iD ওপেনস্ট্রীটম্যাপ সম্পাদকে অাপনাকে স্বাগতম",
-            "walkthrough": "ওয়াকথ্রু শুরু করুন",
-            "start": "এখুনি পরিবর্তন করুন"
+            "walkthrough": "ওয়াকথ্রু শুরু করুন"
         },
         "source_switch": {
             "live": "সরাসরি",
@@ -333,10 +331,6 @@
             "tag_suggests_area": "{tag} ট্যাগটি অনুসারে রেখাটি এলাকা হবে, কিন্তু নয়।",
             "deprecated_tags": "পুরোন ও অব্যবহৃত ট্যাগ: {tags}"
         },
-        "zoom": {
-            "in": "জুম্ ইন",
-            "out": "জুম্ আউট"
-        },
         "cannot_zoom": "বর্তমান মোডে আরও জুম আউট করা যাবে না.",
         "help": {
             "title": "সাহায্য"
@@ -1093,9 +1087,6 @@
                 "office": {
                     "name": "কার্যালয়"
                 },
-                "office/newspaper": {
-                    "name": "সংবাদপত্র"
-                },
                 "office/ngo": {
                     "name": "এনজিও অফিস"
                 },
@@ -1108,9 +1099,6 @@
                 "office/telecommunication": {
                     "name": "টেলিকম অফিস"
                 },
-                "office/therapist": {
-                    "name": "থেরাপিস্ট"
-                },
                 "place": {
                     "name": "জায়গা"
                 },
diff --git a/dist/locales/bs.json b/dist/locales/bs.json
index 3bb42236b..22cb579f5 100644
--- a/dist/locales/bs.json
+++ b/dist/locales/bs.json
@@ -186,7 +186,6 @@
             "localized_translation_language": "Izaberite jezik",
             "localized_translation_name": "Naziv"
         },
-        "zoom_in_edit": "Uvećajte da bi ste uređivali.",
         "logout": "Odjavite se",
         "loading_auth": "Povezivanje na OpenStreetMap...",
         "status": {
@@ -265,8 +264,7 @@
         "splash": {
             "welcome": "Dobrodošli u ID - OpenStreetMap uređivač",
             "text": "ID je prijateljski ali moćan alat za doprinos najboljoj svjetskoj besplatnoj karti svijeta. Ovo je verzija {version}. Za više informacija pogledajte stranicu {website} i prijavite greške na stranici {github}.",
-            "walkthrough": "Počnite sa upoznavanjem",
-            "start": "Uređujte sada"
+            "walkthrough": "Počnite sa upoznavanjem"
         },
         "source_switch": {
             "live": "uživo",
@@ -285,10 +283,6 @@
             "tag_suggests_area": "Oznaka {tag} ukazuje da bi linija trebala biti područje, ali nije područje",
             "deprecated_tags": "Zastarjele oznake: {tags}"
         },
-        "zoom": {
-            "in": "Uvećati",
-            "out": "Umanjiti"
-        },
         "cannot_zoom": "Ne može se umanjiti više u trenutnom načinu.",
         "help": {
             "title": "Pomoć",
@@ -1096,15 +1090,9 @@
                 "craft/saddler": {
                     "name": "Sedlar"
                 },
-                "craft/sculpter": {
-                    "name": "Skulptor"
-                },
                 "craft/stonemason": {
                     "name": "Klesar"
                 },
-                "craft/sweep": {
-                    "name": "Čišćenje dimnjaka"
-                },
                 "craft/tailor": {
                     "name": "Krojač"
                 },
@@ -1569,18 +1557,10 @@
                     "name": "Ured",
                     "terms": "ured,uslužni ured"
                 },
-                "office/accountant": {
-                    "name": "Računovođa",
-                    "terms": "računovođa,ured računovođe"
-                },
                 "office/administrative": {
                     "name": "Administrativni ured",
                     "terms": "administracija,administrativni ured,ured upravljanja"
                 },
-                "office/architect": {
-                    "name": "Arhitekta",
-                    "terms": "arhitekta,arhitekt,inžinjer arhitekture"
-                },
                 "office/company": {
                     "name": "Ured kompanije",
                     "terms": "ured kompanije,ured firme,korporativni ured"
@@ -1609,18 +1589,10 @@
                     "name": "Ured za osiguranje",
                     "terms": "ured za osiguranje,kancelarija za osiguranje"
                 },
-                "office/it": {
-                    "name": "IT ured",
-                    "terms": "IT ured,informatički ured,IT kancelarija"
-                },
                 "office/lawyer": {
                     "name": "Pravni ured",
                     "terms": "pravni ured,pravna kancelarija"
                 },
-                "office/newspaper": {
-                    "name": "Novina",
-                    "terms": "novine,novina,novinska agencija"
-                },
                 "office/ngo": {
                     "name": "Ured NVO",
                     "terms": "Nevladin ured,ured NVO,NVO kancelarija"
@@ -1640,10 +1612,6 @@
                     "name": "Ured telekoma",
                     "terms": "ured telekoma,ured telekom operatera,kancelarija telekom operatera"
                 },
-                "office/therapist": {
-                    "name": "Terapeut",
-                    "terms": "terapeut"
-                },
                 "office/travel_agent": {
                     "name": "Putnička agencija"
                 },
@@ -1981,10 +1949,6 @@
                     "name": "Kamp park",
                     "terms": "kamp park,autokamp"
                 },
-                "tourism/chalet": {
-                    "name": "Šale",
-                    "terms": "šale,pastirska kuća"
-                },
                 "tourism/guest_house": {
                     "name": "Gostinjska kuća",
                     "terms": "gostinjska kuća,gostinjski dom"
diff --git a/dist/locales/ca.json b/dist/locales/ca.json
index 28dcfe9a6..a2cfa83c0 100644
--- a/dist/locales/ca.json
+++ b/dist/locales/ca.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Trieu una llengua",
             "localized_translation_name": "Nom"
         },
-        "zoom_in_edit": "Apropeu-vos més per editar",
         "login": "inicia sessió",
         "logout": "Tancar la sessió",
         "loading_auth": "Connectant a OpenStreetMap...",
@@ -330,9 +329,11 @@
             "title": "Puja a l'OpenStreetMap",
             "upload_explanation": "Els canvis que deseu seran visibles a tots els mapes que utilitzin dades d'OpenStreetMap.",
             "upload_explanation_with_user": "Els canvis que deseu com a {user} seran visibles en tots els mapes que utilitzin dades d'OpenStreetMap.",
+            "request_review": "M'agradaria que algú revisés les meves modificacions.",
             "save": "Puja",
             "cancel": "Cancel·lar",
             "changes": "{count} canvis",
+            "download_changes": "Descarregar el fitxer osmChange",
             "warnings": "Avisos",
             "modified": "Modificat",
             "deleted": "Eliminat",
@@ -346,6 +347,53 @@
             "list": "Edicions fetes per {users}",
             "truncated_list": "Edicions fetes per {users} i {count} més"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "Fons",
+                "zoom": "Zoom",
+                "vintage": "Antic",
+                "source": "Font",
+                "description": "Descripció",
+                "resolution": "Resolució",
+                "accuracy": "Precisió",
+                "unknown": "Desconegut",
+                "show_tiles": "Mostrar rajoles",
+                "hide_tiles": "Ocultar rajoles"
+            },
+            "history": {
+                "key": "H",
+                "title": "Història",
+                "selected": "{n} seleccionat",
+                "version": "Versió",
+                "last_edit": "Darrera modificació",
+                "edited_by": "Modificat per",
+                "changeset": "Conjunt de modificacions",
+                "unknown": "Desconegut",
+                "link_text": "Història a openstreetmap.og"
+            },
+            "location": {
+                "key": "L",
+                "title": "Ubicació",
+                "unknown_location": "Ubicació desconeguda"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Mesurament",
+                "selected": "{n} seleccionat",
+                "geometry": "Geometria",
+                "closed": "tancat",
+                "center": "Center",
+                "perimeter": "Perímetre",
+                "length": "Longitud",
+                "area": "Àrea",
+                "centroid": "Centroide",
+                "location": "Ubicació",
+                "metric": "Mètric",
+                "imperial": "Imperial"
+            }
+        },
         "geometry": {
             "point": "punt",
             "vertex": "vèrtex",
@@ -408,6 +456,7 @@
         "background": {
             "title": "Fons",
             "description": "Paràmetres de configuració del fons",
+            "key": "B",
             "percent_brightness": "{opacity}% brillantor",
             "none": "Cap",
             "best_imagery": "Font d'imatgeria millor coneguda per a aquesta ubicació",
@@ -420,16 +469,25 @@
             "offset": "Arrosega cap a qualsevol lloc de la zona gris de sota per ajustar la alineació de la imatgeria, o entra els valors de la alineació en metres.",
             "minimap": {
                 "description": "Miniatura del mapa",
-                "tooltip": "Mostra un mapa amb menys zoom per ajudar a localitzar l'àrea que es mostra actualment."
+                "tooltip": "Mostra un mapa amb menys zoom per ajudar a localitzar l'àrea que es mostra actualment.",
+                "key": "/"
             }
         },
         "map_data": {
             "title": "Dades del mapa",
             "description": "Dades del mapa",
+            "key": "F",
             "data_layers": "Capes de dades",
+            "layers": {
+                "osm": {
+                    "tooltip": "Dades del mapa d'OpenStreetMap",
+                    "title": "Dades d'OpenStreetMap"
+                }
+            },
             "fill_area": "Emplenat d'àrees",
             "map_features": "Elements del mapa",
-            "autohidden": "Aquests objectes s'han ocultat automàticament perquè n'haurien aparegut massa a la pantalla. Us podeu acostar per editar-los."
+            "autohidden": "Aquests objectes s'han ocultat automàticament perquè n'haurien aparegut massa a la pantalla. Us podeu acostar per editar-los.",
+            "osmhidden": "Aquestes característiques han sigut ocultades automàticament perquè la capa d'OpenStreetMap es troba ocultada."
         },
         "feature": {
             "points": {
@@ -484,7 +542,8 @@
         "area_fill": {
             "wireframe": {
                 "description": "Sense emplenat (esquelet)",
-                "tooltip": "El mode d'esquelet fa més fàcil veure la imatgeria de fons."
+                "tooltip": "El mode d'esquelet fa més fàcil veure la imatgeria de fons.",
+                "key": "W"
             },
             "partial": {
                 "description": "Emplenat parcial",
@@ -497,7 +556,9 @@
         },
         "restore": {
             "heading": "Teniu canvis sense desar",
-            "description": "Voleu restaurar els canvis no desats de la sessió anterior?"
+            "description": "Voleu restaurar els canvis no desats de la sessió anterior?",
+            "restore": "Restaurar els meus canvis",
+            "reset": "Descartar els meus canvis"
         },
         "save": {
             "title": "Desa",
@@ -517,6 +578,7 @@
                 "keep_remote": "Utilitzar els seus",
                 "restore": "Restaurar",
                 "delete": "Deixar eliminat",
+                "download_changes": "O descarregar el fitxer osmChange",
                 "done": "Tots els conflictes resolts!",
                 "help": "Un altre usuari ha canviat algun dels objectes que heu editat.\nCliqueu a cada objecte de sota per tenir més detalls del conflicte,  escollint així si mantenir\nels vostres canvis o els de l'altre usuari.\n"
             }
@@ -548,8 +610,7 @@
         "splash": {
             "welcome": "Benvinguts a l'editor iD per a l'OpenStreetMap",
             "text": "L'editor iD és una eina fàcil i potent per contribuir al millor mapa lliure del món. Aquesta és la versió {version}. Per obtenir més informació visiteu {website} i si voleu comunicar l'existència d'algun error feu-ho a {github}.",
-            "walkthrough": "Comenceu la visita guiada",
-            "start": "Editeu-lo ara"
+            "walkthrough": "Comenceu la visita guiada"
         },
         "source_switch": {
             "live": "directe",
@@ -579,10 +640,6 @@
             "tag_suggests_area": "L'etiqueta {tag} suggereix que la línia hauria de ser una àrea, però no és una àrea",
             "deprecated_tags": "Etiquetes obsoletes : {tags}"
         },
-        "zoom": {
-            "in": "Apropa't",
-            "out": "Allunya't"
-        },
         "cannot_zoom": "No es pot allunyar més la vista al mode actual.",
         "full_screen": "Passar a pantalla completa",
         "gpx": {
@@ -604,6 +661,7 @@
         },
         "help": {
             "title": "Ajuda",
+            "key": "H",
             "help": "# Ajuda\n\nAixò és un editor per al [OpenStreetMap](http://www.openstreetmap.org/), el mapa lliure i editable del món. Podeu utilitzar-lo per afegir i actualitzar\nles dades a la vostra àrea, contibuint així a fer un mapa de codi obert i amb dades lliures del món\nmillor per a tothom.\n\nLes edicions que feu en aquest mapa seran visibles per tothom que faci servir OpenStreetMap. Per tal de començar a editar, necessitareu\n[iniciar sessió](https://www.openstreetmap.org/login).\n\nL'[Editor iD](http://ideditor.com/) és un projecte cooperatiu que té el [codi font\ndisponible a GitHub](https://github.com/openstreetmap/iD).\n",
             "gps": "# GPS\n\nLes traces enregistrades amb GPS són una font fiable de dades per a l'OpenStreetMap. Aquest editor accepta les traces locals - fitxers `.gpx` del vostre ordinador. Podeu generar aquest tipus de traça GPS amb aplicacions per a mòbils o per dispositius personals de GPS.\n\nPer a més informació de com recollir dades amb GPS, llegiu [Recollir dades amb GPS](http://learnosm.org/en/mobile-mapping/).\n\nPer utilitzar una traça GPX en la edició del mapa arrossegueu el fitxer GPX i deixeu-lo a l'editor. En detectar-se, s'afegirà en el mapa com una línia lila llampant. Cliqueu al menú 'Dades del mapa', al cantó dret, per activar, desactivar, o ajustar la visió d'aquesta capa GPX.\n\nLa traça GPX no pujarà directament a OpenStreetMap - la millor manera d'utilitzar-la és que dibuixeu en el mapa els nous objectes, fent-la servir com a guia. De tota manera, també la podeu [pujar a l'OpenStreetMap] (http://www.openstreetmap.org/trace/create) perquè d'altres persones l'aprofitin.\n",
             "imagery": "# Imatgeria\n\nLa imatgeria aèria és un recurs important per a l'edició de mapes. Una combinació de\nvols d'aeronaus, fotografies de satèl·lit, i d'altres fonts compilades gratuïtament\nestan disponibles a l'editor dins del menú de l'esquerra 'Paràmetres de configuració del fons'.\n\nPer defecte, l'editor mostra la capa de satèl·lit de [Bing Maps](http://www.bing.com/maps/), però a mesura que us moveu i ajusteu la vista del mapa a noves àrees geogràfiques, noves fonts estaran disponibles. En alguns països, com ara els Estats Units, França, i Dinamarca tenen\nuna imatgeria d'alta qualitat disponible per a determinades àrees.\n\nLa imatgeria a vegades no es correspon amb les dades del mapa, això és degut a un error\nper part del proveïdor de la imatge. Si observeu moltes carreteres mogudes del seu lloc a la imatge,\nno les mogueu per tal que encaixin amb aquesta. Ja que podeu ajustar la imatgeria per tal de que quadri amb les dades existents clicant a 'Corregeix la desalineació' al capdevall de la pestanya dels\n'Paràmetres de configuració del fons'.\n",
@@ -615,16 +673,36 @@
             "ok": "D'acord",
             "graph": {
                 "block_number": "<value for addr:block_number>",
+                "city": "Tres Rius",
                 "county": "<value for addr:county>",
                 "district": "<value for addr:district>",
                 "hamlet": "<value for addr:hamlet>",
                 "neighbourhood": "<value for addr:neighbourhood>",
+                "postcode": "49093",
                 "province": "<value for addr:province>",
                 "quarter": "<value for addr:quarter>",
                 "state": "<value for addr:state>",
                 "subdistrict": "<value for addr:subdistrict>",
                 "suburb": "<value for addr:suburb>",
-                "countrycode": "es"
+                "countrycode": "es",
+                "name": {
+                    "1st-avenue": "1ra Avinguda",
+                    "2nd-avenue": "2na Avinguda",
+                    "4th-avenue": "4ta Avinguda",
+                    "5th-avenue": "5ena Avinguda",
+                    "6th-avenue": "6ena Avinguda",
+                    "6th-street": "Carrer 6",
+                    "7th-avenue": "7ena Avinguda",
+                    "8th-avenue": "8ena Avinguda",
+                    "9th-avenue": "9ena Avinguda",
+                    "10th-avenue": "10ena Avinguda",
+                    "11th-avenue": "11ena Avinguda",
+                    "12th-avenue": "12ena Avinguda",
+                    "adams-street": "Carrer Adams",
+                    "andrews-elementary-school": "Escola de primària Andrews",
+                    "andrews-street": "Carrer Andrews",
+                    "pizza-hut": "Pizza Hut"
+                }
             },
             "welcome": {
                 "title": "Benvingut",
@@ -736,7 +814,50 @@
             }
         },
         "shortcuts": {
-            "title": "Dreceres de teclat"
+            "title": "Dreceres de teclat",
+            "tooltip": "Mostra la finestra de dreceres del teclat.",
+            "toggle": {
+                "key": "?"
+            },
+            "key": {
+                "alt": "Alt",
+                "backspace": "Tecla de retrocés",
+                "cmd": "Cmd",
+                "ctrl": "Ctrl",
+                "delete": "Suprimir",
+                "del": "Supr",
+                "end": "Fin",
+                "enter": "Entrar",
+                "esc": "Esc",
+                "home": "Inicio",
+                "pgdn": "Av Pág",
+                "pgup": "Re Pág"
+            },
+            "or": "-o-",
+            "browsing": {
+                "title": "Cercant",
+                "navigation": {
+                    "title": "Navegació"
+                },
+                "help": {
+                    "title": "Ajuda"
+                }
+            },
+            "editing": {
+                "title": "Modificant",
+                "drawing": {
+                    "title": "Dibuixant",
+                    "add_point": "Mode \"Afegir punt\"",
+                    "add_line": "Mode \"Afegir línia\"",
+                    "add_area": "Mode \"Afegir Àrea\""
+                }
+            },
+            "tools": {
+                "title": "Ferramentes",
+                "info": {
+                    "title": "Informació"
+                }
+            }
         },
         "presets": {
             "categories": {
@@ -860,7 +981,8 @@
                         "subdistrict": "Subdistricte",
                         "subdistrict!vn": "Ward/Commune/Townlet",
                         "suburb": "Sector",
-                        "suburb!jp": "Suburbi"
+                        "suburb!jp": "Suburbi",
+                        "unit": "Unitat"
                     }
                 },
                 "admin_level": {
@@ -974,12 +1096,19 @@
                 "board_type": {
                     "label": "Tipus"
                 },
+                "boules": {
+                    "label": "Tipus"
+                },
                 "boundary": {
                     "label": "Tipus"
                 },
                 "brand": {
                     "label": "Marca"
                 },
+                "bridge": {
+                    "label": "Tipus",
+                    "placeholder": "Predeterminat"
+                },
                 "building": {
                     "label": "Edifici"
                 },
@@ -989,6 +1118,9 @@
                 "bunker_type": {
                     "label": "Tipus"
                 },
+                "cables": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direcció (graus en sentit horari)",
                     "placeholder": "45, 90, 180, 270"
@@ -1039,12 +1171,19 @@
                         "clockwise": "en sentit de les agulles del rellotge"
                     }
                 },
+                "clothes": {
+                    "label": "Roba"
+                },
                 "club": {
                     "label": "Tipus"
                 },
                 "collection_times": {
                     "label": "Horari de recollida"
                 },
+                "comment": {
+                    "label": "Comentari dels canvis",
+                    "placeholder": "Breu descripció de les teves contribucions (necessari)"
+                },
                 "communication_multi": {
                     "label": "Tipus de comunicació"
                 },
@@ -1055,6 +1194,9 @@
                     "label": "URL de la webcam",
                     "placeholder": "http://example.com/"
                 },
+                "content": {
+                    "label": "Contingut"
+                },
                 "country": {
                     "label": "País"
                 },
@@ -1064,6 +1206,16 @@
                 "craft": {
                     "label": "Tipus"
                 },
+                "crane/type": {
+                    "label": "Tipus de grua",
+                    "options": {
+                        "floor-mounted_crane": "Grua muntada al pis",
+                        "portal_crane": "Pont Grua"
+                    }
+                },
+                "crop": {
+                    "label": "Cultius"
+                },
                 "crossing": {
                     "label": "Tipus"
                 },
@@ -1073,6 +1225,10 @@
                 "currency_multi": {
                     "label": "Tipus de divisa"
                 },
+                "cutting": {
+                    "label": "Tipus",
+                    "placeholder": "Predeterminat"
+                },
                 "cycle_network": {
                     "label": "Xarxa"
                 },
@@ -1129,6 +1285,10 @@
                 "description": {
                     "label": "Descripció"
                 },
+                "devices": {
+                    "label": "Dispositius",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Canviadors per a nadons"
                 },
@@ -1141,6 +1301,10 @@
                 "drive_through": {
                     "label": "Via dins una propietat."
                 },
+                "duration": {
+                    "label": "Durada",
+                    "placeholder": "00:00"
+                },
                 "electrified": {
                     "label": "Electrificació",
                     "options": {
@@ -1158,6 +1322,10 @@
                     "label": "Correu-e",
                     "placeholder": "exemple@exemple.com"
                 },
+                "embankment": {
+                    "label": "Tipus",
+                    "placeholder": "Predeterminat"
+                },
                 "emergency": {
                     "label": "Material per a emergències"
                 },
@@ -1180,6 +1348,9 @@
                 "fire_hydrant/position": {
                     "label": "Posició",
                     "options": {
+                        "green": "Verd",
+                        "lane": "Carril",
+                        "parking_lot": "Aparcament",
                         "sidewalk": "Vorera"
                     }
                 },
@@ -1192,9 +1363,19 @@
                         "wall": "Mur"
                     }
                 },
+                "fitness_station": {
+                    "label": "Tipus d'equipament"
+                },
                 "fixme": {
                     "label": "Arregla'm"
                 },
+                "ford": {
+                    "label": "Tipus",
+                    "placeholder": "Predeterminat"
+                },
+                "frequency": {
+                    "label": "Freqüència de funcionament"
+                },
                 "fuel": {
                     "label": "Carburant"
                 },
@@ -1216,12 +1397,19 @@
                 "generator/method": {
                     "label": "Mètode"
                 },
+                "generator/output/electricity": {
+                    "label": "Sortida de potència",
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Font"
                 },
                 "generator/type": {
                     "label": "Tipus"
                 },
+                "grape_variety": {
+                    "label": "Varietats de raïm"
+                },
                 "handicap": {
                     "label": "Handicap",
                     "placeholder": "1-18"
@@ -1229,6 +1417,16 @@
                 "handrail": {
                     "label": "Barana"
                 },
+                "hashtags": {
+                    "label": "Hashtags suggerits",
+                    "placeholder": "#exemple"
+                },
+                "healthcare": {
+                    "label": "Tipus"
+                },
+                "healthcare/speciality": {
+                    "label": "Especialitats"
+                },
                 "height": {
                     "label": "Altura (metres)"
                 },
@@ -1238,6 +1436,9 @@
                 "historic": {
                     "label": "Tipus"
                 },
+                "historic/civilization": {
+                    "label": "Civilització històrica"
+                },
                 "hoops": {
                     "label": "Cistella de basquetbol",
                     "placeholder": "1, 2, 4..."
@@ -1267,6 +1468,9 @@
                 "inscription": {
                     "label": "Inscripció"
                 },
+                "intermittent": {
+                    "label": "Intermitent"
+                },
                 "internet_access": {
                     "label": "Accés a Internet",
                     "options": {
@@ -1283,6 +1487,12 @@
                 "internet_access/ssid": {
                     "label": "SSID (nom de la xarxa)"
                 },
+                "kerb": {
+                    "label": "Vorera"
+                },
+                "label": {
+                    "label": "Etiqueta"
+                },
                 "lamp_type": {
                     "label": "Tipus"
                 },
@@ -1294,7 +1504,8 @@
                     "placeholder": "1, 2, 3..."
                 },
                 "layer": {
-                    "label": "Capa"
+                    "label": "Capa",
+                    "placeholder": "0"
                 },
                 "leaf_cycle": {
                     "label": "Cicle del fullatge",
@@ -1354,6 +1565,9 @@
                 "man_made": {
                     "label": "Tipus"
                 },
+                "manhole": {
+                    "label": "Tipus"
+                },
                 "map_size": {
                     "label": "Cobertura"
                 },
@@ -1371,6 +1585,12 @@
                 "maxstay": {
                     "label": "Estada màxima"
                 },
+                "maxweight": {
+                    "label": "Pes màxim"
+                },
+                "memorial": {
+                    "label": "Tipus"
+                },
                 "mtb/scale": {
                     "label": "Dificultat per a bicicletes de muntanya",
                     "options": {
@@ -1510,6 +1730,10 @@
                 "payment_multi": {
                     "label": "Tipus de pagament"
                 },
+                "phases": {
+                    "label": "Fases",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telèfon",
                     "placeholder": "+31 42 123 4567"
@@ -1558,6 +1782,19 @@
                 "plant": {
                     "label": "Planta"
                 },
+                "plant/output/electricity": {
+                    "label": "Sortida de potència",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
+                "playground/baby": {
+                    "label": "Seient de nadó"
+                },
+                "playground/max_age": {
+                    "label": "Edat màxima"
+                },
+                "playground/min_age": {
+                    "label": "Edat mínima"
+                },
                 "population": {
                     "label": "Població"
                 },
@@ -1586,6 +1823,39 @@
                         "container": "Contenidor"
                     }
                 },
+                "ref": {
+                    "label": "Codi de referència"
+                },
+                "ref_aeroway_gate": {
+                    "label": "Nombre de porta"
+                },
+                "ref_golf_hole": {
+                    "label": "Nombre de forat",
+                    "placeholder": "1-18"
+                },
+                "ref_highway_junction": {
+                    "label": "Nombre d'encreuament"
+                },
+                "ref_platform": {
+                    "label": "Nombre de plataforma"
+                },
+                "ref_road_number": {
+                    "label": "Nombre de carretera"
+                },
+                "ref_route": {
+                    "label": "Nombre de ruta"
+                },
+                "ref_runway": {
+                    "label": "Número de Pista",
+                    "placeholder": "p.e. 01L/19R"
+                },
+                "ref_stop_position": {
+                    "label": "Nombre de parada"
+                },
+                "ref_taxiway": {
+                    "label": "Nom del carrer de rodatge",
+                    "placeholder": "exemple A5"
+                },
                 "relation": {
                     "label": "Tipus"
                 },
@@ -1652,6 +1922,9 @@
                         "yard": "Platja"
                     }
                 },
+                "service_times": {
+                    "label": "Temps de Servei"
+                },
                 "shelter": {
                     "label": "Coberta"
                 },
@@ -1693,6 +1966,9 @@
                 "social_facility": {
                     "label": "Tipus"
                 },
+                "source": {
+                    "label": "Fonts"
+                },
                 "sport": {
                     "label": "Esports"
                 },
@@ -1711,6 +1987,9 @@
                 "start_date": {
                     "label": "Data d'inici"
                 },
+                "step_count": {
+                    "label": "Nobmre de pases"
+                },
                 "stop": {
                     "label": "Tipus de stop",
                     "options": {
@@ -1729,9 +2008,19 @@
                     },
                     "placeholder": "Desconegut"
                 },
+                "structure_waterway": {
+                    "label": "Estructura",
+                    "options": {
+                        "tunnel": "Túnel"
+                    },
+                    "placeholder": "Desconegut"
+                },
                 "studio": {
                     "label": "Tipus"
                 },
+                "substance": {
+                    "label": "Substància"
+                },
                 "substation": {
                     "label": "Tipus"
                 },
@@ -1751,12 +2040,22 @@
                     "label": "Tipus de vigilància",
                     "options": {
                         "ALPR": "Lector de matrícules automàtic",
-                        "camera": "Càmera"
+                        "camera": "Càmera",
+                        "guard": "Vigilat"
                     }
                 },
                 "surveillance/zone": {
                     "label": "Zona de vigilància"
                 },
+                "switch": {
+                    "label": "Tipus",
+                    "options": {
+                        "circuit_breaker": "Contactor",
+                        "disconnector": "Desconector",
+                        "earthing": "Presa de terra",
+                        "mechanical": "Mecanic"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Paviment rugós"
                 },
@@ -1787,6 +2086,9 @@
                 "tourism": {
                     "label": "Tipus"
                 },
+                "tourism_attraction": {
+                    "label": "Turisme"
+                },
                 "tower/construction": {
                     "label": "Construcció"
                 },
@@ -1804,6 +2106,9 @@
                     },
                     "placeholder": "Sòlid, majoritàriament sòlid, tou..."
                 },
+                "trade": {
+                    "label": "Tipus"
+                },
                 "traffic_calming": {
                     "label": "Tipus"
                 },
@@ -1822,9 +2127,26 @@
                     },
                     "placeholder": "Excel·lent, Bona, Dolenta..."
                 },
+                "transformer": {
+                    "label": "Tipus",
+                    "options": {
+                        "auto": "Autotransformador",
+                        "auxiliary": "Auxiliar",
+                        "converter": "Convertidor",
+                        "distribution": "Distribuidor",
+                        "generator": "Generador",
+                        "phase_angle_regulator": "Regulador d'angle de fase",
+                        "traction": "Tracció",
+                        "yes": "Desconegut"
+                    }
+                },
                 "trees": {
                     "label": "Arbres"
                 },
+                "tunnel": {
+                    "label": "Tipus",
+                    "placeholder": "Predeterminat"
+                },
                 "vending": {
                     "label": "Tipus de mercaderies"
                 },
@@ -1836,6 +2158,34 @@
                         "street": "De 5 a 20 m (16 a 65 peus)"
                     }
                 },
+                "volcano/status": {
+                    "label": "Estat del volcà",
+                    "options": {
+                        "active": "Actiu",
+                        "dormant": "Inactiu",
+                        "extinct": "Extingit"
+                    }
+                },
+                "volcano/type": {
+                    "label": "Tipus de volcà",
+                    "options": {
+                        "scoria": "Escòria",
+                        "shield": "Escut",
+                        "stratovolcano": "Estratovolcà"
+                    }
+                },
+                "voltage": {
+                    "label": "Voltatge"
+                },
+                "voltage/primary": {
+                    "label": "Voltatge Primari"
+                },
+                "voltage/secondary": {
+                    "label": "Voltatge Secondari"
+                },
+                "voltage/tertiary": {
+                    "label": "Voltatge Terciari"
+                },
                 "wall": {
                     "label": "Tipus"
                 },
@@ -1863,6 +2213,22 @@
                 },
                 "wikipedia": {
                     "label": "Viquipèdia"
+                },
+                "windings": {
+                    "label": "Bobines",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Configuració de bobines",
+                    "options": {
+                        "delta": "Delta",
+                        "leblanc": "Leblanc",
+                        "open": "Obert",
+                        "open-delta": "Obert Delta",
+                        "scott": "Scott",
+                        "star": "Estrella",
+                        "zigzag": "Zig Zag"
+                    }
                 }
             },
             "presets": {
@@ -1871,16 +2237,19 @@
                     "terms": "Adreça, Direcció, Domicili"
                 },
                 "advertising/billboard": {
-                    "name": "Taulell"
+                    "name": "Taulell",
+                    "terms": "Cartellera"
                 },
                 "aerialway": {
                     "name": "Transport per cable"
                 },
                 "aerialway/cable_car": {
-                    "name": "Telefèric"
+                    "name": "Telefèric",
+                    "terms": "Telefèric"
                 },
                 "aerialway/chair_lift": {
-                    "name": "Telecadira"
+                    "name": "Telecadira",
+                    "terms": "Telecadira"
                 },
                 "aerialway/gondola": {
                     "name": "Telecabina",
@@ -1940,6 +2309,12 @@
                 "amenity": {
                     "name": "Instal·lació"
                 },
+                "amenity/animal_boarding": {
+                    "name": "Instal·lació d'embarcament d'animals"
+                },
+                "amenity/animal_breeding": {
+                    "name": "Instal·lació de reproducció d'animals"
+                },
                 "amenity/animal_shelter": {
                     "name": "Refugi d'animals",
                     "terms": "Refugi d'animals, protectora"
@@ -2021,6 +2396,12 @@
                 "amenity/clinic": {
                     "name": "Clínica"
                 },
+                "amenity/clinic/abortion": {
+                    "name": "Clínica d'avortament"
+                },
+                "amenity/clinic/fertility": {
+                    "name": "Clínica de fertilitat"
+                },
                 "amenity/clock": {
                     "name": "Rellotge"
                 },
@@ -2118,9 +2499,15 @@
                 "amenity/motorcycle_parking": {
                     "name": "Aparcament per a motocicletes"
                 },
+                "amenity/music_school": {
+                    "name": "Escola de música"
+                },
                 "amenity/nightclub": {
                     "name": "Club nocturn"
                 },
+                "amenity/nursing_home": {
+                    "name": "Llar d'avis"
+                },
                 "amenity/parking": {
                     "name": "Aparcament",
                     "terms": "Aparcament, Pàrquing, Garatge, Parking, parking"
@@ -2131,6 +2518,9 @@
                 "amenity/parking_space": {
                     "name": "Espai d'aparcament"
                 },
+                "amenity/pavilion": {
+                    "name": "Pabelló"
+                },
                 "amenity/pharmacy": {
                     "name": "Farmàcia",
                     "terms": "Farmàcia, establiment de venda de medicaments,"
@@ -2147,6 +2537,9 @@
                     "name": "Església",
                     "terms": "Temple, església"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Temple Hindú"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "Sinagoga",
                     "terms": "Sinagoga, temple jueu, església jueva, culte jueu, jueu"
@@ -2155,6 +2548,15 @@
                     "name": "Mesquita",
                     "terms": "Mesquita, temple musulmà, espai musulmà, musulmà"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "Santuari sintoísta"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Temple Sikh "
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Temple Taoista"
+                },
                 "amenity/planetarium": {
                     "name": "Planetari"
                 },
@@ -2207,9 +2609,15 @@
                     "name": "Escola",
                     "terms": "Escola, CEIP, IES, Col·legi, Institut, Centre educatiu, Guarderia"
                 },
+                "amenity/scrapyard": {
+                    "name": "Escorxador"
+                },
                 "amenity/shelter": {
                     "name": "Refugi"
                 },
+                "amenity/shower": {
+                    "name": "Dutxa"
+                },
                 "amenity/social_facility": {
                     "name": "Equipament social"
                 },
@@ -2223,6 +2631,9 @@
                 "amenity/social_facility/homeless_shelter": {
                     "name": "Refugi per a indigents"
                 },
+                "amenity/social_facility/nursing_home": {
+                    "name": "Llar d'avis"
+                },
                 "amenity/studio": {
                     "name": "Estudi"
                 },
@@ -2252,6 +2663,9 @@
                 "amenity/university": {
                     "name": "Campus universitari"
                 },
+                "amenity/vending_machine": {
+                    "name": "Màquina de vending"
+                },
                 "amenity/vending_machine/cigarettes": {
                     "name": "Màquina de tabac"
                 },
@@ -2264,9 +2678,15 @@
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Equipament de residus canins"
                 },
+                "amenity/vending_machine/feminine_hygiene": {
+                    "name": "Màquina de vènding d'articles d'higiene femenina"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Màquina expenedora de diaris"
                 },
+                "amenity/vending_machine/newspapers": {
+                    "name": "Màquina expenedora de diaris"
+                },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
                     "name": "Màquina de recollida/enviament de paqueteria"
                 },
@@ -2604,18 +3024,12 @@
                 "craft/scaffolder": {
                     "name": "Muntador de bastides"
                 },
-                "craft/sculpter": {
-                    "name": "Escultor"
-                },
                 "craft/shoemaker": {
                     "name": "Sabater"
                 },
                 "craft/stonemason": {
                     "name": "Manobra"
                 },
-                "craft/sweep": {
-                    "name": "Netejador de xemeneies"
-                },
                 "craft/tailor": {
                     "name": "Sastreria"
                 },
@@ -2775,9 +3189,6 @@
                     "name": "Camí",
                     "terms": "Sender,Corriol"
                 },
-                "highway/pedestrian": {
-                    "name": "Zona de vianants"
-                },
                 "highway/primary": {
                     "name": "Carretera primària",
                     "terms": "Carretera primària,Carretera de 1r ordre"
@@ -3329,17 +3740,10 @@
                     "name": "Oficines",
                     "terms": "Oficina, Oficines"
                 },
-                "office/accountant": {
-                    "name": "Contable"
-                },
                 "office/administrative": {
                     "name": "Oficina de tràmits locals",
                     "terms": "Oficina administrativa"
                 },
-                "office/architect": {
-                    "name": "Arquitecte",
-                    "terms": "Arquitecte"
-                },
                 "office/company": {
                     "name": "Oficines de companyia"
                 },
@@ -3367,9 +3771,6 @@
                 "office/insurance": {
                     "name": "Oficina de companyia asseguradora"
                 },
-                "office/it": {
-                    "name": "Oficina d'informàtic/a"
-                },
                 "office/lawyer": {
                     "name": "Bufet d'advocats"
                 },
@@ -3377,10 +3778,6 @@
                     "name": "Notaria",
                     "terms": "Oficina del notari"
                 },
-                "office/newspaper": {
-                    "name": "Diari",
-                    "terms": "Periòdic"
-                },
                 "office/ngo": {
                     "name": "Oficina d'ONG"
                 },
@@ -3397,9 +3794,6 @@
                 "office/telecommunication": {
                     "name": "Oficina de telecomunicacions"
                 },
-                "office/therapist": {
-                    "name": "Terapeuta"
-                },
                 "office/travel_agent": {
                     "name": "Agència de viatges"
                 },
@@ -3951,9 +4345,6 @@
                 "tourism/caravan_site": {
                     "name": "Càmping per a caravanes"
                 },
-                "tourism/chalet": {
-                    "name": "Xalet"
-                },
                 "tourism/gallery": {
                     "name": "Galeria d'art"
                 },
@@ -4188,17 +4579,95 @@
                 "description": "Imatges aèries i de satèl·lit.",
                 "name": "Imatges aèries de Bing"
             },
+            "DigitalGlobe-Premium": {
+                "attribution": {
+                    "text": "Termes i comentaris"
+                },
+                "description": "Imatges de satèl·lit de DigitalGlobe Premium",
+                "name": "Imatges de DigitalGlobe Premium"
+            },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Termes i comentaris"
+                },
+                "description": "Limitacions d'imatges i dates de captura. Les etiquetes apareixen al nivell de zoom 14 i superior.",
+                "name": "Imatges de DigitalGlobe Premium Vintage"
+            },
             "DigitalGlobe-Standard": {
+                "attribution": {
+                    "text": "Termes i comentaris"
+                },
                 "description": "Imatges de satèl·lit de DigitalGlobe estàndard",
                 "name": "Imatges de DigitalGlobe estàndard"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Termes i comentaris"
+                },
+                "description": "Limitacions d'imatges i dates de captura. Les etiquetes apareixen al nivell de zoom 14 i superior.",
+                "name": "Imatges de DigitalGlobe estàndard Vintage"
+            },
+            "EsriWorldImagery": {
+                "attribution": {
+                    "text": "Termes i comentaris"
+                },
+                "description": "Imatges aèries de Esri",
+                "name": "Imatges aèries de Esri"
+            },
             "MAPNIK": {
+                "attribution": {
+                    "text": "© OpenStreetMap col·laboradors, CC-BY-SA"
+                },
                 "description": "La capa d'OpenStreetmap predeterminada",
                 "name": "OpenStreetMap (Estàndard)"
             },
             "Mapbox": {
+                "attribution": {
+                    "text": "Termes i comentaris"
+                },
                 "description": "Imatges aèries i de satèl·lit."
             },
+            "OSM_Inspector-Addresses": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap col·laboradors, CC-BY-SA"
+                },
+                "name": "Inspector OSM: Adreces"
+            },
+            "OSM_Inspector-Geometry": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap col·laboradors, CC-BY-SA"
+                },
+                "name": "Inspector OSM: Geometria"
+            },
+            "OSM_Inspector-Highways": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap col·laboradors, CC-BY-SA"
+                },
+                "name": "Inspector OSM: Carreteres"
+            },
+            "OSM_Inspector-Multipolygon": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap col·laboradors, CC-BY-SA"
+                },
+                "name": "Inspector OSM: Àrea"
+            },
+            "OSM_Inspector-Places": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap col·laboradors, CC-BY-SA"
+                },
+                "name": "Inspector OSM: Llocs"
+            },
+            "OSM_Inspector-Routing": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap col·laboradors, CC-BY-SA"
+                },
+                "name": "Inspector OSM: Planificació de ruta"
+            },
+            "OSM_Inspector-Tagging": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap col·laboradors, CC-BY-SA"
+                }
+            },
             "basemap.at": {
                 "attribution": {
                     "text": "basemap.at"
@@ -4210,11 +4679,36 @@
                     "text": "basemap.at"
                 }
             },
+            "hike_n_bike": {
+                "name": "Excursió i bicicleta"
+            },
+            "mapbox_locator_overlay": {
+                "attribution": {
+                    "text": "Termes i comentaris"
+                }
+            },
+            "openpt_map": {
+                "attribution": {
+                    "text": "© OpenStreetMap col·laboradors, CC-BY-SA"
+                }
+            },
             "osm-gps": {
+                "attribution": {
+                    "text": "© OpenStreetMap col·laboradors"
+                },
                 "description": "Traces GPS públiques pujades a OpenStreetMap.",
                 "name": "Traces GPS d'OpenStreetMap"
             },
+            "osm-mapnik-black_and_white": {
+                "attribution": {
+                    "text": "© OpenStreetMap col·laboradors, CC-BY-SA"
+                },
+                "name": "OpenStreetMap (Estàndard Blanc i Negre)"
+            },
             "osm-mapnik-german_style": {
+                "attribution": {
+                    "text": "© OpenStreetMap col·laboradors, CC-BY-SA"
+                },
                 "name": "OpenStreetMap (Estil alemany)"
             }
         }
diff --git a/dist/locales/cs.json b/dist/locales/cs.json
index 87dca8fbd..e0e7aa8f5 100644
--- a/dist/locales/cs.json
+++ b/dist/locales/cs.json
@@ -7,8 +7,8 @@
                 "tail": "Klikněte na mapu a začněte tak kreslit plochu, jako třeba park, jezero nebo budovu."
             },
             "add_line": {
-                "title": "Linie",
-                "description": "Přidat do mapy silnice, ulice, stezky, potoky či jiné linie.",
+                "title": "Čára",
+                "description": "Přidat do mapy silnice, ulice, stezky, potoky či jiné čáry.",
                 "tail": "Klikněte na mapu a začněte tak kreslit silnice, stezky nebo trasy."
             },
             "add_point": {
@@ -310,7 +310,6 @@
             "localized_translation_language": "Zvolte jazyk",
             "localized_translation_name": "Název"
         },
-        "zoom_in_edit": "Pro editaci přibližte mapu",
         "login": "přihlášení",
         "logout": "odhlásit",
         "loading_auth": "Připojování na OpenStreetMap…",
@@ -330,9 +329,11 @@
             "title": "Nahrát na OpenStreetMap",
             "upload_explanation": "Vámi provedené změny budou viditelné na všech mapách postavených na datech z OpenStreetMap.",
             "upload_explanation_with_user": "Změny provedené pod jménem {user} budou viditelné na všech mapách postavených na datech z OpenStreetMap.",
+            "request_review": "Rád bych, kdyby se na mé změny někdo podíval.",
             "save": "Nahrát",
             "cancel": "Storno",
             "changes": "{count} změn",
+            "download_changes": "Stáhnout soubor osmChange",
             "warnings": "Varování",
             "modified": "Upraveno",
             "deleted": "Smazáno",
@@ -346,6 +347,51 @@
             "list": "Přispěli {users}",
             "truncated_list": "Přispěli {users} a {count} další."
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "Pozadí",
+                "zoom": "Úroveň přiblížení",
+                "source": "Zdroj",
+                "description": "Popis",
+                "resolution": "Rozlišení",
+                "accuracy": "Přesnost",
+                "unknown": "Neznámé",
+                "show_tiles": "Zobrazit dlaždice",
+                "hide_tiles": "Skrýt dlaždice"
+            },
+            "history": {
+                "key": "H",
+                "title": "Historie",
+                "selected": "{n} vybráno",
+                "version": "Verze",
+                "last_edit": "Poslední úprava",
+                "edited_by": "Upravil(a)",
+                "changeset": "Sada změn",
+                "unknown": "Neznámé",
+                "link_text": "Historie na openstreetmap.org"
+            },
+            "location": {
+                "key": "L",
+                "title": "Umístění",
+                "unknown_location": "Neznámé umístění"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Měřítko",
+                "selected": "{n} vybráno",
+                "geometry": "Geometrie",
+                "closed": "zavřeno",
+                "center": "Střed",
+                "perimeter": "Perimetr",
+                "length": "Délka",
+                "area": "Plocha",
+                "location": "Umístění",
+                "metric": "Metrické",
+                "imperial": "Imperiální"
+            }
+        },
         "geometry": {
             "point": "bod",
             "vertex": "bod vnitřní",
@@ -408,6 +454,7 @@
         "background": {
             "title": "Pozadí",
             "description": "Nastavení pozadí",
+            "key": "B",
             "percent_brightness": "{opacity}% viditelnost",
             "none": "Žádné",
             "best_imagery": "Nejlepší známý zdroj podkladů pro toto místo",
@@ -420,13 +467,21 @@
             "offset": "Vizuálně vyrovnejte posunutí podkladů v šedé oblasti tak, aby lícovaly s mapou. Nebo zadejte hodnotu posunu v metrech.",
             "minimap": {
                 "description": "Mapka",
-                "tooltip": "Zobrazit přehledovou mapku zobrazující aktuální výřez v širším okolí"
+                "tooltip": "Zobrazit přehledovou mapku zobrazující aktuální výřez v širším okolí",
+                "key": "I"
             }
         },
         "map_data": {
             "title": "Mapová data",
             "description": "Mapová data",
+            "key": "F",
             "data_layers": "Datové vrstvy",
+            "layers": {
+                "osm": {
+                    "tooltip": "Mapová data z OpenStreetMap",
+                    "title": "Data OpenStreetMap"
+                }
+            },
             "fill_area": "Vyplnění ploch",
             "map_features": "Mapové prvky",
             "autohidden": "Tyto prvky jsou nyní skryté, protože jinak by jich na mapě bylo zobrazeno příliš mnoho. Když mapu zvětšíte, můžete je zobrazit a editovat."
@@ -484,7 +539,8 @@
         "area_fill": {
             "wireframe": {
                 "description": "Bez výplně",
-                "tooltip": "Při zobrazení bez výplně dobře uvidíte podkladové snímky."
+                "tooltip": "Při zobrazení bez výplně dobře uvidíte podkladové snímky.",
+                "key": "W"
             },
             "partial": {
                 "description": "Částečná výplň",
@@ -497,7 +553,9 @@
         },
         "restore": {
             "heading": "Vaše úpravy nebyly uloženy",
-            "description": "Přejete si obnovit úpravy, které při minulém spuštění nebyly uloženy?"
+            "description": "Přejete si obnovit úpravy, které při minulém spuštění nebyly uloženy?",
+            "restore": "Obnovit moje změny",
+            "reset": "Zahodit moje změny"
         },
         "save": {
             "title": "Uložit",
@@ -517,6 +575,7 @@
                 "keep_remote": "Použít cizí",
                 "restore": "Obnovit",
                 "delete": "Nechat smazané",
+                "download_changes": "Nebo stáhnout soubor osmChange",
                 "done": "Všechny konflikty vyřešeny!",
                 "help": "Jiný uživatel změnil některé stejné prvky jako vy.\nKlikněte na každý prvek níže pro zobrazení více detailů o konfliktu a zvolte, zda zachovat vaše změny nebo změny druhého uživatele.\n"
             }
@@ -548,8 +607,7 @@
         "splash": {
             "welcome": "Vítá vás iD, program pro editaci OpenStreetMap",
             "text": "iD je uživatelsky přátelský, ale silný nástroj pro editaci nejrozsáhlejší svobodné mapy světa. Toto je verze {version}. Více informací na {website}, chybová hlášení na {github}.",
-            "walkthrough": "Prohlídka editoru",
-            "start": "Začít s editací"
+            "walkthrough": "Prohlídka editoru"
         },
         "source_switch": {
             "live": "live",
@@ -565,7 +623,7 @@
             "used_with": "užito s {type}"
         },
         "validations": {
-            "disconnected_highway": "Nepřipojená dálnice",
+            "disconnected_highway": "Nepřipojená cesta",
             "disconnected_highway_tooltip": "Cesty by měly být připojeny k dalším cestám nebo vstupům budov.",
             "old_multipolygon": "Na vnější linii se nachází tag multipolygon",
             "old_multipolygon_tooltip": "Takto se multipolygon již nedělá. Prosím přiřaďte tagy relaci multipolygon, nikoliv vnější cestě.",
@@ -581,10 +639,6 @@
             "tag_suggests_area": "Vlastnost {tag} obvykle označuje plochu, ale zvolený objekt není plocha",
             "deprecated_tags": "Zastaralé vlastnosti: {tag}"
         },
-        "zoom": {
-            "in": "Přiblížit",
-            "out": "Oddálit"
-        },
         "cannot_zoom": "Aktuální nastavení nedovoluje větší zvětšení.",
         "full_screen": "Na celou obrazovku",
         "gpx": {
@@ -606,6 +660,7 @@
         },
         "help": {
             "title": "Nápověda",
+            "key": "H",
             "help": "# Pomoc\n\nToto je editor [OpenStreetMap](http://www.openstreetmap.org/), svobodné a otevřené mapy světa, vytvářené jako open-source a open-data. S pomocí editoru můžete přidávat a upravovat data v mapě třeba ve svém okolí, a zlepšovat tak celou mapu pro každého.\n\nVaše úpravy mapy budou viditelné pro každého uživatele OpenStreetMap. Před editací se ovšem musíte [přihlásit](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) je projekt vytvářený spoluprací mnoha lidí, se [zdrojovým kódem na GitHubu](https://github.com/openstreetmap/iD).\n",
             "gps": "# GPS\n\nData z GPS jsou jedním z důvěryhodných zdrojů informací pro OpenStreetMap. Tento editor podporuje zobrazení tras ve formátu `.gpx` nahraných z vašeho počítače. Takovou trasu můžete nasbírat s pomocí nejrůznějších aplikací pro mobily nebo s pomocí specializované navigace.\n\nPro více informací, jak provést takový sběr dat z GPS, viz např. návod anglicky: [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nPokud už máte záznam ve formátu GPX, přetáhněte soubor myší či prstem nad editor. Rozpozná-li editor formát souboru, zobrazí se trasa v mapě jako světle růžová čára. Pokud chcete tuto novou vrstvu zapnout, vypnout nebo zvětšit na velikost pracovní plochy, klikněte na menu 'Mapová data' na pravé straně.\n\nTrasa GPX nebude přímo nahrána na OpenStreetMap - pouze slouží jako vodítko, podle kterého se můžete orientovat, a podle kterého můžete kreslit nové objekty do mapy. Pokud chcete přímo trasu GPX poskytnout i ostatním, můžete ji [nahrát do samostatné databáze OpenStreetMap](http://www.openstreetmap.org/trace/create).\n",
             "imagery": "# Podkladové snímky\n\nSatelitní a letecké snímky jsou důležitým zdrojem mapových dat. V menu 'Nastavení pozadí' na levé straně editoru je k dispozici kombinace leteckých snímků, satelitních snímků a dalších volně dostupných podkladů.\n\nImplicitní vrstvou jsou satelitní snímky [Bing](http://www.bing.com/maps/), ale jakmile se přesunete do konkrétní geografické oblasti a nastavíte dostatečné zvětšení, nabídnou se vám další mapové podklady. V některých státech, jako jsou Spojené státy, Francie či Dánskou, jsou k dispozici snímky ve vysoké kvalitě. Pro velkou část České republiky jsou také dostupné velmi detailní satelitní snímky. **Data z katastru nemovitostí a letecké mapy ÚHUL** je možné zobrazit dle [návodu zde](https://wiki.openstreetmap.org/wiki/WikiProject_Czech_Republic/freemap#WMS_UHUL_-_ortofotomapa).\n\nPodklady jsou někdy posunuté vůči mapě, kvůli chybám na straně poskytovatele snímků. Pokud uvidíte, že je mnoho cest v mapě posunuto vůči pozadí, nesnažte se je hned přesunout - posun obvykle znamená chybu v podkladu a ne chybu v mapě. V menu 'Nastavení pozadí' klikněte na 'Zarovnat pozadí' - to vám dovolí posunout podklad, aby lícoval s mapou.\n",
@@ -860,6 +915,10 @@
         },
         "shortcuts": {
             "title": "Klávesové zkratky",
+            "tooltip": "Zobrazit obrazovku klávesových zkratek.",
+            "toggle": {
+                "key": "?"
+            },
             "key": {
                 "alt": "Alt",
                 "backspace": "Backspace",
@@ -885,8 +944,51 @@
             "or": "-nebo-",
             "browsing": {
                 "title": "Procházení",
+                "navigation": {
+                    "title": "Navigace",
+                    "zoom": "Přiblížit / /oddálit"
+                },
                 "help": {
                     "title": "Nápověda"
+                },
+                "display_options": {
+                    "title": "Vlastnosti zobrazení",
+                    "background": "Zobrazit volby pozadí",
+                    "map_data": "Zobrazit volby mapových dat",
+                    "fullscreen": "Vstoupit do režimu celé obrazovky",
+                    "minimap": "Přepnout minimapu"
+                },
+                "selecting": {
+                    "select_one": "Zvolit jednu vlastnost",
+                    "select_multi": "Zvolit více vlastností"
+                }
+            },
+            "editing": {
+                "title": "Úpravy",
+                "drawing": {
+                    "title": "Kreslení",
+                    "add_point": "Režim 'Přidat bod'",
+                    "add_line": "Režim 'Přidat čáru'",
+                    "add_area": "Režim 'Přidat plochu'",
+                    "place_point": "Umístit bod",
+                    "disable_snap": "Přidržte pro zakázání přichytávání bodů"
+                },
+                "operations": {
+                    "title": "Operace",
+                    "reverse": "Vrátit čáru",
+                    "circularize": "Zakulacení uzavřených čar, nebo ploch"
+                },
+                "commands": {
+                    "title": "Příkazy",
+                    "copy": "Kopírovat vybrané vlastnosti",
+                    "paste": "Vložit vybrané vlastnosti",
+                    "save": "Uložit změny"
+                }
+            },
+            "tools": {
+                "title": "Nástroje",
+                "info": {
+                    "title": "Informace"
                 }
             }
         },
@@ -1012,7 +1114,8 @@
                         "subdistrict": "Subdistrikt",
                         "subdistrict!vn": "Okrsek/Komuna/Městys",
                         "suburb": "Městská část (obvod)",
-                        "suburb!jp": "Okrsek"
+                        "suburb!jp": "Okrsek",
+                        "unit": "Jednotka"
                     }
                 },
                 "admin_level": {
@@ -1126,12 +1229,19 @@
                 "board_type": {
                     "label": "Typ"
                 },
+                "boules": {
+                    "label": "Typ"
+                },
                 "boundary": {
                     "label": "Typ"
                 },
                 "brand": {
                     "label": "Obchodní značka"
                 },
+                "bridge": {
+                    "label": "Typ",
+                    "placeholder": "Výchozí"
+                },
                 "building": {
                     "label": "Budova"
                 },
@@ -1191,12 +1301,18 @@
                         "clockwise": "Po směru hod. ručiček"
                     }
                 },
+                "clothes": {
+                    "label": "Oblečení"
+                },
                 "club": {
                     "label": "Typ"
                 },
                 "collection_times": {
                     "label": "Čas výběru"
                 },
+                "comment": {
+                    "label": "Komentář ke změnám"
+                },
                 "communication_multi": {
                     "label": "Druhy komunikace"
                 },
@@ -1207,6 +1323,9 @@
                     "label": "URL webkamery",
                     "placeholder": "http://priklad.cz/"
                 },
+                "content": {
+                    "label": "Obsah"
+                },
                 "country": {
                     "label": "Stát"
                 },
@@ -1216,6 +1335,13 @@
                 "craft": {
                     "label": "Typ"
                 },
+                "crane/type": {
+                    "label": "Typ jeřábu",
+                    "options": {
+                        "floor-mounted_crane": "Pozemní jeřáb",
+                        "portal_crane": "Portálový jeřáb"
+                    }
+                },
                 "crop": {
                     "label": "Plodina"
                 },
@@ -1228,6 +1354,10 @@
                 "currency_multi": {
                     "label": "Měny"
                 },
+                "cutting": {
+                    "label": "Typ",
+                    "placeholder": "Výchozí"
+                },
                 "cycle_network": {
                     "label": "Síť"
                 },
@@ -1284,6 +1414,9 @@
                 "description": {
                     "label": "Popis"
                 },
+                "devices": {
+                    "placeholder": "1, 2, 3…"
+                },
                 "diaper": {
                     "label": "Přizpůsobeno výměně plenek"
                 },
@@ -1296,6 +1429,10 @@
                 "drive_through": {
                     "label": "Obsluha z/do auta"
                 },
+                "duration": {
+                    "label": "Trvání",
+                    "placeholder": "00:00"
+                },
                 "electrified": {
                     "label": "Elektrifikace",
                     "options": {
@@ -1313,6 +1450,10 @@
                     "label": "Email",
                     "placeholder": "priklad@priklad.cz"
                 },
+                "embankment": {
+                    "label": "Typ",
+                    "placeholder": "Výchozí"
+                },
                 "emergency": {
                     "label": "Pohotovost"
                 },
@@ -1353,6 +1494,13 @@
                 "fixme": {
                     "label": "Opravit"
                 },
+                "ford": {
+                    "label": "Typ",
+                    "placeholder": "Výchozí"
+                },
+                "frequency": {
+                    "label": "Pracovní frekvence"
+                },
                 "fuel": {
                     "label": "Palivo"
                 },
@@ -1374,6 +1522,10 @@
                 "generator/method": {
                     "label": "Princip"
                 },
+                "generator/output/electricity": {
+                    "label": "Výkon",
+                    "placeholder": "500kW, 100MW, 200MW…"
+                },
                 "generator/source": {
                     "label": "Zdroj"
                 },
@@ -1390,6 +1542,16 @@
                 "handrail": {
                     "label": "Zábradlí"
                 },
+                "hashtags": {
+                    "label": "Navržené hashtagy",
+                    "placeholder": "#příklad"
+                },
+                "healthcare": {
+                    "label": "Typ"
+                },
+                "healthcare/speciality": {
+                    "label": "Specializace"
+                },
                 "height": {
                     "label": "Výška (m)"
                 },
@@ -1431,6 +1593,9 @@
                 "inscription": {
                     "label": "Nápis"
                 },
+                "intermittent": {
+                    "label": "Vysychající"
+                },
                 "internet_access": {
                     "label": "Připojení k internetu",
                     "options": {
@@ -1450,6 +1615,9 @@
                 "kerb": {
                     "label": "Obrubník"
                 },
+                "label": {
+                    "label": "Štítek"
+                },
                 "lamp_type": {
                     "label": "Typ"
                 },
@@ -1461,7 +1629,8 @@
                     "placeholder": "1, 2, 3..."
                 },
                 "layer": {
-                    "label": "Vrstva"
+                    "label": "Vrstva",
+                    "placeholder": "O"
                 },
                 "leaf_cycle": {
                     "label": "Opadavost listí",
@@ -1521,6 +1690,9 @@
                 "man_made": {
                     "label": "Typ"
                 },
+                "manhole": {
+                    "label": "Typ"
+                },
                 "map_size": {
                     "label": "Pokrytí"
                 },
@@ -1541,6 +1713,13 @@
                 "maxweight": {
                     "label": "Max. hmotnost"
                 },
+                "memorial": {
+                    "label": "Typ"
+                },
+                "milestone_position": {
+                    "label": "Pozice milníku",
+                    "placeholder": "Vzdálenost na jedno desetinné místo (123.4)"
+                },
                 "mtb/scale": {
                     "label": "Klasifikace obtížnosti pro MTB",
                     "options": {
@@ -1680,6 +1859,9 @@
                 "payment_multi": {
                     "label": "Platební možnosti"
                 },
+                "phases": {
+                    "placeholder": "1, 2, 3…"
+                },
                 "phone": {
                     "label": "Telefon",
                     "placeholder": "+420 603 123456"
@@ -1728,6 +1910,19 @@
                 "plant": {
                     "label": "Rostlina"
                 },
+                "plant/output/electricity": {
+                    "label": "Výkon",
+                    "placeholder": "500MW, 1000MW, 2000MW…"
+                },
+                "playground/baby": {
+                    "label": "Autosedačka"
+                },
+                "playground/max_age": {
+                    "label": "Maximální věk"
+                },
+                "playground/min_age": {
+                    "label": "Minimální věk"
+                },
                 "population": {
                     "label": "Počet obyvatel"
                 },
@@ -1756,6 +1951,9 @@
                         "container": "Kontejner"
                     }
                 },
+                "ref_road_number": {
+                    "label": "Číslo silnice"
+                },
                 "relation": {
                     "label": "Typ"
                 },
@@ -1869,6 +2067,9 @@
                 "social_facility_for": {
                     "label": "Komu slouží"
                 },
+                "source": {
+                    "label": "Zdroje"
+                },
                 "sport": {
                     "label": "Sporty"
                 },
@@ -1908,6 +2109,12 @@
                     },
                     "placeholder": "Není známo"
                 },
+                "structure_waterway": {
+                    "options": {
+                        "tunnel": "Tunel"
+                    },
+                    "placeholder": "Neznámé"
+                },
                 "studio": {
                     "label": "Typ"
                 },
@@ -1967,6 +2174,9 @@
                 "tourism": {
                     "label": "Typ"
                 },
+                "tourism_attraction": {
+                    "label": "Turismus"
+                },
                 "tower/construction": {
                     "label": "Konstrukce",
                     "placeholder": "Ukotvená, příhradová, skrytá, ..."
@@ -1985,6 +2195,9 @@
                     },
                     "placeholder": "Pevný, převážně pevný, měkký povrch"
                 },
+                "trade": {
+                    "label": "Typ"
+                },
                 "traffic_calming": {
                     "label": "Typ"
                 },
@@ -2003,9 +2216,19 @@
                     },
                     "placeholder": "Výborná, Dobrá, Špatná..."
                 },
+                "transformer": {
+                    "options": {
+                        "auto": "Autotransformátor",
+                        "generator": "Generátor"
+                    }
+                },
                 "trees": {
                     "label": "Stromy"
                 },
+                "tunnel": {
+                    "label": "Typ",
+                    "placeholder": "Výchozí"
+                },
                 "vending": {
                     "label": "Druh zboží"
                 },
@@ -2017,6 +2240,29 @@
                         "street": "5 až 20 m (16 až 65 ft)"
                     }
                 },
+                "volcano/status": {
+                    "label": "Stav sopky",
+                    "options": {
+                        "active": "Aktivní",
+                        "dormant": "Spící",
+                        "extinct": "Vyhaslá"
+                    }
+                },
+                "volcano/type": {
+                    "label": "Druh sopky",
+                    "options": {
+                        "stratovolcano": "Stratovulkán"
+                    }
+                },
+                "voltage/primary": {
+                    "label": "Primární napětí"
+                },
+                "voltage/secondary": {
+                    "label": "Sekundární napětí"
+                },
+                "voltage/tertiary": {
+                    "label": "Terciální napětí"
+                },
                 "wall": {
                     "label": "Typ"
                 },
@@ -2044,6 +2290,16 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "placeholder": "1, 2, 3…"
+                },
+                "windings/configuration": {
+                    "label": "Konfigurace vinutí",
+                    "options": {
+                        "delta": "Trojúhelník",
+                        "star": "Hvězda"
+                    }
                 }
             },
             "presets": {
@@ -2244,6 +2500,12 @@
                     "name": "Poliklinika",
                     "terms": "poliklinika,klinika,nemocnice,ambulance,špitál"
                 },
+                "amenity/clinic/abortion": {
+                    "name": "Potratová klinika"
+                },
+                "amenity/clinic/fertility": {
+                    "name": "Klinika plodnosti"
+                },
                 "amenity/clock": {
                     "name": "Hodiny",
                     "terms": "hodiny,orloj,hodinky,chronometr,ciferník,čas,ukazatel času"
@@ -2257,7 +2519,6 @@
                     "terms": "komunitní centrum,kulturní centrum,sociální centrum,komunitní dům,dům dětí,dům mládeže,dům dětí a mládeže,klub"
                 },
                 "amenity/compressed_air": {
-                    "name": "Vzduchová pumpa",
                     "terms": "vzduchová pumpa,pumpa,pumpička,stlačený vzduch,kompresor,hustilka"
                 },
                 "amenity/courthouse": {
@@ -2398,6 +2659,9 @@
                     "name": "Kostel",
                     "terms": "křesťanský,křesťanství,kostel,kostelík,chrám,bazilika,katedrála,kaple,kaplička,chrám páně,rotunda,farnost,diecéze"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Hinduistický chrám"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "Synagoga",
                     "terms": "synagoga,židovský,židovská,židovské"
@@ -2406,6 +2670,9 @@
                     "name": "Mešita",
                     "terms": "mešita,islám,muslim,muslimský,muslimská,muslimské"
                 },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Taoistický chrám"
+                },
                 "amenity/planetarium": {
                     "name": "Planetárium",
                     "terms": "planetárium,hvězdárna,astronomie"
@@ -2465,10 +2732,16 @@
                     "name": "Prostor školy",
                     "terms": "škola,základní škola,střední škola,obecná škola,gymnázium,gymnasium,střední odborná škola,učiliště,odborné učiliště,střední odborné učiliště,školní,školský"
                 },
+                "amenity/scrapyard": {
+                    "name": "Vrakoviště"
+                },
                 "amenity/shelter": {
                     "name": "Přístřešek",
                     "terms": "přístřešek,střecha,budka,bouda,čekárna"
                 },
+                "amenity/shower": {
+                    "name": "Sprchy"
+                },
                 "amenity/social_facility": {
                     "name": "Zařízení sociálních služeb",
                     "terms": "sociální služby,sociální zařízení,sociální pomoc,sociální služba,azylový dům,dům na půl cesty,denní stacionář,nízkoprahové centrum,noclehárna,chudobinec"
@@ -2540,6 +2813,9 @@
                     "name": "Automat na pytlíky na exkrementy",
                     "terms": "automat,prodejní automat,pytlík,pes,psí exkrementy,psí hovna,exkrement,hovno,hovínko"
                 },
+                "amenity/vending_machine/feminine_hygiene": {
+                    "name": "Automat dámské hygieny"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Automat na noviny"
                 },
@@ -2567,6 +2843,9 @@
                     "name": "Veterina",
                     "terms": "veterina,veterinář,zvíře"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "Koš na psí výkaly"
+                },
                 "amenity/waste_basket": {
                     "name": "Odpadkový koš",
                     "terms": "popelnice,kontejner,odpadkový koš,odpadky"
@@ -2595,6 +2874,15 @@
                     "name": "Plocha silnice",
                     "terms": "plocha silnice,povrch silnice,plocha cesty,povrch cesty"
                 },
+                "attraction/bumper_car": {
+                    "name": "Autodrom"
+                },
+                "attraction/roller_coaster": {
+                    "name": "Horská dráha"
+                },
+                "attraction/train": {
+                    "name": "Turistický vláček"
+                },
                 "barrier": {
                     "name": "Zábrana",
                     "terms": "zábrana,ohrada,bariéra"
@@ -2863,6 +3151,9 @@
                     "name": "Hodinář (ne hodinky)",
                     "terms": "hodinářství,hodinář,hodiny"
                 },
+                "craft/distillery": {
+                    "name": "Lihovar"
+                },
                 "craft/dressmaker": {
                     "name": "Švadlena",
                     "terms": "švadlena,krejčí,krejčová,šaty,dámská krejčová"
@@ -2960,10 +3251,6 @@
                     "name": "Lešenář",
                     "terms": "lešenář,lešenářství,lešení"
                 },
-                "craft/sculpter": {
-                    "name": "Sochař",
-                    "terms": "sochař,sochařství,socha"
-                },
                 "craft/shoemaker": {
                     "name": "Švec",
                     "terms": "švec,ševcovství,obuvník,obuvnictví"
@@ -2972,10 +3259,6 @@
                     "name": "Kameník",
                     "terms": "kameník,kamenictví"
                 },
-                "craft/sweep": {
-                    "name": "Kominík",
-                    "terms": "kominík,kominictví"
-                },
                 "craft/tailor": {
                     "name": "Krejčí"
                 },
@@ -3025,6 +3308,9 @@
                     "name": "Požární hydrant",
                     "terms": "požární hydrant, hasičský hydrant, pumpa"
                 },
+                "emergency/life_ring": {
+                    "name": "Kruh života"
+                },
                 "emergency/no": {
                     "name": "Vjezd záchranných vozidel zakázán"
                 },
@@ -3101,10 +3387,43 @@
                     "name": "Vodní překážka",
                     "terms": "voda,příčná voda,příčná překážka,žlutá voda"
                 },
+                "healthcare/alternative": {
+                    "name": "Alternativní medicína"
+                },
+                "healthcare/alternative/chiropractic": {
+                    "name": "Chiropraktik"
+                },
+                "healthcare/audiologist": {
+                    "name": "Ušní"
+                },
+                "healthcare/birthing_center": {
+                    "name": "Porodnice"
+                },
                 "healthcare/blood_donation": {
                     "name": "Odběr krve",
                     "terms": "odběr krve,darování krve,transfúze,transfúzní stanice"
                 },
+                "healthcare/hospice": {
+                    "name": "Hospic"
+                },
+                "healthcare/optometrist": {
+                    "name": "Optik"
+                },
+                "healthcare/physiotherapist": {
+                    "name": "Fyzioterapeut"
+                },
+                "healthcare/podiatrist": {
+                    "name": "Pedikér"
+                },
+                "healthcare/psychotherapist": {
+                    "name": "Psychoterapeut"
+                },
+                "healthcare/rehabilitation": {
+                    "name": "Rehabilitační středisko"
+                },
+                "healthcare/speech_therapist": {
+                    "name": "Logoped"
+                },
                 "highway": {
                     "name": "Pozemní komunikace"
                 },
@@ -3168,10 +3487,6 @@
                     "name": "Pěšina",
                     "terms": "cesta"
                 },
-                "highway/pedestrian": {
-                    "name": "Pěší zóna",
-                    "terms": "pěší zóna,ulice pro pěší"
-                },
                 "highway/primary": {
                     "name": "Silnice 1. třídy",
                     "terms": "silnice I. třídy"
@@ -3348,6 +3663,9 @@
                     "name": "Umělá vodní plocha",
                     "terms": "zdrž,nádrž,voda,jezero,rybník"
                 },
+                "landuse/brownfield": {
+                    "name": "Deprimující zóna"
+                },
                 "landuse/cemetery": {
                     "name": "Hřbitov",
                     "terms": "hřbitov,pohřebiště"
@@ -3387,6 +3705,9 @@
                     "name": "Tráva",
                     "terms": "tráva"
                 },
+                "landuse/greenfield": {
+                    "name": "Zelená louka"
+                },
                 "landuse/harbour": {
                     "name": "Přístav",
                     "terms": "loď"
@@ -3635,6 +3956,9 @@
                     "name": "Běžecká závodní dráha",
                     "terms": "závod,závodění,běh,sprint,dráha"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna"
+                },
                 "leisure/slipway": {
                     "name": "Vodní skluz",
                     "terms": "spouštění lodi,dok,loděnice,skluz v loděnici,skluzavka"
@@ -3687,6 +4011,9 @@
                     "name": "Komín",
                     "terms": "komín"
                 },
+                "man_made/crane": {
+                    "name": "Jeřáb"
+                },
                 "man_made/cutline": {
                     "name": "Průsek",
                     "terms": "lesní průsek,holina"
@@ -3774,6 +4101,10 @@
                     "name": "Vodárna",
                     "terms": "vodárna,úpravna vody"
                 },
+                "man_made/watermill": {
+                    "name": "Vodní mlýn",
+                    "terms": "Větrný mlýn"
+                },
                 "man_made/works": {
                     "name": "Továrna",
                     "terms": "montáž,výroba,pivovar,auto,závod,továrna,zpracování,rafinerie"
@@ -3894,18 +4225,10 @@
                     "name": "Kanceláře",
                     "terms": "kancelář,kancelářský,úřad,úřadovna,administrativa,office,sídlo"
                 },
-                "office/accountant": {
-                    "name": "Finanční poradce",
-                    "terms": "finanční poradce,účetní,daňový poradce"
-                },
                 "office/administrative": {
                     "name": "Místní úřad",
                     "terms": "místní úřad,městský úřad,krajský úřad,kancelář,administrativa,samospráva"
                 },
-                "office/architect": {
-                    "name": "Architekt",
-                    "terms": "architekt,stavební,architektonické studio"
-                },
                 "office/company": {
                     "name": "Kancelář",
                     "terms": "kancelář,firma,společnost,soukromá firma,soukromá společnost,sídlo,s.r.o."
@@ -3942,10 +4265,6 @@
                     "name": "Pojišťovna",
                     "terms": "pojišťovna,pojištění,zajišťovna"
                 },
-                "office/it": {
-                    "name": "IT specialista",
-                    "terms": "IT specialista,počítačový specialista"
-                },
                 "office/lawyer": {
                     "name": "Právní kancelář",
                     "terms": "právní kancelář,právník,právní zástupce,advokátní kancelář,advokát"
@@ -3954,10 +4273,6 @@
                     "name": "Kancelář notáře",
                     "terms": "koncipient,podpis,závěť,listina,pozemek,pozemky"
                 },
-                "office/newspaper": {
-                    "name": "Noviny",
-                    "terms": "noviny,deník,časopis,vydavatelství"
-                },
                 "office/ngo": {
                     "name": "Nezisková organizace",
                     "terms": "nezisková organizace,neziskovka,nevládní organizace"
@@ -3977,10 +4292,6 @@
                     "name": "Telekomunikační společnost",
                     "terms": "telekomunikační společnost,telekomunikace,spoje,mobilní operátor,mobil,radiotelekomunikace"
                 },
-                "office/therapist": {
-                    "name": "Fyzioterapeut",
-                    "terms": "fyzioterapeut,terapeut,rekonvalescence,masér"
-                },
                 "office/travel_agent": {
                     "name": "Cestovní kancelář"
                 },
@@ -4038,6 +4349,9 @@
                     "name": "Vesnice",
                     "terms": "vesnice"
                 },
+                "playground/seesaw": {
+                    "name": "Houpačka"
+                },
                 "point": {
                     "name": "Uzel",
                     "terms": "uzel,bod,vrchol,tečka,puntík"
@@ -4049,6 +4363,12 @@
                     "name": "Generátor",
                     "terms": "generátor,elektrický generátor,elektrárna,zdroj proudu"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "Jaderný reaktor"
+                },
+                "power/generator/source_wind": {
+                    "name": "Větrná turbína"
+                },
                 "power/line": {
                     "name": "Elektrické vedení vyššího napětí (nad 50 kV)",
                     "terms": "elektrické vedení,velmi vysoké napětí,zvláště vysoké napětí,přenosová soustava,energetika"
@@ -4675,10 +4995,6 @@
                     "name": "Místo pro karavany",
                     "terms": "místo pro karavany,kemp,camp,camping,karavan"
                 },
-                "tourism/chalet": {
-                    "name": "Chata",
-                    "terms": "chata,chalupa,chatka"
-                },
                 "tourism/gallery": {
                     "name": "Galerie umění",
                     "terms": "muzeum umění,galerie umění,umělecká galerie,umělecké muzeum,galerie"
@@ -4775,6 +5091,9 @@
                     "name": "Opticko-akustická brzda",
                     "terms": "opticko-akustická brzda,spotflex,zpomalovací práh,optická brzda,akustická brzda"
                 },
+                "traffic_calming/table": {
+                    "name": "Rychlostní cedule"
+                },
                 "type/boundary": {
                     "name": "Hranice",
                     "terms": "hranice,hraniční,čára"
@@ -4929,6 +5248,9 @@
                     "name": "Potok",
                     "terms": "potok,potůček,strouha,tok,říčka,přítok,koryto,řeka,proud,vír,odtok,příliv,odliv"
                 },
+                "waterway/stream_intermittent": {
+                    "name": "Vysychající/přerušovaný tok"
+                },
                 "waterway/water_point": {
                     "name": "Pitná voda pro lodě",
                     "terms": "pitná voda,lodě"
@@ -4942,6 +5264,160 @@
                     "terms": "jez, splav"
                 }
             }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "Satelitní a letecké snímky.",
+                "name": "Letecké snímky Bing"
+            },
+            "DigitalGlobe-Premium": {
+                "attribution": {
+                    "text": "Podmínky použití & zpětná vazba"
+                },
+                "description": "Prémiové satelitní snímky DigitalGlobe",
+                "name": "Prémiové snímky DigitalGlobe"
+            },
+            "DigitalGlobe-Standard": {
+                "attribution": {
+                    "text": "Podmínky použití & zpětná vazba"
+                },
+                "description": "Standardní satelitní snímky DigitalGlobe",
+                "name": "Standardní snímky DigitalGlobe"
+            },
+            "EsriWorldImagery": {
+                "attribution": {
+                    "text": "Podmínky použití & zpětná vazba"
+                }
+            },
+            "MAPNIK": {
+                "attribution": {
+                    "text": "© Přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "description": "Výchozí vrstva OpenStreetMap.",
+                "name": "OpenStreetMap (standardní)"
+            },
+            "Mapbox": {
+                "attribution": {
+                    "text": "Podmínky použití & zpětná vazba"
+                },
+                "description": "Satelitní a letecké snímky.",
+                "name": "Satelitní snímky Mapbox"
+            },
+            "OSM_Inspector-Addresses": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OSM Inspektor: Adresy"
+            },
+            "OSM_Inspector-Geometry": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OSM Inspektor: Geometrie"
+            },
+            "OSM_Inspector-Highways": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OSM Inspektor: Cesty"
+            },
+            "OSM_Inspector-Multipolygon": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OSM Inspektor: Plochy"
+            },
+            "OSM_Inspector-Places": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OSM Inspektor: Místa"
+            },
+            "OSM_Inspector-Routing": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OSM Inspektor: Navigace"
+            },
+            "OSM_Inspector-Tagging": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OSM Inspektor: Štítkování"
+            },
+            "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© Sarah Hoffmannová, CC by-SA 3.0, mapová data přispěvatelé OpenStreetMap, ODbL 1.0"
+                }
+            },
+            "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© Sarah Hoffmannová, CC by-SA 3.0, mapová data přispěvatelé OpenStreetMap, ODbL 1.0"
+                }
+            },
+            "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© Sarah Hoffmannová, CC by-SA 3.0, mapová data přispěvatelé OpenStreetMap, ODbL 1.0"
+                }
+            },
+            "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© Sarah Hoffmannová, CC by-SA 3.0, mapová data přispěvatelé OpenStreetMap, ODbL 1.0"
+                }
+            },
+            "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© Michael Spreng, CC by-SA 3.0, mapová data přispěvatelé OpenStreetMap, ODbL 1.0"
+                }
+            },
+            "basemap.at": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "name": "basemap.at"
+            },
+            "basemap.at-orthofoto": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "name": "Ortofoto basemap.at"
+            },
+            "hike_n_bike": {
+                "attribution": {
+                    "text": "© Přispěvatelé OpenStreetMap"
+                }
+            },
+            "mapbox_locator_overlay": {
+                "attribution": {
+                    "text": "Podmínky použití & zpětná vazba"
+                }
+            },
+            "osm-gps": {
+                "attribution": {
+                    "text": "© Přispěvatelé OpenStreetMap"
+                },
+                "name": "GPS stopy OpenStreetMap"
+            },
+            "osm-mapnik-black_and_white": {
+                "attribution": {
+                    "text": "© Přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OpenStreetMap (standardní černobílá)"
+            },
+            "osm-mapnik-german_style": {
+                "attribution": {
+                    "text": "© Přispěvatelé OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OpenStreetMap (německý styl)"
+            },
+            "qa_no_address": {
+                "attribution": {
+                    "text": "Simon Poole, data © přispěvatelé OpenStreetMap"
+                }
+            },
+            "stamen-terrain-background": {
+                "name": "Terén Stamen"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/da.json b/dist/locales/da.json
index 02c6bed14..267df5857 100644
--- a/dist/locales/da.json
+++ b/dist/locales/da.json
@@ -334,6 +334,7 @@
             "save": "Upload",
             "cancel": "Annuller",
             "changes": "{count} ændringer",
+            "download_changes": "Download osmChange fil",
             "warnings": "Advarsler",
             "modified": "Ændret",
             "deleted": "Slettet",
@@ -354,9 +355,15 @@
                 "title": "Baggrund",
                 "zoom": "Zoom",
                 "vintage": "Årgang",
+                "source": "Kilde",
+                "description": "Beskrivelse",
+                "resolution": "Opløsning",
+                "accuracy": "Nøjagtighed",
                 "unknown": "Ukendt",
                 "show_tiles": "Vis Kort-fliser",
-                "hide_tiles": "Skjul Kort-fliser"
+                "hide_tiles": "Skjul Kort-fliser",
+                "show_vintage": "Vis alder",
+                "hide_vintage": "Gem alder"
             },
             "history": {
                 "key": "H",
@@ -475,9 +482,16 @@
             "description": "Kortdata",
             "key": "F",
             "data_layers": "Datalag",
+            "layers": {
+                "osm": {
+                    "tooltip": "Kortdata fra OpenStreetMap",
+                    "title": "OpenStreetMap data"
+                }
+            },
             "fill_area": "Udfyldning af områder",
             "map_features": "Kortobjekter",
-            "autohidden": "Disse objekter er automatisk blevet skjult, da for mange ellers ville blive vist på skærmen.\nDu kan zoome ind for at redigere dem."
+            "autohidden": "Disse objekter er automatisk blevet skjult, da for mange ellers ville blive vist på skærmen.\nDu kan zoome ind for at redigere dem.",
+            "osmhidden": "Disse kortobjekter er blevet automatisk gemt fordi OpenStreetMap-laget er gemt."
         },
         "feature": {
             "points": {
@@ -568,6 +582,7 @@
                 "keep_remote": "Brug deres",
                 "restore": "Gendan",
                 "delete": "Behold slettet",
+                "download_changes": "Eller download osmChange fil",
                 "done": "Alle konflikter løst!",
                 "help": "En anden bruger har ændret nogle af de samme kortobjekter som du har ændret.\n\nKlik på hvert objekt nedenfor for flere detaljer om konflikten, og vælg hvorvidt dine ændringer\n\neller den anden brugers ændringer skal bibeholdes.\n"
             }
@@ -659,6 +674,8 @@
             "title": "Hjælp",
             "key": "H",
             "help": "# Hjælp\n\nDette er et redigeringsværktøj til [OpenStreetMap](http://www.openstreetmap.org/), det åbne og redigerbare verdenskort. Du kan bruge dette værktøj til at opdatere geodata i dit lokalområde. Derved skaber du et bedre verdenskort med open source og frie geodata til gavn for alle.\n\nDine ændringer på kortet vil blive synligt for alle og enhver der benytter OpenStreetMap. For at lave redigeringer skal du være [logget ind](https://www.openstreetmap.org/login).\n\nDette værktøj, kaldet [iD-editoren](http://ideditor.com/), er et kollaborativt projekt og dets [kildekode er tilgængelig på GitHub](https://github.com/openstreetmap/iD).\n",
+            "editing_saving": "# Redigering & gemning\n\nDette redigeringsværktøj er primært beregnet til online brug, ligesom\ndu bruger det lige nu gennem en webside.\n\n### Markering af objekter\n\nFor at markere et kortobjekt f.eks. en vej eller et interessepunkt, klik\npå dette på kortet. Dette vil tydeligt markere objektet, og åbne et panel\nmed flere oplysninger om det. Højreklikker du på det, vil en menu vises med handlinger der kan foretages på objektet.\n\nFor at markere flere objekter på en gang, skal 'Skift\"-knappen holdes nede. Dernæst enten klik direkte\npå objekterne du vil markere, eller venstre-klik og træk med musen på kortet, hvilket markerer\nalle objekter indenfor rammen du tegner.\n\n### Gem redigeringer\n\nNår du laver ændringer f.eks. redigering af veje, bygninger og steder, så\ngemmes disse lokalt i din browser indtil du gemmer dem på serveren. Vær ikke bange for\nat lave en fejl - du kan fortryde ved at klikke på fortryd-knappen, og\nfå fortrudte ændringer tilbage med gendan-knappen.\n\nKlik på 'Gem' for at afslutte en serie af redigeringer - f.eks. hvis du har afsluttet\net område af en by og vil starte på et nyt område. Du vil få lejlighed\ntil at gennemse hvad du har lavet, og redigeringsværktøjet vil give forslag\nog advarsler hvis noget ikke ser korrekt ud.\n\nHvis alting ser fint ud, kan du tilføje en kort kommentar der forklarer\nændringerne du har lavet, og dernæst klikker du 'Upload' for at afsende ændringerne\ntil [OpenStreetMap.org](http://www.openstreetmap.org/), hvor de vil blive synlige\nfor alle andre brugere og tilgængelige for andre at bygge videre på.\n\nHvis du ikke kan nå at afslutte dine redigeringer, så kan du forlade redigeringsværktøjet\nog komme tilbage (på samme browser og computer) og redigeringsværktøjet\nvil tilbyde at gendanne dit arbejde.\n\n### Brug af redigeringsværktøjet\n\nDu kan hurtigt få vist en liste over genvejstaster ved at trykke på `?`-tasten.\n",
+            "roads": "# Veje\n\nDu kan oprette, tilrette og slette veje med dette tegneværktøj. Veje kan være af\nmange forskellige typer: stier, landeveje, spor, cykelstier m.v. Enhver\nofte benyttet rute kan kortlægges.\n\n### Markering\n\nKlik på en vej for at markere den. Et omrids vises\nsammen med et sidepanel der viser flere oplysninger om vejen. Hvis du højreklikker\npå den, får du vist en værktøjsmenu med handlinger du kan udføre på vejen.\n\n### Ændring\n\nOfte ses veje der ikke er justeret i forhold til luftfotoet bag dem\neller i forhold til et GPS-spor. Du kan justere disse veje så de er placeret rigtigt.\nKlik først på vejen du vil ændre. Dette fremhæver den og viser\nkontrolpunkter langs med den som kan trækkes det rigtige sted hen. Hvis\ndu har brug for flere kontrolpunkter for at gøre vejen mere detaljeret, kan du dobbeltklikke\npå en del af vejen, så tilføjes et nyt punkt her.\n\nHvis vejen er forbundet til andre veje, men ikke er korrekt forbundet\npå kortet, så træk et af kontrolpunkterne hen på den anden vej\nfor at koble dem sammen. Det er vigtigt for kortet, faktisk vitalt for rutevejledninger,\nat veje er forbundet.\n\nDu kan også højreklikke og vælge flytteværktøjet eller bare trykke\npå tastegenvejen \"M\" for at flytte hele vejen på en gang, og så klikke\nigen for at gemme flytningen.\n\n### Sletning\n\nHvis en vej er helt forkert - du kan ikke se den på et luftfoto\nog du har ideelt set fået bekræftet at vejen reelt ikke findes - så kan du slette\nvejen. Men pas på med at slette hvad andre har lavet - som med andre ændringer\ner resultatet synligt for alle, og luftfotos kan være forældede så vejen kunne\nvære bygget i mellemtiden.\n\nDu kan slette en vej ved at klikke på den for at vælge den og trykke på 'Slet'-tasten på dit tastatur, eller højreklikke og vælge skraldespands-ikonet.\n\n### Oprettelse\n\nHar du fundet et sted hvor der skulle være en vej, men den er ikke på kortet? Klik på 'Linje'-ikonet\ni øverste venstre hjørne af redigeringsværktøjet, eller klik på tastegenvejen '2' for at starte ned at tegne en linje.\n\nKlik hvor vejen begynder på luftfotoet for at påbegynde den. Hvis vejen\nforgrener sig fra en eksisterende vej, så begynd vejen der hvor de er forbundet.\n\nKlik derefter på punkter langs vejens forløb så det passer med\nluftfoto eller GPS-spor. Hvis vejen du tegner krydser en anden vej, så kobl\ndem sammen ved at klikke på punktet hvor de skærer hinanden. Når du er færdig med at tegne,\nså dobbeltklik eller tryk på 'Retur' eller 'Enter'-tasten på tastaturet.\n",
             "gps": "# GPS\n\nIndsamlede GPS-spor er en værdifuld kilde til data for OpenStreetMap. Denne editor understøtter lokale spor – '.gpx'-filer på din lokale computer. Du kan indsamle denne form for GPS-spor med en række smartphone-applikationer såvel som personlige GPS-enheder.\n\nLæs artiklen [Mapping with a Smartphone, GPS or Paper](http://learnosm.org/en/mobile-mapping/) (på engelsk) for nærmere information om, hvordan du optager et GPS-spor.\n\nFor at bruge et GPX-spor til kortlægning, skal du trække og slippe  GPX-filen over på kort-editoren. Hvis sporet bliver accepteret, vil det blive tilføjet kortet som en lys lilla linje. Klik på \"Kortdata\"-menuen til højre for at aktivere, deaktivere eller zoome til dette nye GPX-drevne lag.\n\nGPX-sporet bliver ikke direkte uploadet til OpenStreetMap, men vises kun i den nuværende redigeringssession i iD. Den bedste måde at bruge sporet på, er at tegne på kortet mens du bruger sporet som en rettesnor til de nye objekter,\ndu tilføjer. {Upload det også gerne til OpenStreetMap](http://www.openstreetmap.org/trace/create), så andre brugere kan bruge det.\n",
             "imagery": "# Billeder\n\nLuftfotos er en vigtig ressource til kortlægning. En kombination af luftfotos taget fra fly, satellitbilleder og andre frit tilgængelige kilder er tilgængelige i redigeringsværktøjet i indstillingsmenuen 'Baggrund' i højre side.\n\n[Bing Maps](http://www.bing.com/maps/) satellitbilledelaget er standardopsætning i redigeringsværktøjet. Når du zoomer og kommer til nye geografiske områder, så vil andre kilder være tilgængelige. I nogle lande som f.eks. USA, Frankrig og Danmark vil der ofte være luftfotos i høj kvalitet i nogle egne.\n\nBillederne er af og til forskudt i forhold til de geografiske data, dette skyldes en fejl fra billedleverandørens side. Hvis du ser at en masse objekter er forskudt i forhold til billederne, så skal du ikke begynde at flytte disse objekter for at matche billedlaget. Du kan i stedet for i indstillingerne for 'Baggrund', nederst finde \"Juster billedets offset\" hvor billedets generelle placering i forhold til de geografisk objekter kan tilpasses.\n",
             "addresses": "#Adresser\n\nAdresser er noget af det mest brugbare information på kortet.\n\nSelvom adresser ofte repræsenteres som et specifikt udsnit af veje, er de i OpenStreetMap registreret som attributter på bygninger eller andre objekter langs med veje.\n\nDu kan tilføje adresseinformation til steder som er kortlagt som bygninger\neller som enkeltpunkter. Den optimale kilde til adressedata stammer fra\nindsamling på selve stedet eller fra personligt kendskab. Som med mange\nandre objekter, så er det strengt forbudt at kopiere fra kommercielle kilder\nsom f.eks. fra Google Maps.\n",
@@ -2714,8 +2731,7 @@
                     "terms": "Skoleområde, Skolegrund"
                 },
                 "amenity/scrapyard": {
-                    "name": "Skrotplads",
-                    "terms": "skrald,skrot,genbrug,affald"
+                    "name": "Skrotplads"
                 },
                 "amenity/shelter": {
                     "name": "Shelter",
@@ -3268,10 +3284,6 @@
                     "name": "Stilladsfirma",
                     "terms": "Stilladsfirma"
                 },
-                "craft/sculpter": {
-                    "name": "Skulpturmager",
-                    "terms": "Skulpturmager, Billedhugger, Stenhugger"
-                },
                 "craft/shoemaker": {
                     "name": "Skomager",
                     "terms": "Skomager"
@@ -3280,10 +3292,6 @@
                     "name": "Stenhugger",
                     "terms": "Stenhugger, Billedhugger"
                 },
-                "craft/sweep": {
-                    "name": "Skorstensfejer",
-                    "terms": "Skorstensfejer"
-                },
                 "craft/tailor": {
                     "name": "Skrædder"
                 },
@@ -3492,10 +3500,6 @@
                     "name": "Sti",
                     "terms": "Sti"
                 },
-                "highway/pedestrian": {
-                    "name": "Gågade",
-                    "terms": "Gågade"
-                },
                 "highway/primary": {
                     "name": "Primærvej",
                     "terms": "Primærvej"
@@ -4234,18 +4238,10 @@
                     "name": "Kontor",
                     "terms": "Kontor"
                 },
-                "office/accountant": {
-                    "name": "Revisor",
-                    "terms": "Revisor"
-                },
                 "office/administrative": {
                     "name": "Administrativt kontor",
                     "terms": "Administrativt kontor"
                 },
-                "office/architect": {
-                    "name": "Arkitekt",
-                    "terms": "Arkitekt, Arkitektfirma"
-                },
                 "office/company": {
                     "name": "Firmakontor",
                     "terms": "Firmakontor, Selskabskonto"
@@ -4282,10 +4278,6 @@
                     "name": "Forsikringselskab",
                     "terms": "Forsikringsselskab"
                 },
-                "office/it": {
-                    "name": "IT-kontor",
-                    "terms": "IT-kontor, IT-firma"
-                },
                 "office/lawyer": {
                     "name": "Advokatkontor",
                     "terms": "Advokatkontor, Advokatfirma"
@@ -4294,10 +4286,6 @@
                     "name": "Notarkontor",
                     "terms": "Notarkontor, Notar"
                 },
-                "office/newspaper": {
-                    "name": "Avis",
-                    "terms": "Avis"
-                },
                 "office/ngo": {
                     "name": "NGO kontor",
                     "terms": "NGO kontor, NGO"
@@ -4317,10 +4305,6 @@
                     "name": "Teleselskabskontor",
                     "terms": "Teleselskabskontor"
                 },
-                "office/therapist": {
-                    "name": "Terapeut",
-                    "terms": "Terapeut"
-                },
                 "office/travel_agent": {
                     "name": "Rejsebureau"
                 },
@@ -5041,10 +5025,6 @@
                     "name": "Autocamperplads",
                     "terms": "Autocamperplads"
                 },
-                "tourism/chalet": {
-                    "name": "Bjergferiehytte",
-                    "terms": "Bjergferiehytte"
-                },
                 "tourism/gallery": {
                     "name": "Kunstgalleri",
                     "terms": "Kunstgalleri, Galleri"
diff --git a/dist/locales/de.json b/dist/locales/de.json
index caed9f45e..cb28c400e 100644
--- a/dist/locales/de.json
+++ b/dist/locales/de.json
@@ -151,7 +151,7 @@
                 "annotation": "Linien/Flächen getrennt.",
                 "not_connected": "Es gibt hier nicht genug Linien/Flächen, um diese zu trennen.",
                 "connected_to_hidden": "Dieses Objekt kann nicht getrennt werden, da es mit einem versteckten Objekt verbunden ist.",
-                "relation": "Dies kann nicht getrennt werde, da es Mitglieder einer Relation verbindet."
+                "relation": "Dies kann nicht getrennt werden, da es Mitglieder einer Relation verbindet."
             },
             "merge": {
                 "title": "Vereinigen",
@@ -314,7 +314,7 @@
         "login": "Login",
         "logout": "Abmelden",
         "loading_auth": "Mit OpenStreetMap verbinden …",
-        "report_a_bug": "Fehler melden",
+        "report_a_bug": "Einen Fehler melden",
         "help_translate": "Beim Übersetzen helfen",
         "feature_info": {
             "hidden_warning": "{count} versteckte Objekte",
@@ -361,7 +361,9 @@
                 "accuracy": "Genauigkeit",
                 "unknown": "Unbekannt",
                 "show_tiles": "Raster einblenden",
-                "hide_tiles": "Raster ausblenden"
+                "hide_tiles": "Raster ausblenden",
+                "show_vintage": "Aufnahmedatum anzeigen",
+                "hide_vintage": "Aufnahmedatum ausblenden"
             },
             "history": {
                 "key": "C",
@@ -408,7 +410,7 @@
             "no_results_worldwide": "Keine Ergebnisse gefunden"
         },
         "geolocate": {
-            "title": "Aktuelle Lage anzeigen",
+            "title": "Zeige meinen Standort",
             "locating": "Lokalisiere, bitte warten ..."
         },
         "inspector": {
@@ -659,7 +661,7 @@
         },
         "mapillary_images": {
             "tooltip": "Straßenfotos von Mapillary",
-            "title": "Photo-Überlagerung (Mapillary)"
+            "title": "Fotoüberlagerung (Mapillary)"
         },
         "mapillary_signs": {
             "tooltip": "Verkehrsschilder von Mapillary (bei aktivierter Fotoebene)",
@@ -668,6 +670,13 @@
         "mapillary": {
             "view_on_mapillary": "Dieses Bild auf Mapillary ansehen"
         },
+        "openstreetcam_images": {
+            "tooltip": "Straßenfotos von OpenStreetCam",
+            "title": "Fotoüberlagerung (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Dieses Bild auf OpenStreetCam ansehen"
+        },
         "help": {
             "title": "Hilfe",
             "key": "H",
@@ -686,46 +695,46 @@
             "ok": "OK",
             "graph": {
                 "block_number": "<value for addr:block_number>",
-                "city": "Graz",
+                "city": "Drei-Flüsse",
                 "county": "<value for addr:county>",
-                "district": "Innere Stadt",
+                "district": "Altstadt",
                 "hamlet": "<value for addr:hamlet>",
                 "neighbourhood": "<value for addr:neighbourhood>",
-                "postcode": "8010",
-                "province": "Steiermark",
+                "postcode": "49093",
+                "province": "Bayern",
                 "quarter": "<value for addr:quarter>",
-                "state": "<value for addr:state>",
+                "state": "BY",
                 "subdistrict": "<value for addr:subdistrict>",
                 "suburb": "<value for addr:suburb>",
-                "countrycode": "at",
+                "countrycode": "de",
                 "name": {
-                    "1st-avenue": "Allee 1",
-                    "2nd-avenue": "Allee 2",
-                    "4th-avenue": "Allee 4",
-                    "5th-avenue": "Allee 5",
-                    "6th-avenue": "Allee 6",
-                    "6th-street": "6. Straße",
-                    "7th-avenue": "7. Straße",
-                    "8th-avenue": "Allee 8",
-                    "9th-avenue": "Allee 9",
-                    "10th-avenue": "Allee 10",
-                    "11th-avenue": "11. Straße",
-                    "12th-avenue": "12. Straße",
+                    "1st-avenue": "Erste Alle",
+                    "2nd-avenue": "Zweite Allee",
+                    "4th-avenue": "Vierte Allee",
+                    "5th-avenue": "Fünfte Allee",
+                    "6th-avenue": "Sechste Allee",
+                    "6th-street": "Sechste Straße",
+                    "7th-avenue": "Siebte Straße",
+                    "8th-avenue": "Achte Allee",
+                    "9th-avenue": "Neunte Allee",
+                    "10th-avenue": "Zehnte Allee",
+                    "11th-avenue": "Elfte Straße",
+                    "12th-avenue": "Zwölfte Straße",
                     "access-point-employment": "Arbeitsmarktservice",
                     "adams-street": "Amselweg",
-                    "andrews-elementary-school": "Andreas Volkschule",
+                    "andrews-elementary-school": "Grundschule St. Anon",
                     "andrews-street": "Ahornweg",
                     "armitage-street": "Am Sportplatz",
                     "barrows-school": "Bischöfliches Gymnasium",
                     "battle-street": "Birkenweg",
                     "bennett-street": "Bergstraße",
-                    "bowman-park": "Augarten",
+                    "bowman-park": "Bayernpark",
                     "collins-drive": "Kiefernweg",
-                    "conrail-railroad": "Graz-Köflacher-Eisenbahn",
+                    "conrail-railroad": "Chiemseebahn",
                     "conservation-park": "Naturschutzgebiet",
                     "constantine-street": "Kirchgasse",
                     "cushman-street": "Kiefernweg",
-                    "dollar-tree": "GardeRobe Second Hand",
+                    "dollar-tree": "Vintys Second Hand",
                     "douglas-avenue": "Dorfallee",
                     "east-street": "Oststraße",
                     "elm-street": "Eichenweg",
@@ -741,69 +750,69 @@
                     "hook-avenue": "Hollunderweg",
                     "jefferson-street": "Jahnstraße",
                     "kelsey-street": "Kastanienweg",
-                    "lafayette-park": "Stadtpark",
-                    "las-coffee-cafe": "Tribeka Café",
+                    "lafayette-park": "Inn Park",
+                    "las-coffee-cafe": "Black Bean Café",
                     "lincoln-avenue": "Lindenstraße",
-                    "lowrys-books": "uni-buchladen",
-                    "lynns-garage": "Schönaugarage",
-                    "main-street-barbell": "Mrs. Sporty",
-                    "main-street-cafe": "Gino Caffe Muhr",
+                    "lowrys-books": "Thalia Buchladen",
+                    "lynns-garage": "A.T.U. Werkstatt",
+                    "main-street-barbell": "Bodyfit",
+                    "main-street-cafe": "Café Simon",
                     "main-street-fitness": "fitinn",
-                    "main-street": "Herrengasse",
+                    "main-street": "Lufwigstraße",
                     "maple-street": "Mühlenweg",
                     "marina-park": "Marina Park",
                     "market-street": "Markstraße",
-                    "memory-isle-park": "Gedächtnisinsel Park",
-                    "memory-isle": "Gedächtnisinsel",
-                    "michigan-avenue": "Hauptstraße",
+                    "memory-isle-park": "Donauinsel Park",
+                    "memory-isle": "Donauinsel",
+                    "michigan-avenue": "Regenbuerger Straße",
                     "middle-street": "Mittelstraße",
                     "millard-street": "Meisenweg",
                     "moore-street": "Mühlenstraße",
                     "morris-avenue": "Meisenweg",
                     "mural-mall": "Franziskanergasse",
-                    "paisanos-bar-and-grill": "Landhauskeller",
-                    "paisley-emporium": "Kastner & Öhler",
-                    "paparazzi-tattoo": "Stichtag - Tattoo & Piercing",
+                    "paisanos-bar-and-grill": "Altes Bräuhaus",
+                    "paisley-emporium": "Stadtgalerie",
+                    "paparazzi-tattoo": "Ink of Hell Tattoo",
                     "pealer-street": "Parkstraße",
                     "pine-street": "Pappelweg",
-                    "pizza-hut": "L'Osteria",
+                    "pizza-hut": "Pizzeria Gallo Nero",
                     "portage-avenue": "Alte Poststraße",
-                    "portage-river": "Grazbach",
-                    "preferred-insurance-services": "Grazer Wechselseitige",
+                    "portage-river": "Inn",
+                    "preferred-insurance-services": "Zürich Versicherungs-AG",
                     "railroad-drive": "Bahnhofstraße",
                     "river-city-appliance": "Haushaltswaren Rauch",
                     "river-drive": "Flussstraße",
                     "river-road": "Flussweg",
                     "river-street": "Ringstraße",
-                    "riverside-cemetery": "Friedhof an der Mur",
+                    "riverside-cemetery": "Innstadt Friedhof",
                     "riverwalk-trail": "Bachweg",
                     "riviera-theatre": "Schauspielhaus",
-                    "rocky-river": "Andritzbach",
-                    "saint-joseph-river": "Mur",
-                    "scidmore-park-petting-zoo": "Schloßpark Eggenberg Streichelzoo",
-                    "scidmore-park": "Schloßpark Eggenberg",
-                    "scouter-park": "Skatepark Grünanger",
+                    "rocky-river": "Ilz",
+                    "saint-joseph-river": "Inn",
+                    "scidmore-park-petting-zoo": "Klostergarten Streichelzoo",
+                    "scidmore-park": "Klostergarten",
+                    "scouter-park": "Skatepar",
                     "sherwin-williams": "Kaspar Harnisch",
                     "south-street": "Südstraße",
-                    "southern-michigan-bank": "Steiermärkische Sparkasse",
+                    "southern-michigan-bank": "Stadtsparkasse",
                     "spring-street": "Gartenstraße",
-                    "sturgeon-river-road": "Andritzbachweg",
-                    "three-rivers-city-hall": "Grazer Rathaus",
+                    "sturgeon-river-road": "Ilzbachweg",
+                    "three-rivers-city-hall": "Rathaus",
                     "three-rivers-elementary-school": "Volksschule",
                     "three-rivers-fire-department": "Feuerwehr",
                     "three-rivers-high-school": "Gymnasium",
-                    "three-rivers-middle-school": "Volksschule Ferdinandeum",
-                    "three-rivers-municipal-airport": "Flughafen Graz",
+                    "three-rivers-middle-school": "Realschule",
+                    "three-rivers-municipal-airport": "Flughafe",
                     "three-rivers-post-office": "Hauptpost",
                     "three-rivers-public-library": "Stadtbibliothek",
-                    "three-rivers": "Graz",
-                    "unique-jewelry": "Juwelier Weikhard",
+                    "three-rivers": "Drei-Flüsse-Stadt",
+                    "unique-jewelry": "Juwelie",
                     "walnut-street": "Waldstraße",
                     "washington-street": "Schillerstraße",
                     "water-street": "Bachstraße",
                     "west-street": "Weststraße",
                     "wheeler-street": "Wilhelmstraße",
-                    "william-towing": "Autowerkstatt Graz Andritz",
+                    "william-towing": "Autowerkstatt",
                     "willow-drive": "Wilhelmstraße",
                     "wood-street": "Weidenweg",
                     "world-fare": "Orange and Green"
@@ -851,7 +860,7 @@
                 "update": "Gib mehr Details über dieses Café ein. Du kannst seinen Namen ändern, angeben welche Küche dort angeboten wird oder die Adresse eingeben. **Ändere die Details des Café.**",
                 "update_close": "Wenn du das Café fertig geändet hast, drücke Escape oder oder klicke den {button} Knopf um den Objekteditor zu schließen.**",
                 "rightclick": "Du kannst jedes Objekt rechtsklicken um das *Bearbeitungs-Menü* zu sehen, welches dir die Bearbeitungs-Möglichkeiten zeigt. **Wähle des erzeugten Punkt durch Rechts-Klicken aus und zeige das Bearbeitungs-Menü.**",
-                "delete": "Du kannst Objekte löschen, die es in der echten Welt nicht gibt.{br}Löschen eines Objets aus OpenStreetMap entfernt es von der Karte, die alle benutzen. Daher solltest du sicher sein, dass das Objekt nicht mehr gibt, bevor du es löschst. **Klicke auf {button} Knopf um den Punkt zu löschen.**",
+                "delete": "Du kannst Objekte löschen, die es in der echten Welt nicht gibt.{br}Löschen eines Objekts aus OpenStreetMap entfernt es von der Karte, die alle benutzen. Daher solltest du dir sicher sein, dass es das Objekt nicht mehr gibt, bevor du es löschst. **Klicke auf {button}-Knopf um den Punkt zu löschen.**",
                 "undo": "Du kannst alle Änderungen rückgängig machen, bis du deine Bearbeitungen zu OpenStreetMap hochgeladen hast. **Klicke auf  {button} Knopf um das Löschen rückgängig zu machen und den Punkt wiederherzustellen.**",
                 "play": "Nachdem du jetzt Punkte erzeugen und bearbeiten kannst, versuche zur Übung ein paar Punkte zu erzeugen! **Wenn du zum nächsten Kapitel willst klicke '{next}'.**"
             },
@@ -977,7 +986,7 @@
                     "title": "Anzeigeoptionen",
                     "background": "Hintergrundeinstellungen ein-/ausblenden",
                     "background_switch": "Auf letzten Hintergrund zurückschalten",
-                    "map_data": "Kartendaten ein-/ausblenden",
+                    "map_data": "Kartendaten-Optionen ein-/ausblenden",
                     "fullscreen": "Vollbildmodus ein-/ausschalten",
                     "wireframe": "Gitter-Modus ein-/ausschalten",
                     "minimap": "Minimap ein-/ausblenden"
@@ -1217,6 +1226,9 @@
                 "aeroway": {
                     "label": "Typ"
                 },
+                "agrarian": {
+                    "label": "Produkte"
+                },
                 "amenity": {
                     "label": "Typ"
                 },
@@ -1285,6 +1297,9 @@
                 "board_type": {
                     "label": "Typ"
                 },
+                "boules": {
+                    "label": "Typ"
+                },
                 "boundary": {
                     "label": "Typ"
                 },
@@ -1304,6 +1319,10 @@
                 "bunker_type": {
                     "label": "Typ"
                 },
+                "cables": {
+                    "label": "Kabel",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Ausrichtung (Winkel Im Uhrzeigersinn) ",
                     "placeholder": "45, 90, 180, 270"
@@ -1469,6 +1488,10 @@
                 "description": {
                     "label": "Beschreibung"
                 },
+                "devices": {
+                    "label": "Geräte",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Windelwechseln möglich"
                 },
@@ -1543,6 +1566,9 @@
                         "wall": "Wandanschluss"
                     }
                 },
+                "fitness_station": {
+                    "label": "Geräteausstattung"
+                },
                 "fixme": {
                     "label": "Korrigiere mich"
                 },
@@ -1550,6 +1576,9 @@
                     "label": "Typ",
                     "placeholder": "Standard"
                 },
+                "frequency": {
+                    "label": "Betriebsfrequenz"
+                },
                 "fuel": {
                     "label": "Kraftstoff"
                 },
@@ -1581,6 +1610,9 @@
                 "generator/type": {
                     "label": "Typ"
                 },
+                "government": {
+                    "label": "Typ"
+                },
                 "grape_variety": {
                     "label": "Traubensorten"
                 },
@@ -1643,7 +1675,7 @@
                     "label": "Inschrift"
                 },
                 "intermittent": {
-                    "label": "periodisch"
+                    "label": "Periodisch"
                 },
                 "internet_access": {
                     "label": "Internetzugang",
@@ -1908,6 +1940,10 @@
                 "payment_multi": {
                     "label": "Zahlungsarten"
                 },
+                "phases": {
+                    "label": "Phasen",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telefonnummer",
                     "placeholder": "+31 42 123 4567"
@@ -1987,8 +2023,11 @@
                 "railway": {
                     "label": "Typ"
                 },
+                "rating": {
+                    "label": "Anschlussleistung"
+                },
                 "recycling_accepts": {
-                    "label": "akzeptiert"
+                    "label": "Akzeptiert"
                 },
                 "recycling_type": {
                     "label": "Recycling Typ",
@@ -2195,6 +2234,9 @@
                 "studio": {
                     "label": "Typ"
                 },
+                "substance": {
+                    "label": "Substanz"
+                },
                 "substation": {
                     "label": "Typ"
                 },
@@ -2221,6 +2263,15 @@
                 "surveillance/zone": {
                     "label": "Überwachungszone"
                 },
+                "switch": {
+                    "label": "Typ",
+                    "options": {
+                        "circuit_breaker": "Schutzschalter",
+                        "disconnector": "Trennschalter",
+                        "earthing": "Erdung",
+                        "mechanical": "mechanisch"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Oberfläche mit Blindenleitsystem"
                 },
@@ -2293,6 +2344,19 @@
                     },
                     "placeholder": "Ausgezeichnet, Gut, Schlecht …"
                 },
+                "transformer": {
+                    "label": "Typ",
+                    "options": {
+                        "auto": "Spartransformer",
+                        "auxiliary": "Eigenbedarfstransformator",
+                        "converter": "Stromrichter-Transformator",
+                        "distribution": "Masttransformator",
+                        "generator": "Generator",
+                        "phase_angle_regulator": "Querregeltransformator",
+                        "traction": "Eisenbahntransformator",
+                        "yes": "Unbekannt"
+                    }
+                },
                 "trees": {
                     "label": "Bäume"
                 },
@@ -2327,6 +2391,18 @@
                         "stratovolcano": "Schichtvulkan"
                     }
                 },
+                "voltage": {
+                    "label": "Spannung"
+                },
+                "voltage/primary": {
+                    "label": "Primärspannung"
+                },
+                "voltage/secondary": {
+                    "label": "Sekundärspannung"
+                },
+                "voltage/tertiary": {
+                    "label": "Tertiärspannung"
+                },
                 "wall": {
                     "label": "Typ"
                 },
@@ -2354,6 +2430,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Windungen",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Windungskonfiguration",
+                    "options": {
+                        "delta": "Dreieckschaltung",
+                        "leblanc": "Leblanc-Schaltung",
+                        "open": " offene Wicklungen",
+                        "open-delta": "offene Dreieckschaltung",
+                        "scott": "Scott-Schaltung",
+                        "star": "Sternschaltung",
+                        "zigzag": "Zickzackschaltung"
+                    }
                 }
             },
             "presets": {
@@ -2662,7 +2754,7 @@
                     "terms": "Internetcafé, Cybercafé"
                 },
                 "amenity/kindergarten": {
-                    "name": "Kindergarten",
+                    "name": "Kindergartengelände",
                     "terms": "Kindergartengeläde,Kinderkrippengelände"
                 },
                 "amenity/library": {
@@ -2677,6 +2769,10 @@
                     "name": "Motorradparkplatz",
                     "terms": "Motorrad-Parkplatz"
                 },
+                "amenity/music_school": {
+                    "name": "Musikschule",
+                    "terms": "Musikschule"
+                },
                 "amenity/nightclub": {
                     "name": "Nachtklub",
                     "terms": "Nachtklub, Etablissement, Nachtlokal"
@@ -2800,8 +2896,7 @@
                     "terms": "Schulhof, Schule, Realschule, Mittelschule, Grundschule, Gymnasium, Ganztagsschule, Förderschule"
                 },
                 "amenity/scrapyard": {
-                    "name": "Schrottplatz",
-                    "terms": "Schrottplatz, Sturzplatz"
+                    "name": "Schrottplatz"
                 },
                 "amenity/shelter": {
                     "name": "Unterstand",
@@ -3120,8 +3215,8 @@
                     "terms": "alleinstehendes Haus, freistehendes Haus, Einfamilienhaus"
                 },
                 "building/dormitory": {
-                    "name": "Schlafsaal",
-                    "terms": "Schlafsaal, Dormitorium"
+                    "name": "Wohnheim",
+                    "terms": "Wohnheim, Studentenwohnheim, Dormitorium"
                 },
                 "building/entrance": {
                     "name": "Eingang/Ausgang"
@@ -3261,6 +3356,10 @@
                     "name": "Partyservice",
                     "terms": "Partyservice, Speiselieferant, Lebensmittellieferant, Brötchenservice, Gastronom"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Kaminkehrer",
+                    "terms": "Kaminkehrer,Schornsteinfeger"
+                },
                 "craft/clockmaker": {
                     "name": "Uhrmacher",
                     "terms": "Uhrmacher"
@@ -3370,7 +3469,7 @@
                     "name": "Gerüstbauer",
                     "terms": "Gerüstbauer"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Bildhauer",
                     "terms": "Bildhauer"
                 },
@@ -3382,10 +3481,6 @@
                     "name": "Steinmetz",
                     "terms": "Steinmetz"
                 },
-                "craft/sweep": {
-                    "name": "Kaminkehrer",
-                    "terms": "Kaminkehrer, Schornsteinfeger, Kaminfeger"
-                },
                 "craft/tailor": {
                     "name": "Herrenschneider"
                 },
@@ -3620,7 +3715,7 @@
                 },
                 "highway/elevator": {
                     "name": "Aufzug",
-                    "terms": "Aufzug, Fahrstuhl, Lift, Personenaufzug, Aufzugsanlage"
+                    "terms": "Aufzug,Fahrstuhl,Lift,Personenaufzug,Aufzugsanlage"
                 },
                 "highway/footway": {
                     "name": "Fußweg",
@@ -3654,9 +3749,13 @@
                     "name": "Weg",
                     "terms": "Mehrzweck-Weg, Wanderweg, Reitweg, Radweg, Fußweg, Pfad"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
                     "name": "Fußgängerzone",
-                    "terms": "Fußgängerzone, Fußgängerstraße"
+                    "terms": "Fußgängerzone"
+                },
+                "highway/pedestrian_line": {
+                    "name": "Fußgängerstraße",
+                    "terms": "Fußgängerstraße"
                 },
                 "highway/primary": {
                     "name": "Hauptverbindungsstraße",
@@ -3834,6 +3933,10 @@
                     "name": "Becken",
                     "terms": "Becken, Kessel"
                 },
+                "landuse/brownfield": {
+                    "name": "Altlast",
+                    "terms": "Altlast, Industriebrache, verseuchter Boden"
+                },
                 "landuse/cemetery": {
                     "name": "Friedhof",
                     "terms": "Friedhof, Friedwald"
@@ -3873,6 +3976,10 @@
                     "name": "Gras",
                     "terms": "Gras, Grünfläche, Wiese"
                 },
+                "landuse/greenfield": {
+                    "name": "Freifläche",
+                    "terms": "Freifläche, unbebaute Fläche, Bauland, Rohbauland"
+                },
                 "landuse/harbour": {
                     "name": "Hafen",
                     "terms": "Hafenanlage, Seehafen"
@@ -3881,6 +3988,14 @@
                     "name": "Fabrikgelände",
                     "terms": "Industriegebiet, Industriegelände, Industriegegend, Industrie, Fabriken"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Schrottplatz",
+                    "terms": "Schrottplatz, Autofriedhof"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Schlachthof",
+                    "terms": "Schlachthof, Schlachthaus"
+                },
                 "landuse/landfill": {
                     "name": "Deponie",
                     "terms": "Deponie, Mülldeponie, Geländeauffüllung, Müllkippe"
@@ -3957,6 +4072,10 @@
                     "name": "Freizeitgelände",
                     "terms": "Freizeitgelände, Erholungsgebiet, Erholungsraum"
                 },
+                "landuse/religious": {
+                    "name": "Gelände mit religiöser Nutzung",
+                    "terms": "Gelände mit religiöser Nutzung"
+                },
                 "landuse/residential": {
                     "name": "Wohngebiet",
                     "terms": "Wohngebiet, Wohnanlage, Wohngegend, Wohnregion, Wohnhäuser, Siedlungsfläche"
@@ -4002,7 +4121,7 @@
                     "terms": "Feuerstelle"
                 },
                 "leisure/fitness_centre": {
-                    "name": "Fitness Studio",
+                    "name": "Fitness-Studio",
                     "terms": "Fitness-Center,Gymnastikstudio"
                 },
                 "leisure/fitness_centre/yoga": {
@@ -4013,6 +4132,50 @@
                     "name": "Freiluft-Fitness-Station",
                     "terms": "Freiluft Fitness Einrichtung"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Schwebebalken",
+                    "terms": "Balken,Schwebebaum"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Sprungbox",
+                    "terms": "Sprungbox"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Reck",
+                    "terms": "Reck,Reckstange"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Klettergerüst",
+                    "terms": "Klettergerüst"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Hyperextension-Bank",
+                    "terms": "Hyperextension-Bank"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Barren",
+                    "terms": "Barren"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Liegestützstation",
+                    "terms": "Liegestützstation"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Ringe",
+                    "terms": "Ringe,Turnringe"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Übungsanleitungstafel",
+                    "terms": "Übungsanleitungstafel,Übungsanleitung"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Sit-Up-Station",
+                    "terms": "Sit-Up-Station"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Übungsstiege",
+                    "terms": "Übungsstiege,Übungsstufen"
+                },
                 "leisure/garden": {
                     "name": "Garten",
                     "terms": "Garten, Gartenanlage, Hausgarten"
@@ -4073,6 +4236,10 @@
                     "name": "Beachvolleyballplatz",
                     "terms": "Beachvolleyballplatz"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Boccia-Platz",
+                    "terms": "Boccia-Platz"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Bowlingrasen",
                     "terms": "Bowling-Rasenfläche, Bowlingrasen"
@@ -4125,6 +4292,10 @@
                     "name": "Rennbbahn (Laufen)",
                     "terms": "Rennbbahn (Laufen)Laufbahn, Laufstrecke"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna",
+                    "terms": "Sauna"
+                },
                 "leisure/slipway": {
                     "name": "Slipanlage",
                     "terms": "Gleitbahn, Rampe"
@@ -4409,16 +4580,32 @@
                     "terms": "Büro, Amt, Behörde"
                 },
                 "office/accountant": {
-                    "name": "Steuerberater",
-                    "terms": "Buchhalter, Buchführer, Wirtschaftsprüfer"
+                    "name": "Buchhaltungsbüro",
+                    "terms": "Steuerberatungskanzlei"
                 },
                 "office/administrative": {
                     "name": "Verwaltungsamt",
                     "terms": "Verwaltungsstelle, Öffentliche Verwaltung"
                 },
+                "office/adoption_agency": {
+                    "name": "Adoptionsagentur",
+                    "terms": "Adoptionsagentur"
+                },
+                "office/advertising_agency": {
+                    "name": "Werbeagentur",
+                    "terms": "Werbeagentur"
+                },
                 "office/architect": {
-                    "name": "Architekt",
-                    "terms": "Architekturbüro, Planungsbüro"
+                    "name": "Architekturbüro",
+                    "terms": "Architekturbüro"
+                },
+                "office/association": {
+                    "name": "Nonprofit-Organisations-Büro",
+                    "terms": "Nonprofit-Organisations-Büro"
+                },
+                "office/charity": {
+                    "name": "Wohlfahrtseinrichtung",
+                    "terms": "Wohlfahrtseinrichtung"
                 },
                 "office/company": {
                     "name": "Firma",
@@ -4436,6 +4623,10 @@
                     "name": "Arbeitsamt",
                     "terms": "Arbeitsagentur, Arbeitsvermittlung, Arbeitsvermittlungsstelle, Stellenvermittlung, Agentur für Arbeit"
                 },
+                "office/energy_supplier": {
+                    "name": "Energieversorgungsunternehmen",
+                    "terms": "Energieversorgungsunternehmen"
+                },
                 "office/estate_agent": {
                     "name": "Immobilienmakler",
                     "terms": "Makler, Immobilienhändler, Liegenschaftsverwalter, Grundstücksmakler"
@@ -4444,6 +4635,14 @@
                     "name": "Finanzberater",
                     "terms": "Geldberater"
                 },
+                "office/forestry": {
+                    "name": "Forstverwaltung",
+                    "terms": "Forstverwaltung"
+                },
+                "office/foundation": {
+                    "name": "Stiftung",
+                    "terms": "Stiftung"
+                },
                 "office/government": {
                     "name": "Behörde",
                     "terms": "Amt, Regierungsstelle"
@@ -4452,13 +4651,21 @@
                     "name": "Standesamt",
                     "terms": "Standesamt"
                 },
+                "office/government/tax": {
+                    "name": "Finanzamt",
+                    "terms": "Finanzamt"
+                },
+                "office/guide": {
+                    "name": "Reisebüro",
+                    "terms": "Reisebüro"
+                },
                 "office/insurance": {
                     "name": "Versicherung",
                     "terms": "Versicherungsbüro"
                 },
                 "office/it": {
-                    "name": "IT-Büro",
-                    "terms": "Softwareentwickler, Softwarebüro, Programmierer, IT"
+                    "name": "Informations-Technologie-Firma",
+                    "terms": "Informations-Technologie-Firma"
                 },
                 "office/lawyer": {
                     "name": "Anwalt",
@@ -4468,14 +4675,22 @@
                     "name": "Notariat",
                     "terms": "Notariat, Notariatskanzlei, Notarbüro"
                 },
+                "office/moving_company": {
+                    "name": "Umzugsfirma",
+                    "terms": "Umzugsfirma, Spedition"
+                },
                 "office/newspaper": {
-                    "name": "Redaktion",
-                    "terms": "Zeitung, Zeitschrift"
+                    "name": "Zeitungsbüro",
+                    "terms": "Zeitungsbüro"
                 },
                 "office/ngo": {
                     "name": "Nichtregierungsorganisation",
                     "terms": "NRO, Nichtregierungsorganisation"
                 },
+                "office/notary": {
+                    "name": "Notariat",
+                    "terms": "Notariat"
+                },
                 "office/physician": {
                     "name": "Arztpraxis"
                 },
@@ -4483,21 +4698,41 @@
                     "name": "Partei",
                     "terms": "Politische Partei, Parteizentrale"
                 },
+                "office/private_investigator": {
+                    "name": "Privatdedektiv",
+                    "terms": "Privatdedektiv"
+                },
+                "office/quango": {
+                    "name": "Quasi-NGO-Büro",
+                    "terms": "Quasi-NGO-Büro"
+                },
                 "office/research": {
                     "name": "Forschungseinrichtung",
                     "terms": "Forschungsinstitut, Wissenschaftliches Institut"
                 },
+                "office/surveyor": {
+                    "name": "Vermessungstechniker",
+                    "terms": "Vermessungstechniker"
+                },
+                "office/tax_advisor": {
+                    "name": "Steuerberatungskanzlei",
+                    "terms": "Steuerberatungskanzlei"
+                },
                 "office/telecommunication": {
                     "name": "Telefongesellschaft",
                     "terms": "Telekommunikation, Nachrichtentechniker"
                 },
                 "office/therapist": {
                     "name": "Therapeut",
-                    "terms": "Masseur"
+                    "terms": "Therapeut"
                 },
                 "office/travel_agent": {
                     "name": "Reisebüro"
                 },
+                "office/water_utility": {
+                    "name": "Wasserversorgungsunternehmen",
+                    "terms": "Wasserversorgungsunternehmen"
+                },
                 "piste": {
                     "name": "Piste/Skipiste",
                     "terms": "Piste, Skipiste, Skiwanderweg"
@@ -4520,6 +4755,10 @@
                     "name": "Insel",
                     "terms": "Insel"
                 },
+                "place/islet": {
+                    "name": "Kleine Insel",
+                    "terms": "Kleine Insel, Inselchen"
+                },
                 "place/isolated_dwelling": {
                     "name": "abgelegene Siedlung",
                     "terms": "frei stehendes Haus, Einzelhaus, Einöde"
@@ -4532,6 +4771,10 @@
                     "name": "Wohngegend",
                     "terms": "Wohngegend, Nachbarschaft, Umgebung, Viertel, Grätzel, Kiez"
                 },
+                "place/plot": {
+                    "name": "Grundstück",
+                    "terms": "Grundstück, Parzelle"
+                },
                 "place/quarter": {
                     "name": "Gegend / Quartier",
                     "terms": "Gegend, Quartier, Stadtviertel"
@@ -4554,7 +4797,7 @@
                 },
                 "playground/balance_beam": {
                     "name": "Balancierbalken",
-                    "terms": "Balancierbalken, Schwebebalken"
+                    "terms": "Balancierbalken"
                 },
                 "playground/basket_spinner": {
                     "name": "Korbschaukel",
@@ -4573,8 +4816,8 @@
                     "terms": "Hüpfkissen"
                 },
                 "playground/horizontal_bar": {
-                    "name": "Reckstange",
-                    "terms": "Reckstange"
+                    "name": "Klimmzugstange",
+                    "terms": "Klimmzugstange"
                 },
                 "playground/rocker": {
                     "name": "Springreiter",
@@ -4650,6 +4893,10 @@
                     "name": "Umspannwerk",
                     "terms": "Umspannwerk, Transformatorenstation, Schaltanlage"
                 },
+                "power/switch": {
+                    "name": "Netzschalter",
+                    "terms": "Netzschalter, Ein/Ausschalter"
+                },
                 "power/tower": {
                     "name": "Hochspannungsmast",
                     "terms": "Hauptstrommast"
@@ -4701,6 +4948,10 @@
                     "name": "Bahnübergang (Straße)",
                     "terms": "Eisenbagnkreuzung (Straße), Eisenbahnstraßenkreuzung"
                 },
+                "railway/light_rail": {
+                    "name": "Stadtbahngleise",
+                    "terms": "Stadtbahngleise"
+                },
                 "railway/milestone": {
                     "name": "Eisenbahn Meilenstein",
                     "terms": "Eisenbahnmeilenstein entlang einer Strecke"
@@ -4768,6 +5019,10 @@
                     "name": "Laden",
                     "terms": "Geschäft, Ladenlokal"
                 },
+                "shop/agrarian": {
+                    "name": "Geschäft für landwirtschaftliche Produktion",
+                    "terms": "Geschäft für landwirtschaftliche Produktion"
+                },
                 "shop/alcohol": {
                     "name": "Spirituosenladen",
                     "terms": "Alkoholika"
@@ -5287,7 +5542,7 @@
                 },
                 "tourism/chalet": {
                     "name": "Ferienhaus",
-                    "terms": "Ferienhaus, Chalet"
+                    "terms": "Ferienhaus"
                 },
                 "tourism/gallery": {
                     "name": "Kunstgalerie",
@@ -5345,6 +5600,10 @@
                     "name": "Aussichtspunkt",
                     "terms": "Aussichtspunkt"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "unbewirtschaftete Schutzhütte",
+                    "terms": "unbewirtschaftete Schutzhütte"
+                },
                 "tourism/zoo": {
                     "name": "Zoo",
                     "terms": "Zoo"
@@ -5548,7 +5807,7 @@
                     "terms": "Bach"
                 },
                 "waterway/stream_intermittent": {
-                    "name": "periodischer Bach",
+                    "name": "Periodischer Bach",
                     "terms": "periodischer Bach, periodisches Fliessgewässer"
                 },
                 "waterway/water_point": {
@@ -5577,6 +5836,13 @@
                 "description": "Premium-DigitalGlobe-Satellitenbilder",
                 "name": "DigitalGlobe Premium"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Bedingungen & Feedback"
+                },
+                "description": "Lufbildgrenzen und Aufnahmedaten. Die Beschriftung erscheint auf Zoom Level 14 und höher.",
+                "name": "DigitalGlobe Premium Luftbildaufnahmedatum"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Bedingungen & Feedback"
@@ -5584,6 +5850,13 @@
                 "description": "Standard-DigitalGlobe-Satellitenbilder",
                 "name": "DigitalGlobe Standard"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Bedingungen & Feedback"
+                },
+                "description": "Lufbildgrenzen und Aufnahmedaten. Die Beschriftung erscheint auf Zoom Level 14 und höher.",
+                "name": "DigitalGlobe Standard Luftbildaufnahmedatum"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Bedingungen & Feedback"
@@ -5648,15 +5921,15 @@
                 "name": "OSM-Objekteditor: Kennzeichnung"
             },
             "US-TIGER-Roads-2012": {
-                "name": "TIGER Straße 2012"
+                "name": "TIGER Straßen 2012"
             },
             "US-TIGER-Roads-2014": {
                 "description": "Bei Zoom Level 16+ Public Domain Kartendaten vom US Census. Bei niedrigeren Zoom Leves werden nur die Änderungen seit 2006 ohne die bereits nach OpenStreetMap eingearbeiteten Änderungen",
-                "name": "TIGER Straße 2014"
+                "name": "TIGER Straßen 2014"
             },
             "US-TIGER-Roads-2017": {
                 "description": "Gelb = Freie Daten vom US Census. Rot = In OpenStreetMap fehlende Daten",
-                "name": "TIGER Straße 2017"
+                "name": "TIGER Straßen 2017"
             },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
diff --git a/dist/locales/el.json b/dist/locales/el.json
index 54427994e..b9e407b6b 100644
--- a/dist/locales/el.json
+++ b/dist/locales/el.json
@@ -274,7 +274,6 @@
             "localized_translation_language": "Επιλογή γλώσσας",
             "localized_translation_name": "Όνομα"
         },
-        "zoom_in_edit": "Μεγεθύνετε για να Επεξεργαστείτε",
         "login": "σύνδεση",
         "logout": "Αποσύνδεση",
         "loading_auth": "Σύνδεση στο OpenStreetMap...",
@@ -522,8 +521,7 @@
         "splash": {
             "welcome": "Καλώς ήλθατε στον iD επεξεργαστή για το OpenStreetMap",
             "text": "Το iD είναι ένα φιλικό αλλά ισχυρό εργαλείο για συνεισφορά στον καλύτερο του κόσμου, ελεύθερο, παγκόσμιο χάρτη. Αυτή είναι η έκδοση {version}. Για περισσότερες πληροφορίες δείτε το {website} και αναφέρετε bugs στο {github}.",
-            "walkthrough": "Ξεκινήστε την Περιήγηση",
-            "start": "Επεξεργασία Τώρα"
+            "walkthrough": "Ξεκινήστε την Περιήγηση"
         },
         "source_switch": {
             "lose_changes": "Έχετε μη αποθηκευμένες αλλαγές. Αλλάζοντας τον διακομιστή χάρτη θα τις απορρίψετε. Είστε σίγουρος/-η ότι θέλετε να αλλάξετε διακομιστή;"
@@ -544,10 +542,6 @@
             "tag_suggests_area": "Η ετικέτα {tag} προτείνει ότι η γραμμή πρέπει να είναι περιοχή, αλλά δεν είναι περιοχή",
             "deprecated_tags": "Παρωχημένες ετικέτες: {tags}"
         },
-        "zoom": {
-            "in": "Μεγέθυνση",
-            "out": "Σμίκρυνση"
-        },
         "cannot_zoom": "Δεν είναι δυνατή μεγαλύτερη σμίκρυνση στην τρέχουσα κατάσταση λειτουργίας.",
         "full_screen": "Αλλάξτε σε Πλήρη Οθόνη",
         "gpx": {
@@ -2234,6 +2228,9 @@
                     "name": "Ωρολογοποιός",
                     "terms": "ρολογάς"
                 },
+                "craft/confectionery": {
+                    "name": "Ζαχαροπλαστείο"
+                },
                 "craft/dressmaker": {
                     "name": "Ενδυματολόγος",
                     "terms": "μοδίστρα, μόδιστρος, ράφτης, ράπτης, σχεδιάστρια μόδας, σχεδιαστής μόδας, μοντελίστ, ενδυματοποιός, ρούχα, φορέματα"
@@ -2290,9 +2287,6 @@
                 "craft/scaffolder": {
                     "name": "Κατασκευαστής σκαλωσιών"
                 },
-                "craft/sculpter": {
-                    "name": "Γλύπτης"
-                },
                 "craft/shoemaker": {
                     "name": "Τσαγκάρης",
                     "terms": "παπουτσής,υποδηματοποιός"
@@ -2300,9 +2294,6 @@
                 "craft/stonemason": {
                     "name": "Λιθοποιός"
                 },
-                "craft/sweep": {
-                    "name": "Καπνοδοχοκαθαριστής"
-                },
                 "craft/tailor": {
                     "name": "Ραφτική"
                 },
@@ -2422,10 +2413,6 @@
                     "name": "Μονοπάτι",
                     "terms": "Διαδρομή, μονοπάτι"
                 },
-                "highway/pedestrian": {
-                    "name": "Πεζόδρομος",
-                    "terms": "Πεζόδρομος"
-                },
                 "highway/primary": {
                     "name": "Πρωτεύων Δρόμος",
                     "terms": "Κύρια Οδός"
@@ -2979,18 +2966,10 @@
                     "name": "Γραφείο",
                     "terms": "Γραφείο"
                 },
-                "office/accountant": {
-                    "name": "Λογιστής",
-                    "terms": "Λογιστική, φορολογικό γραφείο, φοροτεχνικό γραφείο, λογιστικό γραφείο"
-                },
                 "office/administrative": {
                     "name": "Διοικητικό γραφείο",
                     "terms": "Γραφείο διοίκησης"
                 },
-                "office/architect": {
-                    "name": "Αρχιτέκτονας",
-                    "terms": "Πολιτικός μηχανικός"
-                },
                 "office/company": {
                     "name": "Εταιρικό Γραφείο",
                     "terms": "Γραφείο Εταιρείας"
@@ -3021,9 +3000,6 @@
                     "name": "Δικηγορικό Γραφείο",
                     "terms": "νομικό γραφείο"
                 },
-                "office/newspaper": {
-                    "name": "Εφημερίδα"
-                },
                 "office/ngo": {
                     "name": "Γραφείο ΜΚΟ"
                 },
@@ -3040,9 +3016,6 @@
                 "office/telecommunication": {
                     "name": "Γραφείο Τηλεπικοινωνιών"
                 },
-                "office/therapist": {
-                    "name": "Θεραπευτής"
-                },
                 "office/travel_agent": {
                     "name": "Ταξιδιωτικό Γραφείο"
                 },
@@ -3504,10 +3477,6 @@
                     "name": "Πάρκο τροχόσπιτων",
                     "terms": "Πάρκο τροχόσπιτων"
                 },
-                "tourism/chalet": {
-                    "name": "Σαλέ",
-                    "terms": "Σαλέ, Αλπική έπαυλη"
-                },
                 "tourism/guest_house": {
                     "name": "Ξενώνας",
                     "terms": "Ξενώνας"
diff --git a/dist/locales/en-GB.json b/dist/locales/en-GB.json
index 858563f21..d74a64fdb 100644
--- a/dist/locales/en-GB.json
+++ b/dist/locales/en-GB.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Choose language",
             "localized_translation_name": "Name"
         },
-        "zoom_in_edit": "Zoom in to Edit",
+        "zoom_in_edit": "Zoom in to edit",
         "login": "login",
         "logout": "logout",
         "loading_auth": "Connecting to OpenStreetMap...",
@@ -361,7 +361,9 @@
                 "accuracy": "Accuracy",
                 "unknown": "Unknown",
                 "show_tiles": "Show Tiles",
-                "hide_tiles": "Hide Tiles"
+                "hide_tiles": "Hide Tiles",
+                "show_vintage": "Show Vintage",
+                "hide_vintage": "Hide Vintage"
             },
             "history": {
                 "key": "H",
@@ -613,7 +615,7 @@
             "welcome": "Welcome to the iD OpenStreetMap editor",
             "text": "iD is a friendly but powerful tool for contributing to the World's best free World map. This is version {version}. For more information see {website} and report bugs at {github}.",
             "walkthrough": "Start the Walkthrough",
-            "start": "Edit Now"
+            "start": "Edit now"
         },
         "source_switch": {
             "live": "live",
@@ -646,8 +648,8 @@
             "deprecated_tags": "Deprecated tags: {tags}"
         },
         "zoom": {
-            "in": "Zoom In",
-            "out": "Zoom Out"
+            "in": "Zoom in",
+            "out": "Zoom out"
         },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
@@ -668,6 +670,13 @@
         "mapillary": {
             "view_on_mapillary": "View this image on Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Street-level photos from OpenStreetCam",
+            "title": "Photo Overlay (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "View this image on OpenStreetCam"
+        },
         "help": {
             "title": "Help",
             "key": "H",
@@ -857,7 +866,7 @@
             },
             "areas": {
                 "title": "Areas",
-                "add_playground": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can be also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**",
+                "add_playground": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**",
                 "start_playground": "Let's add this playground to the map by drawing an area. Areas are drawn by placing *nodes* along the outer edge of the feature. **Click or press spacebar to place a starting node on one of the corners of the playground.**",
                 "continue_playground": "Continue drawing the area by placing more nodes along the playground's edge. It is OK to connect the area to the existing walking paths.{br}Tip: You can hold down the '{alt}' key to prevent nodes from connecting to other features. **Continue drawing an area for the playground.**",
                 "finish_playground": "Finish the area by pressing enter, or clicking again on either the first or last node. **Finish drawing an area for the playground.**",
@@ -1217,6 +1226,9 @@
                 "aeroway": {
                     "label": "Type"
                 },
+                "agrarian": {
+                    "label": "Products"
+                },
                 "amenity": {
                     "label": "Type"
                 },
@@ -1254,7 +1266,7 @@
                     "label": "Sand Bath"
                 },
                 "bath/type": {
-                    "label": "Specialty",
+                    "label": "Speciality",
                     "options": {
                         "foot_bath": "Foot Bath",
                         "hot_spring": "Hot Spring",
@@ -1285,6 +1297,9 @@
                 "board_type": {
                     "label": "Type"
                 },
+                "boules": {
+                    "label": "Type"
+                },
                 "boundary": {
                     "label": "Type"
                 },
@@ -1304,6 +1319,10 @@
                 "bunker_type": {
                     "label": "Type"
                 },
+                "cables": {
+                    "label": "Cables",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direction (Degrees Clockwise)",
                     "placeholder": "45, 90, 180, 270"
@@ -1469,6 +1488,10 @@
                 "description": {
                     "label": "Description"
                 },
+                "devices": {
+                    "label": "Devices",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Baby Changing Available"
                 },
@@ -1543,6 +1566,9 @@
                         "wall": "Wall"
                     }
                 },
+                "fitness_station": {
+                    "label": "Equipment Type"
+                },
                 "fixme": {
                     "label": "Fix Me"
                 },
@@ -1550,6 +1576,9 @@
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "frequency": {
+                    "label": "Operating Frequency"
+                },
                 "fuel": {
                     "label": "Fuel"
                 },
@@ -1581,6 +1610,9 @@
                 "generator/type": {
                     "label": "Type"
                 },
+                "government": {
+                    "label": "Type"
+                },
                 "grape_variety": {
                     "label": "Grape Varieties"
                 },
@@ -1599,7 +1631,7 @@
                     "label": "Type"
                 },
                 "healthcare/speciality": {
-                    "label": "Specialties"
+                    "label": "Specialities"
                 },
                 "height": {
                     "label": "Height (Meters)"
@@ -1908,6 +1940,10 @@
                 "payment_multi": {
                     "label": "Payment Types"
                 },
+                "phases": {
+                    "label": "Phases",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telephone",
                     "placeholder": "+44 207 123456"
@@ -1987,6 +2023,9 @@
                 "railway": {
                     "label": "Type"
                 },
+                "rating": {
+                    "label": "Power Rating"
+                },
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
@@ -2195,6 +2234,9 @@
                 "studio": {
                     "label": "Type"
                 },
+                "substance": {
+                    "label": "Substance"
+                },
                 "substation": {
                     "label": "Type"
                 },
@@ -2221,6 +2263,15 @@
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "switch": {
+                    "label": "Type",
+                    "options": {
+                        "circuit_breaker": "Circuit Breaker",
+                        "disconnector": "Disconnector",
+                        "earthing": "Earthing",
+                        "mechanical": "Mechanical"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Tactile Paving"
                 },
@@ -2293,6 +2344,19 @@
                     },
                     "placeholder": "Excellent, Good, Bad..."
                 },
+                "transformer": {
+                    "label": "Type",
+                    "options": {
+                        "auto": "Autotransformer",
+                        "auxiliary": "Auxiliary",
+                        "converter": "Converter",
+                        "distribution": "Distribution",
+                        "generator": "Generator",
+                        "phase_angle_regulator": "Phase Angle Regulator",
+                        "traction": "Traction",
+                        "yes": "Unknown"
+                    }
+                },
                 "trees": {
                     "label": "Trees"
                 },
@@ -2327,6 +2391,18 @@
                         "stratovolcano": "Stratovolcano"
                     }
                 },
+                "voltage": {
+                    "label": "Voltage"
+                },
+                "voltage/primary": {
+                    "label": "Primary Voltage"
+                },
+                "voltage/secondary": {
+                    "label": "Secondary Voltage"
+                },
+                "voltage/tertiary": {
+                    "label": "Tertiary Voltage"
+                },
                 "wall": {
                     "label": "Type"
                 },
@@ -2354,6 +2430,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Windings",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Windings Configuration",
+                    "options": {
+                        "delta": "Delta",
+                        "leblanc": "Leblanc",
+                        "open": "Open",
+                        "open-delta": "Open Delta",
+                        "scott": "Scott",
+                        "star": "Star / Wye",
+                        "zigzag": "Zig Zag"
+                    }
                 }
             },
             "presets": {
@@ -2602,6 +2694,9 @@
                 "amenity/motorcycle_parking": {
                     "name": "Motorcycle Parking"
                 },
+                "amenity/music_school": {
+                    "name": "Music School"
+                },
                 "amenity/nightclub": {
                     "name": "Nightclub"
                 },
@@ -3047,6 +3142,9 @@
                 "craft/caterer": {
                     "name": "Caterer"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Chimney Sweeper"
+                },
                 "craft/clockmaker": {
                     "name": "Clockmaker"
                 },
@@ -3131,8 +3229,8 @@
                 "craft/scaffolder": {
                     "name": "Scaffolder"
                 },
-                "craft/sculpter": {
-                    "name": "Sculpter"
+                "craft/sculptor": {
+                    "name": "Sculptor"
                 },
                 "craft/shoemaker": {
                     "name": "Shoemaker"
@@ -3140,9 +3238,6 @@
                 "craft/stonemason": {
                     "name": "Stonemason"
                 },
-                "craft/sweep": {
-                    "name": "Chimney Sweep"
-                },
                 "craft/tailor": {
                     "name": "Tailor"
                 },
@@ -3351,7 +3446,10 @@
                 "highway/path": {
                     "name": "Path"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Pedestrian Area"
+                },
+                "highway/pedestrian_line": {
                     "name": "Pedestrian Street"
                 },
                 "highway/primary": {
@@ -3486,6 +3584,9 @@
                 "landuse/basin": {
                     "name": "Basin"
                 },
+                "landuse/brownfield": {
+                    "name": "Brownfield"
+                },
                 "landuse/cemetery": {
                     "name": "Cemetery"
                 },
@@ -3516,12 +3617,21 @@
                 "landuse/grass": {
                     "name": "Grass"
                 },
+                "landuse/greenfield": {
+                    "name": "Greenfield"
+                },
                 "landuse/harbour": {
                     "name": "Harbor"
                 },
                 "landuse/industrial": {
                     "name": "Industrial Area"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Scrap Yard"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Slaughterhouse"
+                },
                 "landuse/landfill": {
                     "name": "Landfill"
                 },
@@ -3579,6 +3689,9 @@
                 "landuse/recreation_ground": {
                     "name": "Recreation Ground"
                 },
+                "landuse/religious": {
+                    "name": "Religious Area"
+                },
                 "landuse/residential": {
                     "name": "Residential Area"
                 },
@@ -3621,6 +3734,39 @@
                 "leisure/fitness_station": {
                     "name": "Outdoor Fitness Station"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Exercise Balance Beam"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Exercise Box"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Exercise Horizontal Bar"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Exercise Monkey Bars"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Hyperextension Station"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Parallel Bars"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Push-Up Station"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Exercise Rings"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Exercise Instruction Sign"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Sit-Up Station"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Exercise Stairs"
+                },
                 "leisure/garden": {
                     "name": "Garden"
                 },
@@ -3666,6 +3812,9 @@
                 "leisure/pitch/beachvolleyball": {
                     "name": "Beach Volleyball Court"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Boules/Bocce Court"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Bowling Green"
                 },
@@ -3705,6 +3854,9 @@
                 "leisure/running_track": {
                     "name": "Racetrack (Running)"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna"
+                },
                 "leisure/slipway": {
                     "name": "Slipway"
                 },
@@ -3919,13 +4071,25 @@
                     "name": "Office"
                 },
                 "office/accountant": {
-                    "name": "Accountant"
+                    "name": "Accountant Office"
                 },
                 "office/administrative": {
                     "name": "Administrative Office"
                 },
+                "office/adoption_agency": {
+                    "name": "Adoption Agency"
+                },
+                "office/advertising_agency": {
+                    "name": "Advertising Agency"
+                },
                 "office/architect": {
-                    "name": "Architect"
+                    "name": "Architect Office"
+                },
+                "office/association": {
+                    "name": "Nonprofit Organization Office"
+                },
+                "office/charity": {
+                    "name": "Charity Office"
                 },
                 "office/company": {
                     "name": "Company Office"
@@ -3939,23 +4103,38 @@
                 "office/employment_agency": {
                     "name": "Employment Agency"
                 },
+                "office/energy_supplier": {
+                    "name": "Energy Supplier Office"
+                },
                 "office/estate_agent": {
                     "name": "Estate Agent"
                 },
                 "office/financial": {
                     "name": "Financial Office"
                 },
+                "office/forestry": {
+                    "name": "Forestry Office"
+                },
+                "office/foundation": {
+                    "name": "Foundation Office"
+                },
                 "office/government": {
                     "name": "Government Office"
                 },
                 "office/government/register_office": {
                     "name": "Register Office"
                 },
+                "office/government/tax": {
+                    "name": "Tax and Revenue Office"
+                },
+                "office/guide": {
+                    "name": "Tour Guide Office"
+                },
                 "office/insurance": {
                     "name": "Insurance Office"
                 },
                 "office/it": {
-                    "name": "IT Office"
+                    "name": "Information Technology Office"
                 },
                 "office/lawyer": {
                     "name": "Law Office"
@@ -3963,30 +4142,51 @@
                 "office/lawyer/notary": {
                     "name": "Notary Office"
                 },
+                "office/moving_company": {
+                    "name": "Moving Company Office"
+                },
                 "office/newspaper": {
-                    "name": "Newspaper"
+                    "name": "Newspaper Office"
                 },
                 "office/ngo": {
                     "name": "NGO Office"
                 },
+                "office/notary": {
+                    "name": "Notary Office"
+                },
                 "office/physician": {
                     "name": "Physician"
                 },
                 "office/political_party": {
                     "name": "Political Party"
                 },
+                "office/private_investigator": {
+                    "name": "Private Investigator Office"
+                },
+                "office/quango": {
+                    "name": "Quasi-NGO Office"
+                },
                 "office/research": {
                     "name": "Research Office"
                 },
+                "office/surveyor": {
+                    "name": "Surveyor Office"
+                },
+                "office/tax_advisor": {
+                    "name": "Tax Advisor Office"
+                },
                 "office/telecommunication": {
                     "name": "Telecom Office"
                 },
                 "office/therapist": {
-                    "name": "Therapist"
+                    "name": "Therapist Office"
                 },
                 "office/travel_agent": {
                     "name": "Travel Agency"
                 },
+                "office/water_utility": {
+                    "name": "Water Utility Office"
+                },
                 "piste": {
                     "name": "Piste/Ski Trail"
                 },
@@ -4005,6 +4205,9 @@
                 "place/island": {
                     "name": "Island"
                 },
+                "place/islet": {
+                    "name": "Islet"
+                },
                 "place/isolated_dwelling": {
                     "name": "Isolated Dwelling"
                 },
@@ -4014,6 +4217,9 @@
                 "place/neighbourhood": {
                     "name": "Neighborhood"
                 },
+                "place/plot": {
+                    "name": "Plot"
+                },
                 "place/quarter": {
                     "name": "Sub-Borough / Quarter"
                 },
@@ -4030,7 +4236,7 @@
                     "name": "Village"
                 },
                 "playground/balance_beam": {
-                    "name": "Balance Beam"
+                    "name": "Play Balance Beam"
                 },
                 "playground/basket_spinner": {
                     "name": "Basket Spinner"
@@ -4045,10 +4251,10 @@
                     "name": "Bouncy Cushion"
                 },
                 "playground/horizontal_bar": {
-                    "name": "Horizontal Bar"
+                    "name": "Play Horizontal Bar"
                 },
                 "playground/rocker": {
-                    "name": "Springy Rocker"
+                    "name": "Spring Rider"
                 },
                 "playground/roundabout": {
                     "name": "Play Roundabout"
@@ -4104,6 +4310,9 @@
                 "power/substation": {
                     "name": "Substation"
                 },
+                "power/switch": {
+                    "name": "Power Switch"
+                },
                 "power/tower": {
                     "name": "High-Voltage Tower"
                 },
@@ -4194,6 +4403,9 @@
                 "shop": {
                     "name": "Shop"
                 },
+                "shop/agrarian": {
+                    "name": "Agriculture Shop"
+                },
                 "shop/alcohol": {
                     "name": "Off licence (Alcohol shop)"
                 },
@@ -4585,7 +4797,7 @@
                     "name": "Caravan Park"
                 },
                 "tourism/chalet": {
-                    "name": "Chalet"
+                    "name": "Holiday Cottage"
                 },
                 "tourism/gallery": {
                     "name": "Art Gallery"
@@ -4629,6 +4841,9 @@
                 "tourism/viewpoint": {
                     "name": "Viewpoint"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Wilderness Hut"
+                },
                 "tourism/zoo": {
                     "name": "Zoo"
                 },
@@ -4808,6 +5023,13 @@
                 "description": "Premium DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Premium Imagery"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Premium Imagery Vintage"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Terms & Feedback"
@@ -4815,6 +5037,13 @@
                 "description": "Standard DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Standard Imagery"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Standard Imagery Vintage"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Terms & Feedback"
@@ -4886,6 +5115,7 @@
                 "name": "TIGER Roads 2014"
             },
             "US-TIGER-Roads-2017": {
+                "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
                 "name": "TIGER Roads 2017"
             },
             "Waymarked_Trails-Cycling": {
@@ -5002,4 +5232,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 40e4cb04b..dea3729a3 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -25,6 +25,9 @@
             },
             "draw_line": {
                 "tail": "Click to add more nodes to the line. Click on other lines to connect to them, and double-click to end the line."
+            },
+            "drag_node": {
+                "connected_to_hidden": "This can't be edited because it is connected to a hidden feature."
             }
         },
         "operations": {
@@ -310,7 +313,7 @@
             "localized_translation_language": "Choose language",
             "localized_translation_name": "Name"
         },
-        "zoom_in_edit": "Zoom in to Edit",
+        "zoom_in_edit": "Zoom in to edit",
         "login": "login",
         "logout": "logout",
         "loading_auth": "Connecting to OpenStreetMap...",
@@ -342,7 +345,7 @@
             "about_changeset_comments": "About changeset comments",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
             "google_warning": "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden.",
-            "google_warning_link": "http://www.openstreetmap.org/copyright"
+            "google_warning_link": "https://www.openstreetmap.org/copyright"
         },
         "contributors": {
             "list": "Edits by {users}",
@@ -361,7 +364,9 @@
                 "accuracy": "Accuracy",
                 "unknown": "Unknown",
                 "show_tiles": "Show Tiles",
-                "hide_tiles": "Hide Tiles"
+                "hide_tiles": "Hide Tiles",
+                "show_vintage": "Show Vintage",
+                "hide_vintage": "Hide Vintage"
             },
             "history": {
                 "key": "H",
@@ -613,7 +618,7 @@
             "welcome": "Welcome to the iD OpenStreetMap editor",
             "text": "iD is a friendly but powerful tool for contributing to the world's best free world map. This is version {version}. For more information see {website} and report bugs at {github}.",
             "walkthrough": "Start the Walkthrough",
-            "start": "Edit Now"
+            "start": "Edit now"
         },
         "source_switch": {
             "live": "live",
@@ -646,8 +651,8 @@
             "deprecated_tags": "Deprecated tags: {tags}"
         },
         "zoom": {
-            "in": "Zoom In",
-            "out": "Zoom Out"
+            "in": "Zoom in",
+            "out": "Zoom out"
         },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
@@ -668,18 +673,177 @@
         "mapillary": {
             "view_on_mapillary": "View this image on Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Street-level photos from OpenStreetCam",
+            "title": "Photo Overlay (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "View this image on OpenStreetCam"
+        },
         "help": {
             "title": "Help",
             "key": "H",
-            "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need to\n[log in](https://www.openstreetmap.org/login).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
-            "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click on it on\nthe map. This will highlight the selected feature and load a sidebar with\ndetails about it. If you right-click on it, it will show a menu of things\nyou can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a contour\naround those features. All the points inside the lasso area will be selected.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Upload' to post the changes to\n[OpenStreetMap.org](http://www.openstreetmap.org/), where they will be visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n\n### Using the editor\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n",
-            "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a sidebar showing more information about the road. If you right-click\non it, you'll have a menu of actions you can apply on the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also right-click on it and select the 'Move' tool, or simply press\nthe `M` shortcut key, to move the entire road at one time, and then click\nagain to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then pressing the 'Delete'\nkey or right-clicking it and then clicking the trash can icon.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
-            "gps": "# GPS\n\nCollected GPS traces are one valuable source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright purple\nline. Click on the 'Map Data' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
-            "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the right.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n",
-            "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n",
-            "inspector": "# Using the Inspector\n\nThe inspector is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click the 'Add field' dropdown to add\nother details, like a Wikipedia link, wheelchair access, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n",
-            "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and load a sidebar showing more information about the building.\nIf you right-click on it, it will show a menu of actions you can execute\nin the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it and press the 'M' shortcut key,\nor right-click it and select the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then pressing the 'Delete'\nkey, or right-clicking it and then clicking the trash can icon.\n",
-            "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the bottom of the\nsidebar, you can see which relations a feature is a member of, and click on a\nrelation there will select it. When the relation is selected, you can see all of\nits members listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\npress the 'C' shortcut key. Other option is to select both, and then right-click one\nof the and click the \"Merge\" (+) button.\n"
+            "help": {
+                "title": "Help",
+                "welcome": "Welcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/). With this editor you can update OpenStreetMap right from your web browser.",
+                "open_data_h": "Open Data",
+                "open_data": "Edits that you make on this map will be visible to everyone who uses OpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying, or imagery collected from aerial or street level photos. Copying from commercial sources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright).",
+                "before_start_h": "Before you start",
+                "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes.",
+                "open_source_h": "Open Source",
+                "open_source": "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD).",
+                "open_source_help": "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+            },
+            "overview": {
+                "title": "Overview",
+                "navigation_h": "Navigation",
+                "navigation_drag": "You can drag the map by pressing and holding down the {leftclick} left mouse button and moving the mouse around. You can also use the `↓`, `↑`, `←`, `→` arrow keys on your keyboard.",
+                "navigation_zoom": "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons along the side of the map. You can also use the `+`, `-` keys on your keyboard.",
+                "features_h": "Map Features",
+                "features": "We use the word *features* to describe things that appear on the map, such as roads, buildings, or points of interest. Anything in the real world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*.",
+                "nodes_ways": "In OpenStreetmap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
+            },
+            "editing": {
+                "title": "Editing & Saving",
+                "select_h": "Select",
+                "select_left_click": "{leftclick} Left-click on a feature to select it. This will highlight it with a pulsing glow, and the sidebar will display details about that feature, such as its name or address.",
+                "select_right_click": "{rightclick} Right-click on a feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting.",
+                "multiselect_h": "Multiselect",
+                "multiselect_shift_click": "`{shift}`+{leftclick} left-click to select several features together.  This makes it easier to move or delete multiple items.",
+                "multiselect_lasso": "Another way to select multiple features is to hold down the `{shift}` key, then press and hold down the {leftclick} left mouse button and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected.",
+                "undo_redo_h": "Undo & Redo",
+                "undo_redo": "Your edits are stored locally in your browser until you choose to save them to the OpenStreetMap server. You can undo edits by clicking the {undo} **Undo** button, and redo them by clicking the {redo} **Redo** button.",
+                "save_h": "Save",
+                "save": "Click {save} **Save** to finish your edits and send them to OpenStreetMap. You should remember to save your work frequently!",
+                "save_validation": "On the save screen, you'll have a chance to review what you've done. iD will also perform some basic checks for missing data and may offer helpful suggestions and warnings if something doesn't seem right.",
+                "upload_h": "Upload",
+                "upload": "Before uploading your changes you must enter a [changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments). Then click **Upload** to send your changes to OpenStreetMap, where they will be merged into the map and publicly visible to everyone.",
+                "backups_h": "Automatic Backups",
+                "backups": "If you can't finish your edits in one sitting, for example if your computer crashes or you close the browser tab, your edits are still saved in your browser's storage. You can come back later (on the same browser and computer), and iD will offer to restore your work.",
+                "keyboard_h": "Keyboard Shortcuts",
+                "keyboard": "You can view a list of keyboard shortcuts by pressing the `?` key."
+            },
+            "feature_editor": {
+                "title": "Feature Editor",
+                "intro": "The *feature editor* appears alongside the map, and allows you to see and edit all of the information for the selected feature.",
+                "definitions": "The top section displays the feature's type. The middle section contains *fields* showing the feature's attributes, such as its name or address.",
+                "type_h": "Feature Type",
+                "type": "You can click on the feature type to change the feature to a different type. Everything that exists in the real world can be added to OpenStreetMap, so there are thousands of feature types to choose from.",
+                "type_picker": "The type picker displays the most common feature types, such as parks, hospitals, restaurants, roads, and buildings. You can search for anything by typing what you're looking for in the search box. You can also click the {inspect} **Info** icon next to the feature type to learn more about it.",
+                "fields_h": "Fields",
+                "fields_all_fields": "The \"All fields\" section contains all of the feature's details that you may edit. In OpenStreetMap, all of the fields are optional, and it's OK to leave a field blank if you are unsure.",
+                "fields_example": "Each feature type will display different fields. For example, a road may display fields for its surface and speed limit, but a restaurant may display fields for the type of food it serves and the hours it is open.",
+                "fields_add_field": "You can also click the \"Add field\" dropdown to add more fields, such as a description, Wikipedia link, wheelchair access, and more.",
+                "tags_h": "Tags",
+                "tags_all_tags": "Below the fields section, you can expand the \"All tags\" section to edit any of the OpenStreetMap *tags* for the selected feature. Each tag consists of a *key* and *value*, data elements that define all of the features stored in OpenStreetMap.",
+                "tags_resources": "Editing a feature's tags requires intermediate knowledge about OpenStreetMap. You should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) or [Taginfo](https://taginfo.openstreetmap.org/) to learn more about accepted OpenStreetMap tagging practices."
+            },
+            "points": {
+                "title": "Points",
+                "intro": "*Points* can be used to represent features such as shops, restaurants, and monuments. They mark a specific location, and describe what's there.",
+                "add_point_h": "Adding Points",
+                "add_point": "To add a point, click the {point} **Point** button on the toolbar above the map, or press the shortcut key `1`. This will change the mouse cursor to a cross symbol.",
+                "add_point_finish": "To place the new point on the map, position the mouse cursor where the point should go, then {leftclick} left-click or press `Space`.",
+                "move_point_h": "Moving Points",
+                "move_point": "To move a point, place the mouse cursor over the point, then press and hold the {leftclick} left mouse button while dragging the point to its new location.",
+                "delete_point_h": "Deleting Points",
+                "delete_point": "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it.",
+                "delete_point_command": "To delete a point, {rightclick} right-click on the point to select it and show the edit menu, then use the {delete} **Delete** command."
+            },
+            "lines": {
+                "title": "Lines",
+                "intro": "*Lines* are used to represent features such as roads, railroads, and rivers. Lines should be drawn down the center of the feature that they represent.",
+                "add_line_h": "Adding Lines",
+                "add_line": "To add a line, click the {line} **Line** button on the toolbar above the map, or press the shortcut key `2`. This will change the mouse cursor to a cross symbol.",
+                "add_line_draw": "Next, position the mouse cursor where the line should begin and {leftclick} left-click or press `Space` to begin placing nodes along the line. Continue placing more nodes by clicking or pressing `Space`. While drawing, you can zoom in or drag the map in order to add more detail.",
+                "add_line_finish": "To finish a line, press `{return}` or click again on the last node.",
+                "modify_line_h": "Modifying Lines",
+                "modify_line_dragnode": "Often you'll see lines that aren't shaped correctly, for example a road that does not match up with the background imagery. To adjust the shape of a line, first {leftclick} left-click to select it. All nodes of the line will be drawn as small circles. You can then drag the nodes to better locations.",
+                "modify_line_addnode": "You can also create new nodes along a line either by {leftclick}**x2** double-clicking on the line or by dragging the small triangles at the midpoints between nodes.",
+                "connect_line_h": "Connecting Lines",
+                "connect_line": "Having roads connected properly is important for the map and essential for providing driving directions.",
+                "connect_line_display": "The connections between roads are drawn with gray circles. The endpoints of a line are drawn with larger white circles if they don't connect to anything.",
+                "connect_line_drag": "To connect a line to another feature, drag one of the line's nodes onto the other feature until both features snap together. Tip: You can hold down the `{alt}` key to prevent nodes from connecting to other features.",
+                "connect_line_tag": "If you know that the connection has traffic lights or crosswalks, you can add them by selecting the connecting node and using the feature editor to select the correct feature's type.",
+                "disconnect_line_h": "Disconnecting Lines",
+                "disconnect_line_command": "To disconnect a road from another feature, {rightclick} right-click the connecting node and select the {disconnect} **Disconnect** command from the editing menu.",
+                "move_line_h": "Moving Lines",
+                "move_line_command": "To move an entire line, {rightclick} right-click the line and select the {move} **Move** command from the editing menu. Then move the mouse, and {leftclick} left-click to place the line in a new location.",
+                "move_line_connected": "Lines that are connected to other features will stay connected as you move the line to a new location. iD may prevent you from moving a line across another connected line.",
+                "delete_line_h": "Deleting Lines",
+                "delete_line": "If a line is entirely incorrect, for example a road that doesn't exist in the real world, it's OK to delete it. Be careful when deleting features: the background imagery you are using might be outdated, and a road that looks wrong could simply be newly built.",
+                "delete_line_command": "To delete a line, {rightclick} right-click on the line to select it and show the edit menu, then use the {delete} **Delete** command."
+            },
+            "areas": {
+                "title": "Areas",
+                "intro": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas. Areas should be traced around the edge of the feature that they represent, for example, around the base of a building.",
+                "point_or_area_h": "Points or Areas?",
+                "point_or_area": "Many features can be represented as points or areas. You should map buildings and property outlines as areas whenever possible. Place points inside a building area to represent businesses, amenities, and other features located inside the building.",
+                "add_area_h": "Adding Areas",
+                "add_area_command": "To add an area, click the {area} **Area** button on the toolbar above the map, or press the shortcut key `3`. This will change the mouse cursor to a cross symbol.",
+                "add_area_draw": "Next, position the mouse cursor at one of the corners of the feature and {leftclick} left-click or press `Space` to begin placing nodes around the outer edge of the area. Continue placing more nodes by clicking or pressing `Space`. While drawing, you can zoom in or drag the map in order to add more detail.",
+                "add_area_finish": "To finish an area, press `{return}` or click again on either the first or last node.",
+                "square_area_h": "Square Corners",
+                "square_area_command": "Many area features like buildings have square corners. To square the corners of an area, {rightclick} right-click the edge of the area and select the {orthogonalize} **Square** command from the editing menu.",
+                "modify_area_h": "Modifying Areas",
+                "modify_area_dragnode": "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first {leftclick} left-click to select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations.",
+                "modify_area_addnode": "You can also create new nodes along an area either by {leftclick}**x2** double-clicking on the edge of the area or by dragging the small triangles at the midpoints between nodes.",
+                "delete_area_h": "Deleting Areas",
+                "delete_area": "If an area is entirely incorrect, for example a building that doesn't exist in the real world, it's OK to delete it. Be cautious when deleting features - the background imagery you are using might be outdated, and a building that looks wrong could simply be newly built.",
+                "delete_area_command": "To delete an area, {rightclick} right-click on the area to select it and show the edit menu, then use the {delete} **Delete** command."
+            },
+            "relations": {
+                "title": "Relations",
+                "intro": "A *relation* is a special type of feature in OpenStreetMap that groups together other features. The features that belong to a relation are called *members*, and each member can have a *role* in the relation.",
+                "edit_relation_h": "Editing Relations",
+                "edit_relation": "At the bottom of the feature editor, you can expand the \"All relations\" section to see if the selected feature is a member of any relations. You can then click on the relation to select and edit it.",
+                "edit_relation_add": "To add a feature to a relation, select the feature, then click the {plus} add button in the \"All relations\" section of the feature editor. You can choose from a list of nearby relations, or choose the \"New relation...\" option.",
+                "edit_relation_delete": "You can also click the {delete} **Delete** button to remove the selected feature from the relation. If you remove all of the members from a relation, the relation will be deleted automatically.",
+                "maintain_relation_h": "Maintaining Relations",
+                "maintain_relation": "For the most part, iD will maintain relations automatically as you edit. You should take care when replacing features that might be members of relations. For example if you delete a section of road and draw a new section of road to replace it, you should add the new section to the same relations (routes, turn restrictions, etc.) as the original.",
+                "relation_types_h": "Relation Types",
+                "multipolygon_h": "Multipolygons",
+                "multipolygon": "A *multipolygon* relation is a group of one or more *outer* features and one or more inner features. The outer features define the outer edges of the multipolygon, and the inner features define sub-areas or holes cut out from the inside of the multipolygon.",
+                "multipolygon_create": "To create a multipolygon, for example a building with a hole in it, draw the outer edge as an area and the inner edge as a line or different kind of area. Then `{shift}`+{leftclick} left-click to select both features, {rightclick} right-click to show the edit menu, and select the {merge} **Merge** command.",
+                "multipolygon_merge": "Merging several lines or areas will create a new multipolygon relation with all selected areas as members. iD will choose the inner and outer roles automatically, based on which features are contained inside other features.",
+                "turn_restriction_h": "Turn restrictions",
+                "turn_restriction": "A *turn restriction* relation is a group of several road segments in an intersection. Turn restrictions consist of a *from* road, *via* node or roads, and a *to* road.",
+                "turn_restriction_field": "To edit turn restrictions, select a junction node where two or more roads meet. The feature editor will display a special \"Turn Restrictions\" field containing a model of the intersection.",
+                "turn_restriction_editing": "In the \"Turn Restrictions\" field, click to select a \"from\" road, and see whether turns are allowed or restricted to any of the \"to\" roads. You can click on the turn icons to toggle them between allowed and restricted. iD will create relations automatically and set the from, via, and to roles based on your choices.",
+                "route_h": "Routes",
+                "route": "A *route* relation is a group of one or more line features that together form a route network, like a bus route, train route, or highway route.",
+                "route_add": "To add a feature to a route relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation.",
+                "boundary_h": "Boundaries",
+                "boundary": "A *boundary* relation is a group of one or more line features that together form an administrative boundary.",
+                "boundary_add": "To add a feature to a boundary relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
+            },
+            "imagery": {
+                "title": "Background Imagery",
+                "intro": "The background imagery that appears beneath the map data is an important resource for mapping. This imagery can be aerial photos collected from satellites, airplanes, and drones, or it can be scanned historical maps or other freely available source data.",
+                "sources_h": "Imagery Sources",
+                "choosing": "To see which imagery sources are available for editing, click the {layers} **Background settings** button on the side of the map.",
+                "sources": "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference.",
+                "offsets_h": "Adjusting Imagery Offset",
+                "offset": "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"Adjust Imagery Offset\" section at the bottom of the Background Settings pane.",
+                "offset_change": "Click on the small triangles to adjust the imagery offset in small steps, or hold the left mouse button and drag within the gray square to slide the imagery into alignment."
+            },
+            "streetlevel": {
+                "title": "Street Level Photos",
+                "intro": "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).",
+                "using_h": "Using Street Level Photos",
+                "using": "To use street level photos for mapping, click the {data} **Map data** panel on the side of the map to enable or disable the available photo layers.",
+                "photos": "When enabled, the photo layer displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken.",
+                "viewer": "When you click on one of the photo locations, a photo viewer appears in the bottom corner of the map. The photo viewer contains controls to step forward and backward in the image sequence. It also shows the username of the person who captured the image, the date it was captured, and a link to view the image on the original site."
+            },
+            "gps": {
+                "title": "GPS Traces",
+                "intro": "Collected GPS traces are a valuable source of data for OpenStreetMap. This editor supports *.gpx*, *.geojson*, and *.kml* files on your local computer. You can collect GPS traces with a smartphone, sports watch, or other GPS device.",
+                "survey": "For information on how to perform a GPS survey, read [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).",
+                "using_h": "Using GPS Traces",
+                "using": "To use a GPS trace for mapping, drag and drop the data file onto the map editor. If it's recognized, it will be drawn on the map as a bright purple line. Click the {data} **Map data** panel on the side of the map to enable, disable, or zoom to your GPS data.",
+                "tracing": "The GPS track isn't sent to OpenStreetMap - the best way to use it is to draw on the map, using it as a guide for the new features that you add.",
+                "upload": "You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use."
+            }
         },
         "intro": {
             "done": "done",
@@ -857,7 +1021,7 @@
             },
             "areas": {
                 "title": "Areas",
-                "add_playground": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can be also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**",
+                "add_playground": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**",
                 "start_playground": "Let's add this playground to the map by drawing an area. Areas are drawn by placing *nodes* along the outer edge of the feature. **Click or press spacebar to place a starting node on one of the corners of the playground.**",
                 "continue_playground": "Continue drawing the area by placing more nodes along the playground's edge. It is OK to connect the area to the existing walking paths.{br}Tip: You can hold down the '{alt}' key to prevent nodes from connecting to other features. **Continue drawing an area for the playground.**",
                 "finish_playground": "Finish the area by pressing enter, or clicking again on either the first or last node. **Finish drawing an area for the playground.**",
@@ -986,7 +1150,8 @@
                     "title": "Selecting features",
                     "select_one": "Select a single feature",
                     "select_multi": "Select multiple features",
-                    "lasso": "Draw a selection lasso around features"
+                    "lasso": "Draw a selection lasso around features",
+                    "search": "Find features matching search text"
                 },
                 "with_selected": {
                     "title": "With feature selected",
@@ -1217,6 +1382,9 @@
                 "aeroway": {
                     "label": "Type"
                 },
+                "agrarian": {
+                    "label": "Products"
+                },
                 "amenity": {
                     "label": "Type"
                 },
@@ -1294,6 +1462,9 @@
                 "brand": {
                     "label": "Brand"
                 },
+                "brewery": {
+                    "label": "Draft Beers"
+                },
                 "bridge": {
                     "label": "Type",
                     "placeholder": "Default"
@@ -1307,6 +1478,10 @@
                 "bunker_type": {
                     "label": "Type"
                 },
+                "cables": {
+                    "label": "Cables",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direction (Degrees Clockwise)",
                     "placeholder": "45, 90, 180, 270"
@@ -1473,7 +1648,7 @@
                     "label": "Description"
                 },
                 "devices": {
-                    "label": "Number of Devices",
+                    "label": "Devices",
                     "placeholder": "1, 2, 3..."
                 },
                 "diaper": {
@@ -1594,6 +1769,9 @@
                 "generator/type": {
                     "label": "Type"
                 },
+                "government": {
+                    "label": "Type"
+                },
                 "grape_variety": {
                     "label": "Grape Varieties"
                 },
@@ -1782,6 +1960,9 @@
                     "label": "Milestone Position",
                     "placeholder": "Distance to one decimal (123.4)"
                 },
+                "monitoring_multi": {
+                    "label": "Monitoring"
+                },
                 "mtb/scale": {
                     "label": "Mountain Biking Difficulty",
                     "placeholder": "0, 1, 2, 3...",
@@ -1922,7 +2103,7 @@
                     "label": "Payment Types"
                 },
                 "phases": {
-                    "label": "Number of Phases",
+                    "label": "Phases",
                     "placeholder": "1, 2, 3..."
                 },
                 "phone": {
@@ -2010,13 +2191,6 @@
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
-                "recycling_type": {
-                    "label": "Recycling Type",
-                    "options": {
-                        "container": "Container",
-                        "centre": "Recycling Center"
-                    }
-                },
                 "ref_aeroway_gate": {
                     "label": "Gate Number"
                 },
@@ -2244,6 +2418,15 @@
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "switch": {
+                    "label": "Type",
+                    "options": {
+                        "mechanical": "Mechanical",
+                        "circuit_breaker": "Circuit Breaker",
+                        "disconnector": "Disconnector",
+                        "earthing": "Earthing"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Tactile Paving"
                 },
@@ -2317,7 +2500,7 @@
                     }
                 },
                 "transformer": {
-                    "label": "Type of Transformer",
+                    "label": "Type",
                     "options": {
                         "distribution": "Distribution",
                         "generator": "Generator",
@@ -2363,6 +2546,9 @@
                         "scoria": "Scoria"
                     }
                 },
+                "voltage": {
+                    "label": "Voltage"
+                },
                 "voltage/primary": {
                     "label": "Primary Voltage"
                 },
@@ -2401,7 +2587,7 @@
                     "label": "Wikipedia"
                 },
                 "windings": {
-                    "label": "Number of Windings",
+                    "label": "Windings",
                     "placeholder": "1, 2, 3..."
                 },
                 "windings/configuration": {
@@ -2462,6 +2648,10 @@
                     "name": "Billboard",
                     "terms": ""
                 },
+                "aerialway/station": {
+                    "name": "Aerialway Station",
+                    "terms": ""
+                },
                 "aerialway/cable_car": {
                     "name": "Cable Car",
                     "terms": "tramway,ropeway"
@@ -2502,10 +2692,6 @@
                     "name": "Rope Tow Lift",
                     "terms": "handle tow,bugel lift"
                 },
-                "aerialway/station": {
-                    "name": "Aerialway Station",
-                    "terms": ""
-                },
                 "aerialway/t-bar": {
                     "name": "T-bar Lift",
                     "terms": "tbar"
@@ -2542,10 +2728,18 @@
                     "name": "Airport Terminal",
                     "terms": "airport,aerodrome"
                 },
+                "amenity/bus_station": {
+                    "name": "Bus Station / Terminal",
+                    "terms": ""
+                },
                 "amenity/coworking_space": {
                     "name": "Coworking Space",
                     "terms": ""
                 },
+                "amenity/ferry_terminal": {
+                    "name": "Ferry Station / Terminal",
+                    "terms": ""
+                },
                 "amenity/nursing_home": {
                     "name": "Nursing Home",
                     "terms": ""
@@ -2622,10 +2816,6 @@
                     "name": "Currency Exchange",
                     "terms": "bureau de change,money changer"
                 },
-                "amenity/bus_station": {
-                    "name": "Bus Station",
-                    "terms": ""
-                },
                 "amenity/cafe": {
                     "name": "Cafe",
                     "terms": "bistro,coffee,tea"
@@ -2722,10 +2912,6 @@
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
                 },
-                "amenity/ferry_terminal": {
-                    "name": "Ferry Terminal",
-                    "terms": ""
-                },
                 "amenity/fire_station": {
                     "name": "Fire Station",
                     "terms": ""
@@ -2782,6 +2968,10 @@
                     "name": "Motorcycle Parking",
                     "terms": ""
                 },
+                "amenity/music_school": {
+                    "name": "Music School",
+                    "terms": "school of music"
+                },
                 "amenity/nightclub": {
                     "name": "Nightclub",
                     "terms": "disco*,night club,dancing,dance club"
@@ -2883,7 +3073,7 @@
                     "terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
                 },
                 "amenity/recycling": {
-                    "name": "Recycling",
+                    "name": "Recycling Container",
                     "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                 },
                 "amenity/restaurant": {
@@ -3262,6 +3452,10 @@
                     "name": "Preschool/Kindergarten Building",
                     "terms": "kindergarden,pre-school"
                 },
+                "building/mosque": {
+                    "name": "Mosque Building",
+                    "terms": ""
+                },
                 "building/public": {
                     "name": "Public Building",
                     "terms": ""
@@ -3374,6 +3568,10 @@
                     "name": "Caterer",
                     "terms": ""
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Chimney Sweeper",
+                    "terms": ""
+                },
                 "craft/clockmaker": {
                     "name": "Clockmaker",
                     "terms": ""
@@ -3474,8 +3672,8 @@
                     "name": "Scaffolder",
                     "terms": ""
                 },
-                "craft/sculpter": {
-                    "name": "Sculpter",
+                "craft/sculptor": {
+                    "name": "Sculptor",
                     "terms": ""
                 },
                 "craft/shoemaker": {
@@ -3486,10 +3684,6 @@
                     "name": "Stonemason",
                     "terms": "masonry"
                 },
-                "craft/sweep": {
-                    "name": "Chimney Sweep",
-                    "terms": ""
-                },
                 "craft/tiler": {
                     "name": "Tiler",
                     "terms": ""
@@ -3690,14 +3884,14 @@
                     "name": "Speech Therapist",
                     "terms": "speech,therapist,therapy,voice"
                 },
+                "highway/bus_stop": {
+                    "name": "Bus Stop / Platform",
+                    "terms": ""
+                },
                 "highway/bridleway": {
                     "name": "Bridle Path",
                     "terms": "bridleway,equestrian,horse"
                 },
-                "highway/bus_stop": {
-                    "name": "Bus Stop",
-                    "terms": ""
-                },
                 "highway/corridor": {
                     "name": "Indoor Corridor",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
@@ -3758,9 +3952,13 @@
                     "name": "Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Pedestrian Area",
+                    "terms": "center,centre,plaza,quad,square,walkway"
+                },
+                "highway/pedestrian_line": {
                     "name": "Pedestrian Street",
-                    "terms": ""
+                    "terms": "center,centre,plaza,quad,square,walkway"
                 },
                 "highway/primary_link": {
                     "name": "Primary Link",
@@ -3986,6 +4184,10 @@
                     "name": "Greenfield",
                     "terms": ""
                 },
+                "landuse/greenhouse_horticulture": {
+                    "name": "Greenhouse Horticulture",
+                    "terms": "flower,greenhouse,horticulture,grow,vivero"
+                },
                 "landuse/harbour": {
                     "name": "Harbor",
                     "terms": "boat"
@@ -4078,6 +4280,10 @@
                     "name": "Recreation Ground",
                     "terms": "playing fields"
                 },
+                "landuse/religious": {
+                    "name": "Religious Area",
+                    "terms": ""
+                },
                 "landuse/residential": {
                     "name": "Residential Area",
                     "terms": ""
@@ -4382,6 +4588,10 @@
                     "name": "Mast",
                     "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
                 },
+                "man_made/monitoring_station": {
+                    "name": "Monitoring Station",
+                    "terms": "weather,earthquake,seismology,air,gps"
+                },
                 "man_made/observation": {
                     "name": "Observation Tower",
                     "terms": "lookout tower,fire tower"
@@ -4582,6 +4792,10 @@
                     "name": "Office",
                     "terms": ""
                 },
+                "office/administrative": {
+                    "name": "Administrative Office",
+                    "terms": ""
+                },
                 "office/physician": {
                     "name": "Physician",
                     "terms": ""
@@ -4591,17 +4805,29 @@
                     "terms": ""
                 },
                 "office/accountant": {
-                    "name": "Accountant",
+                    "name": "Accountant Office",
                     "terms": ""
                 },
-                "office/administrative": {
-                    "name": "Administrative Office",
+                "office/adoption_agency": {
+                    "name": "Adoption Agency",
                     "terms": ""
                 },
+                "office/advertising_agency": {
+                    "name": "Advertising Agency",
+                    "terms": "ad,ad agency,advert agency,advertising,marketing"
+                },
                 "office/architect": {
-                    "name": "Architect",
+                    "name": "Architect Office",
                     "terms": ""
                 },
+                "office/association": {
+                    "name": "Nonprofit Organization Office",
+                    "terms": "association,non-profit,nonprofit,organization,society"
+                },
+                "office/charity": {
+                    "name": "Charity Office",
+                    "terms": "charitable organization"
+                },
                 "office/company": {
                     "name": "Company Office",
                     "terms": ""
@@ -4618,6 +4844,10 @@
                     "name": "Employment Agency",
                     "terms": "job"
                 },
+                "office/energy_supplier": {
+                    "name": "Energy Supplier Office",
+                    "terms": "electricity,energy company,energy utility,gas utility"
+                },
                 "office/estate_agent": {
                     "name": "Real Estate Office",
                     "terms": ""
@@ -4626,6 +4856,14 @@
                     "name": "Financial Office",
                     "terms": ""
                 },
+                "office/forestry": {
+                    "name": "Forestry Office",
+                    "terms": "forest,ranger"
+                },
+                "office/foundation": {
+                    "name": "Foundation Office",
+                    "terms": ""
+                },
                 "office/government": {
                     "name": "Government Office",
                     "terms": ""
@@ -4634,13 +4872,21 @@
                     "name": "Register Office",
                     "terms": "clerk,marriage,death,birth,certificate"
                 },
+                "office/government/tax": {
+                    "name": "Tax and Revenue Office",
+                    "terms": "fiscal authorities,revenue office,tax office"
+                },
+                "office/guide": {
+                    "name": "Tour Guide Office",
+                    "terms": "dive guide,mountain guide,tour guide"
+                },
                 "office/insurance": {
                     "name": "Insurance Office",
                     "terms": ""
                 },
                 "office/it": {
-                    "name": "IT Office",
-                    "terms": ""
+                    "name": "Information Technology Office",
+                    "terms": "computer,information,software,technology"
                 },
                 "office/lawyer": {
                     "name": "Law Office",
@@ -4650,29 +4896,57 @@
                     "name": "Notary Office",
                     "terms": "clerk,signature,wills,deeds,estate"
                 },
+                "office/moving_company": {
+                    "name": "Moving Company Office",
+                    "terms": "relocation"
+                },
                 "office/newspaper": {
-                    "name": "Newspaper",
+                    "name": "Newspaper Office",
                     "terms": ""
                 },
                 "office/ngo": {
                     "name": "NGO Office",
+                    "terms": "ngo,non government,non-government,organization,organisation"
+                },
+                "office/notary": {
+                    "name": "Notary Office",
                     "terms": ""
                 },
                 "office/political_party": {
                     "name": "Political Party",
                     "terms": ""
                 },
+                "office/private_investigator": {
+                    "name": "Private Investigator Office",
+                    "terms": "PI,private eye,private detective"
+                },
+                "office/quango": {
+                    "name": "Quasi-NGO Office",
+                    "terms": "ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous"
+                },
                 "office/research": {
                     "name": "Research Office",
                     "terms": ""
                 },
+                "office/surveyor": {
+                    "name": "Surveyor Office",
+                    "terms": ""
+                },
+                "office/tax_advisor": {
+                    "name": "Tax Advisor Office",
+                    "terms": "tax,tax consultant"
+                },
                 "office/telecommunication": {
                     "name": "Telecom Office",
                     "terms": ""
                 },
                 "office/therapist": {
-                    "name": "Therapist",
-                    "terms": ""
+                    "name": "Therapist Office",
+                    "terms": "therapy"
+                },
+                "office/water_utility": {
+                    "name": "Water Utility Office",
+                    "terms": "water board,utility"
                 },
                 "piste": {
                     "name": "Piste/Ski Trail",
@@ -4830,6 +5104,10 @@
                     "name": "Substation",
                     "terms": ""
                 },
+                "power/switch": {
+                    "name": "Power Switch",
+                    "terms": ""
+                },
                 "power/tower": {
                     "name": "High-Voltage Tower",
                     "terms": ""
@@ -4838,14 +5116,190 @@
                     "name": "Transformer",
                     "terms": ""
                 },
+                "public_transport/linear_platform_aerialway": {
+                    "name": "Aerialway Stop / Platform",
+                    "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/linear_platform_bus": {
+                    "name": "Bus Stop / Platform",
+                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/linear_platform_ferry": {
+                    "name": "Ferry Stop / Platform",
+                    "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/linear_platform_light_rail": {
+                    "name": "Light Rail Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/linear_platform_monorail": {
+                    "name": "Monorail Stop / Platform",
+                    "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/linear_platform_subway": {
+                    "name": "Subway Stop / Platform",
+                    "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/linear_platform_train": {
+                    "name": "Train Stop / Platform",
+                    "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/linear_platform_tram": {
+                    "name": "Tram Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/linear_platform_trolleybus": {
+                    "name": "Trolleybus Stop / Platform",
+                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
+                },
+                "public_transport/linear_platform": {
+                    "name": "Transit Stop / Platform",
+                    "terms": "platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_aerialway": {
+                    "name": "Aerialway Stop / Platform",
+                    "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_bus": {
+                    "name": "Bus Stop / Platform",
+                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_ferry": {
+                    "name": "Ferry Stop / Platform",
+                    "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_light_rail": {
+                    "name": "Light Rail Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/platform_monorail": {
+                    "name": "Monorail Stop / Platform",
+                    "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/platform_subway": {
+                    "name": "Subway Stop / Platform",
+                    "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/platform_train": {
+                    "name": "Train Stop / Platform",
+                    "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/platform_tram": {
+                    "name": "Tram Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/platform_trolleybus": {
+                    "name": "Trolleybus Stop / Platform",
+                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
+                },
                 "public_transport/platform": {
-                    "name": "Platform",
+                    "name": "Transit Stop / Platform",
+                    "terms": "platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/station_aerialway": {
+                    "name": "Aerialway Station",
+                    "terms": "aerialway,cable car,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_bus": {
+                    "name": "Bus Station / Terminal",
+                    "terms": "bus,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_ferry": {
+                    "name": "Ferry Station / Terminal",
+                    "terms": "boat,dock,ferry,pier,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_light_rail": {
+                    "name": "Light Rail Station",
+                    "terms": "electric,light rail,public transit,public transportation,rail,station,terminal,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/station_monorail": {
+                    "name": "Monorail Station",
+                    "terms": "monorail,public transit,public transportation,rail,station,terminal,transit,transportation"
+                },
+                "public_transport/station_subway": {
+                    "name": "Subway Station",
+                    "terms": "metro,public transit,public transportation,rail,station,subway,terminal,track,transit,transportation,underground"
+                },
+                "public_transport/station_train_halt": {
+                    "name": "Train Station (Halt / Request)",
+                    "terms": "halt,public transit,public transportation,rail,station,track,train,transit,transportation,whistle stop"
+                },
+                "public_transport/station_train": {
+                    "name": "Train Station",
+                    "terms": "public transit,public transportation,rail,station,terminal,track,train,transit,transportation"
+                },
+                "public_transport/station_tram": {
+                    "name": "Tram Station",
+                    "terms": "electric,light rail,public transit,public transportation,rail,station,streetcar,terminal,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/station_trolleybus": {
+                    "name": "Trolleybus Station / Terminal",
+                    "terms": "bus,electric,public transit,public transportation,station,streetcar,terminal,trackless,tram,trolley,transit,transportation"
+                },
+                "public_transport/station": {
+                    "name": "Transit Station",
+                    "terms": "public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/stop_area": {
+                    "name": "Transit Stop Area",
                     "terms": ""
                 },
+                "public_transport/stop_position_aerialway": {
+                    "name": "Aerialway Stopping Location",
+                    "terms": "aerialway,cable car,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_bus": {
+                    "name": "Bus Stopping Location",
+                    "terms": "bus,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_ferry": {
+                    "name": "Ferry Stopping Location",
+                    "terms": "boat,dock,ferry,pier,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_light_rail": {
+                    "name": "Light Rail Stopping Location",
+                    "terms": "electric,light rail,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/stop_position_monorail": {
+                    "name": "Monorail Stopping Location",
+                    "terms": "monorail,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/stop_position_subway": {
+                    "name": "Subway Stopping Location",
+                    "terms": "metro,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/stop_position_train": {
+                    "name": "Train Stopping Location",
+                    "terms": "public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/stop_position_tram": {
+                    "name": "Tram Stopping Location",
+                    "terms": "electric,light rail,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/stop_position_trolleybus": {
+                    "name": "Trolleybus Stopping Location",
+                    "terms": "bus,electric,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
+                },
                 "public_transport/stop_position": {
-                    "name": "Stop Position",
+                    "name": "Transit Stopping Location",
+                    "terms": "public transit,public transportation,transit,transportation"
+                },
+                "railway/halt": {
+                    "name": "Train Station (Halt / Request)",
+                    "terms": "break,interrupt,rest,wait,interruption"
+                },
+                "railway/platform": {
+                    "name": "Train Stop / Platform",
                     "terms": ""
                 },
+                "railway/station": {
+                    "name": "Train Station",
+                    "terms": "train station,station"
+                },
+                "railway/tram_stop": {
+                    "name": "Tram Stopping Position",
+                    "terms": "light rail,streetcar,tram,trolley"
+                },
                 "railway/abandoned": {
                     "name": "Abandoned Railway",
                     "terms": ""
@@ -4870,18 +5324,22 @@
                     "name": "Funicular",
                     "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
                 },
-                "railway/halt": {
-                    "name": "Railway Halt",
-                    "terms": "break,interrupt,rest,wait,interruption"
-                },
                 "railway/level_crossing": {
                     "name": "Railway Crossing (Road)",
                     "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
                 },
+                "railway/light_rail": {
+                    "name": "Light Rail",
+                    "terms": "light rail,streetcar,trolley"
+                },
                 "railway/milestone": {
                     "name": "Railway Milestone",
                     "terms": "milestone,marker"
                 },
+                "railway/miniature": {
+                    "name": "Miniature Railway",
+                    "terms": "rideable miniature railway,narrow gauge railway,minimum gauge railway"
+                },
                 "railway/monorail": {
                     "name": "Monorail",
                     "terms": ""
@@ -4890,10 +5348,6 @@
                     "name": "Narrow Gauge Rail",
                     "terms": "narrow gauge railway,narrow gauge railroad"
                 },
-                "railway/platform": {
-                    "name": "Railway Platform",
-                    "terms": ""
-                },
                 "railway/rail": {
                     "name": "Rail",
                     "terms": ""
@@ -4902,10 +5356,6 @@
                     "name": "Railway Signal",
                     "terms": "signal,lights"
                 },
-                "railway/station": {
-                    "name": "Railway Station",
-                    "terms": "train station,station"
-                },
                 "railway/subway_entrance": {
                     "name": "Subway Entrance",
                     "terms": "metro,transit"
@@ -4922,10 +5372,6 @@
                     "name": "Train Wash",
                     "terms": "wash,clean"
                 },
-                "railway/tram_stop": {
-                    "name": "Tram Stop",
-                    "terms": "light rail,streetcar,tram,trolley"
-                },
                 "railway/tram": {
                     "name": "Tram",
                     "terms": "light rail,streetcar,tram,trolley"
@@ -4954,6 +5400,10 @@
                     "name": "Vacant Shop",
                     "terms": ""
                 },
+                "shop/agrarian": {
+                    "name": "Agriculture Shop",
+                    "terms": "agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools"
+                },
                 "shop/alcohol": {
                     "name": "Liquor Store",
                     "terms": "alcohol,beer,booze,wine"
@@ -5211,7 +5661,7 @@
                     "terms": "diamond,gem,ring"
                 },
                 "shop/kiosk": {
-                    "name": "News Kiosk",
+                    "name": "Kiosk",
                     "terms": ""
                 },
                 "shop/kitchen": {
@@ -5463,8 +5913,8 @@
                     "terms": "Motor Home,Camper"
                 },
                 "tourism/chalet": {
-                    "name": "Chalet",
-                    "terms": ""
+                    "name": "Holiday Cottage",
+                    "terms": "holiday,holiday cottage,holiday home,vacation,vacation home"
                 },
                 "tourism/gallery": {
                     "name": "Art Gallery",
@@ -5522,6 +5972,10 @@
                     "name": "Viewpoint",
                     "terms": ""
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Wilderness Hut",
+                    "terms": "wilderness hut,backcountry hut,bothy"
+                },
                 "tourism/zoo": {
                     "name": "Zoo",
                     "terms": "animal"
@@ -5646,10 +6100,18 @@
                     "name": "Riding Route",
                     "terms": ""
                 },
+                "type/route/light_rail": {
+                    "name": "Light Rail Route",
+                    "terms": ""
+                },
                 "type/route/pipeline": {
                     "name": "Pipeline Route",
                     "terms": ""
                 },
+                "type/route/piste": {
+                    "name": "Piste/Ski Route",
+                    "terms": ""
+                },
                 "type/route/power": {
                     "name": "Power Route",
                     "terms": ""
@@ -5658,6 +6120,10 @@
                     "name": "Road Route",
                     "terms": ""
                 },
+                "type/route/subway": {
+                    "name": "Subway Route",
+                    "terms": ""
+                },
                 "type/route/train": {
                     "name": "Train Route",
                     "terms": ""
@@ -5752,6 +6218,13 @@
                 "description": "Premium DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Premium Imagery"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Premium Imagery Vintage"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Terms & Feedback"
@@ -5759,6 +6232,13 @@
                 "description": "Standard DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Standard Imagery"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Standard Imagery Vintage"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Terms & Feedback"
@@ -5947,4 +6427,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/dist/locales/eo.json b/dist/locales/eo.json
index 8e235bb45..c7d749f9d 100644
--- a/dist/locales/eo.json
+++ b/dist/locales/eo.json
@@ -360,7 +360,9 @@
                 "accuracy": "Akurateco",
                 "unknown": "Nekonata",
                 "show_tiles": "Montri kahelojn",
-                "hide_tiles": "Kaŝi kahelojn"
+                "hide_tiles": "Kaŝi kahelojn",
+                "show_vintage": "Montri fot-daton",
+                "hide_vintage": "Kaŝi fot-daton"
             },
             "history": {
                 "key": "H",
@@ -666,6 +668,13 @@
         "mapillary": {
             "view_on_mapillary": "Montri ĉi tiun bildon en Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Strat-niveloj fotoj de OpenStreetCam",
+            "title": "Fotara surtavolo (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Montri tiun ĉi bildon ĉe OpenStreetCam"
+        },
         "help": {
             "title": "Helpo",
             "key": "H",
@@ -1215,6 +1224,9 @@
                 "aeroway": {
                     "label": "Speco"
                 },
+                "agrarian": {
+                    "label": "Produktaĵoj"
+                },
                 "amenity": {
                     "label": "Speco"
                 },
@@ -1283,6 +1295,9 @@
                 "board_type": {
                     "label": "Speco"
                 },
+                "boules": {
+                    "label": "Speco"
+                },
                 "boundary": {
                     "label": "Speco"
                 },
@@ -1302,6 +1317,10 @@
                 "bunker_type": {
                     "label": "Speco"
                 },
+                "cables": {
+                    "label": "Kabloj",
+                    "placeholder": "1, 2, 3…"
+                },
                 "camera/direction": {
                     "label": "Direkto (horloĝdirekte en gradoj)",
                     "placeholder": "45, 90, 180, 270"
@@ -1467,6 +1486,10 @@
                 "description": {
                     "label": "Priskribo"
                 },
+                "devices": {
+                    "label": "Aparatoj",
+                    "placeholder": "1, 2, 3…"
+                },
                 "diaper": {
                     "label": "Tablo por travindotukado"
                 },
@@ -1541,6 +1564,9 @@
                         "wall": "Muro"
                     }
                 },
+                "fitness_station": {
+                    "label": "Speco de ekzerc-ilaro"
+                },
                 "fixme": {
                     "label": "Riparu min!"
                 },
@@ -1548,6 +1574,9 @@
                     "label": "Speco",
                     "placeholder": "Norma"
                 },
+                "frequency": {
+                    "label": "Frekvenco"
+                },
                 "fuel": {
                     "label": "Brulaĵo"
                 },
@@ -1579,6 +1608,9 @@
                 "generator/type": {
                     "label": "Tipo"
                 },
+                "government": {
+                    "label": "Speco"
+                },
                 "grape_variety": {
                     "label": "Specoj de vinberujoj"
                 },
@@ -1906,6 +1938,10 @@
                 "payment_multi": {
                     "label": "Pagmanieroj"
                 },
+                "phases": {
+                    "label": "Fazoj",
+                    "placeholder": "1, 2, 3…"
+                },
                 "phone": {
                     "label": "Telefono",
                     "placeholder": "+31 42 1231 4567"
@@ -1985,6 +2021,9 @@
                 "railway": {
                     "label": "Tipo"
                 },
+                "rating": {
+                    "label": "Eliga povo"
+                },
                 "recycling_accepts": {
                     "label": "Akceptanta"
                 },
@@ -2193,6 +2232,9 @@
                 "studio": {
                     "label": "Speco"
                 },
+                "substance": {
+                    "label": "Substanco"
+                },
                 "substation": {
                     "label": "Speco"
                 },
@@ -2219,6 +2261,15 @@
                 "surveillance/zone": {
                     "label": "Gardata areo"
                 },
+                "switch": {
+                    "label": "Tipo",
+                    "options": {
+                        "circuit_breaker": "Malŝaltilo kurent-limiganta (441-14-20)",
+                        "disconnector": "Malkonektilo (441-14-05)",
+                        "earthing": "Ŝaltilo alteriga (441-14-07)",
+                        "mechanical": "Meĥanika (441-14-10)"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Reliefo por blinduloj"
                 },
@@ -2291,6 +2342,19 @@
                     },
                     "placeholder": "Bonega, bona, malbona…"
                 },
+                "transformer": {
+                    "label": "Tipo",
+                    "options": {
+                        "auto": "Komun-transformilo (aŭtotransformilo)",
+                        "auxiliary": "Helpa (intern-sistema)",
+                        "converter": "Konvertilo",
+                        "distribution": "Distribu-transformilo",
+                        "generator": "Blok-transformilo",
+                        "phase_angle_regulator": "Fazangul-alĝustigilo",
+                        "traction": "Kontaktrela",
+                        "yes": "Nekonata"
+                    }
+                },
                 "trees": {
                     "label": "Arboj"
                 },
@@ -2325,6 +2389,18 @@
                         "stratovolcano": "Tavolovulkano (stratovulkano)"
                     }
                 },
+                "voltage": {
+                    "label": "Tensio"
+                },
+                "voltage/primary": {
+                    "label": "Unua tensio"
+                },
+                "voltage/secondary": {
+                    "label": "Dua tensio"
+                },
+                "voltage/tertiary": {
+                    "label": "Tria tensio"
+                },
                 "wall": {
                     "label": "Speco"
                 },
@@ -2352,6 +2428,22 @@
                 },
                 "wikipedia": {
                     "label": "Vikipedio"
+                },
+                "windings": {
+                    "label": "Volvaĵoj",
+                    "placeholder": "1, 2, 3…"
+                },
+                "windings/configuration": {
+                    "label": "Aranĝo de volvaĵoj",
+                    "options": {
+                        "delta": "IEC 421-10-02 (delta / triangula)",
+                        "leblanc": "IEC 421-10-07 (Leblanc)",
+                        "open": "IEC 421-10-05 (malfermita)",
+                        "open-delta": "IEC 421-10-03 (malfermita delta)",
+                        "scott": "IEC 421-10-06 (Scott)",
+                        "star": " IEC 421-10-01 (stel-forma)",
+                        "zigzag": "IEC 421-10-04 (zigzaga)"
+                    }
                 }
             },
             "presets": {
@@ -2675,6 +2767,10 @@
                     "name": "Motorcikla parkumejo",
                     "terms": "motorciklejo,motociklejo"
                 },
+                "amenity/music_school": {
+                    "name": "Muzika lernejo",
+                    "terms": "muziklernejo"
+                },
                 "amenity/nightclub": {
                     "name": "Noktoklubejo",
                     "terms": "noktoklubo,diskoteko,dancejo,noktklubo,klubo nokta,nokta klubo"
@@ -2798,8 +2894,7 @@
                     "terms": "lernejo,edukejo,instruejo"
                 },
                 "amenity/scrapyard": {
-                    "name": "Ferrubejo",
-                    "terms": "aŭtovrakejo,vrakejo,feraĵejo,recikliga centro,rubejo"
+                    "name": "Ferrubejo"
                 },
                 "amenity/shelter": {
                     "name": "Ŝirmejo",
@@ -3259,6 +3354,10 @@
                     "name": "Manĝ-provizista oficejo",
                     "terms": "manghprovizado,mangxprovizado,catering"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Oficejo de kamenpurigisto",
+                    "terms": "kamenisto,kamenpurigisto,kamentubisto"
+                },
                 "craft/clockmaker": {
                     "name": "Horloĝista laborejo",
                     "terms": "horloĝisto,horloghisto,horlogxisto"
@@ -3368,9 +3467,9 @@
                     "name": "Skafaldista oficejo",
                     "terms": "skafaldo,trabaro,trabaĵo,trabaĵaro"
                 },
-                "craft/sculpter": {
-                    "name": "Skulptista laborejo",
-                    "terms": "skulptisto,skulptejo"
+                "craft/sculptor": {
+                    "name": "Laborejo de skulptisto",
+                    "terms": "skulptisto"
                 },
                 "craft/shoemaker": {
                     "name": "Ŝuista laborejo",
@@ -3380,10 +3479,6 @@
                     "name": "Ŝton-tranĉista laborejo",
                     "terms": "ŝtontranĉisto,shtontranchisto,sxtontrancxisto,ŝtonisto,shtonisto,sxtonisto"
                 },
-                "craft/sweep": {
-                    "name": "Kamenpurigista oficejo",
-                    "terms": "kamenoisto,kamenpurigisto,kamentubisto"
-                },
                 "craft/tailor": {
                     "name": "Tajlora laborejo (ĉefe viraj vestoj)"
                 },
@@ -3652,9 +3747,13 @@
                     "name": "Vojeto (piedpremita)",
                     "terms": "vojo,pado,irejo,piedvojeto"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Piedirada areo",
+                    "terms": "trotuaro,irejo,piedirejo,promenejo,promenvojo"
+                },
+                "highway/pedestrian_line": {
                     "name": "Piedirada strato",
-                    "terms": "trotuaro,irejo,piedirejo,pavimo"
+                    "terms": "trotuaro,irejo,piedirejo,pavimo,promenejo,promenvojo"
                 },
                 "highway/primary": {
                     "name": "Vojo unua-ranga",
@@ -3832,6 +3931,10 @@
                     "name": "Baseno (artefarita lageto)",
                     "terms": "akvo,akvejo,akvujo,lageto,lago,rezervujo"
                 },
+                "landuse/brownfield": {
+                    "name": "Konstruejo (post industria tereno)",
+                    "terms": "bruna kampo,kampo"
+                },
                 "landuse/cemetery": {
                     "name": "Tombejo",
                     "terms": "tombarejo,mortintejo,enterigejo,sepultejo,nekropolo"
@@ -3871,6 +3974,10 @@
                     "name": "Herbotapiŝo",
                     "terms": "gazono,herbejo"
                 },
+                "landuse/greenfield": {
+                    "name": "Konstruejo (virga tereno)",
+                    "terms": "verda kampo,kampo"
+                },
                 "landuse/harbour": {
                     "name": "Haveno",
                     "terms": "marhaveno,ŝipejo"
@@ -3879,6 +3986,14 @@
                     "name": "Industria tereno",
                     "terms": "industrio,fabriko"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Ferrubejo",
+                    "terms": "aŭtovrakejo,vrakejo,feraĵejo,recikliga centro,rubejo"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Buĉejo",
+                    "terms": "buchejo,bucxejo,porkmortigejo.porkomortigejo,mortigejo"
+                },
                 "landuse/landfill": {
                     "name": "Rubodeponejo",
                     "terms": "rubdeponejo,balaaĵejo,rubejo"
@@ -3955,6 +4070,10 @@
                     "name": "Ripoza tereno",
                     "terms": "ripozejo,distro"
                 },
+                "landuse/religious": {
+                    "name": "Religia tereno",
+                    "terms": "preĝejo,monaĥejo"
+                },
                 "landuse/residential": {
                     "name": "Privatdoma tereno",
                     "terms": "loĝejo,domo"
@@ -4011,6 +4130,50 @@
                     "name": "Ekzerc-parko (eksterdoma)",
                     "terms": "ripozgimnastiko,gimnastikejo,gimnastejo"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Ŝtipo ekvilibra",
+                    "terms": "shtipo,sxtipo,ekvilibrilo,balancilo"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Ekzerca skatolo (por salti)",
+                    "terms": "gimnastika skatolo,ĉevalo gimnastika"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Horizontala stango",
+                    "terms": "reko,alta stango"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Horizontala ŝtupetaro",
+                    "terms": "gimnastikaj simiaj stangoj"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Dors-muskol-ekzercilo",
+                    "terms": "dorsaj muskoloj,distranĉilo"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Du paralelaj stangoj",
+                    "terms": "paralelaj stangoj,rekoj"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Puŝlev-ekzercilo",
+                    "terms": "puŝlevoj,pusxlevoj,pushlevoj,kuŝapogo"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Ekzercaj ringegoj",
+                    "terms": "ringegoj"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Inform-tabulo pri ekzerco",
+                    "terms": "informtabulo,informsigno,signo"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Ventr-muskol-ekzercilo",
+                    "terms": "ventraj muskoloj"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Ekzerca ŝtuparo",
+                    "terms": "ŝtuparo"
+                },
                 "leisure/garden": {
                     "name": "Ĝardeno",
                     "terms": "ghardeno,gxardeno"
@@ -4071,6 +4234,10 @@
                     "name": "Plaĝ-flugpilkada ludkampo",
                     "terms": "flugpilkadejo,retpilkadejo,volejbalejo,plaĝa flugpilkado, plagha flugpilkado,plagxa flugpilkado"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Globludo grunda (Boules)",
+                    "terms": "globludo,bocce,lyonnaise,pétanque,petanque,grunda globludo"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Globlud-herbeja (bowls) ludkampo",
                     "terms": "bowls,globludo,herbejglobludo"
@@ -4123,6 +4290,10 @@
                     "name": "Kurejo",
                     "terms": "dromo,kurado"
                 },
+                "leisure/sauna": {
+                    "name": "Ŝvitbanejo",
+                    "terms": "shvitbanejo,sxvitbanejo,saŭno,sauxno,sauno,naĝejo,baseno"
+                },
                 "leisure/slipway": {
                     "name": "Ŝipglitejo",
                     "terms": "shipglitejo,sxipglitejo,ŝiplanĉejo"
@@ -4408,15 +4579,31 @@
                 },
                 "office/accountant": {
                     "name": "Oficejo de kontisto",
-                    "terms": "kontisto,librotenisto,kontregistristo"
+                    "terms": "kontisto,librotenisto,librotenanto"
                 },
                 "office/administrative": {
                     "name": "Administra oficejo",
                     "terms": "administrado"
                 },
+                "office/adoption_agency": {
+                    "name": "Oficejo de adopto",
+                    "terms": "adoptoficejo,agentejo de adopto,orfejo"
+                },
+                "office/advertising_agency": {
+                    "name": "Oficejo de reklamo",
+                    "terms": "reklamejo,reklamistejo,merkatado"
+                },
                 "office/architect": {
                     "name": "Oficejo de arĥitekturisto",
-                    "terms": "arĥitekto,arkitekto,arhxitekto,arĥitekturisto,arkitekturisto,arhxitekturisto,konstruisto"
+                    "terms": "arĥitekto,arhhitekto,arhxitekto,arkitekto,kontruisto"
+                },
+                "office/association": {
+                    "name": "Oficejo de ne-profit-cela organizaĵo",
+                    "terms": "neprofitcela organizaĵo,neprofitdona organizaĵo,organizaĵo,neregistara organizaĵo,senprofitcela organizaĵo"
+                },
+                "office/charity": {
+                    "name": "Oficejo de almoza organizaĵo",
+                    "terms": "almoza organizaĵo,karitata organizaĵo,karita organizaĵo"
                 },
                 "office/company": {
                     "name": "Oficejo de firmao",
@@ -4434,6 +4621,10 @@
                     "name": "Dungoficejo",
                     "terms": "dungado,labora agentejo,senlaborula oficejo,dungejo"
                 },
+                "office/energy_supplier": {
+                    "name": "Oficejo de elektr-provizanto",
+                    "terms": "elektroprovizanto,energiprovizanto"
+                },
                 "office/estate_agent": {
                     "name": "Oficejo de nemoveblaĵisto",
                     "terms": "nemoveblaĵisto,domvendisto"
@@ -4442,6 +4633,14 @@
                     "name": "Financa oficejo",
                     "terms": "financisto"
                 },
+                "office/forestry": {
+                    "name": "Oficejo de arbar-mastrumo",
+                    "terms": "arbarmastrumado,forsto,arbarkultivo"
+                },
+                "office/foundation": {
+                    "name": "Oficejo de fondaĵo",
+                    "terms": "fondaĵo,fondajho,fondajxo,fondacio"
+                },
                 "office/government": {
                     "name": "Registara oficejo",
                     "terms": "registaro,ministrejo,civila stato,civilstato,prokuroro,imposto,prezidanto,doganejo"
@@ -4450,13 +4649,21 @@
                     "name": "Oficejo de civila stato",
                     "terms": "civila stato,civilstato,geedzeco"
                 },
+                "office/government/tax": {
+                    "name": "Oficejo de imposto",
+                    "terms": "imposto,impostkolekto,depago"
+                },
+                "office/guide": {
+                    "name": "Oficejo de vojaĝ-gvido",
+                    "terms": "vojaĝgvidado,vojaghgvidado,vojagxgvidado,ekskurso,gvidado"
+                },
                 "office/insurance": {
                     "name": "Oficejo de asekur-kompanio",
                     "terms": "asekurkompanio,asekur-kompanio,asekuragento,asekuristo"
                 },
                 "office/it": {
-                    "name": "Inform-teĥnologia oficejo",
-                    "terms": "informteĥnologio,informteknologio,programisto,komputscienco,komputoscienco,informatikisto,IT"
+                    "name": "Oficejo de inform-teĥnologia firmao",
+                    "terms": "inform-teĥnologio,informteĥnologio,komputiloj,programaro,IT"
                 },
                 "office/lawyer": {
                     "name": "Oficejo de leĝisto",
@@ -4466,14 +4673,22 @@
                     "name": "Oficejo de notario",
                     "terms": "notario,aktisto,registristo"
                 },
+                "office/moving_company": {
+                    "name": "Oficejo de transloĝiĝ-helpa firmao",
+                    "terms": "transloĝiĝo,transporto"
+                },
                 "office/newspaper": {
-                    "name": "Gazet-redaktejo",
-                    "terms": "gazetredaktejo,redaktejo,redakcio"
+                    "name": "Oficejo de redakto",
+                    "terms": "redaktejo,gazeto"
                 },
                 "office/ngo": {
                     "name": "Oficejo de neregistara organizaĵo",
                     "terms": "neregistara organizaĵo,ne-registara organizaĵo"
                 },
+                "office/notary": {
+                    "name": "Oficejo de notario",
+                    "terms": "notario,aktisto,registristo"
+                },
                 "office/physician": {
                     "name": "Kabineto de kuracisto"
                 },
@@ -4481,21 +4696,41 @@
                     "name": "Oficejo de politika partio",
                     "terms": "politika partio,politikpartio,partio"
                 },
+                "office/private_investigator": {
+                    "name": "Oficejo de detektivo",
+                    "terms": "detektivo"
+                },
+                "office/quango": {
+                    "name": "Oficejo de duon-registara organizaĵo",
+                    "terms": "organizaĵo"
+                },
                 "office/research": {
                     "name": "Oficejo de scienca esplorado",
                     "terms": "esploro,progreso,scienco"
                 },
+                "office/surveyor": {
+                    "name": "Oficejo de analiza firmao",
+                    "terms": "anketo,demandfolio,analizo,mezuro"
+                },
+                "office/tax_advisor": {
+                    "name": "Oficejo de impost-konsilo",
+                    "terms": "impostkonsilo"
+                },
                 "office/telecommunication": {
                     "name": "Oficejo de telekomunikada firmao",
                     "terms": "telekomunikado"
                 },
                 "office/therapist": {
                     "name": "Kabineto de terapiisto",
-                    "terms": "terapiisto,terapeŭto,okup-terapiisto,psikologo,psiĥologo"
+                    "terms": "terapiisto,psiĥoterapiisto,psikoterapiisto,psikologo,kuracisto"
                 },
                 "office/travel_agent": {
                     "name": "Vojaĝa oficejo"
                 },
+                "office/water_utility": {
+                    "name": "Oficejo de akv-provizanta firmao",
+                    "terms": "akvoprovizo,akvokondukto"
+                },
                 "piste": {
                     "name": "Skivojo",
                     "terms": "skitrako,skiado"
@@ -4518,6 +4753,10 @@
                     "name": "Insulo",
                     "terms": "insulo"
                 },
+                "place/islet": {
+                    "name": "Insuleto",
+                    "terms": "insulo"
+                },
                 "place/isolated_dwelling": {
                     "name": "Solstaranta domo",
                     "terms": "domo,kabano,ĥato,domaro"
@@ -4530,6 +4769,10 @@
                     "name": "Najbaraĵo",
                     "terms": "najbarajho,najbarajxo,vilaĝo,vilaĝeto,domaro,kvartalo"
                 },
+                "place/plot": {
+                    "name": "Parcelo",
+                    "terms": "terpeco,farmbieno,bieno"
+                },
                 "place/quarter": {
                     "name": "Kvartalo",
                     "terms": "suburbo,urboparto,distrikto,domaro"
@@ -4551,8 +4794,8 @@
                     "terms": "vilagho,vilagxo,kamparo"
                 },
                 "playground/balance_beam": {
-                    "name": "Ŝtipo ekvilibra (infanludilo)",
-                    "terms": "ekvilibrilo,balancilo"
+                    "name": "Ŝtipo ekvilibra (por infanoj)",
+                    "terms": "shtipo,sxtipo,ekvilibrilo,balancilo"
                 },
                 "playground/basket_spinner": {
                     "name": "Korba turniĝilo (infanludilo)",
@@ -4571,7 +4814,7 @@
                     "terms": "salta kuseno"
                 },
                 "playground/horizontal_bar": {
-                    "name": "Horizontala stango (infanludilo)",
+                    "name": "Horizontala stango (por infanoj)",
                     "terms": "reko,alta stango"
                 },
                 "playground/rocker": {
@@ -4648,6 +4891,10 @@
                     "name": "Elektrosubcentralo",
                     "terms": "subcentralo,transformatoro,substacio"
                 },
+                "power/switch": {
+                    "name": "Ŝaltilo elektra",
+                    "terms": "sxaltilo,shaltilo,malŝaltilo,elektroŝaltilo,malkonektilo"
+                },
                 "power/tower": {
                     "name": "Elektrofosto (alttensia)",
                     "terms": "fosto,elektrfosto,elektromasto"
@@ -4699,6 +4946,10 @@
                     "name": "Traknivela pasejo (por aŭtoj)",
                     "terms": "pasejo,nivelpasejo,trenpasejo,trajnpasejo"
                 },
+                "railway/light_rail": {
+                    "name": "Fervojo malpeza",
+                    "terms": "malpeza fervojo,malpeza trajno,suburba fervojo,tramo"
+                },
                 "railway/milestone": {
                     "name": "Mejloŝtono fervoja",
                     "terms": "fervoja mejloŝtono"
@@ -4766,6 +5017,10 @@
                     "name": "Vendejo",
                     "terms": "aĉetejo"
                 },
+                "shop/agrarian": {
+                    "name": "Terkultur-investaĵa vendejo",
+                    "terms": "terkulturo,agrokulturo,agrikulturo,semoj,kripoj,furaĝoj,pesticidoj,kemiaĵoj,ĥemiaĵoj"
+                },
                 "shop/alcohol": {
                     "name": "Alkohola vendejo",
                     "terms": "alkoholejo,vino,brando,trinkaĵo,drinkaĵo"
@@ -5284,8 +5539,8 @@
                     "terms": "kampadveturilo,kampveturilo"
                 },
                 "tourism/chalet": {
-                    "name": "Dometo feria (luprenebla)",
-                    "terms": "pensiono,luprenado de ĉambro,luigado de ĉambro,apartamento,gastejo"
+                    "name": "Dometo feria",
+                    "terms": "feria dometo,hoteleto,loĝejo feria,apartamento"
                 },
                 "tourism/gallery": {
                     "name": "Artgalerio",
@@ -5343,6 +5598,10 @@
                     "name": "Belvidejo",
                     "terms": "videjo,vidindaĵo,rigardejo"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Sovaĝeja kabano",
+                    "terms": "sovagheja kabano,sovagxeja kabano,kabano,ĥato,ŝirmejo"
+                },
                 "tourism/zoo": {
                     "name": "Bestoĝardeno",
                     "terms": "bestoghardeno,bestogxardeno,zoo,zoologia ĝardeno"
@@ -5575,6 +5834,13 @@
                 "description": "Detala satelita fotaro de DigitalGlobe.",
                 "name": "Detala fotaro de DigitalGlobe"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Kondiĉoj kaj rimarkoj"
+                },
+                "description": "Limoj kaj datoj de fotoj. Etikedoj montriĝas de skal-nivelo 14.",
+                "name": "Detala fotaro de DigitalGlobe - fot-dato"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Kondiĉoj kaj rimarkoj"
@@ -5582,12 +5848,19 @@
                 "description": "Norma satelita fotaro de DigitalGlobe.",
                 "name": "Norma fotaro de DigitalGlobe"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Kondiĉoj kaj rimarkoj"
+                },
+                "description": "Limoj kaj datoj de fotoj. Etikedoj montriĝas de skal-nivelo 14.",
+                "name": "Norma fotaro de DigitalGlobe - fot-dato"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Kondiĉoj kaj rimarkoj"
                 },
                 "description": "Tutmonda fotaro de Esri.",
-                "name": "Tutmonda fotaro de Esri."
+                "name": "Tutmonda fotaro de Esri"
             },
             "MAPNIK": {
                 "attribution": {
diff --git a/dist/locales/es.json b/dist/locales/es.json
index cdbdfed21..e73efae41 100644
--- a/dist/locales/es.json
+++ b/dist/locales/es.json
@@ -361,7 +361,9 @@
                 "accuracy": "Precisión",
                 "unknown": "Desconocido",
                 "show_tiles": "Mostrar teselas",
-                "hide_tiles": "Ocultar teselas"
+                "hide_tiles": "Ocultar teselas",
+                "show_vintage": "Mostrar antigüedad",
+                "hide_vintage": "Ocultar antigüedad"
             },
             "history": {
                 "key": "H",
@@ -408,7 +410,7 @@
             "no_results_worldwide": "No hay resultados"
         },
         "geolocate": {
-            "title": "Mostrar mi localización",
+            "title": "Mostrar mi ubicación",
             "locating": "Ubicando, por favor espere..."
         },
         "inspector": {
@@ -451,7 +453,7 @@
             "node": "Nodo",
             "way": "Vía",
             "relation": "Relación",
-            "location": "Localización",
+            "location": "Ubicación",
             "add_fields": "Añadir campo:"
         },
         "background": {
@@ -464,7 +466,7 @@
             "switch": "Volver a este fondo",
             "custom": "Personalizado",
             "custom_button": "Editar fondo personalizado",
-            "custom_prompt": "Introduzca una plantilla URL de tesela. Los tokens válidos son:\n  - {zoom}/{z}, {x}, {y} para el esquema de tesela Z / X / Y\n  - {ty} para coordenadas Y invertidas del estilo TMS\n  - {u} para el esquema cuádruple\n  - {switch:a,b,c} para la multiplexación del servidor DNS\n\nEjemplo:\n{example}",
+            "custom_prompt": "Introduzca una plantilla URL de tesela. Los tokens válidos son:\n  - {zoom}/{z}, {x}, {y} para el esquema de tesela Z/X/Y\n  - {ty} para coordenadas Y invertidas del estilo TMS\n  - {u} para el esquema quadtile\n  - {switch:a,b,c} para la multiplexación del servidor DNS\n\nEjemplo:\n{example}",
             "fix_misalignment": "Ajustar desplazamiento de imágenes",
             "imagery_source_faq": "¿De dónde vienen estas imágenes?",
             "reset": "reiniciar",
@@ -659,23 +661,34 @@
         },
         "mapillary_images": {
             "tooltip": "Fotos a nivel calle de Mapillary",
-            "title": "Superposición de fotos (Mapillary)"
+            "title": "Capa de fotos (Mapillary)"
         },
         "mapillary_signs": {
-            "tooltip": "Señales de tráfico de Mapillary (debe permitir superposición de fotos)",
-            "title": "Superposición de señal de tráfico (Mapillary)"
+            "tooltip": "Señales de tráfico Mapillary (debe habilitar Capa de fotos)",
+            "title": "Capa de señales de tráfico (Mapillary)"
         },
         "mapillary": {
             "view_on_mapillary": "Ver esta imagen en Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Fotos a nivel de calle de OpenStreetCam",
+            "title": "Capa de fotos (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Ver esta imagen en OpenStreetCam"
+        },
         "help": {
             "title": "Ayuda",
             "key": "H",
             "help": "# Ayuda\n\nEste es un editor para [OpenStreetMap](http://www.openstreetmap.org/), el\nmapa libre y editable del mundo. Se puede utilizar para añadir y actualizar\ndatos en su área, haciendo que el mapa del mundo de fuente y datos abiertos\nsea mejor para todos.\n\nLas ediciones que realice en este mapa serán visible a todos los que usen\nOpenStreetMap. Para poder hacer una edición tendrá que\n[Iniciar sesión](https://www.openstreetmap.org/login).\n\nEl [editor iD](http://ideditor.com/) es un proyecto colaborativo con [código\nfuente disponible en GitHub](https://github.com/openstreetmap/iD).\n",
+            "editing_saving": "# Editando & Guardando\n\nEste editor está diseñado para trabajar principalmente en línea, y usted está accediendo\na él mediante una página web ahora mismo.\n\n### Seleccionando elementos\n\nPara seleccionar un elemento de mapa, como una carretera o un punto de interés, click sobre\nel mapa. Esto resaltará la función seleccionada\ny cargará una barra lateral con\ndetalles sobre él. Si hace click derecho sobre él, mostrará un menú de cosas\nque puede hacer con el elemento.\n\nPara seleccionar múltiples elementos, mantenga pulsada la «Tecla Shift». Luego haga click\nen los elementos que quiere seleccionar, o arrastre sobre el mapa para dibujar un contorno\nalrededor de esos elementos. Se seleccionarán todos los puntos dentro del área de lazo.\n\n### Guardando Ediciones\n\nCuando realiza cambios como editar carreteras, edificios y lugares, estos son\nalmacenados localmente hasta que los guarde en el servidor. No se preocupe si comete\nun error- puede deshacer los cambios haciendo click en el botón deshacer, y rehacer\ncambios haciendo click en el boton rehacer.\n\nHaga click en «Guardar» para finalizar un grupo de ediciones- por ejemplo, si ha completado\nun área de ciudad y le gustaría empezar un nuevo área. Tendrá una oportunidad\nde revisar lo que ha hecho, y el editor proporciona sugerencias útiles\ny advertencias si algo no parece estar correcto sobre los cambios.\n\nSi todo parece estar bien, puede introducir un breve comentario explicando el cambio\nque hizo, y hacer click en «Subir» para publicar los cambios en\n[OpenStreetMap.org](http://www.openstreetmap.org/), donde estarán visibles\npara los demás usuarios y disponibles para otros para construir y mejorar.\n\nSi no puede terminar sus ediciones de una vez, puede dejar la ventana del editor y volver (en el mismo navegador y computadora), y la aplicación del editor ofrecerá restaurar su trabajo.\n\n### Usando el editor\n\nPuede ver una lista de atajos de teclado presionando la tecla «?».\n",
+            "roads": "# Carreteras\n\nUsted puede crear, reparar y eliminar carreteras con este editor. Las carreteras pueden ser de todos los\ntipos: rutas, autovías, senderos, carriles bici y más - cualquier segmento cruzado a menudo\nel segmento debe ser mapeable.\n\n### Seleccionando\n\nClick en una carretera para seleccionar. Un esquema debe ser visible, junto\ncon una barra lateral mostrando más información sobre la carretera. Si hace click derecho\nen él, tendrá un menú de acciones que puede aplicar a la carretera.\n\n### Modificando\n\nA menudo verá carreteras que no están alineados con las imágenes detrás de ellos\no a un rastro GPS. Puede ajustar esas carreteras para que estén en el lugar\ncorrecto.\n\nPrimero clickee en la carretera que quiere cambiar. Esto la resaltará y mostrará\npuntos de control a lo largo de ella que puede arrastrar a mejores ubicaciones. Si\nquiere añadir nuevos puntos de control para más detalle, doble click en una parte\nde la carretera que no tenga nodo, y se añadido uno.\n\nSi la carretera conecta a otra carretera, pero no conecta apropiadamente con\nel mapa, puede arrastrar uno de sus puntos de control a la otra carretera para\nunirlas. Tener carreteras conectadas es importante para el mapa\ny esencial para proporcionar instrucciones de conducción.\n\nTambién puede hacer click derecho en ella y seleccionar la herramienta «Mover», o simplemente presionar\nla tecla de atajo «M», para mover toda la carretera al mismo tiempo, y luego hacer click\nde nuevo para guardar el movimiento.\n\n### Eliminando\n\nSi una carretera está completamente incorrecta - puede ver que no existe en las imágenes\nde satélitee y han confirmado localmente que no está presente - puede eliminarla\nlo que la borra del mapa. Tenga cuidado al eliminar elementos-\ncomo cualquier otra editar, los resultados son vistos por todos y las imágenes de satélite\na menudo están desactualizadas, por lo que la carretera podría simplemente ser de nueva construcción.\n\nPuede eliminar una carretera clickeando sobre ella para seleccionar, después presionar la tecla «Eliminar»\no haciendo click derecho sobre ella y luego hacer clic en el icono de la papelera.\n\n### Creando\n\n¿Ha encontrado en algún lugar en el que debería haber una carretera pero no hay? Clickee en el icono «Línea»\nen la esquina superior izquierda del editor o presione la tecla de acceso directo «2» para empezar a dibujar\nuna línea.\n\nClick al principio de la carretera en el mapa para empezar a dibujar. Si la carretera\nse ramifica desde una carretera existente, comience haciendo clic en el lugar donde se conectan.\n\nLuego haga clic en los puntos a lo largo de la carretera para que siga el camino correcto, de acuerdo\na la imagen de satélite o de GPS. Si la carretera que está atravesando atraviesa otra carretera, conéctela\nhaciendo clic en el punto de intersección. Cuando haya terminado de dibujar, doble click\no presione «Retorno» o «Intro» en su teclado.\n",
             "gps": "# GPS\n\nLas trazas de GPS recogidas son una valiosa fuente de datos para OpenStreetMap. Este\neditor soporta trazas locales - archivos `.gpx` en su equipo local. Usted puede obtener\neste tipo de traza GPS con una serie de aplicaciones de smartphone, como también con\nhardware GPS personal.\n\nPara más información sobre cómo realizar un relevamiento GPS, lea\n[Mapear con un smartphone, GPS, o papel](http://learnosm.org/es/mobile-mapping/).\n\nPara utilizar una traza GPX para mapear, arrastre y suelte el archivo GPX en el editor\nde mapa. Si este es reconocido, se añadirá al mapa como una línea púrpura brillante.\nHaga clic en el menú 'Datos del mapa' en el lado derecho para activar,\ndesactivar o acercar a esta nueva capa alimentada por GPX.\n\nLa traza GPX no se carga directamente a OpenStreetMap - la mejor manera de\nutilizarlo es dibujar en el mapa, usándolo como guía para las nuevos elementos que\nagregue, y también [subirlo a OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que otros usuarios lo utilicen.\n",
             "imagery": "# Imágenes\n\nLas imágenes aéreas son un importante recurso para mapear. Una combinación\nde vuelos aéreos, vistas de satélite, y compilaciones de fuentes libres están disponibles\nen el editor bajo el menú 'Ajustes del fondo' a la derecha.\n\nDe forma predeterminada se presenta la capa de satélite de [Bing Maps](http://www.bing.com/maps/) en el editor, pero mientras se mueva y acerque el mapa a nuevas áreas\ngeográficas, nuevas fuentes estarán disponibles. Algunos países, como los Estados\nUnidos, Francia, y Dinamarca poseen imágenes de muy alta calidad disponible\npara algunas áreas.\n\nLas imágenes a veces están desplazadas de los datos del mapa debido a un error en el\nlado del proveedor de imágenes. Si observa muchos caminos desplazados del fondo,\nno los mueva inmediatamente para emparejarlos con el fondo. En su lugar puede ajustar\nlas imágenes para que coincidan con los datos existentes haciendo clic\nen 'Corregir alineación' en la opción 'Ajustes del fondo' de la interfaz.\n",
             "addresses": "# Direcciones\n\nLas direcciones son parte de la información más útil que se puede añadir al mapa.\n\nAunque las direcciones se representan a menudo como parte de las calles, en OpenStreetMap esta información es guardada como atributos de los edificios y lugares presentes a lo largo de los viales.\n\nPuede agregar información sobre direcciones a lugares dibujados en el mapa como contornos de edificios, así como aquellos localizados únicamente con un punto. La fuente óptima para obtener datos de direcciones es la consulta sobre el terreno o el conocimiento personal. El uso de fuentes comerciales, como Google Maps, para obtener estos datos está estrictamente prohibido.\n",
-            "inspector": "# Usando el inspector\n\nEl inspector es la sección en la parte izquierda de la página que le permite\neditar los detalles del elemento seleccionado.\n\n## Selección de un tipo de elemento\n\nDespués de agregar un punto, línea o área, puede elegir qué tipo de elemento\nes, como si se trata de una carretera o camino residencial, supermercado o una cafetería.\nEl inspector mostrará botones para tipos de elementos comunes, y usted puede\nencontrar otros escribiendo lo que  está buscando en el cuadro de búsqueda.\n\nHaga clic en la 'i' de la esquina inferior derecha de un botón de tipo de elemento\npara aprender más sobre él. Haga clic en un botón para elegir ese tipo.\n\n\n### Uso de formularios y edición de etiquetas\n\nDespués de elegir un tipo de elemento, o cuando se selecciona un elemento\nque ya tiene un tipo asignado, el inspector mostrará campos con detalles sobre\nel elemento como su nombre y dirección.\n\nDebajo de los campos que ve, puede hacer clic en el desplegable 'Añadir campo'\npara agregar otros detalles, como un enlace de Wikipedia,  acceso en silla de ruedas, y más.\n\nEn la parte inferior del inspector, haga clic en 'Etiquetas adicionales' para agregar otras\netiquetas arbitrarias al elemento. [Taginfo](http://taginfo.openstreetmap.org/) es un\ngran recurso para aprender más acerca de las combinaciones de etiquetas populares.\n\nLos cambios que realice en el inspector se aplican automáticamente al mapa.\nPuede deshacerlos en cualquier momento haciendo clic en el botón 'Deshacer'.\n"
+            "inspector": "# Usando el inspector\n\nEl inspector es la sección en la parte izquierda de la página que le permite\neditar los detalles del elemento seleccionado.\n\n## Selección de un tipo de elemento\n\nDespués de agregar un punto, línea o área, puede elegir qué tipo de elemento\nes, como si se trata de una carretera o camino residencial, supermercado o una cafetería.\nEl inspector mostrará botones para tipos de elementos comunes, y usted puede\nencontrar otros escribiendo lo que  está buscando en el cuadro de búsqueda.\n\nHaga clic en la 'i' de la esquina inferior derecha de un botón de tipo de elemento\npara aprender más sobre él. Haga clic en un botón para elegir ese tipo.\n\n\n### Uso de formularios y edición de etiquetas\n\nDespués de elegir un tipo de elemento, o cuando se selecciona un elemento\nque ya tiene un tipo asignado, el inspector mostrará campos con detalles sobre\nel elemento como su nombre y dirección.\n\nDebajo de los campos que ve, puede hacer clic en el desplegable 'Añadir campo'\npara agregar otros detalles, como un enlace de Wikipedia,  acceso en silla de ruedas, y más.\n\nEn la parte inferior del inspector, haga clic en 'Etiquetas adicionales' para agregar otras\netiquetas arbitrarias al elemento. [Taginfo](http://taginfo.openstreetmap.org/) es un\ngran recurso para aprender más acerca de las combinaciones de etiquetas populares.\n\nLos cambios que realice en el inspector se aplican automáticamente al mapa.\nPuede deshacerlos en cualquier momento haciendo clic en el botón 'Deshacer'.\n",
+            "buildings": "# Edificios\n\nOpenStreetMap es la base de datos de edificios más grande del mundo. Usted puede crear\ny mejorar esta base de datos.\n\n### Seleccionando\n\nPuede seleccionar un edificio haciendo clic en su borde. Esto resaltará el\nedificio y cargará una barra lateral que muestra más información sobre el edificio.\nSi hace clic derecho en él, se mostrará un menú de acciones que puede ejecutar\nen el edificio.\n\n### Modificando\n\nA veces los edificios se colocan incorrectamente o tienen etiquetas incorrectas.\n\nPara mover un edificio entero, seleccionar y presione la tecla de acceso directo «M»,\no haga click derecho en él y seleccionar la herramienta «Mover». Mueva su\nratón para cambiar el edificio, y haga click cuando esté colocado correctamente.\n\nPara arreglar la forma específica de un edificio, haga clic y arrastre los nodos que forman\nsu borde enlugares mejores.\n\n### Creando\n\nUna de las preguntas principales sobre añadir edificios al mapa es que\nOpenStreetMap guarda edificios como formas y puntos. La regla de oro\nes _mapear un edificio como una forma cuando sea posible_, y mapear empresas, casas,\nservicios, y otras cosas que operan fuera de los edificios como puntos colocados\nen el interior de la forma del edificio.\n\nEmpiece dibujando un edificio como una forma pulsando el botón «Área» arriba\na la izquierda de la interfaz, y termínelo pulsando «Retorno» en su teclado\no haciendo clic en el primer nodo dibujado para cerrar la forma.\n\n### Eliminando\n\nSi un edificio está completamente incorrecto - puede ver que no existe en la imagen de satélite\ne idealmente han confirmado localmente que no está presente - puede eliminarlo\nlo que lo borra del mapa. Tenga cuidado al eliminar elementos-\ncomo cualquier otra editar, los resultados son vistos por todos y la imagen de satélite\na menudo está desactualizado, por lo que el edificio podría simplemente ser de nueva construcción.\n\nPuede eliminar un edificio haciendo click en él para seleccionar, después presionar la tecla «Suprimir»,\no haciendo clic derecho sobre él y luego haciendo clic en el ícono de papelera.\n",
+            "relations": "# Relaciones\n\nUna relación es un tipo de elemento especial de OpenStreetMap que agrupa\na otros elementos. Por ejemplo, dos tipos comunes de relaciones son *relaciones de ruta*,\nque agrupan secciones de la carretera que pertenecen a una autopista específica o\nautovía , y *multipolígonos*, que agrupan varias líneas que definen\nun área compleja (uno con varias piezas o agujeros como una rosquilla).\n\nEl grupo de elementos en una relación se llaman *miembros*. En la parte inferior de la\nbarra lateral, puede ver a qué relaciones es miembro un elemento y hacer clic en una\nrelación allí lo seleccionará. Cuando la relación está seleccionar, puede ver a todos\nsus miembros enumerados en la barra lateral y resaltados en el mapa.\n\nEn la mayor parte, la iD se ocupará de mantener las relaciones automáticamente\nmientras usted editar. Lo principal que debe tener en cuenta es que si elimina una\nsección de carretera para volver a dibujarla con mayor precisión, debería asegurarse de que la\nnueva sección es un miembro de las mismas relaciones que el original.\n\n## Editando Relaciones\n\nSi quiere editar relaciones, aquí están los básicos.\n\nPara añadir un elemento a una relación, seleccionar el elemento, click en el botón «+» en la\nsección «Todas las relaciones» de la barra lateral, y seleccionar o tipo el nombre de la relación.\n\nPara crear una nueva relación, seleccionar el primer elemento que debería ser un miembro,\nclick en el botón «+» en la sección «Todas las relaciones», y seleccionar «Nueva relación...».\n\nPara eliminar un elemento de una relación, seleccionar el elemento y haga click en el botón papelera\njunto a la relación de la que quiere eliminarlo.\n\nPuede crear multipolígonos con agujeros usando la herramienta «Mezclar». Dibuje dos áreas (interior\ny exterior), mantenga la tecla Shift y click en cada uno de ellas para seleccionar ambas, y luego\npresione la tecla de acceso directo «C». Otra opción es seleccionar ambas, y luego hacer click derecho en una\nde ellas y hacer click en el botón «Mezclar» (+).\n"
         },
         "intro": {
             "done": "listo",
@@ -818,7 +831,7 @@
             "navigation": {
                 "title": "Navegación",
                 "drag": "El área del mapa principal muestra los datos de OpenStreetMap encima de un fondo.{br}Puede arrastrar el mapa manteniendo presionado el botón izquierdo del ratón mientras mueve el ratón alrededor. También puede utilizar las teclas de flechas de su teclado. **¡Arrastre el mapa!**",
-                "zoom": "Puede acercar o alejar desplazándose con la rueda del ratón o el trackpad, o haciendo clic en los botones {plus} / {minus}. **¡Acerque el mapa!**",
+                "zoom": "Puede acercar o alejar desplazándose con la rueda del ratón o el trackpad, o haciendo clic en los botones {plus} / {minus}. **¡Acercar el mapa!**",
                 "features": "Utilizamos la palabra *elementos* para describir las cosas que aparecen en el mapa. Cualquier cosa en el mundo real puede ser mapeada como un elemento en OpenStreetMap.",
                 "points_lines_areas": "Las elementos del mapa se representan usando *puntos, líneas o áreas.*",
                 "nodes_ways": "En OpenStreetMap, los puntos a veces se llaman *nodos*, y las líneas y áreas a veces se llaman *vías*.",
@@ -1213,6 +1226,9 @@
                 "aeroway": {
                     "label": "Tipo"
                 },
+                "agrarian": {
+                    "label": "Productos"
+                },
                 "amenity": {
                     "label": "Tipo"
                 },
@@ -1261,7 +1277,7 @@
                     "label": "Tipo de tienda"
                 },
                 "bench": {
-                    "label": "Banco"
+                    "label": "Banco / Asiento"
                 },
                 "bicycle_parking": {
                     "label": "Tipo"
@@ -1281,6 +1297,9 @@
                 "board_type": {
                     "label": "Tipo"
                 },
+                "boules": {
+                    "label": "Tipo"
+                },
                 "boundary": {
                     "label": "Tipo"
                 },
@@ -1300,6 +1319,10 @@
                 "bunker_type": {
                     "label": "Tipo"
                 },
+                "cables": {
+                    "label": "Cables",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Dirección (grados en sentido horario)",
                     "placeholder": "45, 90, 180, 270"
@@ -1385,6 +1408,14 @@
                 "craft": {
                     "label": "Tipo"
                 },
+                "crane/type": {
+                    "label": "Tipo de grúa",
+                    "options": {
+                        "floor-mounted_crane": "Grúa fija al suelo",
+                        "portal_crane": "Grúa portal",
+                        "travel_lift": "Ascensor de viaje"
+                    }
+                },
                 "crop": {
                     "label": "Cultivo"
                 },
@@ -1457,6 +1488,10 @@
                 "description": {
                     "label": "Descripción"
                 },
+                "devices": {
+                    "label": "Dispositivos",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Cambiador de pañales disponible"
                 },
@@ -1531,6 +1566,9 @@
                         "wall": "Pared"
                     }
                 },
+                "fitness_station": {
+                    "label": "Tipo de equipo"
+                },
                 "fixme": {
                     "label": "Arréglame"
                 },
@@ -1538,6 +1576,9 @@
                     "label": "Tipo",
                     "placeholder": "Predeterminado"
                 },
+                "frequency": {
+                    "label": "Frecuencia de operación"
+                },
                 "fuel": {
                     "label": "Combustible"
                 },
@@ -1569,6 +1610,9 @@
                 "generator/type": {
                     "label": "Tipo"
                 },
+                "government": {
+                    "label": "Tipo"
+                },
                 "grape_variety": {
                     "label": "Variedades de uva"
                 },
@@ -1580,6 +1624,7 @@
                     "label": "Pasamanos"
                 },
                 "hashtags": {
+                    "label": "Hashtags sugeridos",
                     "placeholder": "#ejemplo"
                 },
                 "healthcare": {
@@ -1895,6 +1940,10 @@
                 "payment_multi": {
                     "label": "Formas de pago"
                 },
+                "phases": {
+                    "label": "Fases",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Teléfono",
                     "placeholder": "+31 42 123 4567"
@@ -1974,6 +2023,9 @@
                 "railway": {
                     "label": "Tipo"
                 },
+                "rating": {
+                    "label": "Potencia nominal"
+                },
                 "recycling_accepts": {
                     "label": "Acepta"
                 },
@@ -2008,14 +2060,14 @@
                 },
                 "ref_runway": {
                     "label": "Número de pista de aterrizaje",
-                    "placeholder": "p.e. 01L/19R"
+                    "placeholder": "ej. 01L/19R"
                 },
                 "ref_stop_position": {
                     "label": "Número de parada"
                 },
                 "ref_taxiway": {
                     "label": "Nombre de pista de rodaje",
-                    "placeholder": "p.e. A5"
+                    "placeholder": "ej. A5"
                 },
                 "relation": {
                     "label": "Tipo"
@@ -2101,7 +2153,7 @@
                 "smoking": {
                     "label": "Fumar",
                     "options": {
-                        "dedicated": "Dedicado a los fumadores (ej: el club de los fumadores)",
+                        "dedicated": "Dedicado a los fumadores (ej.: club de fumadores)",
                         "isolated": "En áreas de fumadores, físicamente aislados",
                         "no": "No fumar en todas partes",
                         "outside": "Permitido fuera",
@@ -2182,6 +2234,9 @@
                 "studio": {
                     "label": "Tipo"
                 },
+                "substance": {
+                    "label": "Sustancia"
+                },
                 "substation": {
                     "label": "Tipo"
                 },
@@ -2208,6 +2263,15 @@
                 "surveillance/zone": {
                     "label": "Zona de vigilancia"
                 },
+                "switch": {
+                    "label": "Tipo",
+                    "options": {
+                        "circuit_breaker": "Cortacircuitos",
+                        "disconnector": "Desconector",
+                        "earthing": "Toma de tierra",
+                        "mechanical": "Mecánico"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Pavimento táctil"
                 },
@@ -2259,6 +2323,9 @@
                     },
                     "placeholder": "Sólido, mayormente sólido, suave..."
                 },
+                "trade": {
+                    "label": "Tipo"
+                },
                 "traffic_calming": {
                     "label": "Tipo"
                 },
@@ -2277,6 +2344,19 @@
                     },
                     "placeholder": "Excelente, bueno, malo..."
                 },
+                "transformer": {
+                    "label": "Tipo",
+                    "options": {
+                        "auto": "Autotransformador",
+                        "auxiliary": "Auxiliar",
+                        "converter": "Convertidor",
+                        "distribution": "Distribución",
+                        "generator": "Generador",
+                        "phase_angle_regulator": "Regulador de ángulo de fase",
+                        "traction": "Tracción",
+                        "yes": "Desconocido"
+                    }
+                },
                 "trees": {
                     "label": "Árboles"
                 },
@@ -2311,6 +2391,18 @@
                         "stratovolcano": "Estratovolcán"
                     }
                 },
+                "voltage": {
+                    "label": "Voltaje"
+                },
+                "voltage/primary": {
+                    "label": "Voltaje primario"
+                },
+                "voltage/secondary": {
+                    "label": "Voltaje secundario"
+                },
+                "voltage/tertiary": {
+                    "label": "Voltaje terciario"
+                },
                 "wall": {
                     "label": "Tipo"
                 },
@@ -2338,6 +2430,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Bobinas",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Configuración de bobinas",
+                    "options": {
+                        "delta": "Delta",
+                        "leblanc": "Leblanc",
+                        "open": "Abierto",
+                        "open-delta": "Delta abierto",
+                        "scott": "Scott",
+                        "star": "Estrella / Wye",
+                        "zigzag": "Zig Zag"
+                    }
                 }
             },
             "presets": {
@@ -2471,7 +2579,7 @@
                     "terms": "barbacoa, asador, parrilla, churrasquería"
                 },
                 "amenity/bench": {
-                    "name": "Banco",
+                    "name": "Banco / Asiento",
                     "terms": "asiento,banco,banquillo,banqueta,banca"
                 },
                 "amenity/bicycle_parking": {
@@ -2540,11 +2648,11 @@
                 },
                 "amenity/clinic/abortion": {
                     "name": "Clínica de aborto",
-                    "terms": "Clínica de aborto, clinica de aborto, aborto"
+                    "terms": "aborto, abotar, interrupción, embarazo, interrupción embarazo, clínica de aborto, clinica aborto"
                 },
                 "amenity/clinic/fertility": {
                     "name": "Clínica de fertilidad",
-                    "terms": "Clínica de fertilidad, clinica de fertilidad, fertilidad, reproducción, reproduccion, esperma, ovulación, ovulacion"
+                    "terms": "clínica de fertilidad, clinica de fertilidad, fertilidad, reproducción, reproduccion, esperma, ovulación, ovulacion"
                 },
                 "amenity/clock": {
                     "name": "Reloj",
@@ -2655,12 +2763,16 @@
                 },
                 "amenity/marketplace": {
                     "name": "Mercado",
-                    "terms": "mercado, mercadillo, mercado público, plaza de mercado"
+                    "terms": "mercado, mercadillo, mercado público, plaza de mercado, feria"
                 },
                 "amenity/motorcycle_parking": {
                     "name": "Aparcamiento de motocicletas",
                     "terms": "motocicleta, moto, aparcamiento, parking, estacionamiento, parqueadero, parqueo, parqueadero de motocicletas, estacionamiento de motocicletas, parqueo de motocicletas"
                 },
+                "amenity/music_school": {
+                    "name": "Escuela de música",
+                    "terms": "conservatorio, academia, música, musica, musical, instrumentos musicales, escuela de música, academia de música, conservatorio de música"
+                },
                 "amenity/nightclub": {
                     "name": "Discoteca",
                     "terms": "discoteca, club nocturno, boliche"
@@ -2784,8 +2896,7 @@
                     "terms": "terreno, área, suelo, recinto escolar, escolar, escuela, colegio, centro educativo, unidad educativa, primaria, secundaria, secundario, instituto, institución educativa"
                 },
                 "amenity/scrapyard": {
-                    "name": "Depósito de chatarra",
-                    "terms": "auto, automóvil, coche, carro, vehículo, basura, metal, objetos salvados, chatarra, naufragio, desguace, depósito, almacén, triturador, reciclaje, desguace, deshuesadero, chivera, yonke, junker"
+                    "name": "Depósito de chatarra"
                 },
                 "amenity/shelter": {
                     "name": "Refugio",
@@ -2793,7 +2904,7 @@
                 },
                 "amenity/shower": {
                     "name": "Ducha",
-                    "terms": "ducha, regadera"
+                    "terms": "ducha, regadera, cuarto de aseo"
                 },
                 "amenity/social_facility": {
                     "name": "Instalación social",
@@ -2930,52 +3041,52 @@
                     "terms": "superficie, revestimiento, cobertura"
                 },
                 "attraction/amusement_ride": {
-                    "name": "Atracción",
-                    "terms": "atracción de feria, juego, juego de feria, máquina de emociones mecanizada"
+                    "name": "Atracción de feria",
+                    "terms": "atracción de feria, juego, juego de feria, juegos mecánicos, máquina de emociones mecanizada"
                 },
                 "attraction/animal": {
                     "name": "Animal",
-                    "terms": "animal, atracción"
+                    "terms": "animal, atracción, parque temático, parque de animales, león, tigue, oso, zoológico"
                 },
                 "attraction/big_wheel": {
                     "name": "Noria",
-                    "terms": "rueda de la fortuna, vuelta al mundo, viaje a la luna, rueda moscovita, rueda de Chicago, rueda chicagua, rueda gigante, rueda Ferris"
+                    "terms": "rueda de la fortuna, vuelta al mundo, viaje a la luna, rueda moscovita, rueda de chicago, rueda chicagua, rueda gigante, rueda feria, juego mecánico, juego de feria"
                 },
                 "attraction/bumper_car": {
                     "name": "Autos chocadores",
-                    "terms": "autos chocadores, chocadores, autos de choque, coches de choque, coches locos, carros chocones"
+                    "terms": "autos, carros, coches, chocadores, choque, locos, chocones, autos chocadores, autos chocones, autos locos, juego mecánico, juego de feria"
                 },
                 "attraction/bungee_jumping": {
-                    "name": "Bungee",
-                    "terms": "bungee, puenting"
+                    "name": "Saldo de bungee",
+                    "terms": "salto, saltar, bungee, puenting, puente, benji, cuerda elástica, salto al vacío"
                 },
                 "attraction/carousel": {
                     "name": "Carrusel",
-                    "terms": "carrusel, tiovivo, calesita"
+                    "terms": "carrusel, tiovivo, calesita, caballitos, juego mecánico, juego de feria"
                 },
                 "attraction/dark_ride": {
                     "name": "Paseo oscuro",
-                    "terms": "viaje oscuro, feria, atracción"
+                    "terms": "viaje oscuro, tren fantasma, paseo guiado, juego de feria"
                 },
                 "attraction/drop_tower": {
                     "name": "Torre de caída",
-                    "terms": "torre de caída, atracción de feria, feria, juego, juego de feria, drop tower"
+                    "terms": "torre de caída, pilar de caída, juego mecánico, juego de feria"
                 },
                 "attraction/pirate_ship": {
                     "name": "Barco pirata",
-                    "terms": "barco pirata"
+                    "terms": "barco pirata, pirata, juego mecánico, juego de feria"
                 },
                 "attraction/river_rafting": {
-                    "name": "Rafting",
-                    "terms": "descenso de ríos, balsismo"
+                    "name": "Rafting de río",
+                    "terms": "descenso, río, balsa, balsismo, canotaje, descenso rápidos, deporte extremo, "
                 },
                 "attraction/roller_coaster": {
                     "name": "Montaña rusa",
-                    "terms": "montaña rusa"
+                    "terms": "montaña rusa, juego mecánico, juego de feria"
                 },
                 "attraction/train": {
                     "name": "Tren turístico",
-                    "terms": "tren, ferrocarril, atracción"
+                    "terms": "tren, ferrocarril, vagón, turismo, turístico"
                 },
                 "attraction/water_slide": {
                     "name": "Tobogán acuático",
@@ -3245,10 +3356,18 @@
                     "name": "Catering",
                     "terms": "abastecedor, proveedor, catering, cáterin, comida"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Deshollinador",
+                    "terms": "chimenea, fogón, hollín, limpiachimenea, limpieza de chimeneas"
+                },
                 "craft/clockmaker": {
                     "name": "Relojero",
                     "terms": "relojero, reloj, relojería"
                 },
+                "craft/confectionery": {
+                    "name": "Confitero",
+                    "terms": "confite, hacer confite, dulce, fabricación de dulces, caramelos duros, caramelos de goma, gomitas, chicles, regaliz, algodón de azúcar, chocolates, trufas de chocolate, grageas, dulce de azúcar, caramelos, toffees"
+                },
                 "craft/distillery": {
                     "name": "Destilería",
                     "terms": "alcohol, bebida, bourbon, licor, brandy, ginebra, hooch, mezcal, moonshine, ron, scotch, escocés, bebidas espirituosas, tequila, vodka, whiskey, whisky, pisco, aguardiente, gin, singani"
@@ -3350,9 +3469,9 @@
                     "name": "Andamista",
                     "terms": "Andamio, monta andamios"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Escultor",
-                    "terms": "escultor, artista, cincelador, imaginero, tallista, modelista"
+                    "terms": "escultura, artista, cincelador, imaginero, tallista, modelista, mármol, piedra, busto, escultura"
                 },
                 "craft/shoemaker": {
                     "name": "Zapatero",
@@ -3362,10 +3481,6 @@
                     "name": "Albañil",
                     "terms": "Albañil, Cantero, Enconfrador"
                 },
-                "craft/sweep": {
-                    "name": "Deshollinador",
-                    "terms": "deshollinador, limpiachimeneas, chimenea"
-                },
                 "craft/tailor": {
                     "name": "Sastre"
                 },
@@ -3504,12 +3619,12 @@
                     "terms": "obstáculo, agua, golf"
                 },
                 "healthcare": {
-                    "name": "Centro de salud",
-                    "terms": "Centro de salud, clínica, doctor, enfermedad, salud, institución, enfermo, cirugía, bienestar"
+                    "name": "Asistencia sanitaria",
+                    "terms": "asistencia médica, atención médica, atención sanitaria, servicio de salud, seguro sanitario, caja, seguro privado, sistema de salud, clínica, doctor, consultorio, salud, institución, enfermo, cirugía, bienestar, salubridad, diagnóstico, enfermedad, lesiones, discapacidad, médicos, odontología, obstetricia, enfermería, optometría, audiología, psicología, laboratorio, fisoterapia, rehabilitación"
                 },
                 "healthcare/alternative": {
                     "name": "Medicina alternativa",
-                    "terms": "Medicina alternativa, acupuntura, antroposófico, kinesiología aplicada, aromaterapia, ayurveda, herbolario, homeopatía, hidroterapia, hipnosis, naturopatía, osteopatía, reflexología, reiki, shiatsu, tradicional, tuina, unani"
+                    "terms": "medicina alternativa, acupuntura, antroposófico, kinesiología aplicada, aromaterapia, ayurveda, herbolario, homeopatía, hidroterapia, hipnosis, naturopatía, osteopatía, reflexología, reiki, shiatsu, tradicional, tuina, unani, medicina alterna"
                 },
                 "healthcare/alternative/chiropractic": {
                     "name": "Quiropráctico",
@@ -3634,9 +3749,13 @@
                     "name": "Sendero",
                     "terms": "vereda, sendero, senda, camino, vía, ramal, trocha, atajo, travesía, huella, rastro"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Área peatonal",
+                    "terms": "área, area, centro, plaza, pasarela, peatón, peaton, peatonal"
+                },
+                "highway/pedestrian_line": {
                     "name": "Calle peatonal",
-                    "terms": "calle, peatón, peatonal, alameda peatonal"
+                    "terms": "peatón, peaton, peatonal, pasarela"
                 },
                 "highway/primary": {
                     "name": "Carretera primaria",
@@ -3814,6 +3933,10 @@
                     "name": "Cuenca",
                     "terms": "cuenca, área con agua"
                 },
+                "landuse/brownfield": {
+                    "name": "Terreno industrial abandonado",
+                    "terms": "terreno, industrial, solar, descampado, tierra, baldío, baldio, abandonada, abandonado"
+                },
                 "landuse/cemetery": {
                     "name": "Cementerio",
                     "terms": "cementerio, necrópolis, muerte, panteón, ataúdes, criptas, féretros, mausoleos"
@@ -3853,6 +3976,10 @@
                     "name": "Césped",
                     "terms": "pasto, hierba, césped, grama, zacate, franjas de separación, césped de parque"
                 },
+                "landuse/greenfield": {
+                    "name": "Terreno en campo sin edificar",
+                    "terms": "terreno, campo, urbanizable, construir, construcción"
+                },
                 "landuse/harbour": {
                     "name": "Puerto",
                     "terms": "puerto, portuario, barco, embarcaciones"
@@ -3861,6 +3988,14 @@
                     "name": "Área industrial",
                     "terms": "área industrial, parque industrial, industria, fábrica, área industrial, terreno industrial"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Depósito de chatarra",
+                    "terms": "chatarra, coche, auto, vehículo, basura, metal, chatarra, naufragio, patio"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Matadero",
+                    "terms": "matadero, carne, carnicería, becerro, pollo, vaca, cerdo, aves de corral, corral"
+                },
                 "landuse/landfill": {
                     "name": "Relleno sanitario",
                     "terms": "relleno sanitario, relleno municipal, vertedero de basura, desperdicio, basurales, vertederos, tiraderos, basureros"
@@ -3937,13 +4072,17 @@
                     "name": "Parque de recreación",
                     "terms": "recreación, diversión, zona verde, patio, terreno de juegos, juegos, área de recreación"
                 },
+                "landuse/religious": {
+                    "name": "Área religiosa",
+                    "terms": "terreno, religioso, religión, religion, monasterio, convento, seminario, casa de retiro, instituto religioso, capilla, templo, iglesia, lugar de oración, gruta"
+                },
                 "landuse/residential": {
                     "name": "Área residencial",
                     "terms": "área residencial, zona residencial, zona urbana, mancha urbana, urbanización, condominio"
                 },
                 "landuse/retail": {
-                    "name": "Área de tiendas y mercado minorista",
-                    "terms": "comercios, tiendas, mercado minorista"
+                    "name": "Área de tiendas",
+                    "terms": "comercios, tiendas, venta, minorista, al por menor, menudeo"
                 },
                 "landuse/vineyard": {
                     "name": "Viñedo",
@@ -3993,6 +4132,50 @@
                     "name": "Estación de gimnasia al aire libre",
                     "terms": "salud, gimnasio, entrenamiento, ejercicio, abierto, al aire libre, aeróbico"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Barra de equilibrio para ejercicios",
+                    "terms": "barra de equilibrio, equilibrio, tronco, ejercicios"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Cajón para ejercicio",
+                    "terms": "cajón, cajon, caja, ejercicio, gimnasio, salto, saltar"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Barra horizontal para ejercicio",
+                    "terms": "barra, mentón, barbilla, ejercicio, gimnasio,  pullup, pull up, dorsalera, dorsales"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "barras trepadoras para ejercicio",
+                    "terms": "barra, mentón, barbilla, ejercicio, gimnasio, escalera, barras de mono, mono, trapadoras, treparse, pullup, pull up"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Estación de hiperextensión",
+                    "terms": "espalda, ejercicio, extensión, gimnasio, silla romana"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Barras paralelas",
+                    "terms": "barra, ejercicio, gimnasio"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Estación para flexión de brazos",
+                    "terms": "barra, ejercicio, gimnasio, flexiones, brazos"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Anillos para ejercicio",
+                    "terms": "ejercicio, gimnasio, musculación, musculacion, pullup, pull up"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Cartel de instrucciones de ejercicio",
+                    "terms": "ejercicio, gimnasio, cartel, señal, instrucciones"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Estación de abdominales",
+                    "terms": "ejercicio, gimnasio, abdominales"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Escaleras para ejercicio",
+                    "terms": "ejercicio, gimnasio, step, escaleras"
+                },
                 "leisure/garden": {
                     "name": "Jardín",
                     "terms": "parque, parterre, vergel, floresta, huerto, rosaleda, jardín"
@@ -4053,6 +4236,10 @@
                     "name": "Cancha de voleibol de playa",
                     "terms": "voleibol, volibol, balonvolea, voley, pelota, arena, playa, playero, mar"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Cancha de bolos / bochas",
+                    "terms": "bolera, bochas, bolos, cancha"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Campo de bolos",
                     "terms": "bolos"
@@ -4105,6 +4292,10 @@
                     "name": "Pista de carrera (atletismo)",
                     "terms": "pista, circuito, carrera, atletismo, caminata, correr"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna",
+                    "terms": "baño de vapor, baño turco, vapor, turco"
+                },
                 "leisure/slipway": {
                     "name": "Rampa para botes",
                     "terms": "Grada, rampa, rampa para botes"
@@ -4157,6 +4348,10 @@
                     "name": "Chimenea",
                     "terms": "chimenea, fogón, fuego"
                 },
+                "man_made/crane": {
+                    "name": "Grúa",
+                    "terms": "elevadora, cabria, cabrestante, trucha, pluma"
+                },
                 "man_made/cutline": {
                     "name": "Línea de corte forestal",
                     "terms": "cortafuegos, cortafuegos forestal, línea de corte, linea de corte"
@@ -4385,16 +4580,32 @@
                     "terms": "oficina, despacho, trabajo, salón"
                 },
                 "office/accountant": {
-                    "name": "Contador",
-                    "terms": "contable, contador, contadora, contabilidad"
+                    "name": "Oficina de contador",
+                    "terms": "contador, contadora, contable"
                 },
                 "office/administrative": {
                     "name": "Oficina administrativa",
                     "terms": "oficina administrativa, oficina de administración, administrativo, gestoría, asesoría"
                 },
+                "office/adoption_agency": {
+                    "name": "Agencia de adopción",
+                    "terms": "adopción, adopcion, bebes, niños"
+                },
+                "office/advertising_agency": {
+                    "name": "Agencia de publicidad",
+                    "terms": "anuncio, agencia de publicidad, agencia publicitaria, publicidad, marketing"
+                },
                 "office/architect": {
-                    "name": "Arquitecto",
-                    "terms": "arquitecto, arquitectos, arquitecta, urbanista"
+                    "name": "Oficina de arquitecto",
+                    "terms": "arquitecto, arquitectos, arquitecta, urbanista, arquitectura"
+                },
+                "office/association": {
+                    "name": "Oficina de organización sin fines de lucro",
+                    "terms": "organización sin ánimo de lucro, OSAL, organización sin fines de lucro, OSFL, organización no lucrativa, ONL, entidad sin ánimo de lucro, ESAL"
+                },
+                "office/charity": {
+                    "name": "Oficina de beneficencia",
+                    "terms": "caridad, beneficencia"
                 },
                 "office/company": {
                     "name": "Oficina de empresa",
@@ -4405,13 +4616,17 @@
                     "terms": "trabajo, oficina, coworking, cotrabajo, cooperativo, cooperación"
                 },
                 "office/educational_institution": {
-                    "name": "Institución educativa",
-                    "terms": "institución educacional, institución educacional, institución de enseñanza, institución docente, centro de enseñanza, institución escolar, centro docente, centro educativo, institución académica"
+                    "name": "Oficina de institución educativa",
+                    "terms": "oficina, institución, educacional, enseñanza, docente, escolar, centro docente, centro educativo, académica"
                 },
                 "office/employment_agency": {
                     "name": "Agencia de empleo",
                     "terms": "empleo, desempleo, colocación, trabajo, ocupación, desocupación, INEM, agencia de colocación, oficina de empleo, agencia de trabajo, agencia de contratación"
                 },
+                "office/energy_supplier": {
+                    "name": "Oficina de proveedor de energía",
+                    "terms": "electricidad,energía,empresa de energía"
+                },
                 "office/estate_agent": {
                     "name": "Inmobiliaria",
                     "terms": "bienes raíces, inmobiliaria, inmueble, oficina"
@@ -4420,6 +4635,14 @@
                     "name": "Financiera",
                     "terms": "financiera, financiero, bancario"
                 },
+                "office/forestry": {
+                    "name": "Oficina forestal",
+                    "terms": "bosque, parque, guardabosques, guardaparques"
+                },
+                "office/foundation": {
+                    "name": "Oficina de fundación",
+                    "terms": "fundación, fundacion"
+                },
                 "office/government": {
                     "name": "Oficina de gobierno",
                     "terms": "Oficina gubernamental, oficina del gobierno"
@@ -4428,13 +4651,21 @@
                     "name": "Registro civil",
                     "terms": "identificación, documento identidad, cédula identidad, nacimiento, defunsión, estado civil, registro personas, dirección registro, dirección nacional registro, servicio identificación"
                 },
+                "office/government/tax": {
+                    "name": "Oficina de impuestos y rentas",
+                    "terms": "autoridades fiscales, ingresos, impuestos, rentas, AFIP, AGIP, ARBA, DGR"
+                },
+                "office/guide": {
+                    "name": "Oficina de turismo",
+                    "terms": "turismo, guía de buceo, guía de montaña, guía de turismo"
+                },
                 "office/insurance": {
                     "name": "Aseguradora",
                     "terms": "aseguradora, seguro, oficina de seguros"
                 },
                 "office/it": {
-                    "name": "Oficina de informática",
-                    "terms": "Oficina de IT, oficina de TI, oficina de informáticos, oficina de tecnologías de información, IT, TI, tecnologías"
+                    "name": "Oficina de tecnología de la información",
+                    "terms": "computadora, información, software, tecnología, tecnologia, informática, informatica"
                 },
                 "office/lawyer": {
                     "name": "Despacho de abogados",
@@ -4444,14 +4675,22 @@
                     "name": "Notaría",
                     "terms": "notaría pública, notario público, asistente de notario, escribano, notariado, notarial, testamento, firma, escritura, inmueble, protocolo notario"
                 },
+                "office/moving_company": {
+                    "name": "Oficina de mudanzas",
+                    "terms": "reubicación, mudanza, flete"
+                },
                 "office/newspaper": {
-                    "name": "Periódico",
+                    "name": "Oficina de periódicos",
                     "terms": "periódico, diario, semanario, revista"
                 },
                 "office/ngo": {
                     "name": "ONG",
                     "terms": "ONG, organización no gubernamental, Oficina de la ONG"
                 },
+                "office/notary": {
+                    "name": "Escribanía / Notaría",
+                    "terms": "notario, notaría, notaria, escribano, escribanía, escribania"
+                },
                 "office/physician": {
                     "name": "Médico"
                 },
@@ -4459,21 +4698,41 @@
                     "name": "Partido político",
                     "terms": "Partido político, formación política, grupo político"
                 },
+                "office/private_investigator": {
+                    "name": "Oficina de investigador privado",
+                    "terms": "investigador privado, detective privado,"
+                },
+                "office/quango": {
+                    "name": "Oficina ONG cuasiautónoma",
+                    "terms": "ONG, no gubernamentales, organización, cuasi autónoma, cuasiautónoma"
+                },
                 "office/research": {
                     "name": "Oficina de investigación",
                     "terms": "oficina, despacho, laboratorio, departamento, centro, investigación"
                 },
+                "office/surveyor": {
+                    "name": "Oficina de agrimensor",
+                    "terms": "agrimensor, agrimensora, topógrafo, topografo, topógrafa, topografa, oficina"
+                },
+                "office/tax_advisor": {
+                    "name": "Oficina de asesor impositivo",
+                    "terms": "asesor impositivo, asesor tributario, asesor impositivo, asesor en asuntos contributivos, asesor de impuestos, consejero de impuestos, asesora fiscal, asesora tributaria, asesora de impuestos, consejero fiscal, asesora impositiva, consejera de impuestos, asesora en asuntos contributivos, impuestos, impositivo, contributivo, fiscal, tributoria, oficina"
+                },
                 "office/telecommunication": {
                     "name": "Oficina de telecomunicaciones",
                     "terms": "Oficina de telecomunicaciones, telecomunicaciones, telefónica"
                 },
                 "office/therapist": {
-                    "name": "Terapeuta",
-                    "terms": "Terapeuta, psicólogo"
+                    "name": "Oficina de terapeuta",
+                    "terms": "terapia, terapeuta, fisioterapia"
                 },
                 "office/travel_agent": {
                     "name": "Agencia de viajes"
                 },
+                "office/water_utility": {
+                    "name": "Oficina de servicios públicos de agua",
+                    "terms": "servicio público, servicio publico, agua, saneamiento"
+                },
                 "piste": {
                     "name": "Pista/Sendero de ski",
                     "terms": "Pista de esquí"
@@ -4496,6 +4755,10 @@
                     "name": "Isla",
                     "terms": "isla"
                 },
+                "place/islet": {
+                    "name": "Islote",
+                    "terms": "archipiélago, atolón, cayo, isla, islote, arrecife"
+                },
                 "place/isolated_dwelling": {
                     "name": "Vivienda aislada",
                     "terms": "Viviendas aisladas"
@@ -4508,6 +4771,10 @@
                     "name": "Barrio / Vecindario",
                     "terms": "barrio, vecindario, vecindad, urbanización, colonia"
                 },
+                "place/plot": {
+                    "name": "Parcela",
+                    "terms": "parcela, terreno, solar, lote"
+                },
                 "place/quarter": {
                     "name": "Sub-municipio / Barrio - Quarter",
                     "terms": "submunicipio, subdistrito, sector, cuadrante, delegación, localidad, barrio, vecindario, quarter"
@@ -4529,8 +4796,8 @@
                     "terms": "población, aldea, pueblo, poblado"
                 },
                 "playground/balance_beam": {
-                    "name": "Barra de equilibrio",
-                    "terms": "barra de equilibrio, equilibrio, tronco"
+                    "name": "Barra de equilibrio para juegos",
+                    "terms": "barra de equilibrio, equilibrio, tronco, juegos"
                 },
                 "playground/basket_spinner": {
                     "name": "Cesta giratoria",
@@ -4549,8 +4816,8 @@
                     "terms": "Colchón inflable, rebotar, saltar, salto, amortiguar, cojín, cojin"
                 },
                 "playground/horizontal_bar": {
-                    "name": "Barra fija",
-                    "terms": "Barra fija, horizonal, dolsalera, barra alta"
+                    "name": "Barra horizontal para juegos",
+                    "terms": "Barra fija, horizonal, dolsalera, barra alta, juegos"
                 },
                 "playground/rocker": {
                     "name": "Mecedor elástico",
@@ -4626,6 +4893,10 @@
                     "name": "Subestación eléctrica",
                     "terms": "Subestación, subestaciones"
                 },
+                "power/switch": {
+                    "name": "Interruptor de alimentación",
+                    "terms": "interruptor de encendido, botón de alimentación, interruptor de red, botón de encendido, interruptor de corriente, encendido, alimentación, alimentacion, red, corriente"
+                },
                 "power/tower": {
                     "name": "Torre de alta tensión",
                     "terms": "Torre de alto voltaje, torres de alta tensión, torre de electricidad"
@@ -4677,6 +4948,10 @@
                     "name": "Cruce de ferrocarril (carretera)",
                     "terms": "cruce, tren, ferrocarril, carretera, camino, cruce ferroviario, paso a nivel"
                 },
+                "railway/light_rail": {
+                    "name": "Tren ligero",
+                    "terms": "lrt, tren, tranvía, tren urbano, tranvía urbano, tren eléctrico, tren rápido, tren ligero, tren tranvía, metro ligero"
+                },
                 "railway/milestone": {
                     "name": "Hito kilométrico ferroviario",
                     "terms": "hito, señal, marcador, kilométrico, mojón, vía, via, férrea, ferroviaria, ferroviario, ferrocarril, tren"
@@ -4744,6 +5019,10 @@
                     "name": "Tienda",
                     "terms": "negocio, tienda, bazar, bodega, comercio, local"
                 },
+                "shop/agrarian": {
+                    "name": "Tienda de agricultura",
+                    "terms": "agricultura, agrícola, cultivo, invernadero, granja, insumos, máquinas, semillas, pesticidas, control plagas, fertilizantes, herramientas, maquinaria, tierra, huerto"
+                },
                 "shop/alcohol": {
                     "name": "Licorería",
                     "terms": "licor, trago, bebida, alcohol, licorería, tienda de licores, almacén de licores"
@@ -4885,8 +5164,8 @@
                     "terms": "cosmético, cosméticos, cosmética, belleza, estética, cuidado personal, perfumería"
                 },
                 "shop/craft": {
-                    "name": "Tienda de artesanías",
-                    "terms": "arte, pintura, oficio, artesanía, manualidades, tienda de artesanías"
+                    "name": "Tienda artística / artículos para arte y artesanía",
+                    "terms": "arte, pintura, oficio, artesanía, manualidades, artículos, articulos"
                 },
                 "shop/curtain": {
                     "name": "Tienda de cortinas",
@@ -5166,6 +5445,10 @@
                     "name": "Venta de boletos",
                     "terms": "ticket, boleto, billete, entrada, venta"
                 },
+                "shop/tiles": {
+                    "name": "Tienda de azulejos",
+                    "terms": "azulejos, azulejos, baldosas, tejas, teselas"
+                },
                 "shop/tobacco": {
                     "name": "Tienda de tabaco",
                     "terms": "tabaquería, tienda de tabacos, tabaco, cigarillos, cigarros, puros, expendeduría, quiosco, kiosko"
@@ -5174,6 +5457,10 @@
                     "name": "Juguetería",
                     "terms": "juguetes, juego, juguetería, tienda de juguetes"
                 },
+                "shop/trade": {
+                    "name": "Tienda de comercio / Corralón",
+                    "terms": "comercio, corralón, corralon, materiales, contrucción, construccion, madera, cemento, ladrillos"
+                },
                 "shop/travel_agency": {
                     "name": "Agencia de viajes",
                     "terms": "agencia de viajes, agencia de turismo, viajes, turismo"
@@ -5226,8 +5513,8 @@
                     "terms": "turismo"
                 },
                 "tourism/alpine_hut": {
-                    "name": "Cabaña alpina",
-                    "terms": "Refugio de montaña, refugio alpino, refugio,  cabaña, choza, caseta, chabola, cabina, cobertizo"
+                    "name": "Refugio de montaña",
+                    "terms": "refugio, abrigo, vivac, choza, cabaña, refugio de montaña, refugio alpino, refugio andino"
                 },
                 "tourism/apartment": {
                     "name": "Apartamento de huéspedes",
@@ -5254,8 +5541,8 @@
                     "terms": "caravana, remolque, autocaravana, roulotte"
                 },
                 "tourism/chalet": {
-                    "name": "Cabaña",
-                    "terms": "chalet, chalé"
+                    "name": "Cabaña de vacaciones",
+                    "terms": "chalet, bungalow, bungaló, bungalo, turismo, cabaña, complejo de cabañas, vacacional, turístico, turistico, turismo"
                 },
                 "tourism/gallery": {
                     "name": "Galería de arte",
@@ -5313,6 +5600,10 @@
                     "name": "Vista panorámica / Mirador",
                     "terms": "oteadero, punto de vista, mirador, vistas, vista panorámica, perspectiva"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Refugio de paraje natural",
+                    "terms": "refugio, abrigo, vivac, choza, cabaña, paraje natural, lugar natural, campo abierto, cabaña sencilla, refugio sin alquiler, alojamiento temporal"
+                },
                 "tourism/zoo": {
                     "name": "Zoológico",
                     "terms": "zoo, zoológico "
@@ -5542,22 +5833,36 @@
                 "attribution": {
                     "text": "Términos y comentarios"
                 },
-                "description": "Imagen de satélite Premium de DigitalGlobe.",
-                "name": "Imágenes aéreas DigitalGlobe Premium"
+                "description": "Imágenes de satélite DigitalGlobe Premium.",
+                "name": "Imágenes DigitalGlobe Premium"
+            },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Términos y comentarios"
+                },
+                "description": "Límites de imágenes y fechas de captura. Las etiquetas aparecen en el nivel de acercamiento 14 y superior.",
+                "name": "Imágenes antiguas DigitalGlobe Premium"
             },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Términos y comentarios"
                 },
-                "description": "Imagen de satélite Standard de DigitalGlobe.",
-                "name": "Imágenes aéreas DigitalGlobe Standard"
+                "description": "Imagen de satélite DigitalGlobe Standard.",
+                "name": "Imágenes DigitalGlobe Standard"
+            },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Términos y comentarios"
+                },
+                "description": "Límites de imágenes y fechas de captura. Las etiquetas aparecen en el nivel de acercamiento 14 y superior.",
+                "name": "Imágenes antiguas DigitalGlobe Standard"
             },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Términos y comentarios"
                 },
-                "description": "Imágenes Esri globales.",
-                "name": "Imágenes Esri globales"
+                "description": "Imágenes mundiales Esri.",
+                "name": "Imágenes mundiales Esri"
             },
             "MAPNIK": {
                 "attribution": {
@@ -5619,11 +5924,11 @@
                 "name": "Carreteras TIGER 2012"
             },
             "US-TIGER-Roads-2014": {
-                "description": "En nivel de zoom +16, datos de mapa de dominio público desde el US Census. En zooms inferiores, sólo cambios desde 2006 menos los cambios ya incorporados en OpenStreetMap",
+                "description": "En nivel de acercamiento 16 o más, datos del mapa de dominio público desde el US Census. En acercamientos inferiores, sólo cambios desde 2006 menos los cambios ya incorporados en OpenStreetMap",
                 "name": "Carreteras TIGER 2014"
             },
             "US-TIGER-Roads-2017": {
-                "description": "Amarillo = Datos de mapa de dominio público desde el US Census. Rojo = Datos no encontrados en OpenStreetMap",
+                "description": "Amarillo = Datos del mapa de dominio público desde el US Census. Rojo = Datos no encontrados en OpenStreetMap",
                 "name": "Carreteras TIGER 2017"
             },
             "Waymarked_Trails-Cycling": {
@@ -5667,7 +5972,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Capa de ortofoto proporcionada por basemap.at. «Sucesor» de las imágenes aéreas de geoimage.at.",
+                "description": "Capa de ortofoto proporcionada por basemap.at. «Sucesor» de las imágenes de geoimage.at.",
                 "name": "Ortofoto de basemap.at"
             },
             "hike_n_bike": {
@@ -5681,7 +5986,7 @@
                     "text": "Términos y comentarios"
                 },
                 "description": "Muestra los principales elementos que le ayudarán a orientarse.",
-                "name": "Superposición de localizador"
+                "name": "Capa de orientación"
             },
             "openpt_map": {
                 "attribution": {
diff --git a/dist/locales/et.json b/dist/locales/et.json
index 70aee77b3..e82eaaa72 100644
--- a/dist/locales/et.json
+++ b/dist/locales/et.json
@@ -117,6 +117,10 @@
                     "single": "Seda objekti ei saa kustutada, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa kustutada, sest piisavalt suur osa neist pole praegu nähtaval."
                 },
+                "incomplete_relation": {
+                    "single": "Seda objekti ei saa kustutada, kuna see ei ole veel täielikult alla laaditud.",
+                    "multiple": "Neid objekte ei saa kustutada, kuna need ei ole veel täielikult alla laaditud."
+                },
                 "part_of_relation": {
                     "single": "Objekti ei saa kustutada, sest see on osa suuremast relatsioonist. Pead kõigepealt selle relatsioonist eemaldama.",
                     "multiple": "Objekte ei saa kustutada, sest need on osa suurematest relatsioonidest. Pead kõigepealt need relatsioonidest eemaldama."
@@ -207,6 +211,10 @@
                         "multiple": "Objektid peegeldatud lühkest telge pidi."
                     }
                 },
+                "incomplete_relation": {
+                    "single": "Seda objekti ei saa peegeldada, kuna see ei ole veel täielikult alla laaditud.",
+                    "multiple": "Neid objekte ei saa peegeldada, kuna need ei ole veel täielikult alla laaditud."
+                },
                 "too_large": {
                     "single": "Seda objekti ei saa peegeldada, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa peegeldada, sest piisavalt suur osa neist pole praegu nähtaval."
@@ -224,6 +232,10 @@
                     "area": "Pööratud ala.",
                     "multiple": "Pööratud mitut objekti."
                 },
+                "incomplete_relation": {
+                    "single": "Seda objekti ei saa pöörata, kuna see ei ole veel täielikult alla laaditud.",
+                    "multiple": "Neid objekte ei saa pöörata, kuna need ei ole veel täielikult alla laaditud."
+                },
                 "too_large": {
                     "single": "Seda objekti ei saa pöörata, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa pöörata, sest piisavalt suur osa neist pole praegu nähtaval."
@@ -277,7 +289,7 @@
             "localized_translation_language": "Vali keel",
             "localized_translation_name": "Nimi"
         },
-        "zoom_in_edit": "Muutmiseks suumi sisse",
+        "zoom_in_edit": "Suurenda, et redigeerida",
         "login": "Logi sisse",
         "logout": "Logi välja",
         "loading_auth": "OpenStreetMapiga ühendamine...",
@@ -295,6 +307,7 @@
             "save": "Laadi üles",
             "cancel": "Loobu",
             "changes": "{count} muudatust",
+            "download_changes": "Laadi alla osmChange-fail",
             "warnings": "Hoiatused",
             "modified": "Muudetud",
             "deleted": "Kustutatud",
@@ -306,6 +319,22 @@
             "list": "Muutjad: {users}",
             "truncated_list": "Muutjad: {users} ja {count} teist"
         },
+        "info_panels": {
+            "background": {
+                "source": "Allikas",
+                "description": "Kirjeldus",
+                "resolution": "Resolutsioon",
+                "accuracy": "Täpsus"
+            },
+            "history": {
+                "title": "Ajalugu",
+                "version": "Versioon",
+                "last_edit": "Viimane muudatus",
+                "edited_by": "Muutis",
+                "changeset": "Muudatuskogum",
+                "unknown": "Teadmata"
+            }
+        },
         "geometry": {
             "point": "punkt",
             "vertex": "tipp",
@@ -383,9 +412,16 @@
             "title": "Kaardi andmed",
             "description": "Kaardi andmed",
             "data_layers": "Andmekihid",
+            "layers": {
+                "osm": {
+                    "tooltip": "Kaardiandmed OpenStreetMapist",
+                    "title": "OpenStreetMapi andmed"
+                }
+            },
             "fill_area": "Täida alad",
             "map_features": "Kaardikuva",
-            "autohidden": "Need objektid on automaatselt peidetud, sest neid oleks ekraanil liiga palju. Suumi sisse, et neid muuta."
+            "autohidden": "Need objektid on automaatselt peidetud, sest neid oleks ekraanil liiga palju. Suumi sisse, et neid muuta.",
+            "osmhidden": "Need objektid on automaatselt peidetud, sest OpenStreetMapi kiht on peidetud."
         },
         "feature": {
             "points": {
@@ -475,6 +511,7 @@
                 "keep_remote": "Kasuta tema oma",
                 "restore": "Taasta",
                 "delete": "Jäta kustutatuna",
+                "download_changes": "Või laadi alla osmChange-fail",
                 "done": "Kõik konfliktid lahendatud!",
                 "help": "Teine kasutaja muutis kaardil mõnd objekti, mida sinagi muutsid.\nKlõpsa allpool igal objektil, et näha konflikti üksikasju ja et valida, kas säilitada\nenda muudatused või teise kasutaja muudatused.\n"
             }
@@ -505,7 +542,7 @@
             "welcome": "Tere tulemast OpenStreetMapi redaktorisse iD",
             "text": "iD on kasutajasõbralik ja samas võimas töövahend parima vaba maailmakaardi täiendamiseks. See on versioon {version}. Rohkem infot võib leida veebilehelt {website} ja vigadest saab teatada lehel {github}.",
             "walkthrough": "Alusta tutvustust",
-            "start": "Alusta muutmist"
+            "start": "Redigeeri kohe"
         },
         "source_switch": {
             "live": "live",
@@ -529,8 +566,8 @@
             "deprecated_tags": "Iganenud sildid: {tags}"
         },
         "zoom": {
-            "in": "Suurenda vaadet",
-            "out": "Vähenda vaadet"
+            "in": "Suurenda",
+            "out": "Vähenda"
         },
         "cannot_zoom": "Ei ole võimalik rohkem välja suumida selles vaates.",
         "full_screen": "Lülita täisekraanile",
@@ -912,6 +949,12 @@
                 "handrail": {
                     "label": "Käsipuu"
                 },
+                "hashtags": {
+                    "label": "Soovitatud trellsildid"
+                },
+                "healthcare/speciality": {
+                    "label": "Erialad"
+                },
                 "iata": {
                     "label": "IATA"
                 },
@@ -1160,6 +1203,9 @@
                 "social_facility": {
                     "label": "Tüüp"
                 },
+                "source": {
+                    "label": "Allikad"
+                },
                 "stop": {
                     "label": "Tüüp",
                     "options": {
@@ -1177,6 +1223,11 @@
                         "tunnel": "Tunnel"
                     }
                 },
+                "structure_waterway": {
+                    "options": {
+                        "tunnel": "Tunnel"
+                    }
+                },
                 "studio": {
                     "label": "Tüüp"
                 },
@@ -1195,6 +1246,9 @@
                 "toll": {
                     "label": "Maksustatud"
                 },
+                "tourism_attraction": {
+                    "label": "Turism"
+                },
                 "tracktype": {
                     "label": "Raja tüüp",
                     "options": {
@@ -1354,6 +1408,12 @@
                 "amenity/clinic": {
                     "name": "Kliinik"
                 },
+                "amenity/clinic/abortion": {
+                    "name": "Abordikliinik"
+                },
+                "amenity/clinic/fertility": {
+                    "name": "Viljakuskliinik"
+                },
                 "amenity/clock": {
                     "name": "Kell",
                     "terms": "seinakell"
@@ -1609,6 +1669,15 @@
                 "area/highway": {
                     "name": "Teekate"
                 },
+                "attraction/amusement_ride": {
+                    "name": "Lõbuatraktsioon"
+                },
+                "attraction/animal": {
+                    "name": "Loom"
+                },
+                "attraction/big_wheel": {
+                    "name": "Vaateratas"
+                },
                 "barrier": {
                     "name": "Barjäär",
                     "terms": "tõke,takistus,blokeering,läbisõidupiirang"
@@ -1913,18 +1982,12 @@
                 "craft/sawmill": {
                     "name": "Saekaater"
                 },
-                "craft/sculpter": {
-                    "name": "Skulptor"
-                },
                 "craft/shoemaker": {
                     "name": "Kingsepp"
                 },
                 "craft/stonemason": {
                     "name": "Kiviraidur"
                 },
-                "craft/sweep": {
-                    "name": "Korstnapühkija"
-                },
                 "craft/tailor": {
                     "name": "Rätsep"
                 },
@@ -1968,8 +2031,15 @@
                 "footway/crossing": {
                     "name": "Ülekäik"
                 },
+                "footway/crossing-raised": {
+                    "name": "Tõstetud ülekäik",
+                    "terms": "lame,künnis,aeglusti"
+                },
                 "footway/crosswalk": {
-                    "name": "Jalakäijate ülekäik"
+                    "name": "Ülekäigurada"
+                },
+                "footway/crosswalk-raised": {
+                    "name": "Tõstetud ülekäigurada"
                 },
                 "footway/sidewalk": {
                     "name": "Kõnnitee"
@@ -1978,10 +2048,33 @@
                     "name": "Koolmekoht",
                     "terms": "Koole"
                 },
+                "healthcare": {
+                    "name": "Tervishoiukeskus",
+                    "terms": "kliinik,arst,haigla,heaolu,taastusravi,ravi"
+                },
+                "healthcare/alternative": {
+                    "name": "Alternatiivmeditsiin"
+                },
+                "healthcare/alternative/chiropractic": {
+                    "name": "Kiropraktik"
+                },
+                "healthcare/audiologist": {
+                    "name": "Audioloog"
+                },
+                "healthcare/birthing_center": {
+                    "name": "Sünnitusmaja"
+                },
                 "healthcare/blood_donation": {
                     "name": "Verekeskus",
                     "terms": "veretalitus, vereteenistus, doonor"
                 },
+                "healthcare/hospice": {
+                    "name": "Hooldekodu",
+                    "terms": "hospiits"
+                },
+                "healthcare/midwife": {
+                    "name": "Ämmaemand"
+                },
                 "highway": {
                     "name": "Tee"
                 },
@@ -1998,10 +2091,16 @@
                 "highway/crossing": {
                     "name": "Ülekäigurada"
                 },
+                "highway/crossing-raised": {
+                    "name": "Tõstetud ristmik"
+                },
                 "highway/crosswalk": {
                     "name": "Ülekäigurada",
                     "terms": "jalakäijate ülekäik,ülekäik"
                 },
+                "highway/crosswalk-raised": {
+                    "name": "Tõstetud ülekäigurada"
+                },
                 "highway/cycleway": {
                     "name": "Rattatee"
                 },
@@ -2032,9 +2131,6 @@
                 "highway/path": {
                     "name": "Rada"
                 },
-                "highway/pedestrian": {
-                    "name": "Jalakäijate tänav"
-                },
                 "highway/primary": {
                     "name": "Põhimaantee",
                     "terms": "maantee"
@@ -2232,6 +2328,12 @@
                     "name": "Tööstuspiirkond",
                     "terms": "Tööstusala"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Vanametalli kokkuost"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Tapamaja"
+                },
                 "landuse/landfill": {
                     "name": "Prügila",
                     "terms": "Prügimägi"
@@ -2388,6 +2490,9 @@
                 "leisure/running_track": {
                     "name": "Jooksurada"
                 },
+                "leisure/sauna": {
+                    "name": "Saun"
+                },
                 "leisure/slipway": {
                     "name": "Slipp",
                     "terms": "Slipp, väikesadam"
@@ -2433,6 +2538,9 @@
                 "man_made/chimney": {
                     "name": "Korsten"
                 },
+                "man_made/crane": {
+                    "name": "Kraana"
+                },
                 "man_made/cutline": {
                     "name": "Siht",
                     "terms": "metsasiht,soosiht"
@@ -2615,6 +2723,13 @@
                 "place/island": {
                     "name": "Saar"
                 },
+                "place/islet": {
+                    "name": "Laid",
+                    "terms": "saareke,rahu,kari"
+                },
+                "place/plot": {
+                    "name": "Krunt"
+                },
                 "place/suburb": {
                     "name": "Eeslinn",
                     "terms": "Äärelinn"
@@ -3202,10 +3317,6 @@
                     "name": "Karavanipark",
                     "terms": "autoelamu,haagissuvila,kämpimisala"
                 },
-                "tourism/chalet": {
-                    "name": "Mägimajake",
-                    "terms": "alpimaja"
-                },
                 "tourism/gallery": {
                     "name": "Kunstigalerii"
                 },
@@ -3295,6 +3406,10 @@
                     "name": "Täristi",
                     "terms": "põristi,põrin,tärin,värin,väristaja,müra,triibud,risti jooned,jooned"
                 },
+                "traffic_calming/table": {
+                    "name": "Tõstetud pind",
+                    "terms": "lame,künnis,lamav politseinik,kiirustõke,tõke,liikluskünnis"
+                },
                 "type/boundary": {
                     "name": "Piir"
                 },
@@ -3420,6 +3535,10 @@
                 "waterway/stream": {
                     "name": "Oja"
                 },
+                "waterway/stream_intermittent": {
+                    "name": "Ajutine oja",
+                    "terms": "perioodiline"
+                },
                 "waterway/water_point": {
                     "name": "Joogiveepunkt (veesõidukitele)",
                     "terms": "vesi,vee"
diff --git a/dist/locales/fa.json b/dist/locales/fa.json
index e54c0d189..f5b2955f3 100644
--- a/dist/locales/fa.json
+++ b/dist/locales/fa.json
@@ -3,7 +3,7 @@
         "modes": {
             "add_area": {
                 "title": "محدوده",
-                "description": "افزودن پارک‌ها، ساختمان‌ها، دریاچه‌ها و سایر  محدوده‌ها به نقشه.",
+                "description": "افزودن پارک‌ها، ساختمان‌ها، دریاچه‌ها و سایر محدوده‌ها به نقشه.",
                 "tail": "برای کشیدن محدوده‌هایی مثل پارک، دریاچه، یا ساختمان روی نقشه کلیک کنید."
             },
             "add_line": {
@@ -299,7 +299,7 @@
             "localized_translation_language": "انتخاب زبان",
             "localized_translation_name": "نام"
         },
-        "zoom_in_edit": "بزرگنمایی برای ویرایش",
+        "zoom_in_edit": "برای ویرایش زوم کنید",
         "login": "ورود",
         "logout": "خروج",
         "loading_auth": "در حال اتصال به OpenStreetMap...",
@@ -316,8 +316,11 @@
             "rateLimit": "این API برای کاربران ثبت‌نام نکرده محدود است. برای رفع این مشکل میتوانید وارد شوید."
         },
         "commit": {
+            "title": "آپلود در اوپن استریت مپ",
             "upload_explanation": "تغییراتی که بارگذاری میکنید در همه ی نقشه هایی که از داده های OpenStreetMap استفاده میکنند پدیدار میشوند.",
             "upload_explanation_with_user": "تفییراتی که شما به عنوان {user} بارگذاری میکنید در همه ی نقشه هایی که از داده های OpenStreetMap استفاده میکنند پدیدار میشوند.",
+            "request_review": "مایل به بازنگری در ویرایش های خود هستم",
+            "save": "بارگزاری",
             "cancel": "لغو",
             "changes": "{count} تغییر",
             "warnings": "اخطارها",
@@ -333,6 +336,31 @@
             "list": "ویرایش توسط {users}",
             "truncated_list": "ویرایش توسط  {users} و {count}  نفر دیگر"
         },
+        "info_panels": {
+            "background": {
+                "title": "پس زمینه",
+                "zoom": "بزرگنمایی",
+                "description": "توضیح",
+                "resolution": "وضوح",
+                "accuracy": "دقت",
+                "unknown": "نامعلوم"
+            },
+            "history": {
+                "title": "تاریخچه",
+                "last_edit": "آخرین ویرایش",
+                "unknown": "نامعلوم",
+                "link_text": "سابقه در openstreetmap.org"
+            },
+            "location": {
+                "title": "مکان"
+            },
+            "measurement": {
+                "title": "اندازه",
+                "length": "درازا",
+                "area": "ناحیه",
+                "location": "مکان"
+            }
+        },
         "geometry": {
             "point": "نقطه",
             "vertex": "رأس",
@@ -376,6 +404,12 @@
                 "yes": "بله",
                 "no": "خیر"
             },
+            "radio": {
+                "structure": {
+                    "default": "پیش‌فرض",
+                    "layer": "لایه"
+                }
+            },
             "add": "اضافه کردن",
             "none": "هیچ",
             "node": "گره",
@@ -476,7 +510,8 @@
         },
         "restore": {
             "heading": "شما تغییرات ذخیره نشده دارید",
-            "description": "آیا مایلید تغییرات ذخیره نشده جلسه قبل را بازیابی کنید؟"
+            "description": "آیا مایلید تغییرات ذخیره نشده جلسه قبل را بازیابی کنید؟",
+            "restore": " بازگردانی تغییرات من"
         },
         "save": {
             "title": "ذخیره",
@@ -524,8 +559,7 @@
         "splash": {
             "welcome": "به ویرایشگر ID OpenStreetMap خوش آمدید",
             "text": "iD یک ابزار دوستانه اما قدرتمند برای کمک کردن به بهترین نقشه رایگان جهان است. این نسخه ی  {version} است. برای اطلاعات بیشتر {website} را ببینید و باگ را در {github} گزارش دهید.",
-            "walkthrough": "آغاز گردش",
-            "start": "حالا ویرایش کن"
+            "walkthrough": "آغاز گردش"
         },
         "source_switch": {
             "live": "زنده",
@@ -538,6 +572,7 @@
             "used_with": "با  {type} استفاده شده"
         },
         "validations": {
+            "disconnected_highway": "قطع اتصال",
             "untagged_point": "نقطه برچسب نخورده",
             "untagged_point_tooltip": "یک نوع عنصر را برای توصیف موجودیت این نقطه انتخاب کنید.",
             "untagged_line": "خط برچسب گذاری نشده",
@@ -549,8 +584,8 @@
             "deprecated_tags": "برچسب های توصیه شده: {tags}"
         },
         "zoom": {
-            "in": "بزرگنمایی",
-            "out": "کوچک نمایی"
+            "in": "بزرگ‌نمایی",
+            "out": "کوچک‌نمایی"
         },
         "cannot_zoom": "در حالت فعلی بیش از این نمیتوان کوچک نمایی کرد.",
         "full_screen": "تعویض صفحه‌نمایش کامل",
@@ -701,12 +736,17 @@
                 "address": {
                     "label": "آدرس",
                     "placeholders": {
+                        "block_number": "شماره بلوک ",
+                        "block_number!jp": "بلوک",
                         "city": "شهر",
+                        "city!jp": "شهر/شهرستان/روستا/بخش",
                         "city!vn": "شهر",
                         "conscriptionnumber": "123",
                         "country": "کشور",
                         "county": "کشور",
+                        "county!jp": "ناحیه",
                         "district": "منطقه",
+                        "district!vn": "محله/ شهر / منطقه",
                         "floor": "طبقه",
                         "hamlet": "دهکده",
                         "housename": "نام خانه",
@@ -715,6 +755,7 @@
                         "place": "مکان",
                         "postcode": "کدپستی",
                         "province": "استان",
+                        "province!jp": "ساختمان ریاست جمهوری",
                         "quarter": "ربع",
                         "state": "ایالت",
                         "street": "خيابان",
@@ -768,6 +809,9 @@
                 "amenity": {
                     "label": "نوع"
                 },
+                "animal_shelter": {
+                    "label": "پناهگاه حیوانات"
+                },
                 "area/highway": {
                     "label": "نوع"
                 },
@@ -2539,10 +2583,6 @@
                     "name": "داربستی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'داربست'، با کاما جدا می‌شوند>"
                 },
-                "craft/sculpter": {
-                    "name": "حجاری",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'حجاری کردن'، با کاما جدا می‌شوند>"
-                },
                 "craft/shoemaker": {
                     "name": "کفاش",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کفاش'، با کاما جدا می‌شوند>"
@@ -2551,10 +2591,6 @@
                     "name": "سنگ تراش",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سنگ‌تراش'، با کاما جدا میشوند>"
                 },
-                "craft/sweep": {
-                    "name": "جاروکش شومینه",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دودکش پاک کن'، با کاما جدا می‌شوند>"
-                },
                 "craft/tailor": {
                     "name": "خیاط"
                 },
@@ -2743,10 +2779,6 @@
                     "name": "مسیر",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر'، با کاما جدا می‌شوند>"
                 },
-                "highway/pedestrian": {
-                    "name": "خیابان پیاده‌روی",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خیابان پیاده‌روی'، با کاما جدا می‌شوند>"
-                },
                 "highway/primary": {
                     "name": "جاده اصلی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راه اصلی'، با کاما جدا می‌شوند>"
@@ -3397,18 +3429,10 @@
                     "name": "اداره",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اداره'، با کاما جدا می‌شوند>"
                 },
-                "office/accountant": {
-                    "name": "حسابدار",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'حسابدار'، با کاما جدا می‌شوند>"
-                },
                 "office/administrative": {
                     "name": "دفتر اداری",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر اداری'، با کاما جدا می‌شوند>"
                 },
-                "office/architect": {
-                    "name": "معمار",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'معمار'، با کاما جدا می‌شوند>"
-                },
                 "office/company": {
                     "name": "دفتر شرکت",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر شرکت'، با کاما جدا می‌شوند>"
@@ -3444,18 +3468,10 @@
                     "name": "دفتر بیمه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اداره بیمه'، با کاما جدا می‌شوند>"
                 },
-                "office/it": {
-                    "name": "سازمان آی تی",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر IT'، با کاما جدا می‌شوند>"
-                },
                 "office/lawyer": {
                     "name": "دفتر حقوقی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر حقوقی'، با کاما جدا می‌شوند>"
                 },
-                "office/newspaper": {
-                    "name": "روزنامه",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'روزنامه'، با کاما جدا می‌شوند>"
-                },
                 "office/ngo": {
                     "name": "سازمان غیر دولتی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر سازمان غیر دولتی NGO'، با کاما جدا می‌شوند>"
@@ -3475,10 +3491,6 @@
                     "name": "اداره مخابرات",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر مخابراتی '، با کاما جدا می‌شوند>"
                 },
-                "office/therapist": {
-                    "name": "درمان شناس",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'درمانگر'، با کاما جدا می‌شوند>"
-                },
                 "office/travel_agent": {
                     "name": "آژانس مسافرتی"
                 },
@@ -4143,10 +4155,6 @@
                     "name": "پارکینگ ماشین کاروان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پارکینگ ماشین کاروان'، با کاما جدا می‌شوند>"
                 },
-                "tourism/chalet": {
-                    "name": "کلبه ییلاقی",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کلبه ییلاقی'، با کاما جدا می‌شوند>"
-                },
                 "tourism/gallery": {
                     "name": "گالری هنری",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گالری هنری'، با کاما جدا می‌شوند>"
@@ -4410,6 +4418,224 @@
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بند'، با کاما جدا می‌شوند>"
                 }
             }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "نقشه های ماهواره ای aerial",
+                "name": "نقشه های Bing"
+            },
+            "DigitalGlobe-Premium": {
+                "attribution": {
+                    "text": "ارسال نظرات"
+                },
+                "description": "نقشه های ماهواره ای Premium DigitalGlobe ",
+                "name": "نقشه های DigitalGlobe Premium"
+            },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "ارسال نظرات"
+                },
+                "description": "مرزها و تاریخ نقشه ها از زوم 14 به بالا قابل مشاهده هستند",
+                "name": "فهرست DigitalGlobe Premium"
+            },
+            "DigitalGlobe-Standard": {
+                "attribution": {
+                    "text": "ارسال نظرات"
+                },
+                "description": "نقشه های ماهواره ای استاندارد DigitalGlobe Premium",
+                "name": "نقشه های استاندارد DigitalGlobe Premium"
+            },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "ارسال نظرات"
+                },
+                "description": "مرزها و تاریخ نقشه ها از زوم 14 به بالا قابل مشاهده هستند",
+                "name": "فهرست DigitalGlobe Premium"
+            },
+            "EsriWorldImagery": {
+                "attribution": {
+                    "text": "ارسال نظرات"
+                },
+                "description": "نقشه های Esri world ",
+                "name": "نقشه های Esri world "
+            },
+            "MAPNIK": {
+                "attribution": {
+                    "text": "©همکاران OSM و CC-BY-SA"
+                },
+                "description": "لایه پیش فرض OSM",
+                "name": "نقشه های OSM ( استاندارد)"
+            },
+            "Mapbox": {
+                "attribution": {
+                    "text": "ارسال نظرات"
+                },
+                "description": "نقشه های ماهواره ای aerial",
+                "name": "نقشه های ماهواره ای Mapbox"
+            },
+            "OSM_Inspector-Addresses": {
+                "attribution": {
+                    "text": "مرکز ژئوگرافی GmbH با همکاری OSM و CC-BY-SA"
+                },
+                "name": "بازرسی OSM : آدرسها"
+            },
+            "OSM_Inspector-Geometry": {
+                "attribution": {
+                    "text": "مرکز ژئوگرافی GmbH با همکاری OSM و CC-BY-SA"
+                },
+                "name": "بازرسی OSM : ژئومتری"
+            },
+            "OSM_Inspector-Highways": {
+                "attribution": {
+                    "text": "مرکز ژئوگرافی GmbH با همکاری OSM و CC-BY-SA"
+                },
+                "name": "بازرسی OSM : اتوبانها"
+            },
+            "OSM_Inspector-Multipolygon": {
+                "attribution": {
+                    "text": "مرکز ژئوگرافی GmbH با همکاری OSM و CC-BY-SA"
+                },
+                "name": "بازرسی OSM : محدوده"
+            },
+            "OSM_Inspector-Places": {
+                "attribution": {
+                    "text": "مرکز ژئوگرافی GmbH با همکاری OSM و CC-BY-SA"
+                },
+                "name": "بازرسی OSM : مکانها"
+            },
+            "OSM_Inspector-Routing": {
+                "attribution": {
+                    "text": "مرکز ژئوگرافی GmbH با همکاری OSM و CC-BY-SA"
+                },
+                "name": "بازرسی OSM : خطوط"
+            },
+            "OSM_Inspector-Tagging": {
+                "attribution": {
+                    "text": "مرکز ژئوگرافی GmbH با همکاری OSM و CC-BY-SA"
+                },
+                "name": "بازرسی OSM : برچسبها"
+            },
+            "US-TIGER-Roads-2012": {
+                "name": "جاده های TIGER 2012"
+            },
+            "US-TIGER-Roads-2014": {
+                "description": "از زوم +16 به بعد اطلاعات مالکیت ملکی در آمریکا دیده میشود.از زومهای کمتر فقط تغییراتی که در OSM مربوط به سال 2006 ثبت شده است قابل دیدن است",
+                "name": "جاده های TIGER 2014"
+            },
+            "US-TIGER-Roads-2017": {
+                "description": "زود = داده های دولتی سرشماری آمریکا. قرمز : داده های بدون منبع در OSM",
+                "name": "جاده های TIGER 2017"
+            },
+            "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                },
+                "name": "مسیرهای مشخص شده: دوچرخه سواری"
+            },
+            "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                },
+                "name": "مسیرهای مشخص شده: پیاده روی"
+            },
+            "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                },
+                "name": "مسیرهای مشخص شده: MTB"
+            },
+            "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                },
+                "name": "مسیرهای مشخص شده: اسکیت"
+            },
+            "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© Michael Spreng, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                },
+                "name": "مسیرهای مشخص شده: ورزشهای زمستانی"
+            },
+            "basemap.at": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "نقشه اصلی استرالیا، نقشه ثبت شده دولتی",
+                "name": "basemap.at"
+            },
+            "basemap.at-orthofoto": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
+                "name": "basemap.at Orthofoto"
+            },
+            "hike_n_bike": {
+                "attribution": {
+                    "text": "© OpenStreetMap contributors"
+                },
+                "name": "پیاده روی و دوچرخه سواری"
+            },
+            "mapbox_locator_overlay": {
+                "attribution": {
+                    "text": "ارسال نظرات"
+                },
+                "description": "برای کمک به شما ویژگی های اصلی نمایش میدهد.",
+                "name": "لایه یاب"
+            },
+            "openpt_map": {
+                "attribution": {
+                    "text": "© OpenStreetMap contributors, CC-BY-SA"
+                },
+                "name": "OpenPT Map (overlay)"
+            },
+            "osm-gps": {
+                "attribution": {
+                    "text": "© OpenStreetMap contributors"
+                },
+                "description": "آپلود GPSهای عمومی در OSM",
+                "name": "ظبط مسیر در OSM"
+            },
+            "osm-mapnik-black_and_white": {
+                "attribution": {
+                    "text": "© OpenStreetMap contributors, CC-BY-SA"
+                },
+                "name": "OSM ( استاندارد سیاه و سفید )"
+            },
+            "osm-mapnik-german_style": {
+                "attribution": {
+                    "text": "© OpenStreetMap contributors, CC-BY-SA"
+                },
+                "name": "SOM (نمای آلمانی)"
+            },
+            "qa_no_address": {
+                "attribution": {
+                    "text": "Simon Poole, Data ©OpenStreetMap contributors"
+                }
+            },
+            "skobbler": {
+                "attribution": {
+                    "text": "© Tiles: skobbler Map data: OpenStreetMap contributors"
+                }
+            },
+            "stamen-terrain-background": {
+                "attribution": {
+                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
+                },
+                "name": "لجن زار"
+            },
+            "tf-cycle": {
+                "attribution": {
+                    "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
+                },
+                "name": "Thunderforest OpenCycleMap"
+            },
+            "tf-landscape": {
+                "attribution": {
+                    "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
+                },
+                "name": "Thunderforest Landscape"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/fi.json b/dist/locales/fi.json
index ea3a9a2d2..a1bc72393 100644
--- a/dist/locales/fi.json
+++ b/dist/locales/fi.json
@@ -292,7 +292,6 @@
             "localized_translation_language": "Valitse kieli",
             "localized_translation_name": "Nimi"
         },
-        "zoom_in_edit": "Lähennä karttaa ennen muokkaamista",
         "login": "kirjaudu",
         "logout": "kirjaudu ulos",
         "loading_auth": "Yhdistetään OpenStreetMap-palveluun...",
@@ -568,8 +567,7 @@
         "splash": {
             "welcome": "Tervetuloa iD-kartanmuokkausohjelmaan",
             "text": "iD on tehokas ja helppokäyttöinen kartanmuokkausohjelma, jolla luodaan maailman tasokkain kartta. Tämä on versio {version}. Lisätietoja ohjelmasta on osoitteessa {website}, ja ohjelmistovirheistä voi ilmoittaa osoitteessa {github}.",
-            "walkthrough": "Aloitusopas",
-            "start": "Muokkaa heti"
+            "walkthrough": "Aloitusopas"
         },
         "source_switch": {
             "live": "suora lähetys",
@@ -596,10 +594,6 @@
             "tag_suggests_area": "Ominaisuustiedon {tag} mukaan viiva on alue, vaikka se ei sitä ole.",
             "deprecated_tags": "Vanhentuneet ominaisuustiedot: {tags}"
         },
-        "zoom": {
-            "in": "Lähennä",
-            "out": "Loitonna"
-        },
         "cannot_zoom": "Nykyisessä tilassa ei voi loitontaa enempää.",
         "full_screen": "Koko näytön tila",
         "gpx": {
@@ -2806,18 +2800,12 @@
                 "craft/scaffolder": {
                     "name": "Rakennustelineliike"
                 },
-                "craft/sculpter": {
-                    "name": "Kuvanveistämö"
-                },
                 "craft/shoemaker": {
                     "name": "Suutari"
                 },
                 "craft/stonemason": {
                     "name": "Kivenhakkaamo"
                 },
-                "craft/sweep": {
-                    "name": "Nuohooja"
-                },
                 "craft/tailor": {
                     "name": "Räätäli"
                 },
@@ -2992,9 +2980,6 @@
                 "highway/path": {
                     "name": "Polku"
                 },
-                "highway/pedestrian": {
-                    "name": "Kävelykatu"
-                },
                 "highway/primary": {
                     "name": "Kantatie"
                 },
@@ -3584,17 +3569,10 @@
                 "office": {
                     "name": "Toimisto"
                 },
-                "office/accountant": {
-                    "name": "Tilintarkastustoimisto",
-                    "terms": "tilintarkastus, tilintarkastaja, kirjanpito, kirjanpitäjä, kirjanpitotoimisto"
-                },
                 "office/administrative": {
                     "name": "Kunnallishallinnon toimisto",
                     "terms": "kunta, paikkakunta, paikallinen, paikallis, seutu, seudullinen, kaupunki, kaupungin, kunnan, kunnallinen, toimisto, hallinto, hallitus"
                 },
-                "office/architect": {
-                    "name": "Arkkitehtitoimisto"
-                },
                 "office/company": {
                     "name": "Yritystoimisto"
                 },
@@ -3627,10 +3605,6 @@
                     "name": "Vakuutustoimisto",
                     "terms": "vakuutus, vakuutusyhtiö, vakuutukset, vakuutuksia"
                 },
-                "office/it": {
-                    "name": "Tietotekniikkatoimisto",
-                    "terms": "tietotalo, tietotekniikka, teknologia, tietoteknologia, IT-talo, IT-teknologia, IT-tekniikka, teknologiatalo"
-                },
                 "office/lawyer": {
                     "name": "Lakitoimisto",
                     "terms": "asianajotoimisto, asianajajatoimisto, asianajo, asianajaja, lakimies, juristi, toimisto, lakiasia, lakiasiaintoimisto"
@@ -3639,10 +3613,6 @@
                     "name": "Asianajotoimisto",
                     "terms": "asianajaja, juristi, laki, lakimies, toimisto, konttori, yritys, firma, oikeus"
                 },
-                "office/newspaper": {
-                    "name": "Toimitus",
-                    "terms": "sanomalehti, sanomalehden, lehti, lehden, aikakauslehti, aikakauslehden, tv, tv-toimitus, media, mediatalo, sanomatalo, lehtitoimitus, toimisto"
-                },
                 "office/ngo": {
                     "name": "Kansalaisjärjestö",
                     "terms": "kansalaisjärjestö, järjestö, kansanliike, kansanjärjestö, kansalaisjärjestötoimisto, toimisto"
@@ -3660,9 +3630,6 @@
                 "office/telecommunication": {
                     "name": "Tietoliikennetoimisto"
                 },
-                "office/therapist": {
-                    "name": "Terapialaitos"
-                },
                 "office/travel_agent": {
                     "name": "Matkatoimisto"
                 },
@@ -4237,9 +4204,6 @@
                 "tourism/caravan_site": {
                     "name": "Asuntoautopysäköinti"
                 },
-                "tourism/chalet": {
-                    "name": "Chalet-huoneisto"
-                },
                 "tourism/gallery": {
                     "name": "Taidegalleria"
                 },
diff --git a/dist/locales/fr.json b/dist/locales/fr.json
index 27109b744..a7f232467 100644
--- a/dist/locales/fr.json
+++ b/dist/locales/fr.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Choisir une langue",
             "localized_translation_name": "Nom"
         },
-        "zoom_in_edit": "Zoomer pour Modifier",
+        "zoom_in_edit": " Zoomer pour Modifier ",
         "login": "identifiant",
         "logout": "Déconnexion",
         "loading_auth": "Connexion à OpenStreetMap...",
@@ -613,7 +613,7 @@
             "welcome": "Bienvenue sur ID, l'éditeur en ligne d'OpenStreetMap",
             "text": "ID est un outil convivial mais puissant pour contribuer à la meilleure carte libre du monde. Ceci est la version {version}. Pour plus d'informations consultez {website} et reportez les bugs sur {github}.",
             "walkthrough": "Commencer le tutoriel",
-            "start": "Editer"
+            "start": "Modifier maintenant"
         },
         "source_switch": {
             "live": "live",
@@ -673,6 +673,7 @@
             "key": "H",
             "help": "# Aide\n\nCeci est un éditeur pour [OpenStreetMap](http://www.openstreetmap.org/), la\ncarte du monde libre et éditable. Vous pouvez l'utiliser pour ajouter ou mettre à jour\nles données dans votre zone, et participer ainsi à la réalisation d'une carte du monde libre et à données ouvertes\nmeilleure pour tout le monde.\n\nLes modifications que vous réaliserez sur cette carte seront visibles par tous les utilisateurs d'OpenStreetMap. Pour commencer à modifier, vous devez vous [connecter](https://www.openstreetmap.org/login).\n\nL'[éditeur iD](http://ideditor.com/) est un projet collaboratif dont le [code\nsource est disponible sur GitHub](https://github.com/openstreetmap/iD).\n",
             "editing_saving": "# Modification et sauvegarde\n\nCet éditeur est conçu pour fonctionner essentiellement en ligne, et vous êtes en train d'y accéder depuis un site Web.\n\n### Sélection des éléments\n\nPour sélectionner un élément de la carte, comme une route ou un point\nd'intérêt, cliquez sur cet élément sur la carte. L'élément sélectionné\nest mis en surbrillance, et un panneau apparaît sur le côté avec des\ndétails sur l'élément. Si vous cliquez droit sur l'élément, un menu apparaît,\navec des actions que vous pouvez faire avec l'élément.\n\nPour sélectionner plusieurs éléments, maintenez la touche « Maj » enfoncée.\nPuis vous pouvez soit cliquer sur chaque élément que vous voulez sélectionner,\nsoit dessiner sur la carte un contour autour de ces éléments. Tous les\npoints dans le « lasso » dessiné seront sélectionnés.\n\n### Sauvegarde des modifications\n\nQuand vous faites des modifications comme changer des routes, des bâtiments,\net des places, ces modifications sont stockées localement jusqu'à ce que\nvous les sauvegardiez sur le serveur. Ne vous inquiétez pas si vous faites\nune erreur : vous pouvez annuler vos modifications en cliquant sur\nle bouton « Annuler », et les refaire en cliquant sur le bouton « Rétablir ».\n\nCliquez sur « Sauvegarder » pour terminer un groupe de modifications\n(par exemple, si vous avez complété une partie de la ville et si vous voulez\ncommencer une nouvelle zone). Vous aurez la possibilité de passer en revue\nce que vous avez fait, et l'éditeur fournit quelques suggestions utiles\nainsi que des avertissements si quelque chose semble être incorrect parmi\nvos modifications.\n\nSi tout semble correct, vous pouvez saisir un petit commentaire pour\nexpliquer vos modifications, et cliquer sur « Envoyer » pour envoyer les modifications\nà [OpenStreetMap.org](http://www.openstreetmap.org/), où elles seront\nvisibles par tous les utilisateurs, et disponibles pour que d'autres viennent\nles enrichir et les améliorer.\n\nSi vous ne pouvez pas terminer vos modifications en une fois, vous pouvez\nquitter la fenêtre de votre éditeur et revenir plus tard (sur le même ordinateur et\nle même navigateur) : l'éditeur vous proposera de restaurer votre travail.\n\n### Utilisation de l'éditeur\n\nVous pouvez afficher une liste des raccourcis clavier en appuyant sur la touche « ? ».\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.Cliquez 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.Si 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.Vous 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.Pour 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. Pour 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.Cliquez 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\nLe GPS est la source la plus fiable de données pour OpenStreetMap. Cet éditeur\nsupporte les traces en local - fichiers `.gpx` sur votre ordinateur. Vous pouvez collecter\nce genre de trace GPS à l'aide de nombreuses applications pour smartphones ainsi\nqu'avec du matériel GPS personnel.\n\nPour savoir comment effectuer un relevé GPS, lisez\n[Sur le terrain avec un GPS](http://learnosm.org/fr/beginner/using-gps/).\n\nPour utiliser un tracé GPX pour cartographier, effectuer un \"glissé-déposé\" du\nfichier GPX dans l'éditeur de cartes. S'il est reconnu, une ligne violette en\nsurbrillance apparaîtra sur la carte. Cliquez dans le menu \"Données de la carte\"\nsur le côté droit pour activer, désactiver, ou zoomer dans ce nouveau calque GPX.\n\nLe tracé GPX n'est pas directement envoyé sur OpenStreetMap - le meilleur moyen de\nl'utiliser est de dessiner sur la carte, en l'utilisant comme guide pour les\nnouveaux éléments que vous ajoutez, et aussi de le\n[charger dans OpenStreetMap](http://www.openstreetmap.org/trace/create) pour que\nles autres utilisateurs puissent s'en servir.\n",
             "imagery": "# Fond de carte\n\nLes photos aériennes sont une source importante pour cartographier. Une\ncompilation de photos prises d'avion, imageries satellites, et autres sources\nlibre d'utilisation sont disponibles dans l'éditeur dans le menu \"Configuration\ndu fond de carte\" à gauche.\n\nPar défaut, l'imagerie aérienne de [Bing Maps](http://www.bing.com/maps/)\nest utilisée dans l'éditeur, mais lorsque vous zoomez sur la carte, d'autres sources sont parfois disponibles dans certaines zones. Certains pays tels que la France, les États-Unis ou le Danemark disposent d'images de très haute qualité sur certaines zones.\n\nCertaines images sont parfois décalées par rapport aux données, notamment\nà cause d'un mauvais calibrage. Si vous voyez de nombreux éléments tous décalés par rapport au fond de carte, ne déplacez pas immédiatement ces éléments. À la place, vous pouvez ajuster le fond de carte afin qu'il soit aligné aux données en cliquant sur \"Ajuster le décalage du fond de carte\" en bas de l'interface de configuration du fond de carte.\n",
             "addresses": "# Adresses\n\nLes adresses sont parmis les informations les plus utiles pour la carte.\n\nAlors que les adresses sont souvent représentées comme faisant partie des rues, dans OpenStreetMap, les adresses sont enregistrées comme attributs des bâtiments le long des rues.\n\nVous pouvez ajouter une adresse sur les éléments modélisés avec un polygone\net sur ceux modélisés avec des points. La meilleure source de données afin\nde cartographier les adresses reste le relevé sur le terrain ou les connaissances personnelles, car comme pour tous les autres éléments, la copie de données à partir de contenu non libre de droits comme Google Maps est strictement interdite.\n",
@@ -1214,6 +1215,9 @@
                 "aeroway": {
                     "label": "Type"
                 },
+                "agrarian": {
+                    "label": "Produits"
+                },
                 "amenity": {
                     "label": "Type"
                 },
@@ -1282,6 +1286,9 @@
                 "board_type": {
                     "label": "Type"
                 },
+                "boules": {
+                    "label": "Type"
+                },
                 "boundary": {
                     "label": "Type"
                 },
@@ -1301,6 +1308,10 @@
                 "bunker_type": {
                     "label": "Type"
                 },
+                "cables": {
+                    "label": "Cables ",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direction (en degrés dans le sens horaire)",
                     "placeholder": "45, 90, 180, 270"
@@ -1387,7 +1398,12 @@
                     "label": "Type"
                 },
                 "crane/type": {
-                    "label": "Type de Grue"
+                    "label": "Type de Grue",
+                    "options": {
+                        "floor-mounted_crane": "Grue inamovible",
+                        "portal_crane": "Grue chargeant un porte-conteneur",
+                        "travel_lift": "Chariot de manutention de bateaux"
+                    }
                 },
                 "crop": {
                     "label": "Cultures"
@@ -1461,6 +1477,10 @@
                 "description": {
                     "label": "Description"
                 },
+                "devices": {
+                    "label": "Appareils",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Table à langer"
                 },
@@ -1535,6 +1555,9 @@
                         "wall": "Mur"
                     }
                 },
+                "fitness_station": {
+                    "label": "Type d'équipement "
+                },
                 "fixme": {
                     "label": "À corriger"
                 },
@@ -1542,6 +1565,9 @@
                     "label": "Type",
                     "placeholder": "Défaut"
                 },
+                "frequency": {
+                    "label": "Fréquence "
+                },
                 "fuel": {
                     "label": "Carburant"
                 },
@@ -1573,6 +1599,9 @@
                 "generator/type": {
                     "label": "Type"
                 },
+                "government": {
+                    "label": "Type"
+                },
                 "grape_variety": {
                     "label": "Cépages"
                 },
@@ -1584,6 +1613,7 @@
                     "label": "Rampe, Main courante"
                 },
                 "hashtags": {
+                    "label": "Hashtags suggérés",
                     "placeholder": "#exemple"
                 },
                 "healthcare": {
@@ -1899,6 +1929,10 @@
                 "payment_multi": {
                     "label": "Types de paiement"
                 },
+                "phases": {
+                    "label": "Phases",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Téléphone ",
                     "placeholder": "+33 1 23 45 67 89"
@@ -1951,6 +1985,15 @@
                     "label": "Puissance",
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
+                "playground/baby": {
+                    "label": "Siège enfant"
+                },
+                "playground/max_age": {
+                    "label": "Age maximum"
+                },
+                "playground/min_age": {
+                    "label": "Age minimum"
+                },
                 "population": {
                     "label": "Population"
                 },
@@ -1969,6 +2012,9 @@
                 "railway": {
                     "label": "Type"
                 },
+                "rating": {
+                    "label": "Puissance"
+                },
                 "recycling_accepts": {
                     "label": "Accepte"
                 },
@@ -2168,13 +2214,18 @@
                     "placeholder": "Inconnu"
                 },
                 "structure_waterway": {
+                    "label": "Structure",
                     "options": {
                         "tunnel": "Tunnel"
-                    }
+                    },
+                    "placeholder": "Inconnu"
                 },
                 "studio": {
                     "label": "Type"
                 },
+                "substance": {
+                    "label": "Substance"
+                },
                 "substation": {
                     "label": "Type"
                 },
@@ -2201,6 +2252,15 @@
                 "surveillance/zone": {
                     "label": "Zone de surveillance"
                 },
+                "switch": {
+                    "label": "Type",
+                    "options": {
+                        "circuit_breaker": "Disjoncteur",
+                        "disconnector": "Sectionneur",
+                        "earthing": "Sectionneur de terre",
+                        "mechanical": "Interrupteur"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Surface podotactile"
                 },
@@ -2252,6 +2312,9 @@
                     },
                     "placeholder": "Dur, compact, mou…"
                 },
+                "trade": {
+                    "label": "Type"
+                },
                 "traffic_calming": {
                     "label": "Dispositif"
                 },
@@ -2270,6 +2333,19 @@
                     },
                     "placeholder": "Excellent, bon, mauvais…"
                 },
+                "transformer": {
+                    "label": "Type",
+                    "options": {
+                        "auto": "Autotransformateur",
+                        "auxiliary": "auxiliaire",
+                        "converter": "Convertisseur",
+                        "distribution": "Distribution",
+                        "generator": "Générateur",
+                        "phase_angle_regulator": "Déphaseur",
+                        "traction": "Traction",
+                        "yes": "Inconnu"
+                    }
+                },
                 "trees": {
                     "label": "Arbres"
                 },
@@ -2304,6 +2380,18 @@
                         "stratovolcano": "Stratovolcan"
                     }
                 },
+                "voltage": {
+                    "label": "Tension électrique"
+                },
+                "voltage/primary": {
+                    "label": "Tension primaire"
+                },
+                "voltage/secondary": {
+                    "label": "Tension secondaire"
+                },
+                "voltage/tertiary": {
+                    "label": "Tension tertiaire"
+                },
                 "wall": {
                     "label": "Type"
                 },
@@ -2331,6 +2419,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipédia"
+                },
+                "windings": {
+                    "label": "Enroulements",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Configuration des enroulements",
+                    "options": {
+                        "delta": "Triangle",
+                        "leblanc": "Leblanc",
+                        "open": "Ouverte",
+                        "open-delta": "Triangle-ouvert",
+                        "scott": "Scott",
+                        "star": "Étoile",
+                        "zigzag": "Zig-zag "
+                    }
                 }
             },
             "presets": {
@@ -2532,10 +2636,12 @@
                     "terms": "hopital, hôpital, ambulatoire, médecins, infirmières, patients, docteurs, clinique médicale, clinique, médical, soins, urgence, clinic"
                 },
                 "amenity/clinic/abortion": {
-                    "name": "Clinique d'avortement"
+                    "name": "Clinique d'avortement",
+                    "terms": "Clinique d'avortement, avortement, clinique IVG, clinique IMG, hopital d'avortement, hopital ivg, hopital img"
                 },
                 "amenity/clinic/fertility": {
-                    "name": "Clinique de fertilité"
+                    "name": "Clinique de fertilité",
+                    "terms": "Clinique fertilité, hôpital fertilité, clinique du couple, hôpital du couple, clinique de la reproduction, hôpital de la reproduction"
                 },
                 "amenity/clock": {
                     "name": "Horloge",
@@ -2645,13 +2751,17 @@
                     "terms": "Bibliothèque, Médiathèque"
                 },
                 "amenity/marketplace": {
-                    "name": "Place de marché",
-                    "terms": "Marché"
+                    "name": "Marché",
+                    "terms": "Marché, Place de marché"
                 },
                 "amenity/motorcycle_parking": {
                     "name": "Parking pour motocyclettes",
                     "terms": "Parc à motos,Stationnement motos"
                 },
+                "amenity/music_school": {
+                    "name": "École de musique",
+                    "terms": "École de musique"
+                },
                 "amenity/nightclub": {
                     "name": "Boîte de nuit",
                     "terms": "Boîte de nuit, Discothèque"
@@ -2775,8 +2885,7 @@
                     "terms": "école élémentaire, école primaire, collège, lycée, \ncycles primaires et secondaires, enseignements élémentaire et secondaire, \nenseignement élémentaire, enseignement secondaire, \nétablissement d'enseignement élémentaire, établissement d'enseignement secondaire, \nécole, écoliers, CP-CE1-CE2-CM1-CM2, college, lycee, school"
                 },
                 "amenity/scrapyard": {
-                    "name": "Ferraille",
-                    "terms": "<translate with synonyms or related terms for 'Scrap Yard', separated by commas>"
+                    "name": "Casse automobile"
                 },
                 "amenity/shelter": {
                     "name": "Abri",
@@ -2857,6 +2966,10 @@
                     "name": "Distributeur de sacs pour excréments d'animaux",
                     "terms": "distributeur de sacs pour excréments d'animaux, distributeur à sacs pour excréments d'animaux, sacs pour excréments d'animaux, sacs à excréments d'animaux, sacs à crottes, distributeur automatique de sacs pour excréments d'animaux, distributeur automatique de sacs à crottes, machine à sacs pour excréments d'animaux, machine à sacs à crottes, vente de sacs pour excréments d'animaux, vente de sacs à crottes, vente sacs pour excréments d'animaux, vente sacs à crottes, vending machine excrement bags, excrement bags"
                 },
+                "amenity/vending_machine/feminine_hygiene": {
+                    "name": "Distributeur de produits d'hygiène féminine",
+                    "terms": "machine distributrice de produits d'hygiène féminine, distributeur de serviettes hygiéniques, distributeur de tampons, distributeur de tampon, serviette, tampon, cup, distributeur de cup, menstruations"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Distributeur de journaux"
                 },
@@ -3232,12 +3345,17 @@
                     "name": "Traiteur",
                     "terms": "Restaurateur"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Ramoneur",
+                    "terms": "Ramoneur, Cheminée"
+                },
                 "craft/clockmaker": {
                     "name": "Horloger",
                     "terms": "Horloger, Horlogerie"
                 },
                 "craft/confectionery": {
-                    "name": "Confiseur"
+                    "name": "Confiseur",
+                    "terms": "Confisier, confiseur, fabricant de bonbons"
                 },
                 "craft/distillery": {
                     "name": "Distillerie",
@@ -3340,7 +3458,7 @@
                     "name": "Monteur d'échafaudages",
                     "terms": "Échafaudages"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Sculpteur",
                     "terms": "Sculpteur"
                 },
@@ -3352,10 +3470,6 @@
                     "name": "Tailleur de pierre",
                     "terms": "Tailleur de pierre"
                 },
-                "craft/sweep": {
-                    "name": "Ramoneur",
-                    "terms": "Fumiste, Chauffagiste"
-                },
                 "craft/tailor": {
                     "name": "Tailleur"
                 },
@@ -3433,10 +3547,18 @@
                     "name": "Passage piéton",
                     "terms": "Traversée de rue,Passage clouté"
                 },
+                "footway/crossing-raised": {
+                    "name": "Passage piéton surélevé",
+                    "terms": "Passage piéton, piéton, passage clouté, croisée de rues"
+                },
                 "footway/crosswalk": {
                     "name": "Passage piéton (zebra)",
                     "terms": "Passage piéton, Zébra, Passage zébré"
                 },
+                "footway/crosswalk-raised": {
+                    "name": "Passage piéton surélevé",
+                    "terms": "Zébra, passage piéton, passage cloûté"
+                },
                 "footway/sidewalk": {
                     "name": "Trottoir",
                     "terms": "Trottoir"
@@ -3486,10 +3608,12 @@
                     "terms": "ligne d'eau"
                 },
                 "healthcare": {
-                    "name": "Établissement de soins de santé"
+                    "name": "Établissement de soins de santé",
+                    "terms": "Hopital, hôpital, clinique, établissement de santé, chr, chu, chic, ch"
                 },
                 "healthcare/alternative": {
-                    "name": "Médecine alternative"
+                    "name": "Médecine alternative",
+                    "terms": "Techniques de bien-être alternatives"
                 },
                 "healthcare/alternative/chiropractic": {
                     "name": "Chiropraticien",
@@ -3500,38 +3624,48 @@
                     "terms": "Audiologiste, Audiologue"
                 },
                 "healthcare/birthing_center": {
-                    "name": "Maison de naissance"
+                    "name": "Maison de naissance",
+                    "terms": "Maternité"
                 },
                 "healthcare/blood_donation": {
                     "name": "Centre de don du sang",
                     "terms": "Centre de don du sang, Banque du sang"
                 },
                 "healthcare/hospice": {
-                    "name": "Hospice"
+                    "name": "Hospice",
+                    "terms": "Hôpital, clinique, établissement de santé, chr, chu, chic, ch"
                 },
                 "healthcare/midwife": {
-                    "name": "Sage-femme"
+                    "name": "Sage-femme",
+                    "terms": "Sage-femme, maïeuticienne"
                 },
                 "healthcare/occupational_therapist": {
-                    "name": "Ergothérapeute"
+                    "name": "Ergothérapeute",
+                    "terms": "Ergothérapeute"
                 },
                 "healthcare/optometrist": {
-                    "name": "Optométriste"
+                    "name": "Optométriste",
+                    "terms": "Opticien"
                 },
                 "healthcare/physiotherapist": {
-                    "name": "Physiothérapeute"
+                    "name": "Physiothérapeute",
+                    "terms": "Kinésithérapeute, kiné"
                 },
                 "healthcare/podiatrist": {
-                    "name": "Podologue"
+                    "name": "Podologue",
+                    "terms": "Pédicure-podologue, podologue"
                 },
                 "healthcare/psychotherapist": {
-                    "name": "Psychothérapeute"
+                    "name": "Psychothérapeute",
+                    "terms": "Psychologue"
                 },
                 "healthcare/rehabilitation": {
-                    "name": "Centre de réadaptation"
+                    "name": "Centre de réadaptation",
+                    "terms": "Centre de réadaptation, établissement de réadaptation"
                 },
                 "healthcare/speech_therapist": {
-                    "name": "Orthophoniste"
+                    "name": "Orthophoniste",
+                    "terms": "Orthophoniste"
                 },
                 "highway": {
                     "name": "Route"
@@ -3552,10 +3686,18 @@
                     "name": "Passage piéton",
                     "terms": "Passage piéton "
                 },
+                "highway/crossing-raised": {
+                    "name": "Passage piéton surélevé",
+                    "terms": "Passage piéton"
+                },
                 "highway/crosswalk": {
                     "name": "Passage piéton (zebra)",
                     "terms": "Passage piéton, Zébra, Passage zébré"
                 },
+                "highway/crosswalk-raised": {
+                    "name": "Passage piéton surélevé",
+                    "terms": "Passage piéton"
+                },
                 "highway/cycleway": {
                     "name": "Voie cyclable",
                     "terms": "Piste cyclable"
@@ -3596,9 +3738,13 @@
                     "name": "Chemin non carrossable",
                     "terms": "Chemin"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Zone piétonne",
+                    "terms": "Zone piétonne, zone piétonnière, piétonnier."
+                },
+                "highway/pedestrian_line": {
                     "name": "Rue piétonne",
-                    "terms": "Rue piétonnière,Espace piétonnier,Place piétonne,Rue piétonne"
+                    "terms": "Rue piétonne, Rue pédestre, Rue pour piétons."
                 },
                 "highway/primary": {
                     "name": "Route principale",
@@ -3776,6 +3922,10 @@
                     "name": "Bassin",
                     "terms": "Bassin"
                 },
+                "landuse/brownfield": {
+                    "name": "Friche industrielle",
+                    "terms": "Friche industrielle, squat"
+                },
                 "landuse/cemetery": {
                     "name": "Cimetière",
                     "terms": "Cimetière"
@@ -3815,6 +3965,10 @@
                     "name": "Herbe",
                     "terms": "Herbe"
                 },
+                "landuse/greenfield": {
+                    "name": "Terrain vierge",
+                    "terms": "Terrain vierge"
+                },
                 "landuse/harbour": {
                     "name": "Havre",
                     "terms": "beateau,navire,port,baie"
@@ -3823,6 +3977,14 @@
                     "name": "Zone industrielle",
                     "terms": "Usines"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Casse automobile",
+                    "terms": "Casse automobile, Cimetière de voitures, Ferrailles."
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Abattoir",
+                    "terms": "Abattoir"
+                },
                 "landuse/landfill": {
                     "name": "Décharge",
                     "terms": "Centre d'enfouissement des déchets"
@@ -3899,6 +4061,10 @@
                     "name": "Terrain de jeux",
                     "terms": "Terrain de jeux,Terrain de loisirs"
                 },
+                "landuse/religious": {
+                    "name": "Zone religieuse",
+                    "terms": "Zone religieuse"
+                },
                 "landuse/residential": {
                     "name": "Zone résidentielle",
                     "terms": "Zone d’habitation"
@@ -3955,6 +4121,50 @@
                     "name": "Fitness en extérieur",
                     "terms": "Équipements de fitness en extérieur"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Poutre (fitness en extérieur)",
+                    "terms": "Poutre "
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Boîte de saut",
+                    "terms": "Boîte de saut"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Barre fixe",
+                    "terms": "Barre fixe"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Barres de singe",
+                    "terms": "Barres de singe"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Équipement d'hyperextension en extérieur",
+                    "terms": "Équipement d’hyperextension en extérieur"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Barres parallèles",
+                    "terms": "Barres parallèles"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Les pompes inclinées en extérieur",
+                    "terms": "Les pompes inclinées en extérieur"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Anneaux de gymnastique ",
+                    "terms": "Anneaux de gymnastique "
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Panneau d'instruction d'un exercice",
+                    "terms": "Panneau d'instruction d'un exercice"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Équipement de Sit-up en extérieur",
+                    "terms": "Équipement de Sit-up en extérieur"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Escalier d'exercices",
+                    "terms": "Escalier d'exercices"
+                },
                 "leisure/garden": {
                     "name": "Jardin",
                     "terms": "Jardin"
@@ -3964,7 +4174,8 @@
                     "terms": "Golf, Terrain de golf, Parcours de golf"
                 },
                 "leisure/hackerspace": {
-                    "name": "Hackerspace"
+                    "name": "Hackerspace",
+                    "terms": "Hackerspace"
                 },
                 "leisure/horse_riding": {
                     "name": "Centre équestre",
@@ -4014,6 +4225,10 @@
                     "name": "Terrain de Beach-volley",
                     "terms": "Terrain de Beach-volley"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Terrain de boules (Pétanque, Bocce...)",
+                    "terms": "Terrain de pétanque, Bocce, Lyonnaise"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Terrain de boulingrin",
                     "terms": "Terrain de boule anglaise"
@@ -4059,13 +4274,17 @@
                     "terms": "Aire de Jeu, Cour de récréation"
                 },
                 "leisure/resort": {
-                    "name": "Complexe touristique",
-                    "terms": "Complexe hôtelier, Complexe touristique, Spa, détente, Relaxation, Station thermale."
+                    "name": "Complexe touristique , Village de vacances",
+                    "terms": "Complexe hôtelier, Complexe touristique, Village de vacances, Spa, détente, Relaxation, Station thermale."
                 },
                 "leisure/running_track": {
                     "name": "Piste de course (à pieds)",
                     "terms": "piste,course,athlétisme"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna",
+                    "terms": "Sauna"
+                },
                 "leisure/slipway": {
                     "name": "Cale de mise à l'eau",
                     "terms": "Cale de lancement, Cale, Cale de mise à l'eau, Rampe de mise à l'eau"
@@ -4119,7 +4338,8 @@
                     "terms": "Cheminée"
                 },
                 "man_made/crane": {
-                    "name": "Grue"
+                    "name": "Grue",
+                    "terms": "Grue"
                 },
                 "man_made/cutline": {
                     "name": "Layon",
@@ -4350,16 +4570,32 @@
                 },
                 "office/accountant": {
                     "name": "Comptable",
-                    "terms": "Comptable, Expert-comptable"
+                    "terms": "Comptable, Expert-comptable."
                 },
                 "office/administrative": {
                     "name": "Bureau administratif",
                     "terms": "Bureau administratif"
                 },
+                "office/adoption_agency": {
+                    "name": "Agence d'adoption",
+                    "terms": "Agence d'adoption"
+                },
+                "office/advertising_agency": {
+                    "name": "Agence de publicité",
+                    "terms": "Agence de publicité, Agence publicitaire"
+                },
                 "office/architect": {
                     "name": "Architecte",
                     "terms": "Architecte"
                 },
+                "office/association": {
+                    "name": "Bureau d'association",
+                    "terms": "Bureau d'association, Organisation à but non lucratif"
+                },
+                "office/charity": {
+                    "name": "Organisation de bienfaisance/charité",
+                    "terms": "Organisation de bienfaisance, Organisation de charité"
+                },
                 "office/company": {
                     "name": "Bureau d'entreprise",
                     "terms": "Bureau d'entreprise, Siège social"
@@ -4376,13 +4612,25 @@
                     "name": "Agence pour l'emploi",
                     "terms": "Agence pour l'emploi"
                 },
+                "office/energy_supplier": {
+                    "name": "Fournisseur d'énergie",
+                    "terms": "Fournisseur d'énergie, électricité"
+                },
                 "office/estate_agent": {
                     "name": "Agence immobilière",
                     "terms": "Agence immobilière"
                 },
                 "office/financial": {
-                    "name": "Établissement financier",
-                    "terms": "Bureau financier"
+                    "name": "Bureau d'entreprise financière  ",
+                    "terms": "Bureau financier,Établissement financier"
+                },
+                "office/forestry": {
+                    "name": "Administration forestière",
+                    "terms": "Administration forestière"
+                },
+                "office/foundation": {
+                    "name": "Fondation",
+                    "terms": "Fondation"
                 },
                 "office/government": {
                     "name": "Administration publique",
@@ -4392,13 +4640,21 @@
                     "name": "Bureau d'état-civil",
                     "terms": "Registre d'état civil"
                 },
+                "office/government/tax": {
+                    "name": "Bureau des impôts",
+                    "terms": "Bureau des impôts"
+                },
+                "office/guide": {
+                    "name": "Bureau des guides",
+                    "terms": "Bureau des guides"
+                },
                 "office/insurance": {
                     "name": "Agence d'assurance",
                     "terms": "Agence d'assurance"
                 },
                 "office/it": {
-                    "name": "Bureau informatique",
-                    "terms": "Bureau informatique,SSII,ESN"
+                    "name": "Spécialiste en informatique",
+                    "terms": "Spécialiste en informatique, informaticien"
                 },
                 "office/lawyer": {
                     "name": "Cabinet d'avocats",
@@ -4408,13 +4664,21 @@
                     "name": "Notaire",
                     "terms": "Notaire"
                 },
+                "office/moving_company": {
+                    "name": "Entreprise de déménagement",
+                    "terms": "Entreprise de déménagement"
+                },
                 "office/newspaper": {
                     "name": "Journal",
-                    "terms": "Journal, Presse"
+                    "terms": "Journal, Agence de presse"
                 },
                 "office/ngo": {
-                    "name": "ONG",
-                    "terms": "ONG"
+                    "name": "Organisation non gouvernementale",
+                    "terms": "ONG, Bureau de l'organisation non gouvernementale"
+                },
+                "office/notary": {
+                    "name": "Notaire",
+                    "terms": "Notaire"
                 },
                 "office/physician": {
                     "name": "Médecin"
@@ -4423,10 +4687,26 @@
                     "name": "Parti politique",
                     "terms": "Parti politique"
                 },
+                "office/private_investigator": {
+                    "name": "Enquêteur privé/détective",
+                    "terms": "Enquêteur privé, Détective"
+                },
+                "office/quango": {
+                    "name": "Autorité administrative indépendante ",
+                    "terms": "Autorité administrative indépendante, ONG quasi-autonome, QUANGO."
+                },
                 "office/research": {
                     "name": "Organisme de recherche",
                     "terms": "Centre de recherches"
                 },
+                "office/surveyor": {
+                    "name": "Géomètre",
+                    "terms": "Géomètre, Géomètre-expert, Arpenteur, Topographe."
+                },
+                "office/tax_advisor": {
+                    "name": "Conseiller fiscal",
+                    "terms": "Conseiller fiscal"
+                },
                 "office/telecommunication": {
                     "name": "Agence de télécommunications",
                     "terms": "Agence télécom,FAI,Opérateur"
@@ -4438,6 +4718,10 @@
                 "office/travel_agent": {
                     "name": "Agence de voyage"
                 },
+                "office/water_utility": {
+                    "name": "Agence de l'eau",
+                    "terms": "Agence de l'eau, Compagnie des eaux"
+                },
                 "piste": {
                     "name": "Piste de ski",
                     "terms": "Piste de ski"
@@ -4460,6 +4744,10 @@
                     "name": "Île",
                     "terms": "Île"
                 },
+                "place/islet": {
+                    "name": "Îlot",
+                    "terms": "Îlot, Île"
+                },
                 "place/isolated_dwelling": {
                     "name": "Lieu-dit habité (1 ou 2 habitations)",
                     "terms": "Habitation isolée"
@@ -4472,6 +4760,10 @@
                     "name": "Voisinage",
                     "terms": "Environs, Voisinage, Quartier"
                 },
+                "place/plot": {
+                    "name": "Parcelle",
+                    "terms": "Terrains"
+                },
                 "place/quarter": {
                     "name": "Quartier",
                     "terms": "quartier"
@@ -4493,34 +4785,60 @@
                     "terms": "Village"
                 },
                 "playground/balance_beam": {
-                    "name": "Poutre "
+                    "name": "Poutre (Jeux pour enfants)",
+                    "terms": "Poutre "
+                },
+                "playground/basket_spinner": {
+                    "name": "Présentoir",
+                    "terms": "Présentoir, présentoir à paniers"
+                },
+                "playground/basket_swing": {
+                    "name": "Balançoire à panier",
+                    "terms": "balançoire, balancelle, jeux pour enfants"
                 },
                 "playground/climbing_frame": {
-                    "name": "Cage à poules "
+                    "name": "Cage à poules ",
+                    "terms": "portique, portique de jeux, jeux, jeux pour enfants"
                 },
                 "playground/cushion": {
-                    "name": "Jeu gonflable"
+                    "name": "Jeu gonflable",
+                    "terms": "trampoline, trampoline à eau, trampoline à air"
                 },
                 "playground/horizontal_bar": {
-                    "name": "Barre fixe"
+                    "name": "Barre fixe pour enfants",
+                    "terms": "Barre fixe"
+                },
+                "playground/rocker": {
+                    "name": "Balançoire à ressort",
+                    "terms": "Jeux pour enfants, animal sur ressort, jouet sur ressort"
                 },
                 "playground/roundabout": {
-                    "name": "Tourniquet"
+                    "name": "Tourniquet",
+                    "terms": "Tourniquet, jeux pour enfant"
                 },
                 "playground/sandpit": {
-                    "name": "Bac à sable"
+                    "name": "Bac à sable",
+                    "terms": "Bac à sable, jeux pour enfants, sable"
                 },
                 "playground/seesaw": {
-                    "name": "Balançoire à bascule"
+                    "name": "Balançoire à bascule",
+                    "terms": "Balançoire à bascule, tape-fesses, tape-cul,  jeux pour enfants"
                 },
                 "playground/slide": {
-                    "name": "Toboggan "
+                    "name": "Toboggan ",
+                    "terms": "Toboggan,  jeux pour enfants"
+                },
+                "playground/structure": {
+                    "name": "Structure (Jeu pour enfants)",
+                    "terms": "Structure de jeux, portique de jeux,  jeux pour enfants"
                 },
                 "playground/swing": {
-                    "name": "Balançoire"
+                    "name": "Balançoire",
+                    "terms": "Balançoire, balancelles,  jeux pour enfants"
                 },
                 "playground/zipwire": {
-                    "name": "Tyrolienne"
+                    "name": "Tyrolienne",
+                    "terms": "Tyrolienne"
                 },
                 "point": {
                     "name": "Point",
@@ -4564,6 +4882,10 @@
                     "name": "Sous-station",
                     "terms": "Sous-station électrique"
                 },
+                "power/switch": {
+                    "name": "Appareil de connexion électrique",
+                    "terms": "Appareil de connexion électrique"
+                },
                 "power/tower": {
                     "name": "Pylône électrique ",
                     "terms": "Pylône haute-tension"
@@ -4615,8 +4937,12 @@
                     "name": "Passage à niveau (route)",
                     "terms": "Passage à niveau (voiture)"
                 },
+                "railway/light_rail": {
+                    "name": "Métro léger",
+                    "terms": "Métro léger"
+                },
                 "railway/milestone": {
-                    "name": "Jalon Féroviaire",
+                    "name": "Borne kilométrique ferroviaire",
                     "terms": "<translate with synonyms or related terms for 'Railway Milestone', separated by commas>"
                 },
                 "railway/monorail": {
@@ -4682,6 +5008,10 @@
                     "name": "Magasin",
                     "terms": "Magasin,Boutique"
                 },
+                "shop/agrarian": {
+                    "name": "Magasin d'agriculture",
+                    "terms": "Magasin d'agriculture"
+                },
                 "shop/alcohol": {
                     "name": "Magasin de vente d'alcool",
                     "terms": "Cave, Caviste, Magasin de vin, Vins & Spiritueux"
@@ -5065,8 +5395,8 @@
                     "terms": "Vendeur de poissons, fruits de mer, écailler"
                 },
                 "shop/second_hand": {
-                    "name": "Magasin caritatif",
-                    "terms": "Magasin caritatif"
+                    "name": "Dépôt-vente/produits d'occasion",
+                    "terms": "Produits de seconde main"
                 },
                 "shop/shoes": {
                     "name": "Magasin de chaussures",
@@ -5201,7 +5531,7 @@
                 },
                 "tourism/chalet": {
                     "name": "Gîte",
-                    "terms": "Chalet"
+                    "terms": "Gîte"
                 },
                 "tourism/gallery": {
                     "name": "Galerie d'art",
@@ -5259,6 +5589,10 @@
                     "name": "Point de vue",
                     "terms": "Point de vue, observatoire, mirador"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Refuge de bivouac",
+                    "terms": "Refuge de bivouac, Refuge non gardé, Cabane."
+                },
                 "tourism/zoo": {
                     "name": "Parc zoologique",
                     "terms": "Zoo"
@@ -5300,7 +5634,8 @@
                     "terms": "Section de route à rainurage"
                 },
                 "traffic_calming/table": {
-                    "name": "Dos d'âne trapézoïdal"
+                    "name": "Dos d'âne trapézoïdal",
+                    "terms": "Ralentisseur, cassis, dos d'âne"
                 },
                 "type/boundary": {
                     "name": "Frontière",
@@ -5406,7 +5741,8 @@
                     "terms": "Site"
                 },
                 "type/waterway": {
-                    "name": "Voie navigable"
+                    "name": "Voie navigable",
+                    "terms": "Canal, rivière, cours d'eau"
                 },
                 "vertex": {
                     "name": "Autre",
@@ -5436,7 +5772,7 @@
                     "terms": "Quai pour cargo"
                 },
                 "waterway/drain": {
-                    "name": "Cours d'eau artificiel ou canalisé",
+                    "name": "Canal d'évacuation des eaux pluviales",
                     "terms": "Drain"
                 },
                 "waterway/fuel": {
@@ -5460,7 +5796,8 @@
                     "terms": "Ruisseau"
                 },
                 "waterway/stream_intermittent": {
-                    "name": "Ruisseau intermittent"
+                    "name": "Ruisseau intermittent",
+                    "terms": "Ruisseau intermittent"
                 },
                 "waterway/water_point": {
                     "name": "Eau potable",
@@ -5558,6 +5895,17 @@
                 },
                 "name": "OSM Inspector: Étiqueter"
             },
+            "US-TIGER-Roads-2012": {
+                "name": "Données géographiques et topologiques intégrées et encodées 2012"
+            },
+            "US-TIGER-Roads-2014": {
+                "description": "Au niveau de zoom 16+, carte du domaine public issue du recensement américain. A des niveaux de zooms inférieur, les changements depuis 2006, moins les changements déjà incorporés dans OpenStreetMap",
+                "name": "Données géographiques et topologiques intégrées et encodées 2014"
+            },
+            "US-TIGER-Roads-2017": {
+                "description": "Le jaune correspond aux données des cartes du domaine public issues du recensement américain, le rouge à des données non trouvées dans OpenStreetMap",
+                "name": "Données géographiques et topologiques intégrées et encodées 2017"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© Sarah Hoffmann, CC by-SA 3.0, données cartographiques des contributeurs OpenStreetMap, ODbL 1.0"
diff --git a/dist/locales/gl.json b/dist/locales/gl.json
index d9820531d..1b1806b3b 100644
--- a/dist/locales/gl.json
+++ b/dist/locales/gl.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Escoller idioma",
             "localized_translation_name": "Nome"
         },
-        "zoom_in_edit": "Fai zoom para editar.",
         "login": "loguear",
         "logout": "saír",
         "loading_auth": "Conectando con OpenStreetMap...",
@@ -612,8 +611,7 @@
         "splash": {
             "welcome": "Benvido ao editor de OpenStreetMap iD",
             "text": "iD é unha amigable pero potente ferramenta para contribuir ao mellor mapa libre do mundo. Esta é a versión {version}. Para obter máis información visita {website} e informa de erros en {github}.",
-            "walkthrough": "Comezar o titorial",
-            "start": "Editar agora"
+            "walkthrough": "Comezar o titorial"
         },
         "source_switch": {
             "live": "en liña",
@@ -645,10 +643,6 @@
             "tag_suggests_area": "A etiqueta {tag} suxire que a liña debería ser unha área, pero non é unha área.",
             "deprecated_tags": "Etiquetas obsoletas: {tags}"
         },
-        "zoom": {
-            "in": "Ampliar",
-            "out": "Reducir"
-        },
         "cannot_zoom": "Non se pode reducir máis no modo actual.",
         "full_screen": "Pasar a pantalla completa",
         "gpx": {
@@ -1170,7 +1164,8 @@
                         "subdistrict": "Subdistrito",
                         "subdistrict!vn": "Ward/Commune/Townlet",
                         "suburb": "Barrio",
-                        "suburb!jp": "Barrio"
+                        "suburb!jp": "Barrio",
+                        "unit": "Departamento"
                     }
                 },
                 "admin_level": {
@@ -1284,6 +1279,9 @@
                 "board_type": {
                     "label": "Tipo"
                 },
+                "boules": {
+                    "label": "Tipo"
+                },
                 "boundary": {
                     "label": "Tipo"
                 },
@@ -1388,6 +1386,9 @@
                 "craft": {
                     "label": "Tipo"
                 },
+                "crane/type": {
+                    "label": "Tipo de grúa"
+                },
                 "crop": {
                     "label": "Cultivos"
                 },
@@ -1460,6 +1461,9 @@
                 "description": {
                     "label": "Descrición completa"
                 },
+                "devices": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Con área de cambia-cueiros "
                 },
@@ -1541,6 +1545,9 @@
                     "label": "Tipo",
                     "placeholder": "Por defecto"
                 },
+                "frequency": {
+                    "label": "Frecuencia de operación"
+                },
                 "fuel": {
                     "label": "Combustible"
                 },
@@ -1583,6 +1590,7 @@
                     "label": "Carretilla"
                 },
                 "hashtags": {
+                    "label": "Cancelos suxeridos",
                     "placeholder": "#exemplo"
                 },
                 "healthcare": {
@@ -1632,6 +1640,9 @@
                 "inscription": {
                     "label": "Inscrición"
                 },
+                "intermittent": {
+                    "label": "Intermitente"
+                },
                 "internet_access": {
                     "label": "Acceso a internet",
                     "options": {
@@ -1895,6 +1906,9 @@
                 "payment_multi": {
                     "label": "Tipos de pagamento"
                 },
+                "phases": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Teléfono",
                     "placeholder": "+34 989 12 34 56"
@@ -1971,6 +1985,9 @@
                 "railway": {
                     "label": "Tipo"
                 },
+                "rating": {
+                    "label": "Potencia"
+                },
                 "recycling_accepts": {
                     "label": "Acepta"
                 },
@@ -2179,6 +2196,9 @@
                 "studio": {
                     "label": "Tipo"
                 },
+                "substance": {
+                    "label": "Substancia"
+                },
                 "substation": {
                     "label": "Tipo"
                 },
@@ -2256,6 +2276,9 @@
                     },
                     "placeholder": "Sólido, maiormente sólido, brando..."
                 },
+                "trade": {
+                    "label": "Tipo"
+                },
                 "traffic_calming": {
                     "label": "Tipo"
                 },
@@ -2274,6 +2297,17 @@
                     },
                     "placeholder": "Excelente, bo, malo..."
                 },
+                "transformer": {
+                    "options": {
+                        "auto": "Autotransformador",
+                        "converter": "Conversor",
+                        "distribution": "Distribución",
+                        "generator": "Xerador",
+                        "phase_angle_regulator": "Desfasador",
+                        "traction": "Tracción",
+                        "yes": "Descoñecido"
+                    }
+                },
                 "trees": {
                     "label": "Árbores"
                 },
@@ -2328,6 +2362,21 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Configuración dos devanados",
+                    "options": {
+                        "delta": "Triángulo",
+                        "leblanc": "Leblanc",
+                        "open": "Independentes",
+                        "open-delta": "Triángulo aberto",
+                        "scott": "Scott",
+                        "star": "Estrela",
+                        "zigzag": "Zig-zag"
+                    }
                 }
             },
             "presets": {
@@ -3216,10 +3265,6 @@
                     "name": "Andamista",
                     "terms": "andamios, andamista"
                 },
-                "craft/sculpter": {
-                    "name": "Escultor",
-                    "terms": "escultor, artista"
-                },
                 "craft/shoemaker": {
                     "name": "Zapateiro",
                     "terms": "zapateiro, zapatos"
@@ -3228,9 +3273,6 @@
                     "name": "Albanel",
                     "terms": "albanel, canteiro, pedra"
                 },
-                "craft/sweep": {
-                    "name": "Limpa Chemineas"
-                },
                 "craft/tailor": {
                     "name": "Xastre"
                 },
@@ -3399,10 +3441,6 @@
                 "highway/path": {
                     "name": "Camiño"
                 },
-                "highway/pedestrian": {
-                    "name": "Rúa peonil",
-                    "terms": "rúa, peonil, peatonal"
-                },
                 "highway/primary": {
                     "name": "Estrada primaria",
                     "terms": "estrada, primaria, primaria básica"
@@ -4033,16 +4071,9 @@
                 "office": {
                     "name": "Oficina"
                 },
-                "office/accountant": {
-                    "name": "Contador",
-                    "terms": "contador, contable, contabilidade"
-                },
                 "office/administrative": {
                     "name": "Administración local"
                 },
-                "office/architect": {
-                    "name": "Arquitecto"
-                },
                 "office/company": {
                     "name": "Oficina de empresa"
                 },
@@ -4071,10 +4102,6 @@
                     "name": "Oficina de seguros",
                     "terms": "seguros, aseguradora"
                 },
-                "office/it": {
-                    "name": "Oficina TIC",
-                    "terms": "it, tic, informática, computación, telecomunicacións"
-                },
                 "office/lawyer": {
                     "name": "Bufete",
                     "terms": "bufete, avogados, legal"
@@ -4083,9 +4110,6 @@
                     "name": "Notaría",
                     "terms": "notaría, notario"
                 },
-                "office/newspaper": {
-                    "name": "Xornal"
-                },
                 "office/ngo": {
                     "name": "Oficina ONG"
                 },
@@ -4102,10 +4126,6 @@
                 "office/telecommunication": {
                     "name": "Oficina de telecomunicacións"
                 },
-                "office/therapist": {
-                    "name": "Terapeuta",
-                    "terms": "terapeuta, fisioterapeuta, fisio"
-                },
                 "office/travel_agent": {
                     "name": "Axencia de viaxes"
                 },
@@ -4671,13 +4691,10 @@
                     "name": "Área de camping"
                 },
                 "tourism/caravan_site": {
-                    "name": "Parque de Caravanas"
-                },
-                "tourism/chalet": {
-                    "name": "Chalé"
+                    "name": "Parque de caravanas"
                 },
                 "tourism/gallery": {
-                    "name": "Galería de Arte"
+                    "name": "Galería de arte"
                 },
                 "tourism/guest_house": {
                     "name": "Hostal",
diff --git a/dist/locales/he.json b/dist/locales/he.json
index 305f76ad5..a30f46cbd 100644
--- a/dist/locales/he.json
+++ b/dist/locales/he.json
@@ -53,6 +53,9 @@
             "cancel_draw": {
                 "annotation": "ביטל ציור."
             },
+            "change_role": {
+                "annotation": "שינוי התפקיד של חבר ביחס."
+            },
             "change_tags": {
                 "annotation": "שינה תגיות."
             },
@@ -62,59 +65,794 @@
                     "line": "להפוך קו זה למעגלי.",
                     "area": "להפוך איזור זה למעגלי."
                 },
+                "key": "ע",
                 "annotation": {
                     "line": "הקו עוגל",
                     "area": "האיזור עוגל."
-                }
+                },
+                "not_closed": "אי אפשר להפוך את זה למעגלי כי זאת לא לולאה.",
+                "too_large": "אי אפשר להפוך את זה למעגלי כי התצוגה של הפריט היא חלקית.",
+                "connected_to_hidden": "אי אפשר להפוך את זה למעגלי כי הפריט מחובר לתכונה נסתרת."
             },
             "orthogonalize": {
                 "title": "ריבוע",
                 "description": {
                     "line": "ריבוע פינות בקו זה",
                     "area": "ריבוע פינות באיזור זה"
+                },
+                "key": "ר",
+                "annotation": {
+                    "line": "הפיכת הקצוות של קו לריבוע.",
+                    "area": "הפיכת הקצוות של שטח לריבוע."
+                },
+                "not_squarish": "אי אפשר להפוך את זה לריבוע כי הצורה לא ריבועית.",
+                "too_large": "אי אפשר להפוך את זה לריבוע כי התצוגה של הפריט היא חלקית.",
+                "connected_to_hidden": "אי אפשר להפוך את זה לריבוע כי הפריט מחובר לתכונה נסתרת."
+            },
+            "straighten": {
+                "title": "יישור",
+                "description": "יישור הקו הזה.",
+                "key": "ש",
+                "annotation": "יישור קו.",
+                "too_bendy": "אי אפשר ליישר את הקו הזה כיוון שהוא יותר מדי מכופף.",
+                "connected_to_hidden": "אי אפשר ליישר את הקו הזה כי הוא מחובר לתכונה נסתרת."
+            },
+            "delete": {
+                "title": "מחיקה",
+                "description": {
+                    "single": "מחיקת התכונה הזו לצמיתות.",
+                    "multiple": "מחיקת התכונות האלה לצמיתות."
+                },
+                "annotation": {
+                    "point": "נמחקה נקודה.",
+                    "vertex": "נמחק מפרק מדרך.",
+                    "line": "נמחק קו.",
+                    "area": "נמחק שטח.",
+                    "relation": "נמחק יחס.",
+                    "multiple": "נמחקו {n} תכונות."
+                },
+                "too_large": {
+                    "single": "אי אפשרות למחוק תכונה זו כי הפריט לא מופיע במלואו."
+                }
+            },
+            "add_member": {
+                "annotation": "נוסף חבר ליחס."
+            },
+            "delete_member": {
+                "annotation": "חבר הוסר מהיחס."
+            },
+            "connect": {
+                "annotation": {
+                    "point": "חיבור של דרך לנקודה.",
+                    "vertex": "חיבור של דרך לדרך אחרת.",
+                    "line": "חיבור של דרך לקו.",
+                    "area": "חיבור של דרך לשטח."
+                }
+            },
+            "disconnect": {
+                "title": "ניתוק",
+                "description": "ניתוק הקווים/השטחים האלה זה מזה.",
+                "key": "נ",
+                "annotation": "קווים/שטחים מנותקים."
+            },
+            "merge": {
+                "title": "מיזוג",
+                "description": "מיזוג התכונות האלה.",
+                "key": "ז",
+                "annotation": "{n} תכונות מוזגו.",
+                "not_eligible": "אי אפשר למזג תכונות אלו."
+            },
+            "move": {
+                "title": "העברה",
+                "description": {
+                    "single": "העברת התכונה הזאת למיקום שונה.",
+                    "multiple": "העברת התכונות האלו למיקום שונה."
+                },
+                "key": "ע",
+                "annotation": {
+                    "point": "העברת נקודה.",
+                    "vertex": "העברת מפרק בדרך.",
+                    "line": "העברת קו.",
+                    "area": "העברת שטח.",
+                    "multiple": "העברת מספר תכונות."
+                }
+            },
+            "rotate": {
+                "title": "הטייה",
+                "description": {
+                    "single": "הטיית התכונה הזאת מסביב לנקודת המרכז שלה.",
+                    "multiple": "הטיית התכונות האלו סביב נקודות המרכז שלהן."
+                },
+                "key": "ט",
+                "annotation": {
+                    "line": "הטיית קו.",
+                    "area": "הטיית שטח.",
+                    "multiple": "טיית מגוון תכונות."
+                },
+                "incomplete_relation": {
+                    "single": "אי אפשר להטות תכונה זו כיוון שהיא לא התקבלה לחלוטין.",
+                    "multiple": "אי אפשר להטות את התכונות האלו כיוון שהן לא התקבלו לחלוטין."
+                },
+                "too_large": {
+                    "single": "לא ניתן להטות את התכונה הזאת כיוון שאינה גלויה מספיק.",
+                    "multiple": "לא ניתן להטות את התכונות הללו כיוון שאינן גלויות מספיק."
+                },
+                "connected_to_hidden": {
+                    "single": "לא ניתן להטות את התכונה הזאת כיוון שהיא מחוברת לתכונה נסתרת.",
+                    "multiple": "אי אפשר להטות את התכונות האלה כיוון שחלקן מחוברות לתכונות נסתרות."
+                }
+            },
+            "reverse": {
+                "title": "היפוך",
+                "description": "הפיכת הכיוון של הקו הזה.",
+                "key": "פ",
+                "annotation": "קו התהפך."
+            },
+            "split": {
+                "title": "פיצול",
+                "description": {
+                    "line": "פיצול הקו הזה לשניים במפרק הזה.",
+                    "area": "פיצול הגבול של השטח הזה לשניים.",
+                    "multiple": "פיצול הקווים/שטח של המפרק הזה לשניים."
+                },
+                "key": "צ",
+                "annotation": {
+                    "line": "פיצול קו.",
+                    "area": "פיצול גבול שטח.",
+                    "multiple": "פיצול {n} קווים/גבולות שטחים."
+                },
+                "not_eligible": "אי אפשר לפצל קווים בהתחלה או בסוף.",
+                "multiple_ways": "יש כאן יותר מדי קווים לפיצול.",
+                "connected_to_hidden": "אי אפשר לפצל את זה כי זה מחובר לתכונה נסתרת."
+            },
+            "restriction": {
+                "help": {
+                    "select": "יש ללחוץ כדי לבחור במקטע דרך.",
+                    "toggle": "יש ללחוץ כדי להפעיל/להשבית הגבלות פנייה.",
+                    "toggle_on": "יש ללחוץ כדי להוסיף הגבלה מסוג „{restriction}”.",
+                    "toggle_off": "יש ללחוץ כדי להסיר הגבלה מסוג „{restriction}”."
+                },
+                "annotation": {
+                    "create": "נוספה הגבלת פנייה",
+                    "delete": "נמחקה הגבלת פנייה"
                 }
             }
         },
+        "undo": {
+            "tooltip": "ביטול: {action}",
+            "nothing": "אין מה לבטל."
+        },
+        "redo": {
+            "tooltip": "ביצוע חוזר: {action}",
+            "nothing": "אין ביטולים לביצוע חוזר."
+        },
+        "tooltip_keyhint": "קיצור דרך:",
+        "browser_notice": "עורך זה נתמך ב־Firefox,‏ Chrome,‏ Safari,‏ Opera ו־Internet Explorer 11 ומעלה. נא לשדרג את הדפדפן שלך או להשתמש ב־Potlatch 2 כדי לערוך את המפה.",
+        "translate": {
+            "translate": "תרגום",
+            "localized_translation_label": "שם רב־לשוני",
+            "localized_translation_language": "בחירת שפה",
+            "localized_translation_name": "שם"
+        },
+        "zoom_in_edit": "יש להתקרב כדי לערוך",
+        "login": "כניסה",
+        "logout": "יציאה",
+        "loading_auth": "מתבצעת התחברות ל־OpenStreetMap…",
+        "report_a_bug": "דיווח על תקלה",
+        "help_translate": "עזרה בתרגום",
+        "feature_info": {
+            "hidden_warning": "{count} תכונות נסתרות",
+            "hidden_details": "התכונות האלו מוסתרות כרגע: {details}"
+        },
+        "status": {
+            "error": "לא ניתן להתחבר ל־API.",
+            "offline": "ה־API אינו זמין. נא לנסות לערוך מאוחר יותר.",
+            "readonly": "ה־API הוא לקריאה בלבד. יהיה עליך להמתין כדי לשמור את השינויים שלך.",
+            "rateLimit": "ה־API מגביל חיבורים אלמוניים. ניתן לתקן זאת על ידי כניסה למערכת."
+        },
+        "commit": {
+            "title": "העלאה ל־OpenStreetMap",
+            "upload_explanation": "השינויים שיועלו על ידיך יהיו גלויים בכל המפות שמשתמשות בנתונים של OpenStreetMap.",
+            "upload_explanation_with_user": "השינויים שיועלו על ידיך בשם {user} יהיו גלויים בכל המפות שמשתמשות בנתונים של OpenStreetMap.",
+            "request_review": "ארצה סיוע בסקירת העריכות שלי.",
+            "save": "העלאה",
+            "cancel": "ביטול",
+            "changes": "{count} שינויים",
+            "download_changes": "הורדת קובץ osmChange",
+            "warnings": "אזהרות",
+            "modified": "השתנה",
+            "deleted": "נמחק",
+            "created": "נוצר",
+            "about_changeset_comments": "על הערות לערכות שינויים",
+            "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
+            "google_warning": "ציינת את Google בהערה הזאת: כדאי לזכור כי העתקה ממפות Google אסורה בתכלית האיסור.",
+            "google_warning_link": "http://www.openstreetmap.org/copyright"
+        },
+        "contributors": {
+            "list": "עריכות מאת {users}",
+            "truncated_list": "עריכות מאת {users} ו־{count} נוספים"
+        },
+        "info_panels": {
+            "key": "ח",
+            "background": {
+                "key": "ר",
+                "title": "רקע",
+                "zoom": "תקריב",
+                "vintage": "סגנון מיושן",
+                "source": "מקור",
+                "description": "תיאור",
+                "resolution": "רזולוציה",
+                "accuracy": "דיוק",
+                "unknown": "לא ידוע",
+                "show_tiles": "הצגת אריחים",
+                "hide_tiles": "הסתרת אריחים",
+                "show_vintage": "הצגת סגנון מיושן",
+                "hide_vintage": "הסתרת סגנון מיושן"
+            },
+            "history": {
+                "key": "ה",
+                "title": "היסטוריה",
+                "selected": "{n} נבחרו",
+                "version": "גרסה",
+                "last_edit": "עריכה אחרונה",
+                "edited_by": "נערך על ידי",
+                "changeset": "ערכת שינויים",
+                "unknown": "לא ידוע",
+                "link_text": "היסטוריה ב־openstreetmap.org"
+            },
+            "location": {
+                "key": "ק",
+                "title": "מיקום",
+                "unknown_location": "מיקום לא ידוע"
+            },
+            "measurement": {
+                "key": "ד",
+                "title": "מדידה",
+                "selected": "{n} נבחרו",
+                "geometry": "צורה",
+                "closed": "סגורה",
+                "center": "מרכז",
+                "perimeter": "היקף",
+                "length": "אורך",
+                "area": "שטח",
+                "location": "מיקום",
+                "metric": "מטרי",
+                "imperial": "אימפריאלית"
+            }
+        },
+        "geometry": {
+            "point": "נקודה",
+            "vertex": "קודקוד",
+            "line": "קו",
+            "area": "שטח",
+            "relation": "יחס"
+        },
+        "geocoder": {
+            "search": "חיפוש בכל העולם…",
+            "no_results_visible": "אין תוצאות באזור הגלוי של המפה",
+            "no_results_worldwide": "לא נמצאו תוצאות"
+        },
+        "geolocate": {
+            "title": "הצגת המיקום שלי",
+            "locating": "בטעינה, נא להמתין…"
+        },
+        "inspector": {
+            "no_documentation_combination": "אין תיעוד זמין לצירוף תגיות זה",
+            "no_documentation_key": "אין תיעוד זמין למפתח זה",
+            "documentation_redirect": "תיעוד זה הופנה לעמוד חדש",
+            "show_more": "הצגת עוד",
+            "view_on_osm": "הצגה ב־openstreetmap.org",
+            "all_fields": "כל השדות",
+            "all_tags": "כל התגיות",
+            "all_members": "כל החברים",
+            "all_relations": "כל היחסים",
+            "new_relation": "יחס חדש…",
+            "role": "תפקיד",
+            "choose": "בחירת סוג תכונה",
+            "results": "{n} תוצאות לחיפוש {search}",
+            "reference": "הצגה בוויקי של OpenStreetMap",
+            "back_tooltip": "שינוי תכונה",
+            "remove": "הסרה",
+            "search": "חיפוש",
+            "multiselect": "תכונות נבחרות",
+            "unknown": "לא ידוע",
+            "incomplete": "<לא התקבל>",
+            "feature_list": "חיפוש תכונות",
+            "edit": "עריכת תכונה",
+            "check": {
+                "yes": "כן",
+                "no": "לא",
+                "reverser": "שינוי הכיוון"
+            },
+            "radio": {
+                "structure": {
+                    "type": "סוג",
+                    "default": "בררת מחדל",
+                    "layer": "שכבה"
+                }
+            },
+            "add": "הוספה",
+            "none": "אין",
+            "node": "מפרק",
+            "way": "דרך",
+            "relation": "יחס",
+            "location": "מיקום",
+            "add_fields": "הוספת שדה:"
+        },
+        "background": {
+            "title": "רקע",
+            "description": "הגדרות רקע",
+            "key": "ר",
+            "percent_brightness": "{opacity}% בהירות",
+            "none": "אין",
+            "best_imagery": "מקור התמונה המוכר והטוב ביותר למיקום זה",
+            "switch": "חזרה לרקע זה",
+            "custom": "התאמה אישית",
+            "custom_button": "עריכת רקע בהתאמה אישית",
+            "fix_misalignment": "התאמת הזחה של תמונת רקע",
+            "imagery_source_faq": "מאיפה מגיעה התמונה הזאת?",
+            "reset": "איפוס",
+            "offset": "ניתן לגרור כל מקום באזור האפור להלן כדי להתאים את הזחת תמונות הרקע או להקליד את ערכי ההזחה במטרים.",
+            "minimap": {
+                "description": "מפה מוקטנת",
+                "tooltip": "הצגת מפה מרוחקת כדי לסייע באיתור האיזור שמוצג כרגע.",
+                "key": "/"
+            }
+        },
+        "map_data": {
+            "title": "נתוני מפה",
+            "description": "נתוני מפה",
+            "key": "נ",
+            "data_layers": "שכבות נתונים",
+            "layers": {
+                "osm": {
+                    "tooltip": "נתוני מפה מ־OpenStreetMap",
+                    "title": "נתוני OpenStreetMap"
+                }
+            },
+            "fill_area": "אזורי מילוי",
+            "map_features": "תכונות מפה",
+            "autohidden": "תכונות אלו הוסתרו אוטומטית כיוון שעלולות להופיע יותר מדי על המסך. ניתן להתקרב כדי לערוך אותן.",
+            "osmhidden": "התכונות האלו הוסתרו אוטומטית כיוון שהשכבה ב־OpenStreetMap מוסתרת."
+        },
+        "feature": {
+            "points": {
+                "description": "נקודות",
+                "tooltip": "נקודות עניין"
+            },
+            "traffic_roads": {
+                "description": "דרכי תנועה",
+                "tooltip": "כבישים מהירים, רחובות וכו׳"
+            },
+            "service_roads": {
+                "description": "כבישי שירות",
+                "tooltip": "כבישי שירות, מתחמי חנייה, מסלולים וכו׳"
+            },
+            "paths": {
+                "description": "שבילים",
+                "tooltip": "מדרכות, שבילים להולכי רגל, שבילי אופניים וכו׳"
+            },
+            "buildings": {
+                "description": "בניינים",
+                "tooltip": "בניינים, מקלטים, חניות מקורות וכו׳"
+            },
+            "landuse": {
+                "description": "תכונות שטח",
+                "tooltip": "יערות, קרקע חקלאית, פארקים, אזורי מגורים, תעשייה וכו׳"
+            },
+            "boundaries": {
+                "description": "גבולות",
+                "tooltip": "גבולות מנהליים"
+            },
+            "water": {
+                "description": "תכונות מים",
+                "tooltip": "נחלים, נהרות, מעיינות, בריכות וכו׳"
+            },
+            "rail": {
+                "description": "תכונות רכבת",
+                "tooltip": "מסילות רכבת"
+            },
+            "power": {
+                "description": "תכונות חשמל",
+                "tooltip": "קווי חשמל, תחנות תת־קרקעיות, מפעלי אנרגיה וכו׳"
+            },
+            "past_future": {
+                "description": "עבר/עתיד",
+                "tooltip": "מקומות מוצעים, בבנייה, נטושים, הרוסים וכו׳"
+            },
+            "others": {
+                "description": "אחרים",
+                "tooltip": "כל השאר"
+            }
+        },
+        "area_fill": {
+            "wireframe": {
+                "description": "ללא מילוי (מסגרת דקיקה)",
+                "tooltip": "הפעלת מצב מסגרת דקיקה מאפשר לך לראות בקלות את התמונה ברקע.",
+                "key": "ד"
+            },
+            "partial": {
+                "description": "מילוי חלקי",
+                "tooltip": "השטחים מצויירים עם מילוי רק סביב הקצוות הפנימיים שלהם. (מומלץ לממפים מתחילים)"
+            },
+            "full": {
+                "description": "מילוי מלא",
+                "tooltip": "השטחים מצויירים עם מילוי מלא."
+            }
+        },
+        "restore": {
+            "heading": "יש לך שינויים שלא נשמרו",
+            "description": "לשחזר שינויים שלא נשמרו מהפעלות עריכה קודמות?",
+            "restore": "שחזור השינויים שלי",
+            "reset": "התעלמות מהשינויים שלי"
+        },
+        "save": {
+            "title": "שמירה",
+            "help": "סקירת השינויים שלך והעלאה שלהם ל־OpenStreetMap כדי להנגיש אותם למשתמשים אחרים.",
+            "no_changes": "אין שינויים לשמירה",
+            "error": "אירעו שגיאות בעת ניסיון השמירה",
+            "status_code": "השרת החזיר קוד מצב {code}",
+            "unknown_error_details": "נא לוודא שיש לך חיבור לאינטרנט",
+            "uploading": "השינויים נשלחים אל OpenStreetMap…",
+            "unsaved_changes": "יש לך שינויים שלא נשמרו",
+            "conflict": {
+                "header": "פתרון עריכות סותרות",
+                "count": "סתירה {num} מתוך {total}",
+                "previous": "< הקודמת",
+                "next": "הבאה >",
+                "keep_local": "להשאיר את שלי",
+                "keep_remote": "להשתמש בשלהם",
+                "restore": "שחזור",
+                "delete": "להשאיר מחוק",
+                "download_changes": "או להוריד קובץ osmChange",
+                "done": "כל הסתירות נפתרו!"
+            }
+        },
+        "merge_remote_changes": {
+            "conflict": {
+                "deleted": "תכונה זו נמחקה על ידי {user}.",
+                "location": "תכונה זו הועברה גם על ידיך וגם על ידי {user}.",
+                "nodelist": "המפרקים עברו שינוי על ידיך וגם על ידי {user}.",
+                "memberlist": "החברים ביחס עברו שינוי גם על ידיך וגם על ידי {user}."
+            }
+        },
+        "success": {
+            "just_edited": "הרגע ערכת את OpenStreetMap!",
+            "view_on_osm": "צפייה ב־OSM",
+            "facebook": "שיתוף בפייסבוק",
+            "twitter": "שיתוף בטוויטר",
+            "google": "שיתוף ב־Google+‎",
+            "help_link_text": "פרטים"
+        },
         "confirm": {
+            "okay": "אישור",
             "cancel": "ביטול"
         },
         "splash": {
+            "welcome": "ברוך בואך לעורך המפות iD של OpenStreetMap",
+            "walkthrough": "להתחיל במדריך",
             "start": "לערוך כעת"
         },
         "source_switch": {
-            "live": "חי"
+            "live": "חי",
+            "lose_changes": "יש לך שינויים שלא נשמרו. החלפת שרת המפות יסלק אותם. לעבור שרת?",
+            "dev": "פיתוח"
         },
         "version": {
             "whats_new": "מה חדש ב־iD {version}"
         },
         "tag_reference": {
-            "description": "תיאור"
+            "description": "תיאור",
+            "on_wiki": "{tag} ב־wiki.osm.org",
+            "used_with": "בשימוש עם {type}"
         },
+        "validations": {
+            "disconnected_highway": "דרך ראשית מנותקת",
+            "disconnected_highway_tooltip": "דרכים אמורות להיות מחוברות לדרכים אחרות או לכניסות לבניינים.",
+            "untagged_point": "נקודה ללא תיוג",
+            "untagged_point_tooltip": "נא לבחור בסוג תכונה שמתאר מה הנקודה הזו.",
+            "untagged_line": "קו ללא תיוג",
+            "untagged_line_tooltip": "נא לבחור בסוג תכונה שמתאר מה הקו הזה.",
+            "untagged_area": "שטח ללא תיוג",
+            "untagged_area_tooltip": "נא לבחור בסוג תכונה שמתאר מה השטח הזה.",
+            "untagged_relation": "יחס בלתי מתויג",
+            "untagged_relation_tooltip": "נא לבחור סוג תכונה שמתארת מה היחס הזה.",
+            "many_deletions": "בחירתך תמחק {n} תכונות. להמשיך בפעולה? אם כן, התכונות תימחקנה מהמפה לכל מי שרואה את openstreetmap.org.",
+            "tag_suggests_area": "התגית {tag} רומזת שהקו אמור להיות שטח, אך זה לא שטח",
+            "deprecated_tags": "תגיות שנזנחו: {tags}"
+        },
+        "zoom": {
+            "in": "התקרבות",
+            "out": "התרחקות"
+        },
+        "cannot_zoom": "לא ניתן להתקרב יותר במצב הנוכחי.",
+        "full_screen": "החלפת מצב מסך מלא",
         "gpx": {
-            "local_layer": "קובץ מקומי"
+            "local_layer": "קובץ מקומי",
+            "drag_drop": "יש לגרור ולהשליך קובצי ‎.gpx,‏ ‎.geojson או ‎.kml לעמוד או ללחוץ על הכפתור שמשמאל לעיון",
+            "zoom": "התקרבות לשכבה",
+            "browse": "עיון אחר קובץ"
+        },
+        "mapillary_images": {
+            "tooltip": "תמונות בהתמקדות על רחובות מ־Mapillary",
+            "title": "שכבת תמונה (Mapillary)"
+        },
+        "mapillary_signs": {
+            "tooltip": "תמרורים מ־Mapillary (חובה להפעיל שכבת תמונה)",
+            "title": "שכבת תמרורים (Mapillary)"
+        },
+        "mapillary": {
+            "view_on_mapillary": "צפייה בתמונה הזאת ב־Mapillary"
+        },
+        "openstreetcam_images": {
+            "tooltip": "תמונות בהתמקדות על רחובות מ־OpenStreetCam",
+            "title": "שכבת תמרורים (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "צפייה בתמונה הזאת ב־OpenStreetCam"
         },
         "help": {
-            "title": "עזרה"
+            "title": "עזרה",
+            "key": "ע",
+            "help": "# עזרה\n\nזהו עורך של [OpenStreetMap](http://www.openstreetmap.org/), המפה\nהעולמית החופשית והזמינה לעריכה. ניתן להשתמש בו כדי להוסיף ולעדכן\nנתונים באזור שלך, למטרת יצירת מפה עולמית בקוד פתוח ונתונים פתוחים\nשתטיב עם כולם.\n\nהעריכות שלך במפה הזאת יהיו חשופים בפני כל המשתמשים\nב־OpenStreetMap. כדי לערוך, עליך\n[להיכנס](https://www.openstreetmap.org/login).\n\n[העורך iD](http://ideditor.com/) הוא מיזם שיתופי ש[קוד\nהמקור שלו זמין ב־GitHub](https://github.com/openstreetmap/iD).\n"
         },
         "intro": {
+            "ok": "אישור",
             "graph": {
                 "block_number": "<value for addr:block_number>",
+                "city": "קריית שלושה",
                 "county": "<value for addr:county>",
                 "district": "<value for addr:district>",
                 "hamlet": "<value for addr:hamlet>",
                 "neighbourhood": "<value for addr:neighbourhood>",
+                "postcode": "9051501",
                 "province": "<value for addr:province>",
                 "quarter": "<value for addr:quarter>",
                 "state": "<value for addr:state>",
                 "subdistrict": "<value for addr:subdistrict>",
                 "suburb": "<value for addr:suburb>",
-                "countrycode": "il"
+                "countrycode": "il",
+                "name": {
+                    "1st-avenue": "אחד העם",
+                    "2nd-avenue": "שדרת הדודאים",
+                    "4th-avenue": "שדרות הארבעה",
+                    "5th-avenue": "שדרת החמישה",
+                    "8th-avenue": "שמיני עצרת",
+                    "elm-street": "רח׳ אלם",
+                    "french-street": "רח׳ צרפת",
+                    "garden-street": "רח׳ גן השקמים",
+                    "lincoln-avenue": "סמטת אשכול",
+                    "lowrys-books": "סטימצקי",
+                    "lynns-garage": "המוסך של ניסים",
+                    "main-street-barbell": "אימון משה ברחוב העצמאות",
+                    "main-street-cafe": "קפה רחוב העצמאות",
+                    "main-street-fitness": "חיטוב רחוב העצמאות",
+                    "main-street": "רחוב העצמאות",
+                    "maple-street": "רחוב דבש",
+                    "marina-park": "רחוב הנמל",
+                    "market-street": "רחוב השוק",
+                    "memory-isle-park": "פארק אבני זכרון",
+                    "memory-isle": "אבני זכרון",
+                    "millard-street": "רח׳ הרב פנחס מילר",
+                    "moore-street": "רח׳ מור",
+                    "morris-avenue": "שד׳ פישר מוריס",
+                    "mural-mall": "קניון איילון",
+                    "paisanos-bar-and-grill": "השווארמה של הרצל",
+                    "pine-street": "רחוב האורן",
+                    "pizza-hut": "פיצה פדאל",
+                    "river-drive": "כביש הנחל",
+                    "river-road": "דרך הנחל",
+                    "river-street": "רחוב הנחל",
+                    "riverside-cemetery": "בית העלמין שליד הנחל",
+                    "riverwalk-trail": "מסלול הליכה לצד הנחל",
+                    "riviera-theatre": "תאטרון עידה",
+                    "rocky-river": "נהר ששון",
+                    "saint-joseph-river": "נחל רבי עקיבא",
+                    "scidmore-park-petting-zoo": "גן חיות המחמד פרץ",
+                    "scidmore-park": "פארק פרץ",
+                    "scouter-park": "פארק מועלם",
+                    "sherwin-williams": "יחיא-עבודי",
+                    "south-street": "כפר דרום",
+                    "southern-michigan-bank": "בנק צפון אשקלון",
+                    "spring-street": "מעלה אביב",
+                    "sturgeon-river-road": "דרך נחל רביבים",
+                    "three-rivers-city-hall": "בניין העירייה של קריית שלושה",
+                    "three-rivers-elementary-school": "בית הספר היסודי של קריית שלושה",
+                    "three-rivers-fire-department": "לוחמי האש של קריית שלושה",
+                    "three-rivers-high-school": "תיכון קריית שלושה",
+                    "three-rivers-middle-school": "חטיבת קריית שלושה",
+                    "three-rivers-municipal-airport": "נמל התעופה העירוני של קריית שלושה",
+                    "three-rivers-post-office": "משרד הדואר של קריית שלושה",
+                    "three-rivers-public-library": "הספרייה הציבורית של קריית שלושה",
+                    "three-rivers": "קריית שלושה",
+                    "washington-street": "רחוב בן גוריון",
+                    "water-street": "רחוב הנחל",
+                    "world-fare": "יריד עולם"
+                }
+            },
+            "welcome": {
+                "title": "ברוך בואך",
+                "welcome": "ברוך בואך! המדריך האינטראקטיבי הזה ילמד אותך את יסודות העריכה ב־OpenStreetMap.",
+                "practice": "כל המידע במדריך הזה מיועד לתרגול בלבד וכל העריכות שתתבצענה במדריך לא תישמרנה.",
+                "words": "המדריך הזה יציג מספר מילים ורעיונות חדשים. בעת הצגת מילה חדשה נשתמש בכתב *נטוי*.",
+                "mouse": "ניתן להשתמש בכל התקן קלט כדי לערוך את המפה אך מדריך זה יוצא מנקודת הנחה שיש לך עכבר עם שני כפתורים. **אם ברצונך לחבר עכבר כדאי לעשות זאת ואז ללחוץ על אישור.**"
+            },
+            "navigation": {
+                "title": "ניווט",
+                "nodes_ways": "ב־OpenStreetMap, נקודות לעתים נקראות *מפרקים* וקווים או שטחים נעתים נקראים *דרכים*.",
+                "click_townhall": "ניתן לבחור את כל התכונות במפה על ידי לחיצה עליהם. **ניתן ללחוץ על הנקודה כדי לבחור אותה**",
+                "selected_townhall": "נהדר! הנקודה נבחרה. התכונות הנבחרות מופיעות עם זריחה מהבהבת.",
+                "close_townhall": "**יש לסגור את עורך התכונות על ידי לחיצה על escape או על הכפתור {button} בפינה העליונה.**",
+                "search_street": "ניתן גם לחפש תכונות בתצוגה הנוכחית או בכל רחבי העולם. **חיפוש אחר ‚{name}’.**",
+                "choose_street": "**יש לבחור {name} מהרשימה כדי לבחור אותו.**"
+            },
+            "points": {
+                "title": "נקודות",
+                "search_cafe": "ישנן מגוון תכונות שניתן לייצג בנקודות. הנקודה שהרגע הוספת היא בית קפה. **חיפוש אחר ‚{preset}’.**",
+                "choose_cafe": "**יש לבחור {preset} מהרשימה.**"
             },
             "areas": {
-                "title": "אזורים"
+                "title": "אזורים",
+                "search_playground": "**חיפוש אחר ‚{preset}’.**",
+                "choose_playground": "**יש לבחור {preset} מהרשימה.**",
+                "choose_field": "**יש לבחור {field} מהרשימה.**",
+                "retry_add_field": "לא בחרת את השדה {field}. נא לנסות שוב."
             },
             "lines": {
-                "title": "קווים"
+                "title": "קווים",
+                "retry_intersect": "הדרך צריכה להשתלב עם {name}. נא לנסות שוב!",
+                "choose_category_road": "**יש לבחור {category} מהרשימה.**",
+                "choose_preset_residential": "ישנן מגוון סוגים של דרכים אך הדרך הזאת היא דרך עירונית. **יש לבחור בסוג {preset}.**",
+                "retry_preset_residential": "לא בחרת את הסוג {preset}. **יש ללחוץ כאן כדי לבחור שוב.**",
+                "did_name_road": "נראה מעולה! עכשיו נלמד איך לעדכן צורה של קו.",
+                "update_line": "לפעמים יש צורך לשנות צורה של קו קיים. להלן דרך שלא נראית כמו שצריך.",
+                "add_node": "נוכל להוסיף עוד מפרקים לקו זה כדי לשפר את הצורה שלו. אחת הדרכים להוסיף מפרק היא ללחוץ לחיצה כפולה על הקו במקום בו ברצונך להוסיף מפרק. **יש ללחוץ לחיצה כפולה על הקו כדי ליצור מפרק חדש.**",
+                "finish_drag_endpoint": "המיקום הזה נראה נהדר. **יש לשחרר את הכפתור השמאלי בעכבר כדי לסיים את הגרירה.**",
+                "rightclick_intersection": "הרחוב האמתי האחרון הוא {street1}, כך שאנחנו *נפצל* את {street2} בצומת הזה ונסיר את כל מה שמעליו. **יש ללחוץ עם הכפתור הימני בעכבר על מפרק הצומת.**",
+                "split_intersection": "**יש ללחוץ על הלחצן {button} כדי לפצל {street}.**",
+                "retry_split": "לא לחצת על לחצן הפיצול. נא לנסות שוב.",
+                "multi_delete": "**יש ללחוץ על הכפתור {button} כדי למחוק את הקווים העודפים.**",
+                "retry_delete": "לא לחצת על כפתור המחיקה. נא לנסות שוב."
+            },
+            "buildings": {
+                "title": "בניינים",
+                "add_building": "OpenStreetMap הוא מסד הנתונים הגדול ביותר של בניינים.{br}ניתן לסייע בשיפור מסד הנתונים הזה על ידי תיעוד בניינים שאינם ממופים עדיין. **יש ללחוץ על כפתור השטח {button} כדי להוסיף שטח חדש.**",
+                "start_building": "בואו נוסיף את הבית הזה למפה על ידי מעקב אחר קו מתאר החיצוני שלו.{br}יש לעקוב אחר קו המתאר החיצוני של הבניין בצורה המדויקת ביותר ככל הניתן. **יש ללחוץ על רווח כדי להציב מפרק התחלה באחת מפינות הבניין.**",
+                "retry_building": "נראה כי נתקלת בבעיה בהצבת המפרקים בפינות הבניין. נא לנסות שוב!",
+                "choose_category_building": "**יש לבחור ב{category} מהרשימה.**",
+                "choose_preset_house": "ישנו מגוון רחב של סוגי סניינים, אך הסוג הזה הוא בוודאות בית.{br}במקרה של ספק בנוגע לסוג, זה בסדר גמור פשוט לבחור בסוג מגנה גנרי. **יש לבחור את הסוג {preset}.**",
+                "close": "**יש ללחוץ על escape או על הכפתור {button} כדי לסגור את עורך התכונות.**",
+                "rightclick_building": "**ניתן לבחור את הבניין שיצרת ולהציג את תפריט העריכה בלחיצה ימנית.**",
+                "square_building": "הבית שזה עתה הוספת ייראה אפילו טוב יותר עם פינות מרובעות לחלוטין. **יש ללחוץ על הכפתור {button} כדי להפוך את צורת הבניין לריבוע.**",
+                "retry_square": "לא לחצת על הכפתור המרובע. נא לנסות שוב.",
+                "done_square": "ראית איך שפינות הבניין התגבשו לכדי צורה? יש עוד טריקים שימושיים כאלה.",
+                "add_tank": "בשלב הבא אנו נסמן את מיכל האחסון עגול הזה. **יש ללחוץ על כפתור השטח {button} כדי להוסיף שטח חדש.**",
+                "start_tank": "אל דאגה, לא חובה לצייר עיגול מושלם. עליך פשוט לצייר שטח בתוך המיכל שנוגע בקצוות שלו. **יש ללחוץ עם העכבר או עם מקש הרווח כדי להציב נקודת התחלה על קצה המיכל.**",
+                "search_tank": "**חיפוש אחר ‚{preset}’.**",
+                "choose_tank": "**יש לבחור {preset} מהרשימה.**",
+                "rightclick_tank": "**ניתן לבחור את מיכל האחסון שיצרת ולהציג את תפריט העריכה בלחיצה ימנית.**",
+                "circle_tank": "**יש ללחוץ על הכפתור {button} כדי להפוך את המיכל לעיגול.**",
+                "retry_circle": "לא לחצת על הכפתור לעיגול. נא לנסות שוב.",
+                "play": "עבודה נפלאה! כעת ניתן להתנסות באיתור מספר בניינים נוספים ולנסות פקודות אחרות בתפריט העריכה. **לאחר סיום ההתנסות, כדי לעבור לפרק הבא יש ללחוץ על ‚{next}’.**"
+            },
+            "startediting": {
+                "title": "להתחיל בעריכה",
+                "help": "סיימת את ההכנות לקראת עריכת OpenStreetMap!{br} ניתן לחזור על המדריך הזה בכל עת או לצפות בתיעוד נוסף על ידי לחיצה על הכפתור העזרה {button} או לחיצה על המקש ‚{key}’.",
+                "shortcuts": "ניתן לצפות ברשימה של פקודות לצד קיצורי המקלדת שלהם על ידי לחיצה על המקש ‚{key}’.",
+                "save": "לא לשכוח לשמור את השינויים שלך לעתים תכופות!",
+                "start": "בואו נתחיל למפות!"
+            }
+        },
+        "shortcuts": {
+            "title": "קיצורי מקלדת",
+            "tooltip": "הצגת מסך קיצורי המקלדת",
+            "toggle": {
+                "key": "?"
+            },
+            "key": {
+                "alt": "Alt",
+                "backspace": "Backspace",
+                "cmd": "Cmd",
+                "ctrl": "Ctrl",
+                "delete": "Delete",
+                "del": "Del",
+                "end": "End",
+                "enter": "Enter",
+                "esc": "Esc",
+                "home": "Home",
+                "option": "Option",
+                "pause": "Pause",
+                "pgdn": "PgDn",
+                "pgup": "PgUp",
+                "return": "Return",
+                "shift": "Shift",
+                "space": "רווח"
+            },
+            "gesture": {
+                "drag": "גרירה"
+            },
+            "or": "-או-",
+            "browsing": {
+                "title": "סיור",
+                "navigation": {
+                    "title": "ניווט",
+                    "pan": "סריקת המפה",
+                    "pan_more": "סריקת המפה תוך מעבר מסך מלא",
+                    "zoom": "התקרבות/התרחקות",
+                    "zoom_more": "התקרבות/התרחקות בהרבה"
+                },
+                "help": {
+                    "title": "עזרה",
+                    "help": "הצגת עזרה/תיעוד",
+                    "keyboard": "הצגת קיצורי מקלדת"
+                },
+                "display_options": {
+                    "title": "אפשרויות תצוגה",
+                    "background": "הצגת אפשרויות רקע",
+                    "background_switch": "חזרה לרקע האחרון",
+                    "map_data": "הצגת אפשרויות נתוני מפה",
+                    "fullscreen": "כניסה למצב מסך מלא",
+                    "wireframe": "החלפת מצב גבול דקיק",
+                    "minimap": "החלפת תצוגת מפה מוקטנת"
+                },
+                "selecting": {
+                    "title": "בחירת תכונות",
+                    "select_one": "בחירת תכונה בודדה",
+                    "select_multi": "בחירת מגוון תכונות",
+                    "lasso": "ציור פלצור בחירה מסביב לתכונות"
+                },
+                "with_selected": {
+                    "edit_menu": "החלפת תצוגה של תפריט עריכה"
+                },
+                "vertex_selected": {
+                    "previous": "קפיצה למפרק הקודם",
+                    "next": "קפיצה למפרק הבא",
+                    "first": "קפיצה למפרק הראשון",
+                    "last": "קפיצה למפרק האחרון",
+                    "change_parent": "החלפת דרך ההורה"
+                }
+            },
+            "editing": {
+                "title": "עריכה",
+                "drawing": {
+                    "title": "ציור",
+                    "add_point": "מצב ‚הוספת נקודה’",
+                    "add_line": "מצב ‚הוספת קו’",
+                    "add_area": "מצב ‚הוספת שטח’",
+                    "place_point": "הצבת נקודה",
+                    "disable_snap": "יש להחזיק כדי להשבית הצמדת נקודות",
+                    "stop_line": "סיום ציור קו או שטח"
+                },
+                "operations": {
+                    "continue_line": "להמשיך את הקו במפרק הנבחר",
+                    "merge": "שילוב (מיזוג) התכונות הנבחרות",
+                    "disconnect": "ניתוק תכונות במפרק הנבחר",
+                    "split": "פיצול קו לשניים במפרק הנבחר",
+                    "reverse": "ביפוך כיוון קו",
+                    "move": "העברת התכונות הנבחרות",
+                    "rotate": "הטיית התכונות הנבחרות",
+                    "orthogonalize": "יישור קו / פינות של איזור ריבועי",
+                    "delete": "מחיקת התכונות הנבחרות"
+                },
+                "commands": {
+                    "title": "פקודות",
+                    "copy": "העתקת התכונות הנבחרות",
+                    "paste": "הדבקת התכונות הנבחרות",
+                    "undo": "ביטול הפעולה האחרונה",
+                    "redo": "ביצוע חוזר של הפעולה שבוטלה",
+                    "save": "שמירת השינויים"
+                }
+            },
+            "tools": {
+                "title": "כלים",
+                "info": {
+                    "title": "מידע",
+                    "all": "החלפת מצב תצוגת כל חלוניות המידע",
+                    "background": "החלפת מצב תצוגת הרקע",
+                    "history": "החלפת מצב תצוגת חלונית היסטוריה",
+                    "location": "החלפת מצב תצוגת חלונית מיקום",
+                    "measurement": "החלפת מצב תצוגת חלונית מדידה"
+                }
             }
         }
     }
diff --git a/dist/locales/hr.json b/dist/locales/hr.json
index 2364a4dd8..783d18008 100644
--- a/dist/locales/hr.json
+++ b/dist/locales/hr.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Odaberi jezik",
             "localized_translation_name": "Ime"
         },
-        "zoom_in_edit": "Približi za uređivanje",
         "login": "prijava",
         "logout": "odjava",
         "loading_auth": "Spajanje na OpenStreetMap...",
@@ -548,8 +547,7 @@
         "splash": {
             "welcome": "Dobrodošli na iD OpenStreetMap uređivač",
             "text": "iD je vrlo jednostavan ali moćan alat za doprinošenje najboljoj besplatnoj karti svijeta. Ovo je verzija {version}. Za više informacija pogledaj {website} i prijavi greške u softveru na {github}.",
-            "walkthrough": "Počni prohod",
-            "start": "Odmah uređuj"
+            "walkthrough": "Počni prohod"
         },
         "source_switch": {
             "live": "uživo",
@@ -581,10 +579,6 @@
             "tag_suggests_area": "Oznaka {tag} ukazuje da bi linija trebala biti područje, ali nije područje",
             "deprecated_tags": "Zastarjele oznake: {tags}"
         },
-        "zoom": {
-            "in": "Približi",
-            "out": "Udalji"
-        },
         "cannot_zoom": "Nije moguće više udaljiti u trenutnom môdu.",
         "full_screen": "Slika preko cijelog zaslona",
         "gpx": {
@@ -2463,18 +2457,12 @@
                 "craft/scaffolder": {
                     "name": "Građevinska skela"
                 },
-                "craft/sculpter": {
-                    "name": "Kipar"
-                },
                 "craft/shoemaker": {
                     "name": "Obućar"
                 },
                 "craft/stonemason": {
                     "name": "Zidar"
                 },
-                "craft/sweep": {
-                    "name": "Dimnjačar"
-                },
                 "craft/tailor": {
                     "name": "Krojač"
                 },
@@ -2590,9 +2578,6 @@
                 "highway/path": {
                     "name": "Staza"
                 },
-                "highway/pedestrian": {
-                    "name": "Pješačka zona"
-                },
                 "highway/primary": {
                     "name": "Državna cesta"
                 },
@@ -3042,12 +3027,6 @@
                     "name": "Ured",
                     "terms": "ured,kancelarija"
                 },
-                "office/accountant": {
-                    "name": "Računovođa"
-                },
-                "office/architect": {
-                    "name": "Arhitekt"
-                },
                 "office/educational_institution": {
                     "name": "Obrazovna ustanova"
                 },
@@ -3057,15 +3036,9 @@
                 "office/insurance": {
                     "name": "Ured osiguravajućeg društva"
                 },
-                "office/it": {
-                    "name": "Informatički ured"
-                },
                 "office/lawyer": {
                     "name": "Odvjetnički ured"
                 },
-                "office/newspaper": {
-                    "name": "Redakcija novina"
-                },
                 "office/ngo": {
                     "name": "Nevladina organizacija"
                 },
@@ -3081,9 +3054,6 @@
                 "office/telecommunication": {
                     "name": "Ured za telekomunikacije"
                 },
-                "office/therapist": {
-                    "name": "Psihoterapeut"
-                },
                 "office/travel_agent": {
                     "name": "Putnička agencija"
                 },
@@ -3613,10 +3583,6 @@
                     "name": "Parkiralište za kamp kućice",
                     "terms": "park za rekreativna vozila,park za kamp-prikolice,RV park,kamp,kamp za kamp kućice,kamp za kamp prikolice,kamp prikolica,park za kamp prikolice,kamp za kamp-prikolice"
                 },
-                "tourism/chalet": {
-                    "name": "Bungalov",
-                    "terms": "planinarski dom,planinska koliba,koliba,planinarski,planinarska"
-                },
                 "tourism/gallery": {
                     "name": "Umjetnička galerija"
                 },
diff --git a/dist/locales/hu.json b/dist/locales/hu.json
index 925cbd58a..91b06d9b6 100644
--- a/dist/locales/hu.json
+++ b/dist/locales/hu.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Válassz nyelvet",
             "localized_translation_name": "Név"
         },
-        "zoom_in_edit": "Szerkesztéshez nagyíts rá",
+        "zoom_in_edit": "Nagyíts a szerkesztéshez",
         "login": "bejelentkezés",
         "logout": "kijelentkezés",
         "loading_auth": "Csatlakozás az OpenStreetMap kiszolgálóhoz…",
@@ -361,7 +361,9 @@
                 "accuracy": "Pontosság",
                 "unknown": "Ismeretlen",
                 "show_tiles": "Csempék megjelenítése",
-                "hide_tiles": "Csempék elrejtése"
+                "hide_tiles": "Csempék elrejtése",
+                "show_vintage": "Évjárat mutatása",
+                "hide_vintage": "Évjárat elrejtése"
             },
             "history": {
                 "key": "H",
@@ -646,8 +648,8 @@
             "deprecated_tags": "Elavult címkék: {tags}"
         },
         "zoom": {
-            "in": "Közelítés",
-            "out": "Távolítás"
+            "in": "Nagyítás",
+            "out": "Kicsinyítés"
         },
         "cannot_zoom": "Nem lehet jobban távolítani ebben a módban.",
         "full_screen": "Váltás teljes képernyőre",
@@ -668,6 +670,13 @@
         "mapillary": {
             "view_on_mapillary": "E kép megtekintése a Mapillary weboldalon"
         },
+        "openstreetcam_images": {
+            "tooltip": "Utcafotók az OpenStreetCam-ról",
+            "title": "Fotó réteg (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "A kép megtekintése az OpenStreetCam weboldalon"
+        },
         "help": {
             "title": "Súgó",
             "key": "H",
@@ -1213,6 +1222,9 @@
                 "aeroway": {
                     "label": "Típus"
                 },
+                "agrarian": {
+                    "label": "Termékek"
+                },
                 "amenity": {
                     "label": "Típus"
                 },
@@ -1281,6 +1293,9 @@
                 "board_type": {
                     "label": "Típus"
                 },
+                "boules": {
+                    "label": "Típus"
+                },
                 "boundary": {
                     "label": "Típus"
                 },
@@ -1300,6 +1315,9 @@
                 "bunker_type": {
                     "label": "Típus"
                 },
+                "cables": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Irány (fok, az óramutató járása szerint)",
                     "placeholder": "45, 90, 180, 270"
@@ -1460,6 +1478,9 @@
                 "description": {
                     "label": "Leírás"
                 },
+                "devices": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Pelenkázó van"
                 },
@@ -1572,6 +1593,9 @@
                 "generator/type": {
                     "label": "Típus"
                 },
+                "government": {
+                    "label": "Típus"
+                },
                 "grape_variety": {
                     "label": "Szőlőfajták"
                 },
@@ -1898,6 +1922,10 @@
                 "payment_multi": {
                     "label": "Fizetési típusok"
                 },
+                "phases": {
+                    "label": "Fázisok",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telefonszám",
                     "placeholder": "+36 1 123 45 67"
@@ -1977,6 +2005,9 @@
                 "railway": {
                     "label": "Típus"
                 },
+                "rating": {
+                    "label": "Generátorteljesítmény"
+                },
                 "recycling_accepts": {
                     "label": "Elfogad"
                 },
@@ -2185,6 +2216,9 @@
                 "studio": {
                     "label": "Típus"
                 },
+                "substance": {
+                    "label": "Szállított anyag"
+                },
                 "substation": {
                     "label": "Típus"
                 },
@@ -2211,6 +2245,13 @@
                 "surveillance/zone": {
                     "label": "Megfigyelt terület"
                 },
+                "switch": {
+                    "label": "Típus",
+                    "options": {
+                        "circuit_breaker": "Áramkör megszakító",
+                        "earthing": "Földelés"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Vakvezető burkolat"
                 },
@@ -2262,6 +2303,9 @@
                     },
                     "placeholder": "Szilárd, vegyes, laza…"
                 },
+                "trade": {
+                    "label": "Típus"
+                },
                 "traffic_calming": {
                     "label": "Típus"
                 },
@@ -2280,6 +2324,14 @@
                     },
                     "placeholder": "Kiváló, jó, rossz…"
                 },
+                "transformer": {
+                    "label": "Típus",
+                    "options": {
+                        "converter": "Átalakító",
+                        "generator": "Áramfejlesztő",
+                        "yes": "Ismeretlen"
+                    }
+                },
                 "trees": {
                     "label": "Fák"
                 },
@@ -2314,6 +2366,9 @@
                         "stratovolcano": "Rétegvulkán"
                     }
                 },
+                "voltage": {
+                    "label": "Feszültség"
+                },
                 "wall": {
                     "label": "Típus"
                 },
@@ -2341,6 +2396,9 @@
                 },
                 "wikipedia": {
                     "label": "Wikipédia"
+                },
+                "windings": {
+                    "placeholder": "1, 2, 3..."
                 }
             },
             "presets": {
@@ -2664,6 +2722,10 @@
                     "name": "Motorkerékpár-parkoló",
                     "terms": "motoros parkoló, motor parkoló"
                 },
+                "amenity/music_school": {
+                    "name": "Zeneiskola",
+                    "terms": "<translate with synonyms or related terms for 'Music School', separated by commas>"
+                },
                 "amenity/nightclub": {
                     "name": "Diszkó",
                     "terms": "Night Club, Éjszakai bár, Diszkó"
@@ -2787,8 +2849,7 @@
                     "terms": "suli, tanítás, oktatás, nevelés, közoktatás, köznevelés"
                 },
                 "amenity/scrapyard": {
-                    "name": "Szeméttelep",
-                    "terms": "hulladékudvar,roncstelep"
+                    "name": "Szeméttelep"
                 },
                 "amenity/shelter": {
                     "name": "Esőbeálló",
@@ -3252,6 +3313,10 @@
                     "name": "Órás (falióra)",
                     "terms": "Órás"
                 },
+                "craft/confectionery": {
+                    "name": "Cukrász",
+                    "terms": "<translate with synonyms or related terms for 'Candy Maker', separated by commas>"
+                },
                 "craft/distillery": {
                     "name": "Párlatfőző",
                     "terms": "alkohol,ital,pálinka,szeszfőzde"
@@ -3353,9 +3418,9 @@
                     "name": "Állványépítő",
                     "terms": "ács-állványozó"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Szobrász",
-                    "terms": "Szobrász"
+                    "terms": "<translate with synonyms or related terms for 'Sculptor', separated by commas>"
                 },
                 "craft/shoemaker": {
                     "name": "Cipész",
@@ -3365,10 +3430,6 @@
                     "name": "Kőfaragó",
                     "terms": "Kőfaragó műhely"
                 },
-                "craft/sweep": {
-                    "name": "Kéményseprő",
-                    "terms": "Kéményseprő"
-                },
                 "craft/tailor": {
                     "name": "Szabó"
                 },
@@ -3637,9 +3698,13 @@
                     "name": "Gyalogút",
                     "terms": "Ösvény"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Sétáló övezet",
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Area', separated by commas>"
+                },
+                "highway/pedestrian_line": {
                     "name": "Sétálóutca",
-                    "terms": "sétálóutca"
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
                 },
                 "highway/primary": {
                     "name": "Főút",
@@ -3817,6 +3882,10 @@
                     "name": "Vízgyűjtő medence",
                     "terms": "Vízgyűjtőterület, vízgyűjtő, vízválasztó"
                 },
+                "landuse/brownfield": {
+                    "name": "Barnamezős terület",
+                    "terms": "mező, barna, szántó"
+                },
                 "landuse/cemetery": {
                     "name": "Temető",
                     "terms": "Köztemető, sírkert"
@@ -3856,6 +3925,10 @@
                     "name": "Fű",
                     "terms": "gyep"
                 },
+                "landuse/greenfield": {
+                    "name": "Zöldmezős terület",
+                    "terms": "mező, szántó, zöld"
+                },
                 "landuse/harbour": {
                     "name": "Kikötő",
                     "terms": "kikötő, hajó"
@@ -3864,6 +3937,14 @@
                     "name": "Ipari terület",
                     "terms": "ipar, gyárterület, gyár, ipari park"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Szeméttelep",
+                    "terms": "<translate with synonyms or related terms for 'Scrap Yard', separated by commas>"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Vágóhíd",
+                    "terms": "<translate with synonyms or related terms for 'Slaughterhouse', separated by commas>"
+                },
                 "landuse/landfill": {
                     "name": "Hulladéklerakó",
                     "terms": "Szemétlerakó, szeméttelep"
@@ -3940,6 +4021,10 @@
                     "name": "Szabadidőpark",
                     "terms": "park, pihenőhely"
                 },
+                "landuse/religious": {
+                    "name": "Vallási övezet",
+                    "terms": "<translate with synonyms or related terms for 'Religious Area', separated by commas>"
+                },
                 "landuse/residential": {
                     "name": "Lakóövezet",
                     "terms": "lakótelep, lakóterület"
@@ -3996,6 +4081,39 @@
                     "name": "Fitneszpark",
                     "terms": "fitnesz,sport, edzőhely"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Balance Beam', separated by commas>"
+                },
+                "leisure/fitness_station/box": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Box', separated by commas>"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Horizontal Bar', separated by commas>"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Monkey Bars', separated by commas>"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "terms": "<translate with synonyms or related terms for 'Hyperextension Station', separated by commas>"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "terms": "<translate with synonyms or related terms for 'Parallel Bars', separated by commas>"
+                },
+                "leisure/fitness_station/push-up": {
+                    "terms": "<translate with synonyms or related terms for 'Push-Up Station', separated by commas>"
+                },
+                "leisure/fitness_station/rings": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Rings', separated by commas>"
+                },
+                "leisure/fitness_station/sign": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Instruction Sign', separated by commas>"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "terms": "<translate with synonyms or related terms for 'Sit-Up Station', separated by commas>"
+                },
+                "leisure/fitness_station/stairs": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Stairs', separated by commas>"
+                },
                 "leisure/garden": {
                     "name": "Kert",
                     "terms": "Kert"
@@ -4056,6 +4174,9 @@
                     "name": "Strandröplabda pálya",
                     "terms": "strand,röplabda,röpi,pálya"
                 },
+                "leisure/pitch/boules": {
+                    "terms": "<translate with synonyms or related terms for 'Boules/Bocce Court', separated by commas>"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Gyeptekepálya",
                     "terms": "bowling pálya"
@@ -4108,6 +4229,10 @@
                     "name": "Futópálya",
                     "terms": "futókör"
                 },
+                "leisure/sauna": {
+                    "name": "Szauna",
+                    "terms": "gőz, meleg, izzad, szauna"
+                },
                 "leisure/slipway": {
                     "name": "Sólya",
                     "terms": "Sólya, hajócsúszda"
@@ -4392,16 +4517,26 @@
                     "terms": "Iroda"
                 },
                 "office/accountant": {
-                    "name": "Könyvelő",
-                    "terms": "könyvvizsgálat"
+                    "terms": "<translate with synonyms or related terms for 'Accountant Office', separated by commas>"
                 },
                 "office/administrative": {
                     "name": "Közigazgatási hivatal",
                     "terms": "hivatal, önkormányzat, hatóság"
                 },
+                "office/adoption_agency": {
+                    "terms": "<translate with synonyms or related terms for 'Adoption Agency', separated by commas>"
+                },
+                "office/advertising_agency": {
+                    "terms": "<translate with synonyms or related terms for 'Advertising Agency', separated by commas>"
+                },
                 "office/architect": {
-                    "name": "Építész",
-                    "terms": "architektúra"
+                    "terms": "<translate with synonyms or related terms for 'Architect Office', separated by commas>"
+                },
+                "office/association": {
+                    "terms": "<translate with synonyms or related terms for 'Nonprofit Organization Office', separated by commas>"
+                },
+                "office/charity": {
+                    "terms": "<translate with synonyms or related terms for 'Charity Office', separated by commas>"
                 },
                 "office/company": {
                     "name": "Vállalati iroda",
@@ -4419,6 +4554,9 @@
                     "name": "Munkaügyi központ",
                     "terms": "munkaügyi hivatal"
                 },
+                "office/energy_supplier": {
+                    "terms": "<translate with synonyms or related terms for 'Energy Supplier Office', separated by commas>"
+                },
                 "office/estate_agent": {
                     "name": "Ingatlaniroda",
                     "terms": "ingatlanközvetítő"
@@ -4427,6 +4565,12 @@
                     "name": "Pénzügyi vállalat irodája",
                     "terms": "pénzügy, hitelezés, kölcsön, befektetés, biztosítás"
                 },
+                "office/forestry": {
+                    "terms": "<translate with synonyms or related terms for 'Forestry Office', separated by commas>"
+                },
+                "office/foundation": {
+                    "terms": "<translate with synonyms or related terms for 'Foundation Office', separated by commas>"
+                },
                 "office/government": {
                     "name": "Kormányzati hivatal",
                     "terms": "Kormányzat, minisztérium, országos szerv"
@@ -4435,13 +4579,18 @@
                     "name": "Anyakönyvi hivatal",
                     "terms": "anyakönyvi hivatal, házasságkötési hivatal"
                 },
+                "office/government/tax": {
+                    "terms": "<translate with synonyms or related terms for 'Tax and Revenue Office', separated by commas>"
+                },
+                "office/guide": {
+                    "terms": "<translate with synonyms or related terms for 'Tour Guide Office', separated by commas>"
+                },
                 "office/insurance": {
                     "name": "Biztosító",
                     "terms": "Biztosító"
                 },
                 "office/it": {
-                    "name": "Informatikai cég irodája",
-                    "terms": "számítástechnika, IT, információ-technológia"
+                    "terms": "<translate with synonyms or related terms for 'Information Technology Office', separated by commas>"
                 },
                 "office/lawyer": {
                     "name": "Ügyvéd",
@@ -4451,14 +4600,19 @@
                     "name": "Közjegyzői iroda",
                     "terms": "közjegyző"
                 },
+                "office/moving_company": {
+                    "terms": "<translate with synonyms or related terms for 'Moving Company Office', separated by commas>"
+                },
                 "office/newspaper": {
-                    "name": "Újságszekesztőség",
-                    "terms": "Újság, szerkesztőség, kiadó, napilap, hetilap, folyóirat"
+                    "terms": "<translate with synonyms or related terms for 'Newspaper Office', separated by commas>"
                 },
                 "office/ngo": {
                     "name": "Civil szervezet",
                     "terms": "Nonprofit szervezet, NGO, egyesület"
                 },
+                "office/notary": {
+                    "terms": "<translate with synonyms or related terms for 'Notary Office', separated by commas>"
+                },
                 "office/physician": {
                     "name": "Orvosi rendelő"
                 },
@@ -4466,21 +4620,35 @@
                     "name": "Pártiroda",
                     "terms": "pártszékház, politika, párt"
                 },
+                "office/private_investigator": {
+                    "terms": "<translate with synonyms or related terms for 'Private Investigator Office', separated by commas>"
+                },
+                "office/quango": {
+                    "terms": "<translate with synonyms or related terms for 'Quasi-NGO Office', separated by commas>"
+                },
                 "office/research": {
                     "name": "Kutatóintézet",
                     "terms": "kutatás, fejlesztés, alapkutatás"
                 },
+                "office/surveyor": {
+                    "terms": "<translate with synonyms or related terms for 'Surveyor Office', separated by commas>"
+                },
+                "office/tax_advisor": {
+                    "terms": "<translate with synonyms or related terms for 'Tax Advisor Office', separated by commas>"
+                },
                 "office/telecommunication": {
                     "name": "Távközlési cég irodája",
                     "terms": "mobilszolgáltató, telekommunikáció, telefon, internet"
                 },
                 "office/therapist": {
-                    "name": "Fizioterápiás rendelő",
-                    "terms": "gyógyász, gyógyító, fizioterápia"
+                    "terms": "<translate with synonyms or related terms for 'Therapist Office', separated by commas>"
                 },
                 "office/travel_agent": {
                     "name": "Utazási iroda"
                 },
+                "office/water_utility": {
+                    "terms": "<translate with synonyms or related terms for 'Water Utility Office', separated by commas>"
+                },
                 "piste": {
                     "name": "Sípálya",
                     "terms": "sífutóút, lesiklópálya"
@@ -4503,6 +4671,10 @@
                     "name": "Sziget",
                     "terms": "sziget"
                 },
+                "place/islet": {
+                    "name": "Szigetecske",
+                    "terms": "<translate with synonyms or related terms for 'Islet', separated by commas>"
+                },
                 "place/isolated_dwelling": {
                     "name": "Elszigetelt lakás",
                     "terms": "Elszigetelt otthon"
@@ -4515,6 +4687,10 @@
                     "name": "Környék",
                     "terms": "környék,negyed"
                 },
+                "place/plot": {
+                    "name": "Parcella",
+                    "terms": "<translate with synonyms or related terms for 'Plot', separated by commas>"
+                },
                 "place/quarter": {
                     "name": "Sub-Borough / Quarter",
                     "terms": "sub-borough,quarter"
@@ -4536,8 +4712,7 @@
                     "terms": "község"
                 },
                 "playground/balance_beam": {
-                    "name": "Egyensúlyozó gerenda",
-                    "terms": "gerenda,egyensúly,ügyesség,sport"
+                    "terms": "<translate with synonyms or related terms for 'Play Balance Beam', separated by commas>"
                 },
                 "playground/basket_spinner": {
                     "name": "Kosár forgó",
@@ -4556,12 +4731,10 @@
                     "terms": "párna,felfúj,ugrál"
                 },
                 "playground/horizontal_bar": {
-                    "name": "Nyújtó",
-                    "terms": "nyújtó,lóg,játék"
+                    "terms": "<translate with synonyms or related terms for 'Play Horizontal Bar', separated by commas>"
                 },
                 "playground/rocker": {
-                    "name": "Rugós hinta",
-                    "terms": "hinta,rugó,játék"
+                    "terms": "<translate with synonyms or related terms for 'Spring Rider', separated by commas>"
                 },
                 "playground/roundabout": {
                     "name": "Körforgó",
@@ -4633,6 +4806,10 @@
                     "name": "Alállomás",
                     "terms": "Elektromos alállomás, transzformátorállomás, trafóállomás, trafóház"
                 },
+                "power/switch": {
+                    "name": "Hálózati kapcsoló",
+                    "terms": "<translate with synonyms or related terms for 'Power Switch', separated by commas>"
+                },
                 "power/tower": {
                     "name": "Távvezetékoszlop",
                     "terms": "Magasfeszültségű oszlop, villanyoszlop"
@@ -5173,6 +5350,10 @@
                     "name": "Jegyárus",
                     "terms": "koncertjegy,színházjegy,interticket,hajójegy"
                 },
+                "shop/tiles": {
+                    "name": "Csempebolt",
+                    "terms": "<translate with synonyms or related terms for 'Tile Shop', separated by commas>"
+                },
                 "shop/tobacco": {
                     "name": "Dohánybolt",
                     "terms": "Nemzeti dohánybolt, dohány, cigaretta, szivar"
@@ -5181,6 +5362,10 @@
                     "name": "Játékbolt",
                     "terms": "barbie,lego,hasbro,mattel,babák,fisher price,logikai,barkács,bébi,gyermek,kreatív"
                 },
+                "shop/trade": {
+                    "name": "Kereskedelmi üzlet",
+                    "terms": "<translate with synonyms or related terms for 'Trade Shop', separated by commas>"
+                },
                 "shop/travel_agency": {
                     "name": "Utazási iroda",
                     "terms": "ibusz,vista,neckermann,nyaralás,last minute,utazás,travel,karthago tours,tours,tui,reisen,otp travel,voyage"
@@ -5262,7 +5447,7 @@
                 },
                 "tourism/chalet": {
                     "name": "Nyaralóház",
-                    "terms": "víkendház, kulcsosház"
+                    "terms": "<translate with synonyms or related terms for 'Holiday Cottage', separated by commas>"
                 },
                 "tourism/gallery": {
                     "name": "Művészeti galéria",
@@ -5320,6 +5505,9 @@
                     "name": "Kilátóhely",
                     "terms": "Kilátópont"
                 },
+                "tourism/wilderness_hut": {
+                    "terms": "<translate with synonyms or related terms for 'Wilderness Hut', separated by commas>"
+                },
                 "tourism/zoo": {
                     "name": "Állatkert",
                     "terms": "Állatkert"
@@ -5552,6 +5740,11 @@
                 "description": "Premium DigitalGlobe műholdképek",
                 "name": "DigitalGlobe Premium felvételek"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Feltételek és visszajelzés"
+                }
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Feltételek és visszajelzés"
@@ -5559,6 +5752,11 @@
                 "description": "Standard DigitalGlobe műholdképek",
                 "name": "DigitalGlobe Standard felvételek"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Feltételek és visszajelzés"
+                }
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Feltételek és visszajelzés"
@@ -5622,6 +5820,15 @@
                 },
                 "name": "OSM Inspector: címkézés ellenőrzése"
             },
+            "US-TIGER-Roads-2012": {
+                "name": "TIGER Roads 2012"
+            },
+            "US-TIGER-Roads-2014": {
+                "name": "TIGER Roads 2014"
+            },
+            "US-TIGER-Roads-2017": {
+                "name": "TIGER Roads 2017"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© Sarah Hoffmann, CC by-SA 3.0, térképadatok: OpenStreetMap-közreműködők, ODbL 1.0"
diff --git a/dist/locales/hy.json b/dist/locales/hy.json
index ffa56499c..426cf0b83 100644
--- a/dist/locales/hy.json
+++ b/dist/locales/hy.json
@@ -211,7 +211,6 @@
             "localized_translation_language": "Ընտրել լեզուն",
             "localized_translation_name": "Անուն"
         },
-        "zoom_in_edit": "Խոշորացնել Խմբագրելու համար",
         "logout": "ելք",
         "loading_auth": "Կապւում է ՕփենՍթրիթՄէփը…",
         "report_a_bug": "Հաղորդել ծրագրի վրիպակի մասին տեղեկատւութիւն",
@@ -408,8 +407,7 @@
         "splash": {
             "welcome": "Բարի գալուստ iD ՕփենՍթրիթՄէփ խմբագրիչ։",
             "text": "iD ֊ն աշխարհի ամենա լաւ ազատ քարտէզին աջակցելու պարզ, բայց հզօր գործիք է։ Սա {version} վարկածն է։ Մանրամասների համար տես {website} եւ յայտնիր վրիպակների մասին {github} ֊ում։",
-            "walkthrough": "Սկսել ծանօթանալը։",
-            "start": "Խմբագրել հիմա"
+            "walkthrough": "Սկսել ծանօթանալը։"
         },
         "source_switch": {
             "live": "եթերում է",
@@ -430,10 +428,6 @@
             "tag_suggests_area": "{tag} պիտակը ենթադրում է, որ գիծը պէտք է լինի տիրոյթ, բայց այն տիրոյթ չէ",
             "deprecated_tags": "Հնացած պիտակներ՝ {tags}"
         },
-        "zoom": {
-            "in": "Խոշորացնել",
-            "out": "Փոքրացնել"
-        },
         "cannot_zoom": "Այս ռեժիմում հնարաւոր չէ աւելի փոքրացնել։",
         "full_screen": "Դարձնել լիաէկրան",
         "mapillary": {
diff --git a/dist/locales/id.json b/dist/locales/id.json
index 23cf48e4e..8cf91ddef 100644
--- a/dist/locales/id.json
+++ b/dist/locales/id.json
@@ -210,7 +210,6 @@
             "localized_translation_language": "Pilih Bahasa",
             "localized_translation_name": "Nama"
         },
-        "zoom_in_edit": "Perbesar untuk bisa menyunting",
         "logout": "keluar",
         "loading_auth": "Menghubungkan dengan OpenStreetMap...",
         "report_a_bug": "Laporkan bug",
@@ -421,8 +420,7 @@
         "splash": {
             "welcome": "Selamat datang di penyuting iD OpenStreetMap",
             "text": "iD begitu bersahabat namun juga alat yang kuat untuk berperan dalam peta dunia gratis terbaik. Ini adalah versi {version}. Untuk informasi lebih lihat {website} dan laporkan kesalahan di {github}.",
-            "walkthrough": "Memulai Perjalanan",
-            "start": "Sunting Sekarang"
+            "walkthrough": "Memulai Perjalanan"
         },
         "source_switch": {
             "live": "terhubung",
@@ -444,10 +442,6 @@
             "tag_suggests_area": "Penanda {tag} menyarankan garis sebaiknya dalam bentuk area, tapi ini bukan sebuah area",
             "deprecated_tags": "Tag sudah tidak dipergunakan: {tags}"
         },
-        "zoom": {
-            "in": "Perbesar tampilan",
-            "out": "Perkecil tampilan"
-        },
         "cannot_zoom": "Tidak bisa memperbesar tampilan lebih jauh dengan mode ini.",
         "full_screen": "Tombol Layar Penuh",
         "mapillary": {
@@ -1566,15 +1560,9 @@
                 "craft/scaffolder": {
                     "name": "Perancah"
                 },
-                "craft/sculpter": {
-                    "name": "Pembuat Patung"
-                },
                 "craft/shoemaker": {
                     "name": "Pembuat Sepatu"
                 },
-                "craft/sweep": {
-                    "name": "Penyapu Cerobong"
-                },
                 "craft/tailor": {
                     "name": "Penjahit Pakaian Pria"
                 },
@@ -1667,9 +1655,6 @@
                 "highway/path": {
                     "name": "Jalur"
                 },
-                "highway/pedestrian": {
-                    "name": "Trotoar"
-                },
                 "highway/primary": {
                     "name": "Jalan Provinsi",
                     "terms": "Jalan Primer, Jalan Utama"
@@ -2088,15 +2073,9 @@
                     "name": "Kantor",
                     "terms": "Balai"
                 },
-                "office/accountant": {
-                    "name": "Akuntan"
-                },
                 "office/administrative": {
                     "name": "Kantor Administrasi"
                 },
-                "office/architect": {
-                    "name": "Arsitek"
-                },
                 "office/company": {
                     "name": "Kantor Perusahaan"
                 },
@@ -2118,16 +2097,9 @@
                 "office/insurance": {
                     "name": "Kantor Asuransi"
                 },
-                "office/it": {
-                    "name": "Kantor IT",
-                    "terms": "Teknologi Informasi, TI"
-                },
                 "office/lawyer": {
                     "name": "Kantor Hukum"
                 },
-                "office/newspaper": {
-                    "name": "Koran"
-                },
                 "office/ngo": {
                     "name": "Kantor LSM"
                 },
@@ -2140,9 +2112,6 @@
                 "office/telecommunication": {
                     "name": "Kantor Telekomunikasi"
                 },
-                "office/therapist": {
-                    "name": "Penerapi"
-                },
                 "office/travel_agent": {
                     "name": "Biro Perjalanan"
                 },
diff --git a/dist/locales/is.json b/dist/locales/is.json
index 36b11bcb6..6ffb52a6e 100644
--- a/dist/locales/is.json
+++ b/dist/locales/is.json
@@ -200,7 +200,6 @@
             "localized_translation_language": "Veldu tungumál",
             "localized_translation_name": "Nafn"
         },
-        "zoom_in_edit": "Þysja inn til að breyta",
         "logout": "útskrá",
         "loading_auth": "Tengist við OpenStreetMap...",
         "status": {
@@ -321,8 +320,7 @@
         "splash": {
             "welcome": "Velkomin/n í iD ritil OpenStreetMap",
             "text": "iD er notandavænt tæki til að bæta við besta fría kortagrunn heimsins. Þetta er þróunarútgáfa {version}. Þú getur fengið meiri upplýsingar á vefnum {website} og tilkynnt villur {github}.",
-            "walkthrough": "Skoða leiðarvísir",
-            "start": "Breyta núna"
+            "walkthrough": "Skoða leiðarvísir"
         },
         "source_switch": {
             "live": "raun",
@@ -341,10 +339,6 @@
             "tag_suggests_area": "Merkingin {tag} þýðir að línan ætti að vera svæði, en hún er ekki svæði",
             "deprecated_tags": "Úrelt merki: {tags}"
         },
-        "zoom": {
-            "in": "Þysja inn",
-            "out": "Þysja út"
-        },
         "cannot_zoom": "Get ekki þysjað lengra út í núverandi ham.",
         "mapillary": {
             "view_on_mapillary": "Skoða þessa mynd á Mapillary"
@@ -1436,18 +1430,12 @@
                 "office": {
                     "name": "Skrifstofa"
                 },
-                "office/architect": {
-                    "name": "Arkitekt"
-                },
                 "office/financial": {
                     "name": "Fjármálafyrirtæki"
                 },
                 "office/government": {
                     "name": "Opinber stofnun"
                 },
-                "office/newspaper": {
-                    "name": "Fréttablað"
-                },
                 "office/political_party": {
                     "name": "Stjórnmálaflokkur"
                 },
@@ -1731,9 +1719,6 @@
                 "tourism/caravan_site": {
                     "name": "Hjólhýsagarður"
                 },
-                "tourism/chalet": {
-                    "name": "Bjálkakofi"
-                },
                 "tourism/guest_house": {
                     "name": "Gestahús"
                 },
diff --git a/dist/locales/it.json b/dist/locales/it.json
index 4cd35df61..5c1c2d3db 100644
--- a/dist/locales/it.json
+++ b/dist/locales/it.json
@@ -330,9 +330,11 @@
             "title": "Carica su OpenStreetMap",
             "upload_explanation": "Le modifiche che carichi saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
             "upload_explanation_with_user": "Le modifiche che carichi come {user} saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
+            "request_review": "Vorrei che qualcuno controllasse le mie modifiche.",
             "save": "Carica",
             "cancel": "Annulla",
             "changes": "{count} Cambiamenti",
+            "download_changes": "Scarica file in formato osmChange",
             "warnings": "Avvertimenti",
             "modified": "Modificati",
             "deleted": "Cancellati",
@@ -346,6 +348,37 @@
             "list": "Modifiche di {users}",
             "truncated_list": "Modifiche di {users} e {count} altri"
         },
+        "info_panels": {
+            "background": {
+                "title": "Sfondo",
+                "description": "Descrizione",
+                "resolution": "Risoluzione",
+                "accuracy": "Accuratezza",
+                "unknown": "Sconosciuto"
+            },
+            "history": {
+                "selected": "{n} selezionato/i",
+                "version": "Versione",
+                "last_edit": "Ultima modifica",
+                "edited_by": "Modificato da",
+                "changeset": "Gruppo di modifiche",
+                "unknown": "Sconosciuto",
+                "link_text": "Cronologia su openstreetmap.org"
+            },
+            "measurement": {
+                "title": "Misurazione",
+                "selected": "{n} selezionato/i",
+                "geometry": "Geometria",
+                "closed": "chiuso",
+                "center": "Centro",
+                "perimeter": "Perimetro",
+                "length": "Lunghezza",
+                "area": "Area",
+                "centroid": "Centroide",
+                "metric": "Metrico",
+                "imperial": "Imperiale"
+            }
+        },
         "geometry": {
             "point": "punto",
             "vertex": "vertice",
@@ -427,9 +460,16 @@
             "title": "Dati mappa",
             "description": "Dati della mappa",
             "data_layers": "Livelli di dati",
+            "layers": {
+                "osm": {
+                    "tooltip": "Dati delle mappe da OpenStreetMap",
+                    "title": "Dati OpenStreetMap"
+                }
+            },
             "fill_area": "Riempimento aree",
             "map_features": "Elementi della mappa",
-            "autohidden": "Questi elementi sono stati automaticamente nascosti perché sarebbero stati troppi da visualizzare. Per modificarli è necessario ingrandire."
+            "autohidden": "Questi elementi sono stati automaticamente nascosti perché sarebbero stati troppi da visualizzare. Per modificarli è necessario ingrandire.",
+            "osmhidden": "Questi elementi sono stati nascosti automaticamente perché il livello OpenStreetMap è nascosto."
         },
         "feature": {
             "points": {
@@ -548,8 +588,7 @@
         "splash": {
             "welcome": "Benvenuti nell'editor OpenStreetMap iD",
             "text": "iD è un intuitivo ma potente strumento per contribuire alla migliore mappa gratuita del mondo. Questa è la versione {version}. Per ulteriori informazioni vai su {website} o segnala gli errori su {github}",
-            "walkthrough": "Inizia il Tutorial",
-            "start": "Modifica adesso"
+            "walkthrough": "Inizia il Tutorial"
         },
         "source_switch": {
             "live": "live",
@@ -581,10 +620,6 @@
             "tag_suggests_area": "Il tag {tag} fa pensare che la linea sia un'area, ma non rappresenta un'area",
             "deprecated_tags": "Tag deprecati: {tags}"
         },
-        "zoom": {
-            "in": "Ingrandisci",
-            "out": "Riduci"
-        },
         "cannot_zoom": "Impossibile fare zooCannot zoom out further in current mode.",
         "full_screen": "Passa a schermo intero",
         "gpx": {
@@ -960,6 +995,12 @@
                     "redo": "Ripeti l'ultima operazione",
                     "save": "Salva le modifiche"
                 }
+            },
+            "tools": {
+                "title": "Strumenti",
+                "info": {
+                    "title": "Informazioni"
+                }
             }
         },
         "presets": {
@@ -3042,10 +3083,6 @@
                     "name": "Impalcature",
                     "terms": "Costruttore di impalcature"
                 },
-                "craft/sculpter": {
-                    "name": "Scultore",
-                    "terms": "Scultore"
-                },
                 "craft/shoemaker": {
                     "name": "Calzolaio",
                     "terms": "scarpe,scarpino,calzature"
@@ -3054,10 +3091,6 @@
                     "name": "Tagliapietre",
                     "terms": "muratura"
                 },
-                "craft/sweep": {
-                    "name": "Spazzacamino",
-                    "terms": "spazzacamino,camino,comignolo"
-                },
                 "craft/tailor": {
                     "name": "Sarto"
                 },
@@ -3250,10 +3283,6 @@
                     "name": "Sentiero",
                     "terms": "Sentiero"
                 },
-                "highway/pedestrian": {
-                    "name": "Area Pedonale",
-                    "terms": "Pedonale"
-                },
                 "highway/primary": {
                     "name": "Primaria",
                     "terms": "Primaria"
@@ -3976,18 +4005,10 @@
                     "name": "Uffici",
                     "terms": "Ufficio"
                 },
-                "office/accountant": {
-                    "name": "Contabile",
-                    "terms": "Commercialista, amministrativo, ragioniere"
-                },
                 "office/administrative": {
                     "name": "Autorità locale",
                     "terms": "Ufficio amministrativo,amministrazione,autorità locale,supervisione,comune"
                 },
-                "office/architect": {
-                    "name": "Architetto",
-                    "terms": "architetto,studio,design"
-                },
                 "office/company": {
                     "name": "Ufficio aziendale",
                     "terms": "Ufficio"
@@ -4024,10 +4045,6 @@
                     "name": "Assicurazione",
                     "terms": "assicurativo,sinistri,polizza assicurativa"
                 },
-                "office/it": {
-                    "name": "Ufficio informatico",
-                    "terms": "internet,web,app,applicazioni,siti web,siti internet,rete internet,computer,informatica,programmazione"
-                },
                 "office/lawyer": {
                     "name": "Studio legale",
                     "terms": "ufficio legale,legale,avvocato,avvocatura,magistrato,difensore,azzeccagarbugli"
@@ -4036,10 +4053,6 @@
                     "name": "Ufficio notarile",
                     "terms": "firma,notaio,stato,burocrazia"
                 },
-                "office/newspaper": {
-                    "name": "Giornale",
-                    "terms": "testata,quotidiano,redazione"
-                },
                 "office/ngo": {
                     "name": "Organizzazione non governativa",
                     "terms": "ong,ngo,onu,associazione,non profit,nonprofit,no profit,onlus,non lucrativa,senza fini di lucro,cooperativa,cooperazione"
@@ -4059,10 +4072,6 @@
                     "name": "Ufficio di telecomunicazioni",
                     "terms": "telecomunicazioni,telefonia"
                 },
-                "office/therapist": {
-                    "name": "Terapista",
-                    "terms": "fisioterapista,terapeuta"
-                },
                 "office/travel_agent": {
                     "name": "Agenzia di viaggi"
                 },
@@ -4757,10 +4766,6 @@
                     "name": "Sosta per camper",
                     "terms": "Parco camper"
                 },
-                "tourism/chalet": {
-                    "name": "Chalet",
-                    "terms": " Casetta (chalet) "
-                },
                 "tourism/gallery": {
                     "name": "Galleria d'arte",
                     "terms": "opere d'arte,quadri,sculture,galleria,fotografie,dipinti,art*"
diff --git a/dist/locales/ja.json b/dist/locales/ja.json
index f21fc694d..ffadcfdd7 100644
--- a/dist/locales/ja.json
+++ b/dist/locales/ja.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "言語選択",
             "localized_translation_name": "名称"
         },
-        "zoom_in_edit": "編集するには地図を拡大してください",
         "login": "ログイン",
         "logout": "ログアウト",
         "loading_auth": "OpenStreetMapへ接続中...",
@@ -330,9 +329,11 @@
             "title": "OpenStreetMapへアップロード",
             "upload_explanation": "あなたがアップロードした編集内容は、OpenStreetMapを利用しているすべてのユーザが閲覧できるようになります。",
             "upload_explanation_with_user": "編集した内容を {user} アカウントでアップロードし、OpenStreetMapを利用しているすべてのユーザが閲覧できるようにします。",
+            "request_review": "編集のレビューを希望します。",
             "save": "アップロード",
             "cancel": "キャンセル",
             "changes": "{count} 個の変更",
+            "download_changes": "osmChangeファイルをダウンロード",
             "warnings": "注意",
             "modified": "変更した地物",
             "deleted": "削除した地物",
@@ -346,6 +347,32 @@
             "list": "{users} による編集",
             "truncated_list": "{users} とその他 {count} 人による編集"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "背景",
+                "zoom": "ズーム",
+                "show_tiles": "タイルを表示",
+                "hide_tiles": "タイルを非表示"
+            },
+            "history": {
+                "key": "H",
+                "title": "編集履歴",
+                "selected": "{n} 個を選択中",
+                "version": "バージョン",
+                "changeset": "変更セット"
+            },
+            "location": {
+                "key": "L"
+            },
+            "measurement": {
+                "key": "M",
+                "selected": "{n} 個を選択中",
+                "length": "長さ",
+                "area": "エリア"
+            }
+        },
         "geometry": {
             "point": "ポイント",
             "vertex": "交点",
@@ -548,8 +575,7 @@
         "splash": {
             "welcome": "iD 起動中",
             "text": "iDは、世界でもっとも優れた自由な世界地図を編集するためのツールで、馴染みやすく、かつ高機能です。現在のバージョンは {version} です。詳細は {website} で公開中です。バグ報告は {github} で受け付けています。",
-            "walkthrough": "チュートリアルを開始",
-            "start": "編集開始"
+            "walkthrough": "チュートリアルを開始"
         },
         "source_switch": {
             "live": "本番サーバ",
@@ -581,10 +607,6 @@
             "tag_suggests_area": "ラインに {tag} タグが付与されています。エリアで描かれるべきです",
             "deprecated_tags": "タグの重複: {tags}"
         },
-        "zoom": {
-            "in": "ズームイン",
-            "out": "ズームアウト"
-        },
         "cannot_zoom": "現在のモードでは、これ以上ズームアウトできません。",
         "full_screen": "フルスクリーンにする",
         "gpx": {
@@ -777,7 +799,25 @@
         "shortcuts": {
             "title": "ショートカットキー",
             "tooltip": "キーボードショートカット画面を表示",
+            "toggle": {
+                "key": "?"
+            },
             "key": {
+                "alt": "Alt",
+                "backspace": "Backspace",
+                "ctrl": "Ctrl",
+                "delete": "Delete",
+                "del": "Del",
+                "end": "End",
+                "enter": "Enter",
+                "esc": "Esc",
+                "home": "Home",
+                "option": "Option",
+                "pause": "Pause",
+                "pgdn": "PgDn",
+                "pgup": "PgUp",
+                "return": "Return",
+                "shift": "Shift",
                 "space": "スペース"
             },
             "gesture": {
@@ -2471,8 +2511,7 @@
                     "terms": "学校の敷地, 校庭"
                 },
                 "amenity/scrapyard": {
-                    "name": "自動車解体場",
-                    "terms": "自動車解体場, 解体, スクラップ, 解体屋"
+                    "name": "自動車解体場"
                 },
                 "amenity/shelter": {
                     "name": "（風雨をしのぐための）休憩所",
@@ -2616,6 +2655,10 @@
                     "name": "ローラーコースター",
                     "terms": "ジェットコースター"
                 },
+                "attraction/water_slide": {
+                    "name": "ウォータースライダー",
+                    "terms": "ウォータースライダー, 滑り台, ウォータースライド"
+                },
                 "barrier": {
                     "name": "障害物",
                     "terms": "障害物, バリア"
@@ -2985,10 +3028,6 @@
                     "name": "足場職人",
                     "terms": "足場職人, とび職"
                 },
-                "craft/sculpter": {
-                    "name": "彫刻家",
-                    "terms": "彫刻家"
-                },
                 "craft/shoemaker": {
                     "name": "製靴",
                     "terms": "製靴, 靴製造"
@@ -2997,10 +3036,6 @@
                     "name": "石工",
                     "terms": "石工, 石材加工"
                 },
-                "craft/sweep": {
-                    "name": "煙突掃除",
-                    "terms": "煙突掃除"
-                },
                 "craft/tailor": {
                     "name": "仕立て屋"
                 },
@@ -3197,10 +3232,6 @@
                     "name": "小道",
                     "terms": "小道"
                 },
-                "highway/pedestrian": {
-                    "name": "歩行者天国",
-                    "terms": "歩行者天国"
-                },
                 "highway/primary": {
                     "name": "主要地方道",
                     "terms": "主要地方道"
@@ -3689,8 +3720,8 @@
                     "terms": "競技トラック"
                 },
                 "leisure/water_park": {
-                    "name": "親水公園",
-                    "terms": "公園, ウォーターパーク"
+                    "name": "ウォーターパーク",
+                    "terms": "テーマパーク, 遊園地, プール, ウォーターパーク"
                 },
                 "line": {
                     "name": "線",
@@ -3927,18 +3958,10 @@
                     "name": "オフィス",
                     "terms": "オフィス"
                 },
-                "office/accountant": {
-                    "name": "会計事務所",
-                    "terms": "会計事務所, 会計士"
-                },
                 "office/administrative": {
                     "name": "地方行政事務所",
                     "terms": "地方行政事務所"
                 },
-                "office/architect": {
-                    "name": "建築事務所",
-                    "terms": "建築事務所, 建設事務所"
-                },
                 "office/company": {
                     "name": "会社事務所",
                     "terms": "会社事務所, 営業所"
@@ -3975,10 +3998,6 @@
                     "name": "保険代理店",
                     "terms": "保険代理店"
                 },
-                "office/it": {
-                    "name": "IT事務所",
-                    "terms": "ＩＴ事務所, システムベンダー"
-                },
                 "office/lawyer": {
                     "name": "法律事務所",
                     "terms": "法律事務所"
@@ -3987,10 +4006,6 @@
                     "name": "公証人役場",
                     "terms": "公証人役場"
                 },
-                "office/newspaper": {
-                    "name": "新聞社",
-                    "terms": "新聞社"
-                },
                 "office/ngo": {
                     "name": "NGO事務所",
                     "terms": "ＮＧＯ事務所"
@@ -4010,10 +4025,6 @@
                     "name": "通信会社事務所",
                     "terms": "通信会社事務所"
                 },
-                "office/therapist": {
-                    "name": "セラピスト",
-                    "terms": "セラピスト"
-                },
                 "office/travel_agent": {
                     "name": "旅行代理店"
                 },
@@ -4736,10 +4747,6 @@
                     "name": "オートキャンプ場",
                     "terms": "オートキャンプ場"
                 },
-                "tourism/chalet": {
-                    "name": "貸別荘",
-                    "terms": "貸別荘, コテージ"
-                },
                 "tourism/gallery": {
                     "name": "アートギャラリー",
                     "terms": "画廊"
@@ -4939,6 +4946,10 @@
                     "name": "区域",
                     "terms": "区域"
                 },
+                "type/waterway": {
+                    "name": "水路",
+                    "terms": "水路"
+                },
                 "vertex": {
                     "name": "その他",
                     "terms": "その他"
diff --git a/dist/locales/kn.json b/dist/locales/kn.json
index 073eec088..dd73e0329 100644
--- a/dist/locales/kn.json
+++ b/dist/locales/kn.json
@@ -310,9 +310,7 @@
             "localized_translation_language": "ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ",
             "localized_translation_name": "ಹೆಸರು"
         },
-        "zoom_in_edit": "ಸಂಪಾದಿಸಲು ಜೂಮ್ ಇನ್ ಮಾಡಿ",
         "login": "ಲಾಗಿನ್",
-        "logout": "ಲಾಗ್ ಔಟ್",
         "loading_auth": "ಓಪನ್ ಸ್ಟ್ರೀಟ್ ಮ್ಯಾಪ್ ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ.....",
         "report_a_bug": "ದೋಷವನ್ನು ವಿವರಿಸಿ. ",
         "help_translate": "ಅನುವಾದಕ್ಕೆ ನೀವು ಸಹಾಯಮಾಡಿ. ",
@@ -549,8 +547,7 @@
         },
         "splash": {
             "welcome": "ಓಪನ್ ಸ್ಟ್ರೀಟ್ ಮ್ಯಾಪ್ ಐಡಿ ಎಡಿಟರಿಗೆ ಸ್ವಾಗತ!",
-            "walkthrough": "ಸಹಾಯದರ್ಶನವನ್ನು ಪ್ರಾರಂಭಿಸಿ  ",
-            "start": "ಈಗ ಸಂಪಾದಿಸಿ"
+            "walkthrough": "ಸಹಾಯದರ್ಶನವನ್ನು ಪ್ರಾರಂಭಿಸಿ  "
         },
         "source_switch": {
             "live": "ಲೈವ್",
@@ -572,10 +569,6 @@
             "untagged_relation": "ಟ್ಯಾಗ್ ಮಾಡಲಾಗದ ಸಂಬಂಧ",
             "deprecated_tags": "‍ಉಪಯೋಗಿಸದ ಗುರುತುಪಟ್ಟಿಗಳು: {tags}"
         },
-        "zoom": {
-            "in": "ಹಿಗ್ಗಿಸು",
-            "out": "ಕುಗ್ಗಿಸು"
-        },
         "full_screen": "‍ಪೂರ್ಣ ಪರದೆಗೆ ಹಿಂದಿರುಗು",
         "gpx": {
             "local_layer": "ಸ್ಥಳೀಯ ಕಡತ"
@@ -1686,9 +1679,6 @@
                 "craft/optician": {
                     "name": "ನೇತ್ರ ತಜ್ಞ"
                 },
-                "craft/sculpter": {
-                    "name": "ಶಿಲ್ಪಿ"
-                },
                 "craft/shoemaker": {
                     "name": "ಚಮ್ಮಾರ"
                 },
@@ -1782,9 +1772,6 @@
                 "office": {
                     "name": "ಕಚೇರಿ"
                 },
-                "office/newspaper": {
-                    "name": "ವಾರ್ತಾಪತ್ರಿಕೆ"
-                },
                 "office/physician": {
                     "name": "ವೈದ್ಯ"
                 },
diff --git a/dist/locales/ko.json b/dist/locales/ko.json
index 4aa338f36..9808ded18 100644
--- a/dist/locales/ko.json
+++ b/dist/locales/ko.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "언어 선택",
             "localized_translation_name": "이름"
         },
-        "zoom_in_edit": "편집하려면 확대",
         "login": "로그인",
         "logout": "로그아웃",
         "loading_auth": "오픈스트리트맵에 연결 중...",
@@ -359,7 +358,7 @@
                 "resolution": "해결",
                 "accuracy": "정확도",
                 "unknown": "알 수 없음",
-                "show_tiles": "타일 나타내기",
+                "show_tiles": "타일 보이기",
                 "hide_tiles": "타일 숨기기"
             },
             "history": {
@@ -610,8 +609,7 @@
         "splash": {
             "welcome": "iD 오픈스트리트맵 편집기에 오신 것을 환영합니다",
             "text": "iD는 세계 최고의 자유 세계 지도에 기여하기 위한 친절하지만 강력한 도구입니다. 버전은 {version}입니다. 자세한 정보에 대해서는 {website}을 참조하고 {github}에서 버그를 보고하세요.",
-            "walkthrough": "연습 시작",
-            "start": "지금 편집하기"
+            "walkthrough": "연습 시작"
         },
         "source_switch": {
             "live": "실시간",
@@ -643,10 +641,6 @@
             "tag_suggests_area": "{tag} 태그의 제안 선은 공간이여야 하지만 태그는 공간이 아닙니다",
             "deprecated_tags": "사용되지 않는 태그: {tags}"
         },
-        "zoom": {
-            "in": "확대",
-            "out": "축소"
-        },
         "cannot_zoom": "현재 모드에서 더 축소할 수 없습니다.",
         "full_screen": "전체 화면 전환",
         "gpx": {
@@ -1130,6 +1124,9 @@
                 "aeroway": {
                     "label": "유형"
                 },
+                "agrarian": {
+                    "label": "상품 종류"
+                },
                 "amenity": {
                     "label": "유형"
                 },
@@ -1217,6 +1214,10 @@
                 "bunker_type": {
                     "label": "유형"
                 },
+                "cables": {
+                    "label": "케이블 수",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "방향 (시계 방향)",
                     "placeholder": "45, 90, 180, 270"
@@ -1274,7 +1275,7 @@
                     "label": "유형"
                 },
                 "collection_times": {
-                    "label": "모은 시간"
+                    "label": "수거 시간"
                 },
                 "comment": {
                     "label": "바뀜집합 댓글",
@@ -1311,7 +1312,7 @@
                     }
                 },
                 "crop": {
-                    "label": "곡물"
+                    "label": "작물"
                 },
                 "crossing": {
                     "label": "유형"
@@ -1382,6 +1383,10 @@
                 "description": {
                     "label": "설명"
                 },
+                "devices": {
+                    "label": "장치 수",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "기저귀 교환대 이용 가능"
                 },
@@ -1395,7 +1400,7 @@
                     "label": "차량 탑승 중 이용 가능"
                 },
                 "duration": {
-                    "label": "지속기간",
+                    "label": "소요 시간",
                     "placeholder": "00:00"
                 },
                 "electrified": {
@@ -1456,6 +1461,9 @@
                         "wall": "벽"
                     }
                 },
+                "fitness_station": {
+                    "label": "운동 기구 종류"
+                },
                 "fixme": {
                     "label": "고쳐주기"
                 },
@@ -1463,6 +1471,9 @@
                     "label": "유형",
                     "placeholder": "기본값"
                 },
+                "frequency": {
+                    "label": "동작 주파수"
+                },
                 "fuel": {
                     "label": "주유소"
                 },
@@ -1494,6 +1505,9 @@
                 "generator/type": {
                     "label": "유형"
                 },
+                "government": {
+                    "label": "유형"
+                },
                 "grape_variety": {
                     "label": "포도 품종"
                 },
@@ -1512,7 +1526,7 @@
                     "label": "종류"
                 },
                 "healthcare/speciality": {
-                    "label": "특징"
+                    "label": "전문 분야"
                 },
                 "height": {
                     "label": "높이(미터)"
@@ -1803,7 +1817,7 @@
                     }
                 },
                 "park_ride": {
-                    "label": "공원과 라이드"
+                    "label": "파크 앤드 라이드"
                 },
                 "parking": {
                     "label": "유형",
@@ -1820,6 +1834,10 @@
                 "payment_multi": {
                     "label": "결제 종류"
                 },
+                "phases": {
+                    "label": "상 수",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "전화",
                     "placeholder": "+82 2 123 4567"
@@ -1891,7 +1909,7 @@
                     "label": "전원 공급 장치"
                 },
                 "produce": {
-                    "label": "생산고"
+                    "label": "생산물"
                 },
                 "product": {
                     "label": "제품"
@@ -1899,6 +1917,9 @@
                 "railway": {
                     "label": "유형"
                 },
+                "rating": {
+                    "label": "정격 용량"
+                },
                 "recycling_accepts": {
                     "label": "수락"
                 },
@@ -2107,6 +2128,9 @@
                 "studio": {
                     "label": "유형"
                 },
+                "substance": {
+                    "label": "물질"
+                },
                 "substation": {
                     "label": "유형"
                 },
@@ -2133,6 +2157,15 @@
                 "surveillance/zone": {
                     "label": "감시 구역"
                 },
+                "switch": {
+                    "label": "개폐기 유형",
+                    "options": {
+                        "circuit_breaker": "회로차단기",
+                        "disconnector": "단로형 개폐기",
+                        "earthing": "접지 개폐기",
+                        "mechanical": "기계적 개폐기"
+                    }
+                },
                 "tactile_paving": {
                     "label": "점자블록"
                 },
@@ -2167,7 +2200,7 @@
                     "label": "관광"
                 },
                 "tower/construction": {
-                    "label": "공사중",
+                    "label": "건축 형태",
                     "placeholder": "Guyed, Lattice, Concealed, ..."
                 },
                 "tower/type": {
@@ -2184,6 +2217,9 @@
                     },
                     "placeholder": "단단함, 거의 단단함, 부드러움..."
                 },
+                "trade": {
+                    "label": "상품 종류"
+                },
                 "traffic_calming": {
                     "label": "유형"
                 },
@@ -2202,6 +2238,19 @@
                     },
                     "placeholder": "우수함, 좋음, 나쁨..."
                 },
+                "transformer": {
+                    "label": "변압기 유형",
+                    "options": {
+                        "auto": "단권변압기",
+                        "auxiliary": "보조변압기",
+                        "converter": "변환기 변압기",
+                        "distribution": "배전용 변압기",
+                        "generator": "발전기 변압기",
+                        "phase_angle_regulator": "이상변압기",
+                        "traction": "가공 전차선 변압기",
+                        "yes": "알 수 없음"
+                    }
+                },
                 "trees": {
                     "label": "나무"
                 },
@@ -2231,10 +2280,23 @@
                 "volcano/type": {
                     "label": "화산 종류",
                     "options": {
+                        "scoria": "스코리아",
                         "shield": "순상화산",
                         "stratovolcano": "성층화산"
                     }
                 },
+                "voltage": {
+                    "label": "전압"
+                },
+                "voltage/primary": {
+                    "label": "주전압"
+                },
+                "voltage/secondary": {
+                    "label": "이차 전압"
+                },
+                "voltage/tertiary": {
+                    "label": "3차 전압"
+                },
                 "wall": {
                     "label": "유형"
                 },
@@ -2262,6 +2324,22 @@
                 },
                 "wikipedia": {
                     "label": "위키백과"
+                },
+                "windings": {
+                    "label": "권선 수",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "권선 배치",
+                    "options": {
+                        "delta": "삼각결선",
+                        "leblanc": "르블랑 결선",
+                        "open": "개방 권선",
+                        "open-delta": "개방 삼각결선",
+                        "scott": "스코트 결선",
+                        "star": "성형결선",
+                        "zigzag": "지그재그 결선"
+                    }
                 }
             },
             "presets": {
@@ -2345,7 +2423,7 @@
                 },
                 "aeroway/helipad": {
                     "name": "헬기 착륙장",
-                    "terms": "헬기 착륙장"
+                    "terms": "헬리콥터,헬리포트"
                 },
                 "aeroway/runway": {
                     "name": "활주로",
@@ -2372,7 +2450,7 @@
                 },
                 "amenity/animal_shelter": {
                     "name": "동물 보호소",
-                    "terms": "동물 보호소"
+                    "terms": "입양,고양이,개,말,애완동물,강아지,맹금,파충류,구조"
                 },
                 "amenity/arts_centre": {
                     "name": "아트 센터",
@@ -2428,7 +2506,7 @@
                 },
                 "amenity/cafe": {
                     "name": "카페",
-                    "terms": "카페"
+                    "terms": "비스트로,커피,차"
                 },
                 "amenity/car_rental": {
                     "name": "자동차 대여",
@@ -2444,15 +2522,15 @@
                 },
                 "amenity/casino": {
                     "name": "카지노",
-                    "terms": "카지노, 도박장"
+                    "terms": "도박장,도박,노름,크랩스,포커,블랙잭"
                 },
                 "amenity/charging_station": {
                     "name": "충전소",
-                    "terms": "충전소"
+                    "terms": "전기차"
                 },
                 "amenity/childcare": {
                     "name": "보육/육아",
-                    "terms": "보육/육아"
+                    "terms": "탁아소,고아원,보육원"
                 },
                 "amenity/cinema": {
                     "name": "영화관",
@@ -2543,7 +2621,7 @@
                 },
                 "amenity/fuel": {
                     "name": "주유소",
-                    "terms": "주유소"
+                    "terms": "휘발유,연료,가솔린,프로페인,경유,LNG,CNG,바이오디젤"
                 },
                 "amenity/grave_yard": {
                     "name": "묘지",
@@ -2585,6 +2663,9 @@
                     "name": "오토바이 주차장",
                     "terms": "모터사이클 주차장"
                 },
+                "amenity/music_school": {
+                    "name": "음악 학교"
+                },
                 "amenity/nightclub": {
                     "name": "나이트클럽",
                     "terms": "나이트 클럽"
@@ -2754,7 +2835,7 @@
                 },
                 "amenity/theatre": {
                     "name": "극장",
-                    "terms": "극장"
+                    "terms": "공연,연극,뮤지컬"
                 },
                 "amenity/toilets": {
                     "name": "화장실",
@@ -2770,7 +2851,7 @@
                 },
                 "amenity/vending_machine": {
                     "name": "자동판매기",
-                    "terms": "자동판매기"
+                    "terms": "자판기"
                 },
                 "amenity/vending_machine/cigarettes": {
                     "name": "담배 자판기",
@@ -3074,7 +3155,7 @@
                 },
                 "building/school": {
                     "name": "학교 건물",
-                    "terms": "학교 건물"
+                    "terms": "초등학교,중학교,고등학교"
                 },
                 "building/semidetached_house": {
                     "name": "반분리된 주택",
@@ -3264,9 +3345,9 @@
                     "name": "비계 설치자",
                     "terms": "비계 설치자"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "조각가",
-                    "terms": "조각가"
+                    "terms": "조각사,조공"
                 },
                 "craft/shoemaker": {
                     "name": "구두공",
@@ -3276,10 +3357,6 @@
                     "name": "석공",
                     "terms": "석공"
                 },
-                "craft/sweep": {
-                    "name": "굴뚝 청소부",
-                    "terms": "굴뚝 청소부"
-                },
                 "craft/tailor": {
                     "name": "재단사"
                 },
@@ -3329,6 +3406,10 @@
                     "name": "소화전",
                     "terms": "소화전"
                 },
+                "emergency/life_ring": {
+                    "name": "구명부환",
+                    "terms": "구명부표"
+                },
                 "emergency/no": {
                     "name": "비상시 접근 금지"
                 },
@@ -3406,16 +3487,19 @@
                     "terms": "워터 해저드"
                 },
                 "healthcare": {
-                    "name": "의료 시설"
+                    "name": "의료 시설",
+                    "terms": "치료소,의원,병원,의사,질병,건강,기관,수술"
                 },
                 "healthcare/alternative": {
                     "name": "대체의학"
                 },
                 "healthcare/alternative/chiropractic": {
-                    "name": "카이로프랙틱"
+                    "name": "카이로프랙틱",
+                    "terms": "허리,요통,척추"
                 },
                 "healthcare/audiologist": {
-                    "name": "청능사"
+                    "name": "청능사",
+                    "terms": "귀,청력,소리"
                 },
                 "healthcare/blood_donation": {
                     "name": "헌혈의 집",
@@ -3428,12 +3512,27 @@
                     "name": "조산사",
                     "terms": "산파"
                 },
+                "healthcare/occupational_therapist": {
+                    "name": "작업치료사"
+                },
                 "healthcare/optometrist": {
-                    "name": "검안사"
+                    "name": "검안사",
+                    "terms": "눈,안경,라식,렌즈,시력"
                 },
                 "healthcare/physiotherapist": {
                     "name": "물리치료사"
                 },
+                "healthcare/podiatrist": {
+                    "name": "족부의사",
+                    "terms": "발,발톱"
+                },
+                "healthcare/psychotherapist": {
+                    "name": "심리치료사",
+                    "terms": "임상심리사,상담심리사,불안,상담사,우울증,정신 건강,마음,자살"
+                },
+                "healthcare/rehabilitation": {
+                    "name": "재활 시설"
+                },
                 "healthcare/speech_therapist": {
                     "name": "언어치료사"
                 },
@@ -3500,9 +3599,11 @@
                     "name": "경로",
                     "terms": "경로"
                 },
-                "highway/pedestrian": {
-                    "name": "보행자 거리",
-                    "terms": "보행자 거리"
+                "highway/pedestrian_area": {
+                    "name": "보행자 지역"
+                },
+                "highway/pedestrian_line": {
+                    "name": "보행자 거리"
                 },
                 "highway/primary": {
                     "name": "주요 도로",
@@ -3661,8 +3762,8 @@
                     "terms": "길가의 신사"
                 },
                 "junction": {
-                    "name": "분기점",
-                    "terms": "분기점"
+                    "name": "교차로",
+                    "terms": "삼거리,사거리,오거리"
                 },
                 "landuse": {
                     "name": "토지 이용",
@@ -3673,13 +3774,16 @@
                     "terms": "텃밭"
                 },
                 "landuse/aquaculture": {
-                    "name": "양식업",
-                    "terms": "양식업"
+                    "name": "양식장",
+                    "terms": "양어장,갑각류,조류,새우,굴"
                 },
                 "landuse/basin": {
                     "name": "웅덩이",
                     "terms": "웅덩이, 분지"
                 },
+                "landuse/brownfield": {
+                    "name": "브라운필드"
+                },
                 "landuse/cemetery": {
                     "name": "묘지",
                     "terms": "묘지"
@@ -3709,7 +3813,7 @@
                 },
                 "landuse/forest": {
                     "name": "숲",
-                    "terms": "숲"
+                    "terms": "삼림,산림,나무"
                 },
                 "landuse/garages": {
                     "name": "차고",
@@ -3719,6 +3823,9 @@
                     "name": "잔디",
                     "terms": "잔디"
                 },
+                "landuse/greenfield": {
+                    "name": "그린필드"
+                },
                 "landuse/harbour": {
                     "name": "항구",
                     "terms": "항구"
@@ -3727,6 +3834,14 @@
                     "name": "산업 지역",
                     "terms": "산업 지역"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "폐차장",
+                    "terms": "자동차,폐품,금속,고철,차량"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "도축장",
+                    "terms": "도살장"
+                },
                 "landuse/landfill": {
                     "name": "쓰레기 매립지",
                     "terms": "쓰레기 매립지"
@@ -3785,7 +3900,7 @@
                 },
                 "landuse/orchard": {
                     "name": "과수원",
-                    "terms": "과수원"
+                    "terms": "과일"
                 },
                 "landuse/plant_nursery": {
                     "name": "식물 양식장",
@@ -3803,6 +3918,9 @@
                     "name": "휴양지",
                     "terms": "레크리에이션 지역"
                 },
+                "landuse/religious": {
+                    "name": "종교 지역"
+                },
                 "landuse/residential": {
                     "name": "주거 지역",
                     "terms": "주거지역"
@@ -3813,7 +3931,7 @@
                 },
                 "landuse/vineyard": {
                     "name": "포도밭",
-                    "terms": "포도밭"
+                    "terms": "포도원,포도주,와인"
                 },
                 "leisure": {
                     "name": "여가",
@@ -3821,11 +3939,11 @@
                 },
                 "leisure/adult_gaming_centre": {
                     "name": "성인용 게임방",
-                    "terms": "성인용 게임방"
+                    "terms": "도박,노름,슬롯머신"
                 },
                 "leisure/bird_hide": {
                     "name": "탐조대",
-                    "terms": "탐조대"
+                    "terms": "감시대,전망대,조망대,새,조류"
                 },
                 "leisure/bowling_alley": {
                     "name": "볼링장",
@@ -3845,7 +3963,7 @@
                 },
                 "leisure/firepit": {
                     "name": "불구덩이",
-                    "terms": "불구덩이"
+                    "terms": "캠프파이어,모닥불"
                 },
                 "leisure/fitness_centre": {
                     "name": "체육관 / 피트니스 센터",
@@ -3859,6 +3977,9 @@
                     "name": "야외 신체단련소",
                     "terms": "야외 피트니스 장소"
                 },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "평행봉"
+                },
                 "leisure/garden": {
                     "name": "정원",
                     "terms": "정원"
@@ -3867,13 +3988,17 @@
                     "name": "골프장",
                     "terms": "골프장"
                 },
+                "leisure/hackerspace": {
+                    "name": "해커스페이스",
+                    "terms": "메이커스페이스"
+                },
                 "leisure/horse_riding": {
                     "name": "승마 시설",
                     "terms": "승마 시설"
                 },
                 "leisure/ice_rink": {
                     "name": "아이스 링크",
-                    "terms": "아이스 링크"
+                    "terms": "아이스하키,스케이팅,컬링"
                 },
                 "leisure/marina": {
                     "name": "마리나",
@@ -3915,6 +4040,10 @@
                     "name": "비치발리볼 코트",
                     "terms": "비치발리볼 코트"
                 },
+                "leisure/pitch/boules": {
+                    "name": "불/보체 코트",
+                    "terms": "보체,리오네즈,페탕크"
+                },
                 "leisure/pitch/bowls": {
                     "name": "잔디 볼링장",
                     "terms": "잔디 볼링장"
@@ -3967,6 +4096,9 @@
                     "name": "육상 트랙 (달리기)",
                     "terms": "육상 트랙 (달리기)"
                 },
+                "leisure/sauna": {
+                    "name": "사우나"
+                },
                 "leisure/slipway": {
                     "name": "선가대",
                     "terms": "선양장, 슬립웨이"
@@ -3992,8 +4124,8 @@
                     "terms": "경마장 (비 자동차 스포츠)"
                 },
                 "leisure/water_park": {
-                    "name": "수상공원",
-                    "terms": "워터파크"
+                    "name": "워터파크",
+                    "terms": "물놀이장"
                 },
                 "line": {
                     "name": "선",
@@ -4013,14 +4145,15 @@
                 },
                 "man_made/bridge": {
                     "name": "다리",
-                    "terms": "다리"
+                    "terms": "교량"
                 },
                 "man_made/chimney": {
                     "name": "굴뚝",
                     "terms": "굴뚝"
                 },
                 "man_made/crane": {
-                    "name": "크레인"
+                    "name": "크레인",
+                    "terms": "기중기"
                 },
                 "man_made/cutline": {
                     "name": "숲 경계선",
@@ -4046,8 +4179,8 @@
                     "terms": "등대"
                 },
                 "man_made/mast": {
-                    "name": "돛대",
-                    "terms": "돛대"
+                    "name": "안테나 기둥",
+                    "terms": "안테나,방송탑,송신탑,기지국"
                 },
                 "man_made/observation": {
                     "name": "전망대",
@@ -4059,7 +4192,7 @@
                 },
                 "man_made/pier": {
                     "name": "부두",
-                    "terms": "부두"
+                    "terms": "선창"
                 },
                 "man_made/pipeline": {
                     "name": "파이프라인",
@@ -4125,13 +4258,17 @@
                     "name": "맨홀",
                     "terms": "맨홀"
                 },
+                "manhole/drain": {
+                    "name": "우수관",
+                    "terms": "빗물 배수관"
+                },
                 "natural": {
                     "name": "자연",
                     "terms": "자연"
                 },
                 "natural/bare_rock": {
-                    "name": "베어 락",
-                    "terms": "베어 락"
+                    "name": "노출된 암반",
+                    "terms": "바위,암석,기반암"
                 },
                 "natural/bay": {
                     "name": "만",
@@ -4139,7 +4276,7 @@
                 },
                 "natural/beach": {
                     "name": "해변",
-                    "terms": "해변"
+                    "terms": "바닷가,연안,해안"
                 },
                 "natural/cave_entrance": {
                     "name": "동굴 입구",
@@ -4147,7 +4284,7 @@
                 },
                 "natural/cliff": {
                     "name": "절벽",
-                    "terms": "절벽"
+                    "terms": "벼랑,낭떠러지,급경사면"
                 },
                 "natural/coastline": {
                     "name": "해안선",
@@ -4163,7 +4300,7 @@
                 },
                 "natural/grassland": {
                     "name": "초원",
-                    "terms": "초원"
+                    "terms": "사바나"
                 },
                 "natural/heath": {
                     "name": "황무지",
@@ -4171,19 +4308,19 @@
                 },
                 "natural/peak": {
                     "name": "정상",
-                    "terms": "정상"
+                    "terms": "봉우리,산꼭대기,정점,첨봉,언덕,산"
                 },
                 "natural/ridge": {
                     "name": "산등성이",
                     "terms": "산등성이"
                 },
                 "natural/saddle": {
-                    "name": "안장",
-                    "terms": "안장"
+                    "name": "안부",
+                    "terms": "콜,고개,재,영"
                 },
                 "natural/sand": {
                     "name": "모래",
-                    "terms": "모래"
+                    "terms": "사막"
                 },
                 "natural/scree": {
                     "name": "급사면",
@@ -4207,7 +4344,7 @@
                 },
                 "natural/volcano": {
                     "name": "화산",
-                    "terms": "화산"
+                    "terms": "산,크레이터,분화구"
                 },
                 "natural/water": {
                     "name": "물",
@@ -4227,11 +4364,11 @@
                 },
                 "natural/wetland": {
                     "name": "습지",
-                    "terms": "습지"
+                    "terms": "늪,갈대밭,갯벌,간석지"
                 },
                 "natural/wood": {
-                    "name": "산림",
-                    "terms": "산림"
+                    "name": "삼림",
+                    "terms": "숲,산림,나무"
                 },
                 "noexit/yes": {
                     "name": "출구 없음",
@@ -4242,16 +4379,28 @@
                     "terms": "사무소"
                 },
                 "office/accountant": {
-                    "name": "회계 사무소",
-                    "terms": "회계 사무소"
+                    "name": "회계사 사무소"
                 },
                 "office/administrative": {
                     "name": "관리 사무소",
                     "terms": "관리 사무소"
                 },
+                "office/adoption_agency": {
+                    "name": "입양기관"
+                },
+                "office/advertising_agency": {
+                    "name": "광고 대행사",
+                    "terms": "광고,선전,마케팅"
+                },
                 "office/architect": {
-                    "name": "건축사",
-                    "terms": "건축사"
+                    "name": "건축가 사무소"
+                },
+                "office/association": {
+                    "name": "비영리 단체 사무소",
+                    "terms": "비영리조직,비영리기관"
+                },
+                "office/charity": {
+                    "name": "자선 단체 사무소"
                 },
                 "office/company": {
                     "name": "회사 사무실",
@@ -4269,6 +4418,10 @@
                     "name": "직업 소개소",
                     "terms": "직업 소개소"
                 },
+                "office/energy_supplier": {
+                    "name": "에너지 공급자 사무소",
+                    "terms": "전기,에너지,가스"
+                },
                 "office/estate_agent": {
                     "name": "부동산 사무소",
                     "terms": "부동산 사무실,부동산 중개"
@@ -4277,6 +4430,9 @@
                     "name": "금융 사무소",
                     "terms": "금융 사무실"
                 },
+                "office/foundation": {
+                    "name": "재단 사무소"
+                },
                 "office/government": {
                     "name": "관청",
                     "terms": "관공서,정부 청사"
@@ -4285,13 +4441,19 @@
                     "name": "등기소",
                     "terms": "등기소"
                 },
+                "office/government/tax": {
+                    "name": "세무서"
+                },
+                "office/guide": {
+                    "name": "여행 가이드 사무소"
+                },
                 "office/insurance": {
                     "name": "보험 사무소",
                     "terms": "보험 사무실"
                 },
                 "office/it": {
-                    "name": "IT 사무실",
-                    "terms": "IT 사무소"
+                    "name": "IT 사무소",
+                    "terms": "컴퓨터,정보,소프트웨어,기술"
                 },
                 "office/lawyer": {
                     "name": "법률 사무소",
@@ -4301,14 +4463,21 @@
                     "name": "공증인 사무소",
                     "terms": "공증인 사무소"
                 },
+                "office/moving_company": {
+                    "name": "이삿짐센터",
+                    "terms": "이사"
+                },
                 "office/newspaper": {
-                    "name": "신문사",
-                    "terms": "신문사"
+                    "name": "신문사 사무소"
                 },
                 "office/ngo": {
                     "name": "NGO 사무실",
                     "terms": "비정부기구 사무실"
                 },
+                "office/notary": {
+                    "name": "공증사무소",
+                    "terms": "공증인"
+                },
                 "office/physician": {
                     "name": "내과의원"
                 },
@@ -4316,21 +4485,30 @@
                     "name": "정당",
                     "terms": "정당"
                 },
+                "office/private_investigator": {
+                    "name": "사설탐정 사무소",
+                    "terms": "민간조사원"
+                },
+                "office/quango": {
+                    "name": "준정부조직 사무소"
+                },
                 "office/research": {
                     "name": "연구 사무실",
                     "terms": "연구 사무소"
                 },
+                "office/tax_advisor": {
+                    "name": "세무사 사무소"
+                },
                 "office/telecommunication": {
                     "name": "통신 사무실",
                     "terms": "통신 사무소,통신 지사,전화국"
                 },
-                "office/therapist": {
-                    "name": "치료원",
-                    "terms": "치료원"
-                },
                 "office/travel_agent": {
                     "name": "여행사"
                 },
+                "office/water_utility": {
+                    "name": "수도사업소"
+                },
                 "piste": {
                     "name": "활강/스키 트레일",
                     "terms": "활강/스키 트레일"
@@ -4385,15 +4563,9 @@
                     "name": "촌",
                     "terms": "촌"
                 },
-                "playground/balance_beam": {
-                    "name": "평균대"
-                },
                 "playground/climbing_frame": {
                     "name": "정글짐"
                 },
-                "playground/horizontal_bar": {
-                    "name": "철봉"
-                },
                 "playground/sandpit": {
                     "name": "모래밭"
                 },
@@ -4471,10 +4643,16 @@
                     "name": "버려진 철도",
                     "terms": "버려진 철도"
                 },
+                "railway/buffer_stop": {
+                    "name": "차막이"
+                },
                 "railway/crossing": {
                     "name": "철도 건널목 (인도)",
                     "terms": "철도 건널목 (인도)"
                 },
+                "railway/derail": {
+                    "name": "탈선기"
+                },
                 "railway/disused": {
                     "name": "폐선된 철도",
                     "terms": "폐선된 철도"
@@ -4507,6 +4685,9 @@
                     "name": "철로",
                     "terms": "철도"
                 },
+                "railway/signal": {
+                    "name": "철도신호"
+                },
                 "railway/station": {
                     "name": "철도역",
                     "terms": "역"
@@ -4542,13 +4723,17 @@
                     "name": "상점",
                     "terms": "가게"
                 },
+                "shop/agrarian": {
+                    "name": "농업 용품 가게",
+                    "terms": "농기계,씨앗,종자,농약,살충제,비료,농기구"
+                },
                 "shop/alcohol": {
                     "name": "주류 상점",
-                    "terms": "주류 상점, 술집"
+                    "terms": "알코올,술,맥주,와인,포도주"
                 },
                 "shop/anime": {
                     "name": "애니메이션 가게",
-                    "terms": "애니메이션 가게"
+                    "terms": "만화,일본,코스프레,피규어"
                 },
                 "shop/antiques": {
                     "name": "골동품 가게",
@@ -4556,7 +4741,7 @@
                 },
                 "shop/appliance": {
                     "name": "가전 제품 가게",
-                    "terms": "가전 제품 가게"
+                    "terms": "에어컨,기기,식기세척기,건조기,냉장고,그릴,석쇠,주방,부엌,오븐,난로,세탁기"
                 },
                 "shop/art": {
                     "name": "미술품 가게",
@@ -4572,19 +4757,19 @@
                 },
                 "shop/bakery": {
                     "name": "제과점",
-                    "terms": "제과점"
+                    "terms": "빵집"
                 },
                 "shop/bathroom_furnishing": {
                     "name": "화장실 기구 판매점",
                     "terms": "화장실 기구 판매점"
                 },
                 "shop/beauty": {
-                    "name": "미용실",
-                    "terms": "미용실, 이발소"
+                    "name": "뷰티 샵",
+                    "terms": "스파,살롱,태닝"
                 },
                 "shop/beauty/nails": {
                     "name": "네일 살롱",
-                    "terms": "네일 살롱"
+                    "terms": "매니큐어,페디큐어"
                 },
                 "shop/beauty/tanning": {
                     "name": "일광 살롱",
@@ -4608,7 +4793,7 @@
                 },
                 "shop/books": {
                     "name": "서점",
-                    "terms": "서점"
+                    "terms": "책방"
                 },
                 "shop/boutique": {
                     "name": "부티크",
@@ -4636,7 +4821,7 @@
                 },
                 "shop/carpet": {
                     "name": "카펫 가게",
-                    "terms": "카펫 가게"
+                    "terms": "융단,양탄자,깔개"
                 },
                 "shop/charity": {
                     "name": "자선 쇼핑몰",
@@ -4691,8 +4876,8 @@
                     "terms": "커튼 가게"
                 },
                 "shop/dairy": {
-                    "name": "낙농장",
-                    "terms": "커튼 가게"
+                    "name": "유제품 가게",
+                    "terms": "우유,달걀,계란,치즈"
                 },
                 "shop/deli": {
                     "name": "델리",
@@ -4716,15 +4901,15 @@
                 },
                 "shop/electronics": {
                     "name": "전자 제품 가게",
-                    "terms": "전자 제품 가게"
+                    "terms": "기기,오디오,블루레이,카메라,사진기,컴퓨터,DVD,라디오,스피커,TV,텔레비전,비디오"
                 },
                 "shop/erotic": {
                     "name": "성인용품 가게",
                     "terms": "성인용품 가게"
                 },
                 "shop/fabric": {
-                    "name": "직물 저장소",
-                    "terms": "직물 저장소"
+                    "name": "직물 가게",
+                    "terms": "천,옷감,바느질"
                 },
                 "shop/farm": {
                     "name": "산지 직매",
@@ -4747,14 +4932,14 @@
                 },
                 "shop/funeral_directors": {
                     "name": "장례식장",
-                    "terms": "장례식장"
+                    "terms": "장의사"
                 },
                 "shop/furnace": {
                     "name": "퍼니스 스토어"
                 },
                 "shop/furniture": {
                     "name": "가구점",
-                    "terms": "가구점"
+                    "terms": "의자,소파,식탁,탁자,책상"
                 },
                 "shop/garden_centre": {
                     "name": "원예 용품점",
@@ -4770,11 +4955,11 @@
                 },
                 "shop/greengrocer": {
                     "name": "청과상",
-                    "terms": "청과상"
+                    "terms": "과일,채소,야채"
                 },
                 "shop/hairdresser": {
-                    "name": "이발소",
-                    "terms": "이발소"
+                    "name": "미용실",
+                    "terms": "이발소,미장원"
                 },
                 "shop/hardware": {
                     "name": "철물점",
@@ -4787,7 +4972,8 @@
                     "name": "약초 가게"
                 },
                 "shop/hifi": {
-                    "name": "고급 오디오 상점"
+                    "name": "고급 오디오 상점",
+                    "terms": "스테레오,비디오"
                 },
                 "shop/houseware": {
                     "name": "가정 용품 매장"
@@ -4796,7 +4982,8 @@
                     "name": "실내장식 가게"
                 },
                 "shop/jewelry": {
-                    "name": "보석 상점"
+                    "name": "보석 상점",
+                    "terms": "다이아몬드,보석,귀금속,반지"
                 },
                 "shop/kiosk": {
                     "name": "신문 판매대"
@@ -4840,10 +5027,12 @@
                     "terms": "모터사이클 대리점"
                 },
                 "shop/music": {
-                    "name": "음반 가게"
+                    "name": "음반 가게",
+                    "terms": "CD,레코드판"
                 },
                 "shop/musical_instrument": {
-                    "name": "악기 상점"
+                    "name": "악기 상점",
+                    "terms": "기타"
                 },
                 "shop/newsagent": {
                     "name": "신문/잡지 가게"
@@ -4852,13 +5041,15 @@
                     "name": "영양 보조 식품 쇼핑몰"
                 },
                 "shop/optician": {
-                    "name": "안경점"
+                    "name": "안경점",
+                    "terms": "눈,안경"
                 },
                 "shop/organic": {
                     "name": "유기농 상품 가게"
                 },
                 "shop/outdoor": {
-                    "name": "아웃도어 상점"
+                    "name": "아웃도어 상점",
+                    "terms": "캠핑,야영,등산,등반,하이킹"
                 },
                 "shop/paint": {
                     "name": "페인트 가게"
@@ -4873,10 +5064,12 @@
                     "name": "향수 상점"
                 },
                 "shop/pet": {
-                    "name": "애완 동물 가게"
+                    "name": "애완동물 가게",
+                    "terms": "동물,고양이,개,물고기,강아지,파충류"
                 },
                 "shop/photo": {
-                    "name": "사진 가게"
+                    "name": "사진 가게",
+                    "terms": "카메라,사진기,필름"
                 },
                 "shop/pyrotechnics": {
                     "name": "불꽃놀이 상점"
@@ -4888,7 +5081,7 @@
                     "name": "종교 상점"
                 },
                 "shop/scuba_diving": {
-                    "name": "스쿠버다이빙 가게"
+                    "name": "스쿠버 다이빙 가게"
                 },
                 "shop/seafood": {
                     "name": "해산물 가게",
@@ -4904,7 +5097,8 @@
                     "name": "스포츠 용품 가게"
                 },
                 "shop/stationery": {
-                    "name": "문구점"
+                    "name": "문구점",
+                    "terms": "문방구,카드,종이"
                 },
                 "shop/storage_rental": {
                     "name": "저장공간 대여소"
@@ -4914,7 +5108,8 @@
                     "terms": "수퍼마켓, 슈퍼마켓"
                 },
                 "shop/tailor": {
-                    "name": "양복점"
+                    "name": "양복점",
+                    "terms": "양복상,양복전,양복집,옷,정장,슈트"
                 },
                 "shop/tattoo": {
                     "name": "문신 가게"
@@ -4925,12 +5120,16 @@
                 "shop/ticket": {
                     "name": "티켓 판매소"
                 },
+                "shop/tiles": {
+                    "name": "타일 가게"
+                },
                 "shop/tobacco": {
                     "name": "담배상점",
                     "terms": "담배 판매업소"
                 },
                 "shop/toys": {
-                    "name": "완구점"
+                    "name": "완구점",
+                    "terms": "장난감"
                 },
                 "shop/travel_agency": {
                     "name": "여행사"
@@ -4961,7 +5160,8 @@
                     "name": "수상 스포츠/수영 가게"
                 },
                 "shop/weapons": {
-                    "name": "무기상점"
+                    "name": "무기상점",
+                    "terms": "탄약,총,칼,나이프"
                 },
                 "shop/window_blind": {
                     "name": "창문 블라인드 가게"
@@ -5002,7 +5202,8 @@
                     "name": "별장"
                 },
                 "tourism/gallery": {
-                    "name": "미술관"
+                    "name": "미술관",
+                    "terms": "예술,전시,그림,회화,사진,조각"
                 },
                 "tourism/guest_house": {
                     "name": "민박"
@@ -5231,10 +5432,10 @@
                 },
                 "waterway/stream": {
                     "name": "개울",
-                    "terms": "하천"
+                    "terms": "개천,시내,하천,물줄기"
                 },
                 "waterway/stream_intermittent": {
-                    "name": "간헐천",
+                    "name": "간헐 하천",
                     "terms": "간헐천"
                 },
                 "waterway/water_point": {
diff --git a/dist/locales/lt.json b/dist/locales/lt.json
index 71fb82eda..17877110d 100644
--- a/dist/locales/lt.json
+++ b/dist/locales/lt.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Pasirinkti kalbą",
             "localized_translation_name": "Pavadinimas"
         },
-        "zoom_in_edit": "Padidinkite prieš redaguodami",
         "login": "prisijungti",
         "logout": "atsijungti",
         "loading_auth": "Jungiamasi prie OpenStreetMap...",
@@ -548,8 +547,7 @@
         "splash": {
             "welcome": "Jus sveikina iD OpenStreetMap redaktorius",
             "text": "iD yra draugiškas, bet galingas įrankis pildant didžiausią, atviriausią ir nemokamą/laisvą pasaulio žemėlapį. Šiuo metu naudojate versiją {version}. Daugiau informacijos rasite svetainėje {website}, o apie klaidas galite pranešti {github}.",
-            "walkthrough": "Pradėti pažingsninę demonstraciją",
-            "start": "Keisti dabar"
+            "walkthrough": "Pradėti pažingsninę demonstraciją"
         },
         "source_switch": {
             "live": "gyva",
@@ -579,10 +577,6 @@
             "tag_suggests_area": "Žyma {tag} rodo, kad linija turėtų būti plotas, bet ji nėra plotas",
             "deprecated_tags": "Pasenusios žymos: {tags}"
         },
-        "zoom": {
-            "in": "Sumažinti",
-            "out": "Padidinti"
-        },
         "cannot_zoom": "Negalima atitolinti šiame režime.",
         "full_screen": "Perjungti pilną ekraną",
         "gpx": {
@@ -2192,10 +2186,6 @@
                 "craft/scaffolder": {
                     "name": "Pastolių montuotojas"
                 },
-                "craft/sculpter": {
-                    "name": "Skulptorius",
-                    "terms": "skulptorius"
-                },
                 "craft/shoemaker": {
                     "name": "Batsiuvys",
                     "terms": "Kurpius"
@@ -2204,10 +2194,6 @@
                     "name": "Mūrininkas",
                     "terms": "mūrininkas"
                 },
-                "craft/sweep": {
-                    "name": "Kaminkrėtys",
-                    "terms": "kaminkrėtys"
-                },
                 "craft/tailor": {
                     "name": "Siuvėjas"
                 },
@@ -2295,9 +2281,6 @@
                     "name": "Takas",
                     "terms": "takas"
                 },
-                "highway/pedestrian": {
-                    "name": "Pėsčiųjų gatvė"
-                },
                 "highway/primary": {
                     "name": "Pagrindinis kelias"
                 },
@@ -2687,17 +2670,9 @@
                     "name": "Biuras",
                     "terms": "kontora"
                 },
-                "office/accountant": {
-                    "name": "Buhalteris",
-                    "terms": "buhalteris"
-                },
                 "office/administrative": {
                     "name": "Administracinis biuras"
                 },
-                "office/architect": {
-                    "name": "Architektas",
-                    "terms": "architektas"
-                },
                 "office/company": {
                     "name": "Kompanijos kontora"
                 },
@@ -2723,17 +2698,9 @@
                     "name": "Draudimo įstaiga",
                     "terms": "draudimas,draudimo kontora"
                 },
-                "office/it": {
-                    "name": "IT kontora",
-                    "terms": "it kontora,informacinės technologijos"
-                },
                 "office/lawyer": {
                     "name": "Advokatų kontora"
                 },
-                "office/newspaper": {
-                    "name": "Laikraštis",
-                    "terms": "laikraštis"
-                },
                 "office/physician": {
                     "name": "Gydytojas"
                 },
@@ -2748,10 +2715,6 @@
                 "office/telecommunication": {
                     "name": "Telekomunikacijų biuras"
                 },
-                "office/therapist": {
-                    "name": "Terapeutas",
-                    "terms": "Gydytojas"
-                },
                 "office/travel_agent": {
                     "name": "Kelionių agentūra"
                 },
@@ -3228,10 +3191,6 @@
                 "tourism/attraction": {
                     "name": "Turistų traukos vieta"
                 },
-                "tourism/chalet": {
-                    "name": "Sodyba",
-                    "terms": "sodyba,kaimo sodyba"
-                },
                 "tourism/guest_house": {
                     "name": "Svečių namai",
                     "terms": "Svečių namai"
diff --git a/dist/locales/lv.json b/dist/locales/lv.json
index 9765e3d33..982804cf1 100644
--- a/dist/locales/lv.json
+++ b/dist/locales/lv.json
@@ -151,7 +151,6 @@
             "translate": "Tulkot",
             "localized_translation_language": "Izvelties valodu"
         },
-        "zoom_in_edit": "Pietuvināt, lai labotu",
         "logout": "atslēgties",
         "loading_auth": "Savienojas ar OpenStreetMap...",
         "status": {
@@ -230,8 +229,7 @@
             "cancel": "Atcelt"
         },
         "splash": {
-            "welcome": "Laipni lūgti iD OpenStreetMap redaktorā",
-            "start": "Labot tagad"
+            "welcome": "Laipni lūgti iD OpenStreetMap redaktorā"
         },
         "source_switch": {
             "live": "live",
@@ -249,10 +247,6 @@
             "tag_suggests_area": "Apzīmējums {tag} parasti tiek lietots apgabaliem, bet objekts nav apgabals",
             "deprecated_tags": "Novecojuši apzīmējumi: {tags}"
         },
-        "zoom": {
-            "in": "Pietuvināt",
-            "out": "Attālināt"
-        },
         "help": {
             "title": "Palīdzība"
         },
diff --git a/dist/locales/mk.json b/dist/locales/mk.json
index 404266ba5..79631b091 100644
--- a/dist/locales/mk.json
+++ b/dist/locales/mk.json
@@ -218,7 +218,6 @@
             "localized_translation_language": "Изберете јазик",
             "localized_translation_name": "Име"
         },
-        "zoom_in_edit": "Приближете за да уредувате",
         "login": "најава",
         "logout": "одјава",
         "loading_auth": "Се поврзувам со OpenStreetMap...",
@@ -439,8 +438,7 @@
         "splash": {
             "welcome": "Добре дојдовте на уредникот ID за OpenStreetMap",
             "text": "iD е достапна, но моќна алатка за учество во најдобрата слободна карта на светот. Ова е верзијата {version}. Повеќе информации ќе најдете на {website}. Грешките пријавувајте ги на {github}.",
-            "walkthrough": "Започнете ја прошетката",
-            "start": "Уреди сега"
+            "walkthrough": "Започнете ја прошетката"
         },
         "source_switch": {
             "live": "во живо",
@@ -462,10 +460,6 @@
             "tag_suggests_area": "Ознаката {tag} укажува дека линијата треба да е подрачје, но не е.",
             "deprecated_tags": "Застарени ознаки: {tags}"
         },
-        "zoom": {
-            "in": "Приближи",
-            "out": "Оддалечи"
-        },
         "cannot_zoom": "Не можам повеќе да приближувам во тековниот режим.",
         "full_screen": "Полн екран",
         "mapillary_images": {
@@ -2400,10 +2394,6 @@
                     "name": "Скелар",
                     "terms": "<преведете со истозначници или сродни поими на „Скелар“, одделени со запирки>"
                 },
-                "craft/sculpter": {
-                    "name": "Вајар",
-                    "terms": "<преведете со истозначници или сродни поими на „Вајар“, одделени со запирки>"
-                },
                 "craft/shoemaker": {
                     "name": "Чевлар",
                     "terms": "<преведете со истозначници или сродни поими на „Чевлар“, одделени со запирки>"
@@ -2412,10 +2402,6 @@
                     "name": "Каменорезец",
                     "terms": "<преведете со истозначници или сродни поими на „Каменорезец“, одделени со запирки>"
                 },
-                "craft/sweep": {
-                    "name": "Оџачар",
-                    "terms": "<преведете со истозначници или сродни поими на „Оџачар“, одделени со запирки>"
-                },
                 "craft/tailor": {
                     "name": "Кројач"
                 },
@@ -2604,10 +2590,6 @@
                     "name": "Патека",
                     "terms": "<преведете со истозначници или сродни поими на „Патека“, одделени со запирки>"
                 },
-                "highway/pedestrian": {
-                    "name": "Пешачка  улица",
-                    "terms": "<преведете со истозначници или сродни поими на „Пешачка улица“, одделени со запирки>"
-                },
                 "highway/primary": {
                     "name": "Главен пат",
                     "terms": "<преведете со истозначници или сродни поими на „Главен пат“, одделени со запирки>"
@@ -3270,18 +3252,10 @@
                     "name": "Канцеларија",
                     "terms": "<преведете со истозначници или сродни поими на „Канцеларија“, одделени со запирки>"
                 },
-                "office/accountant": {
-                    "name": "Сметководител",
-                    "terms": "<преведете со истозначници или сродни поими на „Сметководител“, одделени со запирки>"
-                },
                 "office/administrative": {
                     "name": "Администрација",
                     "terms": "<преведете со истозначници или сродни поими на „Администрација“, одделени со запирки>"
                 },
-                "office/architect": {
-                    "name": "Архитект",
-                    "terms": "<преведете со истозначници или сродни поими на „Архитект“, одделени со запирки>"
-                },
                 "office/company": {
                     "name": "Претпријатие",
                     "terms": "<преведете со истозначници или сродни поими на „Претпријатие“, одделени со запирки>"
@@ -3314,18 +3288,10 @@
                     "name": "Осигурително друштво",
                     "terms": "<преведете со истозначници или сродни поими на „Осигурително друштво“, одделени со запирки>"
                 },
-                "office/it": {
-                    "name": "Информатичка служба",
-                    "terms": "<преведете со истозначници или сродни поими на „Информатичка служба“, одделени со запирки>"
-                },
                 "office/lawyer": {
                     "name": "Правник",
                     "terms": "<преведете со истозначници или сродни поими на „Правник“, одделени со запирки>"
                 },
-                "office/newspaper": {
-                    "name": "Весник",
-                    "terms": "<преведете со истозначници или сродни поими на „Весник“, одделени со запирки>"
-                },
                 "office/ngo": {
                     "name": "НВО",
                     "terms": "<преведете со истозначници или сродни поими на „НВО“, одделени со запирки>"
@@ -3345,10 +3311,6 @@
                     "name": "Телекомуникациска служба",
                     "terms": "<преведете со истозначници или сродни поими на „Телекомуникациска служба“, одделени со запирки>"
                 },
-                "office/therapist": {
-                    "name": "Терапевт",
-                    "terms": "<преведете со истозначници или сродни поими на „Терапевт“, одделени со запирки>"
-                },
                 "office/travel_agent": {
                     "name": "Туристичка агенција"
                 },
@@ -4011,10 +3973,6 @@
                     "name": "Трајлерски камп",
                     "terms": "<преведете со истозначници или сродни поими на „Трајлерски камп“, одделени со запирки>"
                 },
-                "tourism/chalet": {
-                    "name": "Планинска викендичка",
-                    "terms": "<преведете со истозначници или сродни поими на „Планинска викендичка“, одделени со запирки>"
-                },
                 "tourism/gallery": {
                     "name": "Уметничка галерија",
                     "terms": "<преведете со истозначници или сродни поими на „Уметничка галерија“, одделени со запирки>"
diff --git a/dist/locales/ms.json b/dist/locales/ms.json
index c57478407..7b1883db0 100644
--- a/dist/locales/ms.json
+++ b/dist/locales/ms.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Pilih bahasa",
             "localized_translation_name": "Nama"
         },
-        "zoom_in_edit": "Zum masuk untuk Menyunting",
         "login": "log masuk",
         "logout": "log keluar",
         "loading_auth": "Berhubung ke OpenStreetMap...",
@@ -598,8 +597,7 @@
         "splash": {
             "welcome": "Selamat datang! Ini ialah penyunting iD OpenStreetMap",
             "text": "Penyunting iD ialah suatu alat yang berkuasa tinggi tetapi sangat mudah digunakan untuk membuat sumbangan terhadap peta percuma yang terunggul di dunia. Ini ialah versi {version}. Untuk maklumat lanjut sila layari {website} dan laporkan pepijat di {github}.",
-            "walkthrough": "Mulakan Panduan",
-            "start": "Sunting Sekarang"
+            "walkthrough": "Mulakan Panduan"
         },
         "source_switch": {
             "live": "live",
@@ -631,10 +629,6 @@
             "tag_suggests_area": "Tanda {tag} mencadangkan garis sepatutnya menjadi kawasan, tetapi ianya bukan kawasan",
             "deprecated_tags": "Tag-tag yang telah lapuk: {tags}"
         },
-        "zoom": {
-            "in": "Zum Dekat",
-            "out": "Zum Jauh"
-        },
         "cannot_zoom": "Had zum jauh telah dicapai dalam mod yang sedang dipakai.",
         "full_screen": "Togol Skrin Penuh",
         "gpx": {
diff --git a/dist/locales/nl.json b/dist/locales/nl.json
index a0a01d303..90e902f55 100644
--- a/dist/locales/nl.json
+++ b/dist/locales/nl.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Selecteer taal",
             "localized_translation_name": "Naam"
         },
-        "zoom_in_edit": "Zoom in om aan te passen",
         "login": "login",
         "logout": "Afmelden",
         "loading_auth": "Aan het verbinden met OpenStreetMap …",
@@ -612,8 +611,7 @@
         "splash": {
             "welcome": "Welkom bij iD, een bewerkingsprogramma voor OpenStreetMap",
             "text": "iD biedt een gebruiksvriendelijke en krachtige manier om bij te dragen aan de beste, open wereldkaart ter wereld. Dit is versie {version}. Voor meer informatie, zie {website} en meld softwarefouten op {github}.",
-            "walkthrough": "Start de rondleiding",
-            "start": "Pas nu aan"
+            "walkthrough": "Start de rondleiding"
         },
         "source_switch": {
             "live": "live",
@@ -645,10 +643,6 @@
             "tag_suggests_area": "De tag {tag} suggereert dat de lijn een vlak is, maar het is geen vlak",
             "deprecated_tags": "Afgeschafte tags: {tags}"
         },
-        "zoom": {
-            "in": "Inzoomen",
-            "out": "Uitzoomen"
-        },
         "cannot_zoom": "Kan niet verder uitzoomen in huidige modus",
         "full_screen": "Volledig scherm aan/uit",
         "gpx": {
@@ -2774,8 +2768,7 @@
                     "terms": "school,onderwijs,secundair onderwijs,lager onderwijs,basisschool,middelbaar,voortgezet onderwijs"
                 },
                 "amenity/scrapyard": {
-                    "name": "Sloperij",
-                    "terms": "autokerkhof,oud ijzer,wrakken,schroothoop,metaal"
+                    "name": "Sloperij"
                 },
                 "amenity/shelter": {
                     "name": "Beschutting",
@@ -3327,10 +3320,6 @@
                     "name": "Stellingenmaker",
                     "terms": "stellagemaker"
                 },
-                "craft/sculpter": {
-                    "name": "Beeldhouwer",
-                    "terms": "beeldhouwer"
-                },
                 "craft/shoemaker": {
                     "name": "Schoenmaker",
                     "terms": "schoenenmaker"
@@ -3339,10 +3328,6 @@
                     "name": "Metselaar",
                     "terms": "metselaar"
                 },
-                "craft/sweep": {
-                    "name": "Schoorsteenveger",
-                    "terms": "schouwveger"
-                },
                 "craft/tailor": {
                     "name": "Kleermaker"
                 },
@@ -3573,7 +3558,7 @@
                 },
                 "highway/cycleway": {
                     "name": "Fietspad",
-                    "terms": "rijwielpad,fietssnelweg,flitsfietspad"
+                    "terms": "rijwielpad,fietssnelweg,flitsfietspad,fietsoversteekplaats"
                 },
                 "highway/elevator": {
                     "name": "Lift"
@@ -3608,11 +3593,7 @@
                 },
                 "highway/path": {
                     "name": "Pad",
-                    "terms": "wandelpad,fietspad,gemengd wandelpad en fietspad,hikepad"
-                },
-                "highway/pedestrian": {
-                    "name": "Voetgangersstraat",
-                    "terms": "voetgangersgebied,voetgangerszone,autovrij gebied,autovrije zone"
+                    "terms": "wandelpad,fietspad,gemengd wandelpad en fietspad,hikepad,fietsoversteekplaats"
                 },
                 "highway/primary": {
                     "name": "Hoofdweg",
@@ -4338,17 +4319,10 @@
                     "name": "Kantoor",
                     "terms": "bureau"
                 },
-                "office/accountant": {
-                    "name": "Boekhouder"
-                },
                 "office/administrative": {
                     "name": "Bestuurlijke instantie",
                     "terms": "administratief kantoor"
                 },
-                "office/architect": {
-                    "name": "Architect",
-                    "terms": "tekenaar"
-                },
                 "office/company": {
                     "name": "Bedrijfskantoor",
                     "terms": "bedrijfsbureau,hoofdkwartier,bedrijfsvestiging,bureau,kantoor"
@@ -4384,10 +4358,6 @@
                     "name": "Verzekeringskantoor",
                     "terms": "verzekeringsmakelaarkantoor,makelaarkantoor"
                 },
-                "office/it": {
-                    "name": "Kantoor van computerspecialist",
-                    "terms": "computer,elektronica,hardware,software,IT,ICT"
-                },
                 "office/lawyer": {
                     "name": "Advocatenkantoor",
                     "terms": "advocatenbureau,wetsgeleerden"
@@ -4396,10 +4366,6 @@
                     "name": "Notariaat",
                     "terms": "notaris,akte,testament"
                 },
-                "office/newspaper": {
-                    "name": "Krantredactie",
-                    "terms": "redactie,nieuwsredactie,krantenredactie"
-                },
                 "office/ngo": {
                     "name": "Kantoor van NGO",
                     "terms": "niet-gouvernementele organisatie,vzw,ngo,kantoor van vzw,bureau van vzw,kantoor van ngo,kantoor van vzw,vereniging zonder winstoogmerk"
@@ -4419,10 +4385,6 @@
                     "name": "Telecomkantoor",
                     "terms": "belwinkel,gsm-winkel,telcokantoor"
                 },
-                "office/therapist": {
-                    "name": "Therapeut",
-                    "terms": "behandelaar,kliniek"
-                },
                 "office/travel_agent": {
                     "name": "Reisbureau"
                 },
@@ -4479,9 +4441,6 @@
                 "playground/climbing_frame": {
                     "name": "Klimrek"
                 },
-                "playground/rocker": {
-                    "name": "Veertoestel"
-                },
                 "playground/roundabout": {
                     "name": "Speel rotonde"
                 },
@@ -5154,10 +5113,6 @@
                     "name": "Caravan-/kampeerwagenterrein",
                     "terms": "caravans,kampeerwagens,campers,motorhomes,mobilehomes,terrein voor kampeerwagens"
                 },
-                "tourism/chalet": {
-                    "name": "Chalet",
-                    "terms": "chalet,vakantiehuis,vakantiehuisje,huisje,bungalow"
-                },
                 "tourism/gallery": {
                     "name": "Kunstgallerij",
                     "terms": "tentoonstelling,exposé,gallerij,kunstgallerie,gallerie"
diff --git a/dist/locales/no.json b/dist/locales/no.json
index d7126fb69..3b92aba77 100644
--- a/dist/locales/no.json
+++ b/dist/locales/no.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Velg språk",
             "localized_translation_name": "Navn"
         },
-        "zoom_in_edit": "Zoom inn for å redigere",
         "login": "logg inn",
         "logout": "logg ut",
         "loading_auth": "Kobler til OpenStreetMap...",
@@ -586,8 +585,7 @@
         "splash": {
             "welcome": "Velkommen til iD OpenStreetMap editor",
             "text": "iD er et brukervennlig, men kraftig verktøy for å bidra til verdens beste frie kart. Dette er versjon {version}. For mer informasjon, se {website} og meld om feil på {github}.",
-            "walkthrough": "Begynn Gjennomgangen",
-            "start": "Rediger nå"
+            "walkthrough": "Begynn Gjennomgangen"
         },
         "source_switch": {
             "live": "direkte",
@@ -617,10 +615,6 @@
             "tag_suggests_area": "Taggen {tag} anbefaler at linje bør være et areal, men dette er ikke et areal",
             "deprecated_tags": "Utgående tagger: {tags}"
         },
-        "zoom": {
-            "in": "Forstørr",
-            "out": "Forminsk"
-        },
         "cannot_zoom": "Kan ikke zoome ut lenger i gjeldende modus.",
         "full_screen": "Skru av/på fullskjerm.",
         "gpx": {
@@ -2028,18 +2022,12 @@
                 "craft/scaffolder": {
                     "name": "Stillasbygger"
                 },
-                "craft/sculpter": {
-                    "name": "Skulptør"
-                },
                 "craft/shoemaker": {
                     "name": "Skomaker"
                 },
                 "craft/stonemason": {
                     "name": "Steinhugger"
                 },
-                "craft/sweep": {
-                    "name": "Feier"
-                },
                 "craft/tailor": {
                     "name": "Skredder"
                 },
@@ -2142,9 +2130,6 @@
                 "highway/path": {
                     "name": "Sti"
                 },
-                "highway/pedestrian": {
-                    "name": "Gågate"
-                },
                 "highway/primary": {
                     "name": "Primær hovedvei"
                 },
@@ -2496,18 +2481,9 @@
                 "office": {
                     "name": "Kontor"
                 },
-                "office/accountant": {
-                    "name": "Regnskapsfører"
-                },
-                "office/architect": {
-                    "name": "Arkitekt"
-                },
                 "office/lawyer": {
                     "name": "Advokatkontor"
                 },
-                "office/newspaper": {
-                    "name": "Avisredaksjon"
-                },
                 "office/political_party": {
                     "name": "Politisk parti"
                 },
@@ -2928,9 +2904,6 @@
                 "tourism/attraction": {
                     "name": "Turistattraksjon"
                 },
-                "tourism/chalet": {
-                    "name": "Hytte"
-                },
                 "tourism/gallery": {
                     "name": "Kunstgalleri"
                 },
diff --git a/dist/locales/pl.json b/dist/locales/pl.json
index e0b27806c..6bd00448d 100644
--- a/dist/locales/pl.json
+++ b/dist/locales/pl.json
@@ -352,7 +352,7 @@
             "key": "I",
             "background": {
                 "key": "B",
-                "title": "Warstawa tła",
+                "title": "Warstwa tła",
                 "zoom": "Powiększenie",
                 "vintage": "Datowanie",
                 "source": "Źródło",
@@ -361,7 +361,9 @@
                 "accuracy": "Dokładność",
                 "unknown": "Nieznane",
                 "show_tiles": "Pokaż dane kafli",
-                "hide_tiles": "Ukryj dane kafli"
+                "hide_tiles": "Ukryj dane kafli",
+                "show_vintage": "Pokaż datowanie",
+                "hide_vintage": "Ukryj datowanie"
             },
             "history": {
                 "key": "H",
@@ -613,7 +615,7 @@
             "welcome": "Witamy w iD, edytorze map OpenStreetMap",
             "text": "iD jest przyjaznym, ale i jednocześnie potężnym narzędziem, dzięki któremu możesz przyczynić się do rozwoju najlepszej wolnej mapy świata. To jest wersja {version}. Więcej informacji znajdziesz na {website}, a błędy zgłosisz na {github}.",
             "walkthrough": "Rozpocznij samouczek",
-            "start": "Edytuj teraz"
+            "start": "Edytuj"
         },
         "source_switch": {
             "live": "live",
@@ -659,15 +661,22 @@
         },
         "mapillary_images": {
             "tooltip": "Zdjęcia z serwisu Mapillary",
-            "title": "Nakładka zdjęć (Mapillary)"
+            "title": "Nakładka ze zdjęciami (Mapillary)"
         },
         "mapillary_signs": {
             "tooltip": "Znaki drogowe z Mapillary (włączy Nakładkę zdjęć)",
-            "title": "Nakładka z znakami drogowymi (Mapillary)"
+            "title": "Nakładka ze znakami drogowymi (Mapillary)"
         },
         "mapillary": {
             "view_on_mapillary": "Zobacz ten obraz w Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Zdjęcia z poziomu ulicy z OpenStreetCam",
+            "title": "Nakładka ze zdjęciami (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Zobacz to zdjęcie na OpenStreetCam"
+        },
         "help": {
             "title": "Pomoc",
             "key": "H",
@@ -1217,6 +1226,9 @@
                 "aeroway": {
                     "label": "Typ"
                 },
+                "agrarian": {
+                    "label": "Asortyment"
+                },
                 "amenity": {
                     "label": "Typ"
                 },
@@ -1236,7 +1248,7 @@
                     "label": "Dzieło sztuki"
                 },
                 "artwork_type": {
-                    "label": "Typ"
+                    "label": "Rodzaj"
                 },
                 "atm": {
                     "label": "Bankomat"
@@ -1285,6 +1297,9 @@
                 "board_type": {
                     "label": "Typ"
                 },
+                "boules": {
+                    "label": "Rodzaj"
+                },
                 "boundary": {
                     "label": "Typ"
                 },
@@ -1304,6 +1319,9 @@
                 "bunker_type": {
                     "label": "Typ"
                 },
+                "cables": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Kierunek (w stopniach, zgodnie z ruchem wskazówek zegara)",
                     "placeholder": "45, 90, 180, 270"
@@ -1389,6 +1407,14 @@
                 "craft": {
                     "label": "Typ"
                 },
+                "crane/type": {
+                    "label": "Rodzaj żurawia",
+                    "options": {
+                        "floor-mounted_crane": "Przymocowany do podłoża",
+                        "portal_crane": "Bramowy",
+                        "travel_lift": "Transportowy"
+                    }
+                },
                 "crop": {
                     "label": "Rodzaj uprawy"
                 },
@@ -1461,6 +1487,10 @@
                 "description": {
                     "label": "Opis obiektu"
                 },
+                "devices": {
+                    "label": "Liczba urządzeń",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Dostępny przewijak dla dzieci"
                 },
@@ -1535,6 +1565,9 @@
                         "wall": "Mur"
                     }
                 },
+                "fitness_station": {
+                    "label": "Rodzaj urządzeń"
+                },
                 "fixme": {
                     "label": "Popraw mnie (fixme)"
                 },
@@ -1542,6 +1575,9 @@
                     "label": "Rodzaj",
                     "placeholder": "Domyślny"
                 },
+                "frequency": {
+                    "label": "Częstotliwość pracy"
+                },
                 "fuel": {
                     "label": "Paliwo"
                 },
@@ -1573,6 +1609,9 @@
                 "generator/type": {
                     "label": "Typ"
                 },
+                "government": {
+                    "label": "Rodzaj"
+                },
                 "grape_variety": {
                     "label": "Odmiany winorośli"
                 },
@@ -1584,6 +1623,7 @@
                     "label": "Poręcz"
                 },
                 "hashtags": {
+                    "label": "Proponowane hasztagi",
                     "placeholder": "#przykład"
                 },
                 "healthcare": {
@@ -1634,7 +1674,7 @@
                     "label": "Inskrypcja"
                 },
                 "intermittent": {
-                    "label": "Okresowy"
+                    "label": "Okresowość"
                 },
                 "internet_access": {
                     "label": "Dostęp do internetu",
@@ -1899,6 +1939,10 @@
                 "payment_multi": {
                     "label": "Rodzaje płatności"
                 },
+                "phases": {
+                    "label": "Liczba faz",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telefon",
                     "placeholder": "+48 42 123 4567"
@@ -1951,6 +1995,15 @@
                     "label": "Moc wyjściowa",
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
+                "playground/baby": {
+                    "label": "Dla niemowląt"
+                },
+                "playground/max_age": {
+                    "label": "Maksymalny wiek dziecka"
+                },
+                "playground/min_age": {
+                    "label": "Minimalny wiek dziecka"
+                },
                 "population": {
                     "label": "Liczba ludności"
                 },
@@ -1969,6 +2022,9 @@
                 "railway": {
                     "label": "Typ"
                 },
+                "rating": {
+                    "label": "Moc"
+                },
                 "recycling_accepts": {
                     "label": "Przyjmuje"
                 },
@@ -2167,9 +2223,19 @@
                     },
                     "placeholder": "Nieznane"
                 },
+                "structure_waterway": {
+                    "label": "Konstrukcja",
+                    "options": {
+                        "tunnel": "Tunel"
+                    },
+                    "placeholder": "Brak"
+                },
                 "studio": {
                     "label": "Typ"
                 },
+                "substance": {
+                    "label": "Substancja chemiczna"
+                },
                 "substation": {
                     "label": "Typ"
                 },
@@ -2196,6 +2262,15 @@
                 "surveillance/zone": {
                     "label": "Obszar Dozoru"
                 },
+                "switch": {
+                    "label": "Rodzaj",
+                    "options": {
+                        "circuit_breaker": "Wyłącznik",
+                        "disconnector": "Odłącznik",
+                        "earthing": "Uziemnik",
+                        "mechanical": "Mechaniczny"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Wypustki dla niewidomych"
                 },
@@ -2247,6 +2322,9 @@
                     },
                     "placeholder": "Utwardzona, nieubita..."
                 },
+                "trade": {
+                    "label": "Rodzaj"
+                },
                 "traffic_calming": {
                     "label": "Rodzaj"
                 },
@@ -2265,6 +2343,16 @@
                     },
                     "placeholder": "Doskonała, Dobra, Zła..."
                 },
+                "transformer": {
+                    "label": "Rodzaj transformatora",
+                    "options": {
+                        "auto": "Autotransformator",
+                        "auxiliary": "Potrzeb własnych",
+                        "converter": "Przekształtnik",
+                        "traction": "Trakcyjny",
+                        "yes": "Nieznany"
+                    }
+                },
                 "trees": {
                     "label": "Drzewa"
                 },
@@ -2299,6 +2387,18 @@
                         "stratovolcano": "Stratowulkan"
                     }
                 },
+                "voltage": {
+                    "label": "Napięcie"
+                },
+                "voltage/primary": {
+                    "label": "Napięcie pierwotne"
+                },
+                "voltage/secondary": {
+                    "label": "Napięcie wtórne"
+                },
+                "voltage/tertiary": {
+                    "label": "Napięcie trzeciorzędne"
+                },
                 "wall": {
                     "label": "Typ"
                 },
@@ -2326,6 +2426,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Liczba uzwojeń",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Układ połączeń",
+                    "options": {
+                        "delta": "Trójkąt",
+                        "leblanc": "Leblanc",
+                        "open": "Otwarty",
+                        "open-delta": "Otwarty trójkąt",
+                        "scott": "Scott",
+                        "star": "Gwiazdowy",
+                        "zigzag": "Zygzak"
+                    }
                 }
             },
             "presets": {
@@ -2448,7 +2564,7 @@
                 },
                 "amenity/bank": {
                     "name": "Bank",
-                    "terms": "bankowość, kasa"
+                    "terms": "bankowość, kasa, skok"
                 },
                 "amenity/bar": {
                     "name": "Bar alkoholowy",
@@ -2649,6 +2765,10 @@
                     "name": "Parking dla motocyklów",
                     "terms": "miejsce postojowe dla motocyklów"
                 },
+                "amenity/music_school": {
+                    "name": "Szkoła muzyczna niepodlegająca MEN",
+                    "terms": "nauka gry, kursy muzyczne, lekcje muzyki"
+                },
                 "amenity/nightclub": {
                     "name": "Klub nocny",
                     "terms": "klub dla dorosłych, striptease"
@@ -2772,8 +2892,7 @@
                     "terms": "tereny szkolne"
                 },
                 "amenity/scrapyard": {
-                    "name": "Złomowisko",
-                    "terms": "skład złomu, składowisko złomu"
+                    "name": "Złomowisko"
                 },
                 "amenity/shelter": {
                     "name": "Schronienie",
@@ -2918,7 +3037,8 @@
                     "terms": "typ nawierzchni"
                 },
                 "attraction/amusement_ride": {
-                    "name": "przejażdżka-atrakcja (ogólna)"
+                    "name": "przejażdżka-atrakcja (ogólna)",
+                    "terms": "przejażdżka-atrakcja (ogólna)"
                 },
                 "attraction/animal": {
                     "name": "Zwierzę",
@@ -2940,6 +3060,14 @@
                     "name": "Karuzela",
                     "terms": "karuzela"
                 },
+                "attraction/dark_ride": {
+                    "name": "Mroczna przejażdżka",
+                    "terms": "dark ride, mroczna przejażdżka, mroczny przejazd, pałac strachów"
+                },
+                "attraction/drop_tower": {
+                    "name": "Wieża Swobodnego Spadania",
+                    "terms": "wieża spadania"
+                },
                 "attraction/pirate_ship": {
                     "name": "Statek piracki",
                     "terms": "statek piracki"
@@ -3224,10 +3352,18 @@
                     "name": "Catering",
                     "terms": "Żywieniowiec, katering"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Kominiarz",
+                    "terms": "kominiarz, zakład kominiarski"
+                },
                 "craft/clockmaker": {
                     "name": "Zegarmistrz",
                     "terms": "zegarmistrz"
                 },
+                "craft/confectionery": {
+                    "name": "Cukiernik",
+                    "terms": "cukiernik, wytwórca słodyczy"
+                },
                 "craft/distillery": {
                     "name": "Gorzelnia",
                     "terms": "wytwórnia napojów alkoholowych, destylarnia"
@@ -3329,9 +3465,9 @@
                     "name": "Rusztowania",
                     "terms": "Wyrób rusztowań"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Rzeźbiarz",
-                    "terms": "rzeźby"
+                    "terms": "rzeźbiarz"
                 },
                 "craft/shoemaker": {
                     "name": "Szewc",
@@ -3341,10 +3477,6 @@
                     "name": "Zakład kamieniarski",
                     "terms": "kamieniarz"
                 },
-                "craft/sweep": {
-                    "name": "Kominiarz",
-                    "terms": "Kominiarz"
-                },
                 "craft/tailor": {
                     "name": "Krawiec"
                 },
@@ -3483,10 +3615,12 @@
                     "terms": "przeszkoda wodna"
                 },
                 "healthcare": {
-                    "name": "Placówka służby zdrowia"
+                    "name": "Placówka służby zdrowia",
+                    "terms": "placówka służby zdrowia"
                 },
                 "healthcare/alternative": {
-                    "name": "Medycyna alternatywna"
+                    "name": "Medycyna alternatywna",
+                    "terms": "medycyna alternatywna"
                 },
                 "healthcare/alternative/chiropractic": {
                     "name": "Kręgarz",
@@ -3559,10 +3693,18 @@
                     "name": "Przejście dla pieszych",
                     "terms": "Przejście drogowe"
                 },
+                "highway/crossing-raised": {
+                    "name": "Przejście dla pieszych-podwyższone",
+                    "terms": "podwyższone przejście dla pieszych, wyniesione przejście dla pieszych"
+                },
                 "highway/crosswalk": {
                     "name": "Przejście dla pieszych",
                     "terms": "Przejście drogowe"
                 },
+                "highway/crosswalk-raised": {
+                    "name": "Przejście dla pieszych-podwyższone i oznakowane",
+                    "terms": "podwyższone oznakowane przejście dla pieszych"
+                },
                 "highway/cycleway": {
                     "name": "Droga rowerowa",
                     "terms": "droga,rowerowa,ścieżka,rowerów"
@@ -3603,8 +3745,12 @@
                     "name": "Ścieżka/droga ",
                     "terms": "ścieżka,dróżka"
                 },
-                "highway/pedestrian": {
-                    "name": "Ciąg pieszy",
+                "highway/pedestrian_area": {
+                    "name": "Plac - deptak",
+                    "terms": "plac, skwer, deptak"
+                },
+                "highway/pedestrian_line": {
+                    "name": "Ulica - deptak",
                     "terms": "deptak"
                 },
                 "highway/primary": {
@@ -3783,6 +3929,10 @@
                     "name": "Zbiornik wodny",
                     "terms": "zbiornik,wodny,retencyjny"
                 },
+                "landuse/brownfield": {
+                    "name": "Teren pod ponowną zabudowę",
+                    "terms": "teren poprzemysłowy, teren powyburzeniowy"
+                },
                 "landuse/cemetery": {
                     "name": "Cmentarz",
                     "terms": "cmentarz"
@@ -3822,6 +3972,10 @@
                     "name": "Trawa",
                     "terms": "trawa, trawnik, "
                 },
+                "landuse/greenfield": {
+                    "name": "Teren niezabudowany",
+                    "terms": "teren niezabudowany"
+                },
                 "landuse/harbour": {
                     "name": "Port morski",
                     "terms": "port morski,port"
@@ -3906,6 +4060,10 @@
                     "name": "Tereny rekreacyjne",
                     "terms": "rekreacja,odpoczynek"
                 },
+                "landuse/religious": {
+                    "name": "Teren dla celów religijnych",
+                    "terms": "teren kościelny, teren religijny"
+                },
                 "landuse/residential": {
                     "name": "Zabudowa mieszkaniowa",
                     "terms": "Teren zamieszkały"
@@ -3970,6 +4128,10 @@
                     "name": "Pole golfowe",
                     "terms": "pole golfowe"
                 },
+                "leisure/hackerspace": {
+                    "name": "Hackerspace",
+                    "terms": "hackerspace, hackspace,  hacklab, makerspace, creative space "
+                },
                 "leisure/horse_riding": {
                     "name": "Jazda konna",
                     "terms": "jazda konna"
@@ -4018,6 +4180,10 @@
                     "name": "Boisko do gry w siatkówkę plażową",
                     "terms": "Siatkówka plażowa"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Bule",
+                    "terms": "bule, petanka"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Pole do gry w bowls",
                     "terms": "bowls"
@@ -4070,6 +4236,10 @@
                     "name": "Bieżnia (Bieganie)",
                     "terms": "bieżnia,tor,bieg"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna",
+                    "terms": "sauna"
+                },
                 "leisure/slipway": {
                     "name": "Pochylnia okrętowa",
                     "terms": "pochylnia"
@@ -4122,6 +4292,10 @@
                     "name": "Komin",
                     "terms": "kominek"
                 },
+                "man_made/crane": {
+                    "name": "Żuraw stacjonarny",
+                    "terms": "żuraw, dźwig"
+                },
                 "man_made/cutline": {
                     "name": "Przecinka leśna",
                     "terms": "przecinka"
@@ -4350,13 +4524,21 @@
                     "terms": "Biuro,"
                 },
                 "office/accountant": {
-                    "name": "Księgowy",
-                    "terms": "biuro rachunkowe, księgowość, rachun"
+                    "name": "Biuro rachunkowe",
+                    "terms": "biuro rachunkowe, księgowy"
                 },
                 "office/administrative": {
                     "name": "Biuro samorządowe",
                     "terms": "Urząd"
                 },
+                "office/adoption_agency": {
+                    "name": "Ośrodek adopcyjny",
+                    "terms": "ośrodek adopcyjny, adopcja"
+                },
+                "office/advertising_agency": {
+                    "name": "Agencja reklamowa",
+                    "terms": "reklama, agencja reklamowa"
+                },
                 "office/architect": {
                     "name": "Architekt",
                     "terms": "studio architektoniczne, biuro architektoniczne, pracownia architektoniczna"
@@ -4393,12 +4575,20 @@
                     "name": "Urząd Stanu Cywilnego",
                     "terms": "stan cywilny,śluby,metryki,rejestracja urodzin"
                 },
+                "office/government/tax": {
+                    "name": "Urząd Skarbowy",
+                    "terms": "urząd skarbowy, fiskus"
+                },
+                "office/guide": {
+                    "name": "Przewodnik turystyczny",
+                    "terms": "przewodnik turystyczny"
+                },
                 "office/insurance": {
                     "name": "Biuro ubezpieczeń",
                     "terms": "agencja ubezpieczeniowa"
                 },
                 "office/it": {
-                    "name": "Biuro firmy informatycznej",
+                    "name": "Firma informatyczna",
                     "terms": "firma it, firma informatyczna"
                 },
                 "office/lawyer": {
@@ -4409,14 +4599,22 @@
                     "name": "Notariusz",
                     "terms": "sekretarz,akt,majątek"
                 },
+                "office/moving_company": {
+                    "name": "Biuro firmy przeprowadzkowej",
+                    "terms": "przeprowadzki"
+                },
                 "office/newspaper": {
-                    "name": "Gazeta",
-                    "terms": "dziennik"
+                    "name": "Siedziba wydawcy gazety",
+                    "terms": "gazeta, dziennik, tygodnik"
                 },
                 "office/ngo": {
                     "name": "Biuro organizacji pożytku publicznego",
                     "terms": "stowarzyszenie, fundacja,ngo"
                 },
+                "office/notary": {
+                    "name": "Notariusz",
+                    "terms": "notariusz"
+                },
                 "office/physician": {
                     "name": "Lekarz"
                 },
@@ -4424,17 +4622,25 @@
                     "name": "Partia polityczna",
                     "terms": "partia polityczna"
                 },
+                "office/private_investigator": {
+                    "name": "Prywatny detektyw",
+                    "terms": "prywatny detektyw"
+                },
                 "office/research": {
                     "name": "Biuro badawcze",
                     "terms": "instytut badawczy"
                 },
+                "office/tax_advisor": {
+                    "name": "Biuro rachunkowe",
+                    "terms": "biuro rachunkowe, podatki"
+                },
                 "office/telecommunication": {
                     "name": "Biuro firmy telekomunikacyjnej",
                     "terms": "telekomunikacja"
                 },
                 "office/therapist": {
                     "name": "Terapeuta",
-                    "terms": "terapeuta"
+                    "terms": "terapeuta, fizjoterapeuta"
                 },
                 "office/travel_agent": {
                     "name": "Biuro podróży"
@@ -4461,6 +4667,10 @@
                     "name": "Wyspa",
                     "terms": "Wyspa"
                 },
+                "place/islet": {
+                    "name": "Wysepka",
+                    "terms": "wysepka, mała wyspa"
+                },
                 "place/isolated_dwelling": {
                     "name": "Pojedyncze zabudowania",
                     "terms": "odosobnione zabudowanie mieszkalne"
@@ -4473,6 +4683,10 @@
                     "name": "Sąsiedztwo",
                     "terms": "osiedle,okolica"
                 },
+                "place/plot": {
+                    "name": "Działka",
+                    "terms": "działka, ewidencja gruntów"
+                },
                 "place/quarter": {
                     "name": "Kwartał",
                     "terms": "kwartał,osiedle,dzielnica"
@@ -4493,8 +4707,32 @@
                     "name": "Wieś",
                     "terms": "wieś, wioska"
                 },
+                "playground/basket_spinner": {
+                    "name": "Kosz obrotowy",
+                    "terms": "kosz obrotowy"
+                },
+                "playground/basket_swing": {
+                    "name": "Huśtawka bocianie gniazdo",
+                    "terms": "bocianie gniazdo"
+                },
+                "playground/climbing_frame": {
+                    "name": "Drabinki",
+                    "terms": "drabinki, wspinaczka, konstrukcja do wspinania"
+                },
+                "playground/cushion": {
+                    "name": "Dmuchana trampolina",
+                    "terms": "trampolina, dmuchaniec"
+                },
+                "playground/rocker": {
+                    "name": "Bujak sprężynowy",
+                    "terms": "bujak sprężynowy, sprężynowiec"
+                },
+                "playground/roundabout": {
+                    "name": "Karuzela",
+                    "terms": "karuzela"
+                },
                 "playground/sandpit": {
-                    "name": "Piaskowanica",
+                    "name": "Piaskownica",
                     "terms": "piaskownica"
                 },
                 "playground/seesaw": {
@@ -4505,10 +4743,18 @@
                     "name": "Zjeżdzalnia",
                     "terms": "zjeżdzalnia"
                 },
+                "playground/structure": {
+                    "name": "Zestaw zabawowy",
+                    "terms": "zestaw zabawowy, budowla"
+                },
                 "playground/swing": {
                     "name": "Huśtawka",
                     "terms": "huśtawka"
                 },
+                "playground/zipwire": {
+                    "name": "Zjazd linowy",
+                    "terms": "zjazd linowy"
+                },
                 "point": {
                     "name": "Punkt",
                     "terms": "węzeł"
@@ -4669,6 +4915,10 @@
                     "name": "Sklep",
                     "terms": "Sklep"
                 },
+                "shop/agrarian": {
+                    "name": "Sklep rolniczy",
+                    "terms": "rolniczy, produkcja rolna, pasze, nasiona, sprzęt rolniczy, pestycydy, części do maszyn rolniczych"
+                },
                 "shop/alcohol": {
                     "name": "Sklep monopolowy",
                     "terms": "alkohol"
@@ -5091,6 +5341,10 @@
                     "name": "Sprzedaż biletów",
                     "terms": "kasa biletowa"
                 },
+                "shop/tiles": {
+                    "name": "Sklep z płytkami ceramicznymi",
+                    "terms": "płytki, gres"
+                },
                 "shop/tobacco": {
                     "name": "Sklep z tytoniem",
                     "terms": "Sklep tytoniowy"
@@ -5099,6 +5353,10 @@
                     "name": "Sklep z zabawkami",
                     "terms": "zabawki, sklep zabawkarski"
                 },
+                "shop/trade": {
+                    "name": "Skład branżowy",
+                    "terms": "skład drewna, skład budowlany, hurtownia budowlana, skład opału"
+                },
                 "shop/travel_agency": {
                     "name": "Biuro podróży",
                     "terms": "Biuro podróży, "
@@ -5179,8 +5437,8 @@
                     "terms": "kemping dla samochodów kempingowych"
                 },
                 "tourism/chalet": {
-                    "name": "Drewniana chata",
-                    "terms": "domek kempingowy"
+                    "name": "Domek/domki na wynajem",
+                    "terms": "domek, domki, letnisko"
                 },
                 "tourism/gallery": {
                     "name": "Galeria lub muzeum (sztuka)",
@@ -5278,6 +5536,10 @@
                     "name": "Linia wibracyjna",
                     "terms": "linia wibracyjna, wibracyjne oznakowanie poziome"
                 },
+                "traffic_calming/table": {
+                    "name": "Próg zwalniający z długą płaską nawierzchnią",
+                    "terms": "długi próg zwalniający"
+                },
                 "type/boundary": {
                     "name": "Granica",
                     "terms": "granica"
@@ -5456,7 +5718,7 @@
         },
         "imagery": {
             "Bing": {
-                "description": "Zdjęcia satelitarne i lotnicze.",
+                "description": "Zdjęcia satelitarne i lotnicze Bing.",
                 "name": "Bing (satelitarne)"
             },
             "DigitalGlobe-Premium": {
@@ -5466,6 +5728,13 @@
                 "description": "Zdjęcia satelitarne DigitalGlobe Premium.",
                 "name": "DigitalGlobe Premium (satelitarne)"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Warunki użytkowania i opinia"
+                },
+                "description": "Granice zdjęć i data ich wykonania. Opisy są widoczne na poziomie powiększenia 14 i wyższym.",
+                "name": "Datowanie zdjęć DigitalGlobe Premium "
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Warunki użytkowania i opinia"
@@ -5473,12 +5742,19 @@
                 "description": "Zdjęcia satelitarne DigitalGlobe Standard.",
                 "name": "DigitalGlobe Standard (satelitarne)"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Warunki użytkowania i opinia"
+                },
+                "description": "Granice zdjęć i data ich wykonania. Opisy są widoczne na poziomie powiększenia 14 i wyższym.",
+                "name": "Datowanie zdjęć DigitalGlobe Standard"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Warunki użytkowania i opinia"
                 },
-                "description": "Obrazowanie świata Esri.",
-                "name": "Obrazowanie świata Esri"
+                "description": "Zdjęcia satelitarne i lotnicze Esri.",
+                "name": "Esri (satelitarne i lotnicze)"
             },
             "MAPNIK": {
                 "attribution": {
@@ -5491,7 +5767,7 @@
                 "attribution": {
                     "text": "Warunki użytkowania i opinia"
                 },
-                "description": "Zdjęcia satelitarne i lotnicze.",
+                "description": "Zdjęcia satelitarne i lotnicze Mapbox.",
                 "name": "Mapbox Satellite (satelitarne)"
             },
             "OSM_Inspector-Addresses": {
@@ -5536,6 +5812,17 @@
                 },
                 "name": "Inspektor OSM: Tagowanie"
             },
+            "US-TIGER-Roads-2012": {
+                "name": "TIGER Roads 2012"
+            },
+            "US-TIGER-Roads-2014": {
+                "description": "Na poziomie powiększenia 16+ są dane public domain od US Census. Na niższych poziomach powiększenia są tylko zmiany od 2006, ale bez zmian już włączonych do OpenStreetMap",
+                "name": "TIGER Roads 2014"
+            },
+            "US-TIGER-Roads-2017": {
+                "description": "Żółty = Dane public domain od US Census. Czerwony = Brak danych w OpenStreetMap",
+                "name": "TIGER Roads 2017"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© Sarah Hoffmann, CC by-SA 3.0, dane mapy autorzy OpenStreetMap, ODbL 1.0"
@@ -5591,7 +5878,7 @@
                     "text": "Warunki użytkowania i opinia"
                 },
                 "description": "Pokazuje najważniejsze obiekty pomocne w orientacji.",
-                "name": "Nakładka lokalizująca"
+                "name": "Nakładka identyfikująca"
             },
             "openpt_map": {
                 "attribution": {
@@ -5622,7 +5909,7 @@
                 "attribution": {
                     "text": "Simon Poole, Dane © autorzy OpenStreetMap"
                 },
-                "name": "QA Bez Adesu"
+                "name": "QA Bez Adresu"
             },
             "skobbler": {
                 "attribution": {
diff --git a/dist/locales/pt-BR.json b/dist/locales/pt-BR.json
index b1387b6ee..0c7bd93f6 100644
--- a/dist/locales/pt-BR.json
+++ b/dist/locales/pt-BR.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Escolha o idioma",
             "localized_translation_name": "Nome"
         },
-        "zoom_in_edit": "Aproxime o zoom para editar o mapa.",
+        "zoom_in_edit": "Aproxime o zoom para editar",
         "login": "login",
         "logout": "sair",
         "loading_auth": "Conectando ao OpenStreetMap...",
@@ -354,14 +354,16 @@
                 "key": "B",
                 "title": "Fundo",
                 "zoom": "Zoom",
-                "vintage": "Vintage",
+                "vintage": "Data de Captura",
                 "source": "Fonte",
                 "description": "Descrição",
                 "resolution": "Resolução",
                 "accuracy": "Precisão",
                 "unknown": "Desconhecido",
                 "show_tiles": "Mostrar moisaco",
-                "hide_tiles": "Ocultar moisaco"
+                "hide_tiles": "Ocultar moisaco",
+                "show_vintage": "Mostrar Data de Captura",
+                "hide_vintage": "Ocultar Data de Captura"
             },
             "history": {
                 "key": "H",
@@ -613,7 +615,7 @@
             "welcome": "Bem vindo(a) ao editor iD do OpenStreetMap",
             "text": "iD é uma ferramenta amigável, porém poderosa, para contribuir no melhor mapa livre do mundo. Esta é a versão {version}. Para mais informações, consulte {website} e reporte bugs no {github}.<br><br>\n<strong>Atenção:</strong> NÃO é permitido copiar nomes de ruas do Google Maps, Bing, Here, mapas impressos ou quaisquer fontes que possuam copyright.",
             "walkthrough": "Comece o tutorial",
-            "start": "Editar Agora"
+            "start": "Editar agora"
         },
         "source_switch": {
             "live": "ao vivo",
@@ -646,8 +648,8 @@
             "deprecated_tags": "Etiquetas obsoletas: {tags}"
         },
         "zoom": {
-            "in": "Aproximar",
-            "out": "Afastar"
+            "in": "Aproximar o zoom",
+            "out": "Afastar o zoom"
         },
         "cannot_zoom": "Não é possível afastar mais no modo atual.",
         "full_screen": "Alterar para Tela Cheia",
@@ -668,15 +670,24 @@
         "mapillary": {
             "view_on_mapillary": "Ver esta imagem no Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Fotos a nível de rua do OpenStreetCam",
+            "title": "Camada de Fotos (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Ver esta imagem no OpenStreetCam"
+        },
         "help": {
             "title": "Ajuda",
             "key": "H",
             "help": "# Ajuda\n\nEste é um editor para [OpenStreetMap](http://www.openstreetmap.org/), o mapa mundial livre e editável. Você pode usá-lo para adicionar e atualizar de dados em sua área,  tornando um mapa mundi de código aberto melhor para todos.\n\nAs edições que você fizer nesse mapa serão visíveis para todos que usam OpenStreetMap. Para fazer uma edição você precisará se [identificar](https://www.openstreetmap.org/login).\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 & Salvando\n\nEste editor foi criado para funcionar primariamente online, e, neste momento, você o está\nacessando através de um website.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma via ou um ponto de interesse, clique\nclique sobre o elemento no mapa. Isto irá destacar o elemento selecionado, abrir um painel\ncom detalhes sobre ele e exibir um menu de ações que você pode executar no elemento.\n\nPara selecionar múltiplos elementos, segure a tecla 'Shift'. Então clique nos elementos\nque você deseja selecionar, ou arraste o mouse sobre o mapa para desenhar um contorno\nem volta destes elementos. Todos os pontos dentro da área que você desenhou serão\nselecionados.\n\n### Salvando Edições\n\nQuando você faz alterações como editar ruas, prédios e locais, elas são\nguardadas localmente até que você as envie para o servidor. Não se preocupe\nse você cometer algum deslize - você pode desfazer alterações clicando no\nbotão de desfazer e também refazer as alterações clicando no botão de refazer.\nClique em \"Salvar\" para finalizar um conjunto de alterações. Por exemplo, você\ncompletou uma área de uma cidade e gostaria de começar a editar uma outra\nárea. Você terá a chance de revisar o que foi feito até o momento e o editor\nmostrará sugestões e dicas se alguma coisa parecer estar errada com as suas\nalterações.Se tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo para enviar as\nmudanças para o [OpenStreetMap](http://www.openstreetmap.org/), onde elas estarão\nvisíveis para todos os outros usuários. Se você não conseguir concluir uma sessão de\nedição, você pode fechar a janela do editor e voltar mais tarde (no mesmo navegador e\ncomputador) que o editor irá oferecer a possibilidade de restaurar o seu trabalho.\n\n### Usando o editor\n\nVocê pode ver uma lista de atalhos de teclado pressionando a tecla `?`.\n",
+            "roads": "# Vias\n\nVocê pode criar, corrigir e excluir vias com este editor. As vias podem ser de vários tipos:\ncaminhos, estradas, ruas, trilhas, ciclovias e muito mais - qualquer segmento onde pessoas\ncostumam transitar pode ser mapeado.\n\n### Selecionando\n\nClique em uma via para selecioná-la. Um contorno deve tornar-se visível junto ao elemento,\nbem como uma barra lateral mostrando mais informações sobre a estrada. Se você clicar com\no botão direito do mouse, um pequeno menu de ações se abrirá e você poderá aplicá-las na\nvia.\n\n### Modificando\n\nMuitas vezes você vai encontrar vias que não estão alinhadas com as imagens por trás\ndelas ou com uma faixa de GPS. Você pode ajustar estas vias para que elas fiquem no\nlugar certo.\n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar pontos\nde controle ao longo dela, os quais você pode arrastar para melhorar o desenho da mesma.\nSe o que você deseja é adicionar novos pontos de controle para obter mais detalhes,\nclique duas vezes em uma parte da estrada que necessite de um ponto adicional.\n\nSe a via se conecta a uma outra, mas não está corretamente conectada no\nmapa, você pode arrastar um de seus pontos de controle para a outra estrada a fim de\nconectá-las. Ter vias que se conectam é importante para o mapa e essencial para\npodermos calcular rotas.\n\nVocê também pode clicar com o botão direito e escolher a ferramenta 'Mover' ou\npressionar a tecla 'M' para mover o caminho inteiro de uma vez. Mova o objeto com o\nmouse e, em seguida, clique com o botão esquerdo para salvar o deslocamento.\n\n### Apagando\n\nSe uma via está completamente errada - você pode ver que ela não existe nas imagens\nde satélite e, além disso, ter confirmado localmente que ela não existe - você pode\napagá-la do mapa. Seja cauteloso ao excluir objetos - como em qualquer outra edição,\nos resultados serão vistos por todos, e como as imagens de satélite podem estar\ndesatualizadas, a via pode ter sido construída recentemente.\n\nVocê pode excluir um caminho clicando sobre ele para selecioná-lo e, em seguida,\npressionando a tecla 'Delete'. Ou clicar com o botão direito na via e, em seguida,\nno ícone da lixeira.\n\n### Criando\n\nEncontrou um lugar onde deveria ter uma via, mas não tem? Clique no botão 'Linha' no\ncanto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a\ndesenhar uma linha.\n\nClique no início da via no mapa para começar a desenhar. Se a via se ramifica de uma\noutra já mapeada, comece clicando sobre o lugar onde elas se conectam.\n\nEm seguida, clique em pontos ao longo da via para que ela siga o caminho certo, de\nacordo com imagens de satélite ou GPS. Se a via que você está desenhando atravessa\numa outra via, conecte-as clicando sobre o ponto de intersecção. Quando você terminar\nde desenhá-la, dê um duplo clique ou pressione 'Return' ou 'Enter' no seu teclado.\n",
             "gps": "# GPS\n\nOs dados de GPS são as fontes mais confiáveis do OpenStreetMap. Este editor suporta trilhas locais - arquivos '.gpx'. Você pode utilizar aplicativos de celular ou aparelhos de GPS para coletar esse tipo de trilha. Para informações sobre como realizar levantamento com GPS, leia [Mapeando com smartphone, GPS ou papel](http://learnosm.org/pt/mobile-mapping/).\n\nPara usar uma trilha GPX para mapeamento, arraste e solte o arquivo GPX no editor de mapa iD. Caso seja reconhecida, será adicionada ao mapa como linhas roxo-claras. Clique no menu 'Dados do Mapa', no lado direito, para ativar, desativar ou focar o zoom nesta nova camada alimentada pelo GPX.\n\nA trilha GPX não é diretamente enviada ao OpenStreetMap - a melhor maneira para usá-la é desenhar no mapa, usando-a como um guia para os novos elementos que você adicionar, e também [enviá-lo ao OpenStreetMap](http://www.openstreetmap.org/trace/create) para que outros usuários possam usá-la.\n",
             "imagery": "# Imagens aéreas\n\nAs imagens aéreas são um recurso muito importante para o mapeamento.\nFotos de avião, de satélite e de outras fontes livre estão disponíveis no editor,\nno menu \"Configurações da Imagem de Fundo\" à direita.\n\nPor padrão, as imagens de satélite do [Bing Maps](http://www.bing.com/maps/)\nestão habilitadas no editor, mas ao mover e aproximar o mapa para certas áreas,\nnovas fontes de imagens estarão disponíveis. Alguns países, tais como os EUA, a\nFrança e a Dinamarca, têm imagens aéreas de alta qualidade disponíveis em algumas áreas.\n\nAtenção: as imagens aéreas algumas vezes não batem exatamente com o\nque há em terra, isto é, têm algum deslocamento por causa de algum erro por\nparte de quem as gerou. Se você notar que muitas ruas estão deslocadas\nem comparação com a imagem de fundo, não as alinhe imediatamente com\na imagem. Em vez disso ajuste a imagem para que ela se alinhe com as ruas\natravés da opção \"Ajustar o deslocamento da imagem de fundo\" no final do painel de Configurações da Imagem de Fundo.\n",
             "addresses": "# Endereços\n\nOs endereços são uma das informações mais úteis do mapa.\n\nApesar de os endereços serem representados como parte de uma rua,\nno OpenStreetMap eles também são gravados como atributos de prédios\ne outros lugares ao longo das ruas.\n\nVocê pode adicionar informações de endereço nos locais mapeados como\nárea de edifícios ou mapeados como pontos. A melhor fonte de informações\nsobre endereços é a que vem de pesquisas de campo ou conhecimento\npessoal do local - assim como qualquer outra informação, copiar de fontes\ncomerciais como o Google Maps é estritamente proibido.\n",
-            "inspector": "# Usando o editor de elementos\n\nO editor de elementos é a seção no lado esquerdo da página que aparece quando um elemento é selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de elemento\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de elemento ele é, como, por exemplo, se é uma autoestrada ou via residencial, supermercado ou cafeteria. O editor de elementos mostrará sugestões para os tipos de elementos mais comuns, mas você pode encontrar outros digitando o que você procura na caixa de pesquisa.\n\nClique no botão \"i\" no canto direito de um botão de recurso para aprender mais sobre ele. Clique em um botão para alterar o tipo.\n\n### Utilizando formulários e editando etiquetas\n\nDepois de escolher um tipo de elemento, ou quando você seleciona um elemento que já tem um tipo atribuído, o editor de elementos exibe campos com detalhes sobre o elemento, como seu nome e endereço.\n\nAbaixo dos campos que você vê, você pode clicar no menu de \"Adicionar campo:\" para adicionar outras informações, como um link da Wikipédia, acessibilidade para cadeirantes, entre outros.\n\nNa parte inferior do editor de elementos, você pode clicar em 'Etiquetas adicionais' para adicionar outras etiquetas específicas. O [Taginfo](http://taginfo.openstreetmap.org/) é uma excelente ferramenta para aprender mais sobre as combinações de etiquetas mais usadas.\n\nAs alterações feitas no editor de elementos são automaticamente aplicadas ao mapa. Você pode desfazê-las a qualquer momento, clicando no botão 'Desfazer'.\n"
+            "inspector": "# Usando o editor de elementos\n\nO editor de elementos é a seção no lado esquerdo da página que aparece quando um elemento é selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de elemento\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de elemento ele é, como, por exemplo, se é uma autoestrada ou via residencial, supermercado ou cafeteria. O editor de elementos mostrará sugestões para os tipos de elementos mais comuns, mas você pode encontrar outros digitando o que você procura na caixa de pesquisa.\n\nClique no botão \"i\" no canto direito de um botão de recurso para aprender mais sobre ele. Clique em um botão para alterar o tipo.\n\n### Utilizando formulários e editando etiquetas\n\nDepois de escolher um tipo de elemento, ou quando você seleciona um elemento que já tem um tipo atribuído, o editor de elementos exibe campos com detalhes sobre o elemento, como seu nome e endereço.\n\nAbaixo dos campos que você vê, você pode clicar no menu de \"Adicionar campo:\" para adicionar outras informações, como um link da Wikipédia, acessibilidade para cadeirantes, entre outros.\n\nNa parte inferior do editor de elementos, você pode clicar em 'Etiquetas adicionais' para adicionar outras etiquetas específicas. O [Taginfo](http://taginfo.openstreetmap.org/) é uma excelente ferramenta para aprender mais sobre as combinações de etiquetas mais usadas.\n\nAs alterações feitas no editor de elementos são automaticamente aplicadas ao mapa. Você pode desfazê-las a qualquer momento, clicando no botão 'Desfazer'.\n",
+            "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios do mundo. Você pode criar e\nmelhorar esta base de dados.\n\n### Selecionando\n\nVocê pode selecionar um edifício clicando em sua borda. Isto irá destacar\no edifício e abrir uma barra lateral com informações sobre ele. Se você clicar com o\nbotão direito do mouse, será exibido um menu de ações que você poderá executar no\nedifício.\n\n### Modificando\n\nÀs vezes um edifício está no lugar errado ou tem etiquetas erradas.\n\nPara mover um edifício inteiro, selecione-o e pressione o atalho de teclado 'M',\nou clique com botão direito do mouse no mesmo e escolha a ferramenta 'Mover'.\nMova o mouse para deslocar o edifício e clique novamente quando ele\nestiver no local certo.\n\nPara corrigir o formato de um edifício, clique e arraste os pontos que\nformam suas bordas para o lugar apropriado.\n\n### Criando\n\nUma das principais questões sobre adicionar edifícios ao mapa é que o\nOpenStreetMap registra-os tanto como polígonos quanto como pontos. A\nregra geral é _mapeie um edifício como polígono sempre que possível_,\ne mapeie empresas, lojas, serviços, e outros locais que funcionam no\nedifício como pontos dentro do contorno dele.\n\nComece desenhando um edifício como polígono clicando no botão 'Área', no\ncanto superior esquerdo da interface, e finalize pressionando 'Enter' no\nteclado ou clicando no primeiro ponto que você desenhou para fechar o polígono.\n\n### Excluindo\n\nSe um edifício estiver totalmente errado - você vê que ele não está na\nimagem de satélite e também confirmou pessoalmente que ele não existe\n- você pode excluí-lo, removendo-o do mapa. Seja cuidadoso ao remover\ncoisas - assim como em qualquer outra edição, os resultados serão vistos por\ntodos, e as imagens de satélite podem estar desatualizadas, ou seja,\npode ser que o edifício tenha sido construído recentemente.\n\nVocê pode remover um edifício clicando nele para selecioná-lo, e depois\npressionando a tecla 'Delete', ou clicando com o botão direito do mouse no mesmo e,\nem seguida, na ferramenta com o ícone de lixeira.\n"
         },
         "intro": {
             "done": "feito",
@@ -1214,6 +1225,9 @@
                 "aeroway": {
                     "label": "Tipo"
                 },
+                "agrarian": {
+                    "label": "Produtos"
+                },
                 "amenity": {
                     "label": "Tipo"
                 },
@@ -1282,6 +1296,9 @@
                 "board_type": {
                     "label": "Tipo"
                 },
+                "boules": {
+                    "label": "Tipo"
+                },
                 "boundary": {
                     "label": "Tipo"
                 },
@@ -1301,6 +1318,10 @@
                 "bunker_type": {
                     "label": "Tipo"
                 },
+                "cables": {
+                    "label": "Cabos",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direção (Graus Sentido Horário)",
                     "placeholder": "45, 90, 180, 270"
@@ -1386,6 +1407,13 @@
                 "craft": {
                     "label": "Tipo"
                 },
+                "crane/type": {
+                    "label": "Tipo de Grua",
+                    "options": {
+                        "floor-mounted_crane": "Guindaste montado no chão",
+                        "portal_crane": "Guindaste Pórtico"
+                    }
+                },
                 "crop": {
                     "label": "Espécie cultivada"
                 },
@@ -1458,6 +1486,10 @@
                 "description": {
                     "label": "Descrição"
                 },
+                "devices": {
+                    "label": "Dispositivos",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Troca de Fraldas Disponível"
                 },
@@ -1532,6 +1564,9 @@
                         "wall": "Muro"
                     }
                 },
+                "fitness_station": {
+                    "label": "Tipo de Equipamento"
+                },
                 "fixme": {
                     "label": "Corrija-me"
                 },
@@ -1539,6 +1574,9 @@
                     "label": "Tipo",
                     "placeholder": "Padrão"
                 },
+                "frequency": {
+                    "label": "Frequência Operacional"
+                },
                 "fuel": {
                     "label": "Combustível"
                 },
@@ -1570,6 +1608,9 @@
                 "generator/type": {
                     "label": "Tipo"
                 },
+                "government": {
+                    "label": "Tipo"
+                },
                 "grape_variety": {
                     "label": "Variedades de Uva"
                 },
@@ -1581,6 +1622,7 @@
                     "label": "Corrimão"
                 },
                 "hashtags": {
+                    "label": "Hashtags Sugeridas",
                     "placeholder": "#exemplo"
                 },
                 "healthcare": {
@@ -1662,7 +1704,7 @@
                     "label": "Tipo"
                 },
                 "lanes": {
-                    "label": "Faixas",
+                    "label": "Total de Faixas",
                     "placeholder": "1, 2, 3..."
                 },
                 "layer": {
@@ -1896,6 +1938,10 @@
                 "payment_multi": {
                     "label": "Tipos de Pagamento"
                 },
+                "phases": {
+                    "label": "Fases",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telefone",
                     "placeholder": "+55 11 0982 1098"
@@ -1975,6 +2021,9 @@
                 "railway": {
                     "label": "Tipo"
                 },
+                "rating": {
+                    "label": "Potência Nominal"
+                },
                 "recycling_accepts": {
                     "label": "Aceita"
                 },
@@ -2183,6 +2232,9 @@
                 "studio": {
                     "label": "Tipo"
                 },
+                "substance": {
+                    "label": "Substância"
+                },
                 "substation": {
                     "label": "Tipo"
                 },
@@ -2209,6 +2261,14 @@
                 "surveillance/zone": {
                     "label": "Zona de vigilância"
                 },
+                "switch": {
+                    "label": "Tipo",
+                    "options": {
+                        "circuit_breaker": "Disjuntor",
+                        "disconnector": "Interruptor",
+                        "mechanical": "Mecânico"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Piso Tátil"
                 },
@@ -2260,6 +2320,9 @@
                     },
                     "placeholder": "Rígida, Parcialmente Rígida, Macia..."
                 },
+                "trade": {
+                    "label": "Tipo"
+                },
                 "traffic_calming": {
                     "label": "Tipo"
                 },
@@ -2278,6 +2341,19 @@
                     },
                     "placeholder": "Excelente, Bom, Ruim..."
                 },
+                "transformer": {
+                    "label": "Tipo",
+                    "options": {
+                        "auto": "Autotransformador",
+                        "auxiliary": "Auxiliar",
+                        "converter": "Conversor",
+                        "distribution": "Distribuição",
+                        "generator": "Gerador",
+                        "phase_angle_regulator": "Regulador de Ângulo de Fase",
+                        "traction": "Tração",
+                        "yes": "Desconhecido"
+                    }
+                },
                 "trees": {
                     "label": "Árvores"
                 },
@@ -2312,6 +2388,18 @@
                         "stratovolcano": "Estratovulcão"
                     }
                 },
+                "voltage": {
+                    "label": "Voltagem"
+                },
+                "voltage/primary": {
+                    "label": "Voltagem Primária"
+                },
+                "voltage/secondary": {
+                    "label": "Voltagem Secundária"
+                },
+                "voltage/tertiary": {
+                    "label": "Voltagem Terciária"
+                },
                 "wall": {
                     "label": "Tipo"
                 },
@@ -2339,6 +2427,17 @@
                 },
                 "wikipedia": {
                     "label": "Artigo na Wikipédia"
+                },
+                "windings": {
+                    "label": "Número de Bombinas",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Configuração das Bombinas",
+                    "options": {
+                        "open": "Aberta",
+                        "zigzag": "Zig Zag"
+                    }
                 }
             },
             "presets": {
@@ -2662,6 +2761,9 @@
                     "name": "Estacionamento de motos",
                     "terms": "Estacionamento de motocicletas, estacionamento de motos, estacionamento"
                 },
+                "amenity/music_school": {
+                    "name": "Escola de Música"
+                },
                 "amenity/nightclub": {
                     "name": "Boate",
                     "terms": "Discoteca, Boate, Casa Noturna, boite, "
@@ -2785,8 +2887,7 @@
                     "terms": "Área Escolar, Terreno Escolar, Pátio Escolar"
                 },
                 "amenity/scrapyard": {
-                    "name": "Ferro Velho",
-                    "terms": "Ferro-velho, ferro velho, sucateiro"
+                    "name": "Ferro Velho"
                 },
                 "amenity/shelter": {
                     "name": "Abrigo contra Intempéries",
@@ -3246,10 +3347,16 @@
                     "name": "Fornecedor de refeições",
                     "terms": "Fornecedor de Mantimentos, Aprovisionador, cozinheiro, encomenda, marmita, PF, refeição,"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Limpador de Chaminé"
+                },
                 "craft/clockmaker": {
                     "name": "Relojoeiro",
                     "terms": "Relógios, relojoaria, Conserto de relógios, Reparos de relógios"
                 },
+                "craft/confectionery": {
+                    "name": "Doceria"
+                },
                 "craft/distillery": {
                     "name": "Destilaria",
                     "terms": "<translate with synonyms or related terms for 'Distillery', separated by commas>"
@@ -3351,9 +3458,8 @@
                     "name": "Montador de Andaimes",
                     "terms": "Montador de Andaimes"
                 },
-                "craft/sculpter": {
-                    "name": "Escultor",
-                    "terms": "Escultor"
+                "craft/sculptor": {
+                    "name": "Escultor"
                 },
                 "craft/shoemaker": {
                     "name": "Sapateiro",
@@ -3363,10 +3469,6 @@
                     "name": "Pedreiro",
                     "terms": "Pedreiro"
                 },
-                "craft/sweep": {
-                    "name": "Limpador de Chaminé",
-                    "terms": "Limpador de Chaminé"
-                },
                 "craft/tailor": {
                     "name": "Alfaiate"
                 },
@@ -3504,8 +3606,8 @@
                     "terms": "Lago, água, perigo de água, golfe"
                 },
                 "healthcare": {
-                    "name": "Posto de Saúde",
-                    "terms": "Posto de Saúde, Unidade de Pronto Atendimento, Unidade Básica de Saúde"
+                    "name": "Assistência Médica",
+                    "terms": "Posto de Saúde, Unidade de Pronto Atendimento, Unidade Básica de Saúde, clínica, doutor, consultório médico, hospital, dentista, fisioterapia"
                 },
                 "healthcare/alternative": {
                     "name": "Medicina Alternativa",
@@ -3624,9 +3726,11 @@
                     "name": "Caminho Informal",
                     "terms": "Caminho Informal"
                 },
-                "highway/pedestrian": {
-                    "name": "Calçadão",
-                    "terms": "Rua de Pedestres, Calçadão, Rua Fechada"
+                "highway/pedestrian_area": {
+                    "name": "Calçadão"
+                },
+                "highway/pedestrian_line": {
+                    "name": "Calçadão"
                 },
                 "highway/primary": {
                     "name": "Via Primária",
@@ -3851,6 +3955,12 @@
                     "name": "Área industrial",
                     "terms": "Indústria, Parque industrial, Fábrica, Fábricas"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Ferro-Velho"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Matadouro"
+                },
                 "landuse/landfill": {
                     "name": "Aterro Sanitário",
                     "terms": "Aterro Sanitário, Depósito de Lixo"
@@ -3927,6 +4037,9 @@
                     "name": "Pátio de Recreação",
                     "terms": "Recreação, Diversão, área verde, pátio"
                 },
+                "landuse/religious": {
+                    "name": "Área Religiosa"
+                },
                 "landuse/residential": {
                     "name": "Área residencial",
                     "terms": "Residencial, residências"
@@ -3983,6 +4096,18 @@
                     "name": "Equipamento de Exercícios ao Ar Livre",
                     "terms": "Máquina de execício, Equipamento de exercício, Equipamento de ginástica"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Trave de Equilíbrio"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Estação de Hiperextensão"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Barras Paralelas"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Escadas de Exercício"
+                },
                 "leisure/garden": {
                     "name": "Jardim / Horta",
                     "terms": "Jardim, plantas, horta, vegetais, flores"
@@ -4095,6 +4220,9 @@
                     "name": "Pista de atletismo",
                     "terms": "corrida, correr, olímpico, olímpica, atletismo, esportes,"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna"
+                },
                 "leisure/slipway": {
                     "name": "Rampa Náutica",
                     "terms": "Rampa Náutica"
@@ -4147,6 +4275,9 @@
                     "name": "Chaminé",
                     "terms": "Lareira, Forno, Fábrica, Indústria, Gás"
                 },
+                "man_made/crane": {
+                    "name": "Grua"
+                },
                 "man_made/cutline": {
                     "name": "Linha de Corte em Floresta",
                     "terms": "Linha de Corte em Floresta"
@@ -4375,16 +4506,26 @@
                     "terms": "Escritório"
                 },
                 "office/accountant": {
-                    "name": "Contador",
-                    "terms": "Contador"
+                    "name": "Escritório de Contabilidade"
                 },
                 "office/administrative": {
                     "name": "Escritório Administrativo",
                     "terms": "Sala Administrativa, Administração, Sala do Administrativo"
                 },
+                "office/adoption_agency": {
+                    "name": "Agência de Adoção"
+                },
+                "office/advertising_agency": {
+                    "name": "Agência de Publicidade"
+                },
                 "office/architect": {
-                    "name": "Arquiteto",
-                    "terms": "Arquitetura, Escritório de Arquitetura"
+                    "name": "Escritório de Arquitetura"
+                },
+                "office/association": {
+                    "name": "Escritório de ONG"
+                },
+                "office/charity": {
+                    "name": "Escritório de Caridade"
                 },
                 "office/company": {
                     "name": "Escritório",
@@ -4402,6 +4543,9 @@
                     "name": "Agência de Empregos",
                     "terms": "agência, SINE, emprego, empregos, desempregado"
                 },
+                "office/energy_supplier": {
+                    "name": "Escritório de Fornecedor de Energia"
+                },
                 "office/estate_agent": {
                     "name": "Imobiliária",
                     "terms": "aluguel, casas, apartamentos, corretora de imóveis, venda de imóveis, imóveis"
@@ -4410,6 +4554,12 @@
                     "name": "Escritório Financeiro",
                     "terms": "Escritório Financeiro, Financeiro"
                 },
+                "office/forestry": {
+                    "name": "Escritório da Administração Florestal"
+                },
+                "office/foundation": {
+                    "name": "Escritório de Fundação"
+                },
                 "office/government": {
                     "name": "Órgão governamental",
                     "terms": "Gabinete, escritório, governo, secretaria, organização, departamento"
@@ -4418,13 +4568,18 @@
                     "name": "Cartório",
                     "terms": "tabelionato, registro civil, registro de imóveis"
                 },
+                "office/government/tax": {
+                    "name": "Escritório de Receita e Fisco"
+                },
+                "office/guide": {
+                    "name": "Escritório de Guia Turístico"
+                },
                 "office/insurance": {
                     "name": "Seguradora",
                     "terms": "seguro, seguradora, apólice, corretor"
                 },
                 "office/it": {
-                    "name": "Escritório de TI",
-                    "terms": "ti, cpd, informática, computador, rede, Tecnologia da Informação"
+                    "name": "Escritório de Empresa de Tecnologia da Informação"
                 },
                 "office/lawyer": {
                     "name": "Escritório de Advocacia",
@@ -4434,14 +4589,19 @@
                     "name": "Notário",
                     "terms": "Notário, Cartório"
                 },
+                "office/moving_company": {
+                    "name": "Escritório de Companhia de Mudanças"
+                },
                 "office/newspaper": {
-                    "name": "Escritório de Jornal",
-                    "terms": "jornal, notícia"
+                    "name": "Escritório de Jornal"
                 },
                 "office/ngo": {
                     "name": "Sede de ONG",
                     "terms": "ONG Escritório, Departamento de ONG, Organização não governamental"
                 },
+                "office/notary": {
+                    "name": "Tabelionato"
+                },
                 "office/physician": {
                     "name": "Médico"
                 },
@@ -4449,21 +4609,33 @@
                     "name": "Escritório de Partido Político",
                     "terms": "política, político, partido, gabinete"
                 },
+                "office/private_investigator": {
+                    "name": "Escritório de Detetive"
+                },
+                "office/quango": {
+                    "name": "Escritório de Organização Não Governamental Quase Autônoma"
+                },
                 "office/research": {
                     "name": "Escritório de Pesquisa",
                     "terms": "pesquisa, pesquisas, pesquisador, escritório"
                 },
+                "office/tax_advisor": {
+                    "name": "Escritório de Assessoria Fiscal"
+                },
                 "office/telecommunication": {
                     "name": "Escritório de Telecomunicações",
                     "terms": "Escritório de Telecomunicações, Departamento de Telecomunicações"
                 },
                 "office/therapist": {
-                    "name": "Terapeuta",
-                    "terms": "Terapista, Terapia, Tratamento Terapêutico"
+                    "name": "Escritório de Terapeuta",
+                    "terms": "terapia, holístico, terapias alternativas, saúde"
                 },
                 "office/travel_agent": {
                     "name": "Agência de Viagens"
                 },
+                "office/water_utility": {
+                    "name": "Escritório de Companhia de Água"
+                },
                 "piste": {
                     "name": "Pista de Ski",
                     "terms": "Pista de Ski, Trilha de Ski"
@@ -4486,6 +4658,9 @@
                     "name": "Ilha",
                     "terms": "Ilhota"
                 },
+                "place/islet": {
+                    "name": "Ilhota"
+                },
                 "place/isolated_dwelling": {
                     "name": "Moradia Isolada",
                     "terms": "Moradia Isolada"
@@ -4498,6 +4673,9 @@
                     "name": "Vizinhança",
                     "terms": "Vizinhança, Bairro"
                 },
+                "place/plot": {
+                    "name": "Lote"
+                },
                 "place/quarter": {
                     "name": "Sub-bairro",
                     "terms": "loteamento, conjunto habitacional, residencial,"
@@ -4518,11 +4696,11 @@
                     "name": "Povoado",
                     "terms": "Vila, Povoado, Distrito"
                 },
-                "playground/balance_beam": {
-                    "name": "Eixo de Equilíbrio"
+                "playground/cushion": {
+                    "name": "Colchão Inflável"
                 },
-                "playground/horizontal_bar": {
-                    "name": "Barra Horizontal"
+                "playground/rocker": {
+                    "name": "Balanço de Mola"
                 },
                 "playground/roundabout": {
                     "name": "Carrossel",
@@ -4704,6 +4882,9 @@
                     "name": "Loja",
                     "terms": "Loja, Comércio"
                 },
+                "shop/agrarian": {
+                    "name": "Loja de Produtos Agrícolas"
+                },
                 "shop/alcohol": {
                     "name": "Loja de alcoólicos licenciada",
                     "terms": "Loja de Licores"
@@ -5126,6 +5307,9 @@
                     "name": "Bilheteria",
                     "terms": "Loja de Tickets, Bilhetes, Entradas"
                 },
+                "shop/tiles": {
+                    "name": "Loja de Azulejos"
+                },
                 "shop/tobacco": {
                     "name": "Tabacaria",
                     "terms": "Loja de tabaco. Cachimbo. Cigarro, Hookah"
@@ -5134,6 +5318,9 @@
                     "name": "Loja de Brinquedos",
                     "terms": "Loja de Brinquedos"
                 },
+                "shop/trade": {
+                    "name": "Distribuidor"
+                },
                 "shop/travel_agency": {
                     "name": "Agência de Viagens",
                     "terms": "Agência de Viagens"
@@ -5213,10 +5400,6 @@
                     "name": "Estacionamento de Trailers",
                     "terms": "Estacionamento de Trailers"
                 },
-                "tourism/chalet": {
-                    "name": "Chalé",
-                    "terms": "Chalé"
-                },
                 "tourism/gallery": {
                     "name": "Galeria de Arte",
                     "terms": "Arte, Galeria, Exposição, Artes Plásticas, Cultura, museu"
@@ -5273,6 +5456,9 @@
                     "name": "Mirante",
                     "terms": "Mirante"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Abrigo Isolado"
+                },
                 "tourism/zoo": {
                     "name": "Zoológico",
                     "terms": "Zoológico, Zoobotânico, Parque Zoológico"
@@ -5504,6 +5690,13 @@
                 "description": "Imagem de satélite premium da DigitalGlobe.",
                 "name": "Imagem premium da DigitalGlobe"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Termos & Comentários"
+                },
+                "description": "Limites de imagens de satélite e datas de captura. Etiquetas aparecerão no nível de zoom 14 ou acima.",
+                "name": "Bordas das Imagens de Satélite DigitalGlobe Premium"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Termos & Comentários"
@@ -5511,6 +5704,13 @@
                 "description": "Imagem de satélite padrão da DigitalGlobe.",
                 "name": "Imagem padrão da DigitalGlobe"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Termos & Comentários"
+                },
+                "description": "Limites de imagens de satélite e datas de captura. Etiquetas aparecerão no nível de zoom 14 ou acima.",
+                "name": "Boradas das Imagens de Satélite DigitalGlobe Standard"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Termos & Comentários"
@@ -5574,6 +5774,17 @@
                 },
                 "name": "Inspetor OSM: Etiquetas"
             },
+            "US-TIGER-Roads-2012": {
+                "name": "Estradas TIGER 2012"
+            },
+            "US-TIGER-Roads-2014": {
+                "description": "No nível de zoom 16+, há dados de mapas de domínio público do Censo dos EUA. Nos níveis de zoom menores, apenas alterações desde 2006 exceto alterações já incorporadas no OpenStreetMap",
+                "name": "Estradas TIGER 2014"
+            },
+            "US-TIGER-Roads-2017": {
+                "description": "Amarelo = Dados de mapa de domínio público do Censo dos EUA. Vermelho = Dados não encontrados no OpenStreetMap",
+                "name": "Estradas TIGER 2017"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© Sarah Hoffmann, CC by-SA 3.0, dados do mapa Colaboradores do OpenStreetMap, ODbL 1.0"
diff --git a/dist/locales/pt.json b/dist/locales/pt.json
index 3f270f9ec..d83336cd6 100644
--- a/dist/locales/pt.json
+++ b/dist/locales/pt.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Escolha a língua",
             "localized_translation_name": "Nome"
         },
-        "zoom_in_edit": "Aproxime para Editar",
+        "zoom_in_edit": "Aproxime para editar",
         "login": "Iniciar sessão",
         "logout": "Terminar sessão",
         "loading_auth": "A fazer a ligação ao OpenStreetMap...",
@@ -361,7 +361,9 @@
                 "accuracy": "Precisão",
                 "unknown": "Desconhecido",
                 "show_tiles": "Mostrar Telas",
-                "hide_tiles": "Ocultar Telas"
+                "hide_tiles": "Ocultar Telas",
+                "show_vintage": "Mostrar data de captura",
+                "hide_vintage": "Ocultar data de captura"
             },
             "history": {
                 "key": "H",
@@ -668,6 +670,13 @@
         "mapillary": {
             "view_on_mapillary": "Ver esta imagem no Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Fotos ao nível da rua de OpenStreetCam",
+            "title": "Sobreposição de Fotos (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Ver esta imagem no OpenStreetCam"
+        },
         "help": {
             "title": "Ajuda",
             "key": "H",
@@ -1217,6 +1226,9 @@
                 "aeroway": {
                     "label": "Tipo"
                 },
+                "agrarian": {
+                    "label": "Produtos"
+                },
                 "amenity": {
                     "label": "Tipo"
                 },
@@ -1285,6 +1297,9 @@
                 "board_type": {
                     "label": "Tipo"
                 },
+                "boules": {
+                    "label": "Tipo"
+                },
                 "boundary": {
                     "label": "Tipo"
                 },
@@ -1304,6 +1319,10 @@
                 "bunker_type": {
                     "label": "Tipo"
                 },
+                "cables": {
+                    "label": "Cabos",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direção (Graus no sentido dos ponteiros do relógio)",
                     "placeholder": "45, 90, 180, 270"
@@ -1390,11 +1409,11 @@
                     "label": "Tipo"
                 },
                 "crane/type": {
-                    "label": "Tipo de grua",
+                    "label": "Tipo de Grua",
                     "options": {
-                        "floor-mounted_crane": "Grua fixa ao solo",
-                        "portal_crane": "Grua pórtica",
-                        "travel_lift": "Grua de transporte"
+                        "floor-mounted_crane": "Grua Fixa ao Solo",
+                        "portal_crane": "Grua de Ponte Rolante",
+                        "travel_lift": "Grua de Elevação de Embarcações"
                     }
                 },
                 "crop": {
@@ -1469,6 +1488,10 @@
                 "description": {
                     "label": "Descrição"
                 },
+                "devices": {
+                    "label": "Dispositivos",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Fraldário "
                 },
@@ -1543,6 +1566,9 @@
                         "wall": "Muro"
                     }
                 },
+                "fitness_station": {
+                    "label": "Tipo de Equipamento"
+                },
                 "fixme": {
                     "label": "Corrigir"
                 },
@@ -1550,6 +1576,9 @@
                     "label": "Tipo",
                     "placeholder": "Padrão"
                 },
+                "frequency": {
+                    "label": "Frequência Operacional"
+                },
                 "fuel": {
                     "label": "Combustível"
                 },
@@ -1581,6 +1610,9 @@
                 "generator/type": {
                     "label": "Tipo"
                 },
+                "government": {
+                    "label": "Tipo"
+                },
                 "grape_variety": {
                     "label": "Variedades de Castas"
                 },
@@ -1760,7 +1792,7 @@
                     "label": "Tempo máximo"
                 },
                 "maxweight": {
-                    "label": "undefined"
+                    "label": "Peso Máximo"
                 },
                 "memorial": {
                     "label": "Tipo"
@@ -1908,6 +1940,10 @@
                 "payment_multi": {
                     "label": "Tipos de pagamentos"
                 },
+                "phases": {
+                    "label": "Fases",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telefone / Telemóvel",
                     "placeholder": "+351 211 123456"
@@ -1987,6 +2023,9 @@
                 "railway": {
                     "label": "Tipo"
                 },
+                "rating": {
+                    "label": "Potência Nominal"
+                },
                 "recycling_accepts": {
                     "label": "Aceita"
                 },
@@ -1998,7 +2037,7 @@
                     }
                 },
                 "ref": {
-                    "label": "Código de referência "
+                    "label": "Código de Referência"
                 },
                 "ref_aeroway_gate": {
                     "label": "Número da Porta"
@@ -2195,6 +2234,9 @@
                 "studio": {
                     "label": "Tipo"
                 },
+                "substance": {
+                    "label": "Substância"
+                },
                 "substation": {
                     "label": "Tipo"
                 },
@@ -2221,6 +2263,15 @@
                 "surveillance/zone": {
                     "label": "Zona de videovigilância"
                 },
+                "switch": {
+                    "label": "Tipo",
+                    "options": {
+                        "circuit_breaker": "Disjuntor",
+                        "disconnector": "Chave Seccionadora",
+                        "earthing": "Ligação à Terra",
+                        "mechanical": "Mecânico"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Pavimento tátil para invisuais"
                 },
@@ -2293,6 +2344,19 @@
                     },
                     "placeholder": "Excelente, boa, má..."
                 },
+                "transformer": {
+                    "label": "Tipo",
+                    "options": {
+                        "auto": "Autotransformador",
+                        "auxiliary": "Auxiliar",
+                        "converter": "Conversor",
+                        "distribution": "Distribuição",
+                        "generator": "Gerador",
+                        "phase_angle_regulator": "Regulador de Ângulo de Fase",
+                        "traction": "Tração",
+                        "yes": "Desconhecido"
+                    }
+                },
                 "trees": {
                     "label": "Árvores"
                 },
@@ -2327,6 +2391,18 @@
                         "stratovolcano": "Estratovulcão"
                     }
                 },
+                "voltage": {
+                    "label": "Voltagem"
+                },
+                "voltage/primary": {
+                    "label": "Voltagem Primária"
+                },
+                "voltage/secondary": {
+                    "label": "Voltagem Secundária"
+                },
+                "voltage/tertiary": {
+                    "label": "Voltagem Terciária"
+                },
                 "wall": {
                     "label": "Tipo"
                 },
@@ -2354,6 +2430,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipédia"
+                },
+                "windings": {
+                    "label": "Bobine",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Configuração da Bobine",
+                    "options": {
+                        "delta": "Delta",
+                        "leblanc": "Leblanc",
+                        "open": "Aberto",
+                        "open-delta": "Delta Aberto",
+                        "scott": "Scott",
+                        "star": "Estrela / Y",
+                        "zigzag": "Zigue Zague"
+                    }
                 }
             },
             "presets": {
@@ -2677,6 +2769,10 @@
                     "name": "Parque de motas",
                     "terms": "Motorcycle Parking, Motas, Estacionamento"
                 },
+                "amenity/music_school": {
+                    "name": "Escola de Música",
+                    "terms": "conservatório,música,escola"
+                },
                 "amenity/nightclub": {
                     "name": "Discoteca (dança)",
                     "terms": "Nightclub, Salão de Dança"
@@ -2800,8 +2896,7 @@
                     "terms": "Academia, Creche, Colégio, Departamento, Externato, Liceu, Seminário"
                 },
                 "amenity/scrapyard": {
-                    "name": "Sucata",
-                    "terms": "scrapyard, scrap yard, scrap, sucata, sucatas, sucateiro, sucateiros, ferro-velho, ferro velho, "
+                    "name": "Sucata"
                 },
                 "amenity/shelter": {
                     "name": "Abrigo",
@@ -3261,13 +3356,17 @@
                     "name": "Catering",
                     "terms": "Caterer, Catering, Cattering, Comida"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Limpa-Chaminés",
+                    "terms": "chaminé, limpador de chaminés, limpar chaminés"
+                },
                 "craft/clockmaker": {
                     "name": "Relojoeiro",
                     "terms": "Clockmaker, Relógios"
                 },
                 "craft/confectionery": {
-                    "name": "Doçaria",
-                    "terms": "<translate with synonyms or related terms for 'Candy Maker', separated by commas>"
+                    "name": "Confeitaria",
+                    "terms": "Confectionery, Confeitos, Doces, Doçaria"
                 },
                 "craft/distillery": {
                     "name": "Destilaria",
@@ -3370,9 +3469,9 @@
                     "name": "Montador de Andaimes",
                     "terms": "Scaffolder, Colocador de Andaimes, Andaimes"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Escultor",
-                    "terms": "Sculpter, Escultura, Escultora"
+                    "terms": "escultora,esculpir,escultura,estatuária"
                 },
                 "craft/shoemaker": {
                     "name": "Sapateiro",
@@ -3382,10 +3481,6 @@
                     "name": "Pedreiro",
                     "terms": "Stonemason, Rocha, Canteiro, Pedra, Pedras, Pedraria, Rocha, Rochas"
                 },
-                "craft/sweep": {
-                    "name": "Limpador de Chaminés",
-                    "terms": "Chimney Sweep, Limpa Chaminés"
-                },
                 "craft/tailor": {
                     "name": "Alfaiate"
                 },
@@ -3654,9 +3749,13 @@
                     "name": "Trilho",
                     "terms": "Trilha, Caminho"
                 },
-                "highway/pedestrian": {
-                    "name": "Rua pedonal",
-                    "terms": "Pedestrian, Rua Pedonal, Rua Pedestre, Praça"
+                "highway/pedestrian_area": {
+                    "name": "Área Pedestre",
+                    "terms": "praça, largo"
+                },
+                "highway/pedestrian_line": {
+                    "name": "Estrada Pedonal",
+                    "terms": "pedestre, rua pedonal, rua pedestre, pedonal"
                 },
                 "highway/primary": {
                     "name": "Estrada primária",
@@ -3834,6 +3933,10 @@
                     "name": "Bacia hidrográfica",
                     "terms": "Bacia de Drenagem"
                 },
+                "landuse/brownfield": {
+                    "name": "Terreno Industrial Abandonado",
+                    "terms": "terreto, industrial, abandonado, contaminado"
+                },
                 "landuse/cemetery": {
                     "name": "Cemitério",
                     "terms": "Cemitério, Vala"
@@ -3873,6 +3976,10 @@
                     "name": "Relva",
                     "terms": "Relva, Grama"
                 },
+                "landuse/greenfield": {
+                    "name": "Terreno com loteamento planeado",
+                    "terms": "loteamento"
+                },
                 "landuse/harbour": {
                     "name": "Porto Marítimo",
                     "terms": "porto, abra, refúgio, abrigo, porto seguro, porto-seguro, porto abrigado, ancoradouro"
@@ -3881,6 +3988,14 @@
                     "name": "Zona industrial",
                     "terms": "Industrial"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Sucata",
+                    "terms": "sucateiro, ferro-velho, ferro velho"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Matadouro",
+                    "terms": "açougue, abatedouro"
+                },
                 "landuse/landfill": {
                     "name": "Aterro sanitário",
                     "terms": "Landfill, Lixeira, Sucata"
@@ -3957,6 +4072,10 @@
                     "name": "Zona de recreação",
                     "terms": "Recreation Ground"
                 },
+                "landuse/religious": {
+                    "name": "Área religiosa",
+                    "terms": "<translate with synonyms or related terms for 'Religious Area', separated by commas>"
+                },
                 "landuse/residential": {
                     "name": "Zona residencial",
                     "terms": "Residencial, Urbano, Antrópico, Residential"
@@ -4013,6 +4132,50 @@
                     "name": "Equipamento de Exercícios ao Ar Livre",
                     "terms": "Máquinas de exercícios, Máquina de execício, Exercício ao ar livre, Exercícios ao ar livre, Ginástica, Equipamento de exercícios"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Trave de Equilíbrio",
+                    "terms": "trave, equilíbrio, barra, balanço"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Caixa de Exercícios",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Box', separated by commas>"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Barra Fixa Horizontal",
+                    "terms": "barra, horizontal"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Escada Horizontal",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Monkey Bars', separated by commas>"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Dispositivo de Extensões",
+                    "terms": "Extensões"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Barras Paralelas",
+                    "terms": "barras, paralelas"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Barra de Flexões",
+                    "terms": "Flexões, Flexão, Extensão"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Argolas de Exercício",
+                    "terms": "Argolas"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Placa de Instruções de Exercício",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Instruction Sign', separated by commas>"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Dispositivo para Abdominais",
+                    "terms": "Abdominais"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Escadas de Exercício",
+                    "terms": "Escadas"
+                },
                 "leisure/garden": {
                     "name": "Jardim",
                     "terms": "Jardim, Garden"
@@ -4073,6 +4236,10 @@
                     "name": "Campo de voleibol de praia",
                     "terms": "Vólei, campo, praia, voleibol, volley"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Campo de Boules/Boccia",
+                    "terms": "<translate with synonyms or related terms for 'Boules/Bocce Court', separated by commas>"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Campo de boccia",
                     "terms": "Bowling Green"
@@ -4125,6 +4292,10 @@
                     "name": "Pista de atletismo ",
                     "terms": "Pista, corrida, jogging, atletismo, atleta"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna",
+                    "terms": "banho finlandês, banho turco, banho de vapor"
+                },
                 "leisure/slipway": {
                     "name": "Rampa para barcos",
                     "terms": "Slipway"
@@ -4179,7 +4350,7 @@
                 },
                 "man_made/crane": {
                     "name": "Grua",
-                    "terms": "<translate with synonyms or related terms for 'Crane', separated by commas>"
+                    "terms": "guindaste, gindaste, guindastre, gindastre"
                 },
                 "man_made/cutline": {
                     "name": "Aceiro / Linha corta-fogo",
@@ -4306,7 +4477,7 @@
                 },
                 "natural/beach": {
                     "name": "Praia",
-                    "terms": "praia"
+                    "terms": "areal"
                 },
                 "natural/cave_entrance": {
                     "name": "Entrada de gruta",
@@ -4416,9 +4587,25 @@
                     "name": "Escritório da administração local",
                     "terms": "Administrative Office, Administrativo"
                 },
+                "office/adoption_agency": {
+                    "name": "Agência de Adoção",
+                    "terms": "adoção, adopção, adotar, adoptar"
+                },
+                "office/advertising_agency": {
+                    "name": "Agência de Publicidade",
+                    "terms": "publicidade, anúncio"
+                },
                 "office/architect": {
-                    "name": "Arquiteto(a)",
-                    "terms": "Architect, Arquiteto, Arquitetos, Arquiteta, Arquitetas, Arquitecto, Arquitectos, Arquitecta, Arquitectas, Arquitetura, Arquitectura"
+                    "name": "Arquiteto",
+                    "terms": "arquitecto, arquitectura, arquitetura"
+                },
+                "office/association": {
+                    "name": "Organização Sem Fins Lucrativos",
+                    "terms": "ONG"
+                },
+                "office/charity": {
+                    "name": "Instituição de Caridade",
+                    "terms": "Caridade, Filantropia"
                 },
                 "office/company": {
                     "name": "Escritório de empresa",
@@ -4433,9 +4620,13 @@
                     "terms": "Educacional Institution, Escola, Instituição Educacional, Educação, Educacional"
                 },
                 "office/employment_agency": {
-                    "name": "Agência de emprego",
+                    "name": "Agência de Emprego",
                     "terms": "Employment Agency, Agência de Emprego, Emprego"
                 },
+                "office/energy_supplier": {
+                    "name": "Fornecedor de Energia",
+                    "terms": "Eletricidade, Gás, Botijas de Gás, Combustível"
+                },
                 "office/estate_agent": {
                     "name": "Agência imobiliária",
                     "terms": "Real Estate Office, Imóvel, Imóveis, Mudanças, Compra de Casas, Casa, Casas, habitação, Habitações"
@@ -4444,21 +4635,37 @@
                     "name": "Finanças",
                     "terms": "Financial Office, Posto de Finanças, Balcão de Finanças, Repartição"
                 },
+                "office/forestry": {
+                    "name": "Posto Florestal",
+                    "terms": "Guarda Florestal"
+                },
+                "office/foundation": {
+                    "name": "Fundação",
+                    "terms": "<translate with synonyms or related terms for 'Foundation Office', separated by commas>"
+                },
                 "office/government": {
                     "name": "Escritório da administração nacional",
-                    "terms": "Government Office, Governo, Estado"
+                    "terms": "Government Office, Governo, Estado, Finanças, Segurança Social, DGV, Instituto de Emprego, Centro de Emprego, Direcção-Geral, Direção-Geral, Loja do Cidadão"
                 },
                 "office/government/register_office": {
                     "name": "Conservatória do Registo Civil",
                     "terms": "Register Office, Conservatória, Registo Civil, Registo, Nascimento, Casamento, Óbito, Divórcio, Conservatória dos Registos Centrais, estado civil, "
                 },
+                "office/government/tax": {
+                    "name": "Finanças",
+                    "terms": "Direção de Finanças, Repartição de Finanças, Direção das Finanças, Repartição das Finanças"
+                },
+                "office/guide": {
+                    "name": "Guia Turístico",
+                    "terms": "Guia"
+                },
                 "office/insurance": {
                     "name": "Agência de seguros",
                     "terms": "Insurance Office, Seguros, Seguro"
                 },
                 "office/it": {
-                    "name": "Escritório de informática",
-                    "terms": "IT Office"
+                    "name": "Escritório de Tecnologia da Informação",
+                    "terms": "<translate with synonyms or related terms for 'Information Technology Office', separated by commas>"
                 },
                 "office/lawyer": {
                     "name": "Escritório de advogados",
@@ -4466,16 +4673,24 @@
                 },
                 "office/lawyer/notary": {
                     "name": "Notário",
-                    "terms": "Notary Office"
+                    "terms": "Notary Office, Notariado"
+                },
+                "office/moving_company": {
+                    "name": "Empresa de Mudanças",
+                    "terms": "Mudanças, Transportadora"
                 },
                 "office/newspaper": {
-                    "name": "Sede/filial de Jornal",
-                    "terms": "Newspaper, Jornal, revista"
+                    "name": "Sede/Filial de Jornal",
+                    "terms": "jornal"
                 },
                 "office/ngo": {
                     "name": "Escritório de ONG",
                     "terms": "NGO Office, Organização, Organização Não Governamental, NGO, ONG"
                 },
+                "office/notary": {
+                    "name": "Notário",
+                    "terms": "Notary Office, Notariado"
+                },
                 "office/physician": {
                     "name": "Médico especialista"
                 },
@@ -4483,21 +4698,41 @@
                     "name": "Sede/filial de partido político",
                     "terms": "Political Party, Partido, Partidos"
                 },
+                "office/private_investigator": {
+                    "name": "Detetive Privado",
+                    "terms": "Detetive, Detetive Particular"
+                },
+                "office/quango": {
+                    "name": "Escritório de NGO Governamental",
+                    "terms": "<translate with synonyms or related terms for 'Quasi-NGO Office', separated by commas>"
+                },
                 "office/research": {
                     "name": "Centro de investigação",
                     "terms": "Research Office, Escritório de Investigação, Centro de Pesquisa"
                 },
+                "office/surveyor": {
+                    "name": "Empresa de Agrimensura",
+                    "terms": "<translate with synonyms or related terms for 'Surveyor Office', separated by commas>"
+                },
+                "office/tax_advisor": {
+                    "name": "Escritório de Assessor Fiscal",
+                    "terms": "Assessoria Fiscal, Acessoria Fiscal, Acecoria Fiscal, Açessoria Fiscal, Açecoria Fiscal, Açesoria Fiscal, Acessor Fiscal, Acecor Fiscal, Açessor Fiscal, Açecor Fiscal, Açesor Fiscal"
+                },
                 "office/telecommunication": {
-                    "name": "Escritório de telecomunicações",
+                    "name": "Empresa de telecomunicações",
                     "terms": "Telecom Office, Telecomunicações, Internet, Televisão"
                 },
                 "office/therapist": {
-                    "name": "Terapeuta",
+                    "name": "Terapista",
                     "terms": "Therapist, Terapista, Terapêutica"
                 },
                 "office/travel_agent": {
                     "name": "Agência de viagens"
                 },
+                "office/water_utility": {
+                    "name": "Fornecedor de Água",
+                    "terms": "Água, Companhia de Água, Cooperativa de Água"
+                },
                 "piste": {
                     "name": "Pista de ski",
                     "terms": "Piste/Ski Trail, Ski"
@@ -4520,6 +4755,10 @@
                     "name": "Ilha",
                     "terms": "Arquipélago, Atol, Ilha, Ilhéu, Recife, Restinga"
                 },
+                "place/islet": {
+                    "name": "Ilhéu",
+                    "terms": "ilhota, farelhão, pequena ilha, ilha pequena, rochedo, banco de areia, roca, cayo"
+                },
                 "place/isolated_dwelling": {
                     "name": "Habitação isolada",
                     "terms": "Isolated Dwelling, isolado, remoto, remota"
@@ -4532,6 +4771,10 @@
                     "name": "Bairro",
                     "terms": "Neigborhood, Vizinhança"
                 },
+                "place/plot": {
+                    "name": "Lote",
+                    "terms": "parcela"
+                },
                 "place/quarter": {
                     "name": "Quarteirão",
                     "terms": "quarteirão, bairro, vizinhança, limite"
@@ -4576,6 +4819,10 @@
                     "name": "Barra Fixa Horizontal",
                     "terms": "Barra Horizontal"
                 },
+                "playground/rocker": {
+                    "name": "Baloiço de mola",
+                    "terms": "Mola"
+                },
                 "playground/roundabout": {
                     "name": "Gira-Gira",
                     "terms": "Girar"
@@ -4646,6 +4893,10 @@
                     "name": "Subestação",
                     "terms": "Substation, energia, Sub-estação, Sub estação, Distribuição"
                 },
+                "power/switch": {
+                    "name": "Interruptor",
+                    "terms": "<translate with synonyms or related terms for 'Power Switch', separated by commas>"
+                },
                 "power/tower": {
                     "name": "Torre de alta tensão",
                     "terms": "High-Voltage Tower, Torre de Alta-Tensão, Poste de Alta-Tensão"
@@ -4697,6 +4948,10 @@
                     "name": "Passagem de nível (estrada)",
                     "terms": "Railway Crossing (Road)"
                 },
+                "railway/light_rail": {
+                    "name": "Metro Ligeiro",
+                    "terms": "Metrô leve, metro ligeiro, metropolitano de superfície, veículo leve sobre trilhos, comboio ligeiro"
+                },
                 "railway/milestone": {
                     "name": "Marco Quilométrico Ferroviário",
                     "terms": "Railway Milestone, marco quilométrico"
@@ -4764,6 +5019,10 @@
                     "name": "Loja",
                     "terms": "Loja, Venda, Vendedor"
                 },
+                "shop/agrarian": {
+                    "name": "Loja de Produtos Agrícolas",
+                    "terms": "produtos agrícolas, produtos agrículas"
+                },
                 "shop/alcohol": {
                     "name": "Loja de bebidas alcoólicas",
                     "terms": "Alcool"
@@ -5187,8 +5446,8 @@
                     "terms": "Ticket Seller, Bilheteria, Bilhete, Ingresso"
                 },
                 "shop/tiles": {
-                    "name": "Loja de telhas",
-                    "terms": "<translate with synonyms or related terms for 'Tile Shop', separated by commas>"
+                    "name": "Loja de Tijoleiras",
+                    "terms": "Tijoleira, Azulejo, Ladrilho"
                 },
                 "shop/tobacco": {
                     "name": "Tabacaria",
@@ -5341,6 +5600,10 @@
                     "name": "Miradouro",
                     "terms": "Viewpoint, Vista"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Abrigo Remoto",
+                    "terms": "Cabana, Abrigo de montanha, cabana de montanha"
+                },
                 "tourism/zoo": {
                     "name": "Jardim zoológico",
                     "terms": "Zoológico, Zoo, Zológico, Animais"
@@ -5570,22 +5833,36 @@
                 "attribution": {
                     "text": "Termos e opinião"
                 },
-                "description": "Imagens de satélite DigitalGlobe Premium.",
-                "name": "Imagens aéreas DigitalGlobe Premium"
+                "description": "Imagens aéreas DigitalGlobe Premium.",
+                "name": "DigitalGlobe Premium"
+            },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Termos e Opinião"
+                },
+                "description": "Limites das imagens e datas de captura. As etiquetas aparecem no nível de aproximação 14 ou superior.",
+                "name": "DigitalGlobe Premium Vintage"
             },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Termos e opinião"
                 },
                 "description": "Imagens aéreas DigitalGlobe Standard.",
-                "name": "Imagens aéreas DigitalGlobe Standard"
+                "name": "DigitalGlobe Standard"
+            },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Termos e Opinião"
+                },
+                "description": "Limites das imagens e datas de captura. As etiquetas aparecem no nível de aproximação 14 ou superior.",
+                "name": "DigitalGlobe Standard Vintage"
             },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Termos e Opinião"
                 },
                 "description": "Imagens aéreas Esri.",
-                "name": "Imagens aéreas Esri."
+                "name": "Esri"
             },
             "MAPNIK": {
                 "attribution": {
@@ -5599,7 +5876,7 @@
                     "text": "Termos e opinião"
                 },
                 "description": "Imagens aéreas e de satélite.",
-                "name": "Imagens aéreas Mapbox"
+                "name": "Mapbox Satellite"
             },
             "OSM_Inspector-Addresses": {
                 "attribution": {
diff --git a/dist/locales/ro.json b/dist/locales/ro.json
index 1cf04ad4d..d71b0735c 100644
--- a/dist/locales/ro.json
+++ b/dist/locales/ro.json
@@ -212,7 +212,6 @@
             "localized_translation_language": "Alege limba",
             "localized_translation_name": "Nume"
         },
-        "zoom_in_edit": "Mărește pentru a edita",
         "login": "login",
         "logout": "logout",
         "loading_auth": "Conectare la OpenStreetMap..",
@@ -463,8 +462,7 @@
         },
         "splash": {
             "welcome": "Bine ai venit în editorul iD OpenStreetMap",
-            "walkthrough": "Începe ghidul",
-            "start": "Editează acum"
+            "walkthrough": "Începe ghidul"
         },
         "source_switch": {
             "live": "live",
@@ -488,10 +486,6 @@
             "tag_suggests_area": "Tag-ul {tag} sugerează că linia trebuie sa fie o suprafață, dar nu e.",
             "deprecated_tags": "Tag-uri învechite: {tags}"
         },
-        "zoom": {
-            "in": "Mărește",
-            "out": "Micșorează"
-        },
         "gpx": {
             "local_layer": "Fișier local",
             "zoom": "Mărește la strat",
@@ -1995,9 +1989,6 @@
                     "name": "Școală",
                     "terms": "<translate with synonyms or related terms for 'School Grounds', separated by commas>"
                 },
-                "amenity/scrapyard": {
-                    "terms": "<translate with synonyms or related terms for 'Scrap Yard', separated by commas>"
-                },
                 "amenity/shelter": {
                     "terms": "<translate with synonyms or related terms for 'Shelter', separated by commas>"
                 },
@@ -2436,10 +2427,6 @@
                 "craft/scaffolder": {
                     "terms": "<translate with synonyms or related terms for 'Scaffolder', separated by commas>"
                 },
-                "craft/sculpter": {
-                    "name": "Sculptor",
-                    "terms": "<translate with synonyms or related terms for 'Sculpter', separated by commas>"
-                },
                 "craft/shoemaker": {
                     "name": "Cizmar",
                     "terms": "<translate with synonyms or related terms for 'Shoemaker', separated by commas>"
@@ -2447,9 +2434,6 @@
                 "craft/stonemason": {
                     "terms": "<translate with synonyms or related terms for 'Stonemason', separated by commas>"
                 },
-                "craft/sweep": {
-                    "terms": "<translate with synonyms or related terms for 'Chimney Sweep', separated by commas>"
-                },
                 "craft/tiler": {
                     "terms": "<translate with synonyms or related terms for 'Tiler', separated by commas>"
                 },
@@ -2601,10 +2585,6 @@
                     "name": "Potecă",
                     "terms": "<translate with synonyms or related terms for 'Path', separated by commas>"
                 },
-                "highway/pedestrian": {
-                    "name": "Drum Pietonal",
-                    "terms": "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
-                },
                 "highway/primary": {
                     "name": "Drum principal",
                     "terms": "<translate with synonyms or related terms for 'Primary Road', separated by commas>"
@@ -3303,18 +3283,10 @@
                     "name": "Oficiu",
                     "terms": "<translate with synonyms or related terms for 'Office', separated by commas>"
                 },
-                "office/accountant": {
-                    "name": "Socotitor",
-                    "terms": "<translate with synonyms or related terms for 'Accountant', separated by commas>"
-                },
                 "office/administrative": {
                     "name": "Oficiu Administrativ",
                     "terms": "<translate with synonyms or related terms for 'Administrative Office', separated by commas>"
                 },
-                "office/architect": {
-                    "name": "Arhitect",
-                    "terms": "<translate with synonyms or related terms for 'Architect', separated by commas>"
-                },
                 "office/company": {
                     "name": "Oficiu de Companie",
                     "terms": "<translate with synonyms or related terms for 'Company Office', separated by commas>"
@@ -3349,10 +3321,6 @@
                     "name": "Oficiu de Asigurare",
                     "terms": "<translate with synonyms or related terms for 'Insurance Office', separated by commas>"
                 },
-                "office/it": {
-                    "name": "Oficiu IT",
-                    "terms": "<translate with synonyms or related terms for 'IT Office', separated by commas>"
-                },
                 "office/lawyer": {
                     "name": "Cabinet de Avocatură",
                     "terms": "<translate with synonyms or related terms for 'Law Office', separated by commas>"
@@ -3361,10 +3329,6 @@
                     "name": "Notar",
                     "terms": "<translate with synonyms or related terms for 'Notary Office', separated by commas>"
                 },
-                "office/newspaper": {
-                    "name": "Ziar",
-                    "terms": "<translate with synonyms or related terms for 'Newspaper', separated by commas>"
-                },
                 "office/ngo": {
                     "name": "Oficiu NGO",
                     "terms": "<translate with synonyms or related terms for 'NGO Office', separated by commas>"
@@ -3384,10 +3348,6 @@
                     "name": "Oficiu Telecom",
                     "terms": "<translate with synonyms or related terms for 'Telecom Office', separated by commas>"
                 },
-                "office/therapist": {
-                    "name": "Terapist",
-                    "terms": "<translate with synonyms or related terms for 'Therapist', separated by commas>"
-                },
                 "office/travel_agent": {
                     "name": "Agenție de Călătorii"
                 },
@@ -4055,10 +4015,6 @@
                 "tourism/caravan_site": {
                     "terms": "<translate with synonyms or related terms for 'RV Park', separated by commas>"
                 },
-                "tourism/chalet": {
-                    "name": "Șalet",
-                    "terms": "<translate with synonyms or related terms for 'Chalet', separated by commas>"
-                },
                 "tourism/gallery": {
                     "name": "Galerie de Artă",
                     "terms": "<translate with synonyms or related terms for 'Art Gallery', separated by commas>"
diff --git a/dist/locales/ru.json b/dist/locales/ru.json
index 2380d85af..a165ccf71 100644
--- a/dist/locales/ru.json
+++ b/dist/locales/ru.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Выберите язык",
             "localized_translation_name": "Название"
         },
-        "zoom_in_edit": "Приблизьте для редактирования",
         "login": "войти",
         "logout": "выйти",
         "loading_auth": "Подключение к OpenStreetMap…",
@@ -334,6 +333,7 @@
             "save": "Сохранить",
             "cancel": "Отменить",
             "changes": "Правок: {count}",
+            "download_changes": "Скачать osmChange файл",
             "warnings": "Предупреждения",
             "modified": "Изменён",
             "deleted": "Удалён",
@@ -360,7 +360,9 @@
                 "accuracy": "Точность",
                 "unknown": "Неизвестно",
                 "show_tiles": "Показать тайлы",
-                "hide_tiles": "Спрятать тайлы"
+                "hide_tiles": "Спрятать тайлы",
+                "show_vintage": "Показать Vintage",
+                "hide_vintage": "Скрыть Vintage"
             },
             "history": {
                 "key": "H",
@@ -479,6 +481,12 @@
             "description": "Данные карты",
             "key": "F",
             "data_layers": "Слой данных",
+            "layers": {
+                "osm": {
+                    "tooltip": "Картографические данные OpenStreetMap",
+                    "title": "Данные OpenStreetMap"
+                }
+            },
             "fill_area": "Заливать полигоны",
             "map_features": "Объекты на карте",
             "autohidden": "Эти объекты были автоматически скрыты, чтобы не загромождать карту на экране. Чтобы их редактировать, приблизьте карту."
@@ -572,6 +580,7 @@
                 "keep_remote": "Чужая версия",
                 "restore": "Восстановить",
                 "delete": "Оставить удалённым",
+                "download_changes": "Или скачать osmChange файл",
                 "done": "Все конфликты устранены!",
                 "help": "Кто-то из участников OSM также изменил объекты, исправленные вами.\nПросмотрите каждый конфликт в списке ниже и решите, оставить ваши\nправки или принять правки другого участника.\n"
             }
@@ -604,7 +613,7 @@
             "welcome": "Вас приветствует iD — редактор карт OpenStreetMap",
             "text": "Редактор iD — простой, но мощный инструмент для редактирования лучшей в мире бесплатной открытой карты. Версия программы: {version}. Дополнительную информацию смотрите на {website}, об ошибках сообщайте на {github}.",
             "walkthrough": "Запустить обучение",
-            "start": "В редактор"
+            "start": "Редактировать"
         },
         "source_switch": {
             "live": "основной",
@@ -663,10 +672,14 @@
             "title": "Справка",
             "key": "H",
             "help": "# Справка\n\nЭто редактор [OpenStreetMap](http://www.openstreetmap.org/): общедоступной,\nсвободноредактируемой карты мира. Вы можете использовать этот редактор для добавления\nи обновления карты вашей местности, улучшая открытую и свободную карту мира и помогая, таким образом, всем.\n\nВаши правки увидит каждый пользователь карты OpenStreetMap. Для\nредактирования вам потребуется [войти в OpenStreetMap](https://www.openstreetmap.org/login).\n\n[Редактор iD](http://ideditor.com/) — открытый совместный проект\nс [исходным кодом на GitHub](https://github.com/openstreetmap/iD).\n",
+            "editing_saving": "# Редактирование и сохранение\n\nЭтот редактор создан в основном для онлайн-редактирования, и\nсейчас вы работаете с ним именно через сайт.\n\n### Выбор объектов\n\nЧтобы выбрать объект карты, например дорогу или точку\nинтереса, щёлкните по нему на карте. Выбранный объект будет\nпомечен выделением, откроется панель его свойств, а рядом с ним\nпоявится меню с действиями, которые вы можете над ним совершить.\n\nМожно выделить несколько объектов сразу, удерживая при щелчке\nклавишу Shift, или растягивая рамку выделения с нажатой кнопкой\nмыши. При этом, все точки внутри рамки будут выделены.\n\n### Сохранение правок\n\nКогда вы редактируете карту, например изменяете дороги, здания и\nместа, эти изменения хранятся на вашем компьютере, пока вы не\nсохраните их на сервере. Не бойтесь ошибиться — изменения\nможно откатить кнопкой «Отмена», а также снова повторить их\nкнопкой «Повтор».\n\nНажмите «Сохранить» для сохранения группы изменений — например,\nвы закончили редактировать один район города и хотите продолжить\nс другим. У вас будет возможность просмотреть ваши изменения, а\nредактор покажет предложения и предупреждения, если\nв изменённых данных что-то не так.\n\nЕсли всё верно, введите краткое описание ваших изменений и ещё\nраз нажмите «Сохранить» для отправки данных на [OpenStreetMap.org](http://www.openstreetmap.org/),\nгде они станут видны другим участникам для просмотра и\nдальнейшего улучшения карты.\n\nЕсли у вас не получается закончить с правками за один раз,\nокно редактора можно закрыть, и тогда при следующем запуске\nредактора (на том же компьютере и в том же браузере) программа\nпредложит восстановить вашу работу.\n\n### Использование редактора\n\nСписок доступных горячих клавиш можно получить нажатием `?`.\n",
+            "roads": "# Дороги\n\nВ этом редакторе вы можете создавать, изменять и удалять дороги.\nДороги бывают самых разных типов: тропы, шоссе, грунтовки, велодорожки\nи другие — любой участок местности, по которому есть какое-либо движение.\n\n### Выбор\n\nЩёлкните по дороге, чтобы выбрать её. Дорога подсветится контуром выделения,\nслева появится редактор свойств дороги. Щелчок правой кнопкой мыши на\nлинии дороги покажет меню действий.\n\n### Изменение\n\nИногда вам могут встретиться дороги, не совпадающие со слоем снимка или\nGPS-трека. Такие дороги можно отредактировать.\n\nЩёлкните по дороге, которую надо изменить. Линия дороги подсветится, и\nна ней появятся контрольные точки, которые можно перетащить на правильные\nместа. Если вы захотите сделать дорогу более детализированной, дважды\nщёлкните по линии для добавления в этом месте новой контрольной точки.\n\nЕсли в реальности дороги соединяются на перекрестке, а на карте не\nсоединены — перетащите одну из контрольных точек дороги на линию другой.\nПравильное соединение дорог очень важно для карты и навигаторов,\nпрокладывающих по ним маршрут.\n\nЧтобы передвинуть линию дороги целиком, выберите инструмент «Перемещение»\nили нажмите клавишу «M». Повторный щелчок мышью зафиксирует дорогу\nна новом месте.\n\n### Удаление\n\nЕсли дорога нарисована совсем неправильно — её не видно на спутниковом снимке,\nа в идеальном случае вы были сами на месте и убедились в её отсутствии — вы\nможете удалить дорогу с карты. Будьте очень осторожны, удаляя что-либо: как и\nдругие ваши правки, это затрагивает всех пользователей карты. Спутниковые снимки\nчасто бывают устаревшими, так что дорога может быть просто построена недавно.\n\nЧтобы удалить дорогу, выберите её щелчком мыши, затем щелкните\nпо значку мусорного ведра или нажмите клавишу Delete.\n\n### Создание\n\nНашли место, где в действительности есть дорога, а на карте её нет?\nНажмите кнопку «Линия» слева вверху окна редактора или клавишу `2`,\nчтобы начать рисовать линию.\n\nЩёлкните на карте в месте, где должна начинаться дорога. Если она ответвляется\nот уже нарисованной, можно начать рисование щелчком мыши в месте\nих пересечения.\n\nЗатем щёлкайте на карте вдоль траектории дороги согласно спутниковому снимку\nили GPS-треку. Если новая дорога пересекается с другой, обязательно щёлкните\nпо уже существующей, чтобы создать точку перекрёстка.\nЧтобы закончить рисование, сделайте двойной щелчок мышью или\nнажмите Enter на клавиатуре.\n",
             "gps": "# GPS\n\nДанные GPS — наиболее достоверный источник данных для OpenStreetMap. Этот редактор\nподдерживает загрузку локальных файлов треков в формате .gpx с вашего компьютера.\nВы можете записывать такие треки с помощью приложений для смартфонов и GPS-устройств.\n\nБолее подробно о сборе данных GPS можно прочесть\nна странице [Mapping with a Smartphone, GPS or Paper](http://learnosm.org/en/mobile-mapping/).\n\nЧтобы воспользоваться GPX-треками при рисовании карты,\nперетащите файл трека прямо в окно редактора. Если трек\nуспешно загрузится, то он отобразится на карте в виде светло-фиолетовой\nлинии. В меню «Данные карты» можно выключить, включить или\nмасштабировать слой с треками.\n\nТрек при этом не будет загружен в базу OpenStreetMap, лучший\nспособ его использования — нарисовать новые объекты карты,\nосновываясь на данных трека; вы также можете [загрузить его на\nOpenStreetMap](http://www.openstreetmap.org/trace/create), чтобы\nим смогли воспользоваться другие.\n",
             "imagery": "# Спутниковые снимки\n\nСнимки земной поверхности с воздуха — важный источник данных для картирования. В меню «Настройка слоёв» с левой стороны окна редактора доступно подключение слоёв спутниковых снимков, аэрофотосъёмки и других открытых источников изображений.\n\nПо умолчанию в редакторе подключён слой спутниковых снимков  [Bing Maps](http://www.bing.com/maps/), но в разных местах земного шара могут быть доступны и другие источники слоёв. Для ряда районов некоторых стран, к примеру США, Франции и Дании, доступны изображения очень высокого качества.\n\nИногда спутниковые снимки сдвинуты относительно данных карты по вине поставщика снимков. Если вы видите множество дорог, не совпадающих со снимком, не начинайте передвигать их под снимок. Вместо этого нужно сдвинуть снимок для совпадения с существующими данными — для этого в меню «Настройка слоёв» есть кнопка «Исправить смещение».\n",
             "addresses": "# Адреса\n\nАдреса — одна из самых важных составляющих карты.\n\nВ OpenStreetMap адреса хранятся в свойствах зданий и мест, расположенных вдоль улиц.\n\nАдресную информацию можно добавлять к полигонам зданий, а также к отдельным точкам. Лучший источник адресов — ваши собственные знания или данные, полученные после обхода местности. Как и в случае с другими данными, копирование адресов из коммерческих источников вроде Yandex, 2GIS, Google строго запрещено.\n",
-            "inspector": "# Использование редактора свойств\n\nРедактор свойств — это элемент интерфейса программы,\nнаходящийся в левой части окна, который позволяет отредактировать\nсвойства выбранного объекта.\n\n### Выбор типа объекта\n\nПосле того как вы добавили точку, линию или область, вы можете\nвыбрать, какой именно это тип объекта: шоссе, обычная дорога,\nсупермаркет или кафе. Редактор свойств показывает кнопки для\nвыбора наиболее часто используемых типов объектов, и можно\nвоспользоваться строкой поиска, чтобы найти другие типы.\n\nЩёлкните по значку «i» в нижнем правом углу кнопки типа\nобъекта, чтобы узнать о нём больше. Щёлкните по самой кнопке,\nчтобы выбрать этот тип.\n\n### Использование полей и редактирование тегов\n\nПосле того как вы выберете тип объекта или выделите объект, у\nкоторого тип уже проставлен, редактор свойств покажет поля\nописывающие его свойства, например название или адрес.\n\nНиже этих полей находится выпадающий список «Добавить поле»,\nс помощью которого можно добавить дополнительные свойства,\nнапример ссылку на статью в Википедии, информацию о\nдоступности для инвалидов и др.\n\nВ самом низу окна редактора свойств находится кнопка\n«Дополнительные теги», позволяющая добавить объекту произвольные\nтеги. О наиболее популярных комбинациях тегов можно узнать на странице [Taginfo](http://taginfo.openstreetmap.org/).\n\nИзменения в редакторе свойств применяются к объекту\nавтоматически. Как и другие изменения, их можно откатить кнопкой «Отмена».\n"
+            "inspector": "# Использование редактора свойств\n\nРедактор свойств — это элемент интерфейса программы,\nнаходящийся в левой части окна, который позволяет отредактировать\nсвойства выбранного объекта.\n\n### Выбор типа объекта\n\nПосле того как вы добавили точку, линию или область, вы можете\nвыбрать, какой именно это тип объекта: шоссе, обычная дорога,\nсупермаркет или кафе. Редактор свойств показывает кнопки для\nвыбора наиболее часто используемых типов объектов, и можно\nвоспользоваться строкой поиска, чтобы найти другие типы.\n\nЩёлкните по значку «i» в нижнем правом углу кнопки типа\nобъекта, чтобы узнать о нём больше. Щёлкните по самой кнопке,\nчтобы выбрать этот тип.\n\n### Использование полей и редактирование тегов\n\nПосле того как вы выберете тип объекта или выделите объект, у\nкоторого тип уже проставлен, редактор свойств покажет поля\nописывающие его свойства, например название или адрес.\n\nНиже этих полей находится выпадающий список «Добавить поле»,\nс помощью которого можно добавить дополнительные свойства,\nнапример ссылку на статью в Википедии, информацию о\nдоступности для инвалидов и др.\n\nВ самом низу окна редактора свойств находится кнопка\n«Дополнительные теги», позволяющая добавить объекту произвольные\nтеги. О наиболее популярных комбинациях тегов можно узнать на странице [Taginfo](http://taginfo.openstreetmap.org/).\n\nИзменения в редакторе свойств применяются к объекту\nавтоматически. Как и другие изменения, их можно откатить кнопкой «Отмена».\n",
+            "buildings": "# Здания\n\nOpenStreetMap — крупнейшая в мире база данных о зданиях. Вы можете добавлять и изменять эти данные.\n\n### Выбор\n\nЧтобы выбрать здание, нужно щёлкнуть по его полигону. При этом здание\nбудет подсвечено, слева откроется редактор его свойств.\nЩелчок правой кнопкой мыши на линии полигона здания покажет меню действий.\n\n### Редактирование\n\nИногда здания неправильно размещены или имеют неверные свойства.\n\nЧтобы переместить здание целиком, выберите его и нажмите клавишу 'M'\nили щёлкните на инструменте «Перемещение» в меню действий.\nПеретащите здание мышью в нужное место и щёлкните, чтобы зафиксировать\nего на новом месте.\n\nЧтобы изменить форму здания, перетаскивайте точки его полигона на нужные места.\n\n### Создание\n\nОдно из основных противоречий в добавлении новых зданий\nв OpenStreetMap заключается в том, что их можно задавать как\nполигонами, так и точками. Стоит взять за правило такой подход:\nсамо здание по возможности рисуется полигоном, а находящиеся\nв этом здании компании, магазины и другие подобные объекты,\nпривязанные к зданиям, рисуются точками, находящимися внутри\nполигона здания.\n\nНарисуйте полигон здания с помощью кнопки «Область», находящейся\nслева вверху окна, затем закончите рисование либо нажатием клавиши\nEnter на клавиатуре, либо щёлкнув мышью на первой нарисованной\nточке здания.\n\n### Удаление\n\nЕсли здание нарисовано совсем неправильно — его нет на спутниковом\nснимке или вы лично, на месте убедились, что оно отсутствует — вы\nможете удалить его с карты. Будьте очень осторожны при удалении\nобъектов: ваши правки затрагивают всех пользователей OSM, а\nснимки часто бывают устаревшими. Возможно,\nэто здание построили недавно.\n\nЧтобы удалить здание, выделите его щелчком мыши, а затем нажмите на значок мусорного ведра в меню действий или клавишу Delete.\n",
+            "relations": "# Отношения\n\nОтношение — это специальный тип объекта в OpenStreetMap,\nкоторый объединяет другие объекты вместе. Например,\nдва распространённых типа отношений — *отношения маршрутов*, которые\nобъединяют вместе участки дорог, принадлежащих одной автостраде или шоссе,\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Чтобы удалить объект из отношения, выберите объект и нажмите кнопку\nс мусорной корзиной рядом с отношением, из которого вы хотите его удалить.\n\nИспользуя инструмент «Объединить», можно создать мультиполигон с отверстиями.\nНарисуйте две границы (внутреннюю и внешнюю) и, удерживая клавишу\nShift, щёлкните по каждой, чтобы они обе были выделены, после чего нажмите\nкнопку «Объединить эти линии» (+).\n"
         },
         "intro": {
             "done": "выполнено",
@@ -802,35 +815,35 @@
                 "title": "Перемещение",
                 "drag": "Область рисования карты показывает данные OpenStreetMap поверх подложки.{br}Двигайте карту, нажав левую кнопку мыши и перетаскивая её. Кнопки клавиатуры со стрелочками тоже работают. **Попробуйте перетащить карту!**",
                 "zoom": "Изменить масштаб можно колесом мыши или прокруткой на трекпеде, либо кнопкам {plus} и {minus}. **Попробуйте увеличить карту!**",
-                "features": "Мы используем слово *объект* для описания предметов, отображаемых на карте. Любой предмет реального мира может быть добавлен как объект не карте в OpenStreetMap.",
+                "features": "Мы используем слово *объект* для описания предметов, отображаемых на карте. Любой предмет реального мира может быть добавлен как объект на карте в OpenStreetMap.",
                 "points_lines_areas": "Объекты на карте создаются с помощью *точек, линий или областей.*",
-                "nodes_ways": "В OpenStreetMap, точки иногда называются *улзами*, а линии и области иногда называются *отрезками*.",
+                "nodes_ways": "В OpenStreetMap, точки иногда называются *узлами*, а линии и области иногда называются *отрезками*.",
                 "click_townhall": "Любые объекты на карте могут быть выбраны щелчком на них. **Нажмите на точку чтобы выбрать ее.**",
                 "selected_townhall": "Отлично! Теперь точка выделена. Выбранный объект выделяется пульсирующей обводкой.",
                 "editor_townhall": "Когда объект выбран, рядом с картой показывается *редактор объекта*.",
                 "preset_townhall": "В верхней части редактора объекта отображается тип объекта. Эта точка имеет тип {preset}.",
                 "fields_townhall": "Средняя часть редактора объектов содержит *поля*, соответствующие свойствам объекта, таким как название и адрес.",
                 "close_townhall": "**Закройте редактор объекта с помощью клавиши Esc или нажмите кнопку {button} в верхнем углу.**",
-                "search_street": "Вы можете искать объекта на видимой части карты или во всём мире. **Попробуйте искать '{name}'.**",
+                "search_street": "Вы можете искать объекты на видимой части карты или во всём мире. **Попробуйте искать '{name}'.**",
                 "choose_street": "**Выберите {name} из списка чтобы выбрать его.**",
-                "selected_street": "Отлично! {name} теперь выбрано.",
-                "editor_street": "Поля, отображаемые для улицы отличаются от полей показываемых для здания администрации.{br}Для выбранной улицы редактор объекта покажет поля наподобие '{field1}' и '{field2}'. **Закройте редактор объекта нажав escape или кнопку {button}.**",
+                "selected_street": "Отлично! Теперь выбрана {name}.",
+                "editor_street": "Поля, отображаемые для улицы, отличаются от полей показываемых для здания администрации.{br}Для выбранной улицы редактор объекта покажет поля, характерные для дорог: '{field1}' и '{field2}'. **Закройте редактор объекта нажав escape или кнопку {button}.**",
                 "play": "Попробуйте подвигать карту и щелкнуть на некоторых других объектах чтобы узнать, какие виды объектов могут быть добавлены на OpenStreetMap. **Когда вы будете готовы перейти к следующей главе, нажмите '{next}'.**"
             },
             "points": {
                 "title": "Точки",
-                "add_point": "Точки можно использовать для отображения таких объектов, как магазины, рестораны и памятники.{br}Они отражают местоположение объекта и описывают его. **Нажмите {button} кнопку Точка, чтобы добавить новую точку.**",
+                "add_point": "Точки можно использовать для отображения таких объектов, как магазины, рестораны и памятники.{br}Они отражают местоположение объекта и описывают его. **Нажмите кнопку {button} Точка, чтобы добавить новую точку.**",
                 "place_point": "Чтобы разместить точку на карте наведите курсор мыши в то место, где она должна располагаться, затем левый клик мыши или нажмите пробел. **Наведите указатель мышь на здание и нажмите левую кнопку или пробел.**",
                 "search_cafe": "Точками можно обозначать самые разные объекты.\nСейчас вы добавили точку для кафе. **Найдите «{preset}»**",
                 "choose_cafe": "**Выберите {preset} из списка.**",
-                "feature_editor": "Вы пометили точку как кафе. Используя свойства объекта, можно добавить больше информации о кофе.",
+                "feature_editor": "Вы пометили точку как кафе. Используя свойства объекта, можно добавить больше информации об этом кафе.",
                 "add_name": "В OpenStreetMap все поля необязательные и это нормально оставить поле пустым если вы не уверены в его значении.{br}Предположим, у вас есть местное знание об этом кафе и вы знаете его название. **Добавьте название этого кафе.**",
                 "add_close": "Редактор объекта запомнит все правки автоматически. **Когда вы добавили имя, нажмите Esc, Ввод, или кнопку {button} чтобы закрыть редактор объектов.**",
-                "reselect": "Нередко точки уже нарисованы на карте, но неточно или с ошибками. Мы можем их поправить. **Нажмите и выберите кафе, которые вы создали.**",
-                "update": "Давайте добавим свойств этом кафе. Заполните его название, укажите кухню или добавьте адрес. **Заполните свойства кафе.**",
+                "reselect": "Часто точки уже нарисованы на карте, но неточно или с ошибками. Мы можем их поправить. **Нажмите на точку кафе, которые вы создали.**",
+                "update": "Давайте добавим значений свойствам этого кафе. Заполните его название, укажите кухню или добавьте адрес. **Заполните свойства кафе.**",
                 "update_close": "**Когда вы закончите обновлять кафе, нажмите Esc, Ввод, или кнопку {button} чтобы закрыть редактор объектов.**",
                 "rightclick": "Вы можете щелкнуть правой кнопкой мыши по любому объекту, чтобы увидеть *меню редактирования*, в котором показан список операций редактирования, которые могут быть выполнены. ** Щелкните правой кнопкой мыши, чтобы выбрать созданную вами точку и показать меню редактирования. **",
-                "delete": "Не бойтесь удалять объекты, которыч нет в реальном мире.{br}Удаление объекта с OpenStreetMap удаляет его с карты, которой все пользуются, поэтому вы должны убедиться, что объект действительно исчез, прежде чем удалить его. ** Нажмите кнопку {button}, чтобы удалить точку. **",
+                "delete": "Не бойтесь удалять объекты, которых нет в реальном мире.{br}Удаление объекта с OpenStreetMap удаляет его с карты, которой все пользуются, поэтому вы должны убедиться, что объект действительно исчез, прежде чем удалить его. ** Нажмите кнопку {button}, чтобы удалить точку. **",
                 "undo": "Вы всегда можете отменить все изменения перед сохранением Ваших правок в OpenStreetMap. **Нажмите кнопку {button} для отмены удаления точки **.",
                 "play": "Теперь, когда вы знаете, как добавлять и править точки, попробуйте попрактиковаться и создать еще немного точек! **Когда вы будете готовы перейти к следующей главе, нажмите '{next}'.**"
             },
@@ -852,36 +865,58 @@
                 "title": "Линии",
                 "add_line": "*Линии* используются для обозначения таких объектов как дороги,  железные дороги и реки. **Нажми {button} кнопку Линия и добавь новую линию.**",
                 "start_line": "Вот дорога, которая не нарисована. Давайте добавим её!{br}В OpenStreetMap линии должны быть нарисованы по центру дороги. Вы можете перетаскивать и масштабировать карту во время рисования, если это необходимо. **Начните новую линию, щёлкнув по верхнему концу этой отсутствующей дороги.**",
-                "intersect": "Кликните или нажмите пробел для добавления сегментов к линии.{br}Дороги, и многие другие типы линий являются частью более крупной сети. Важно, чтобы эти линии были соединены в правильном порядке для работы приложений навигации. **Кликните на {names} для создания точки пересечения двух линий.**",
+                "intersect": "Кликните или нажмите пробел для добавления сегментов к линии.{br}Дороги, и многие другие типы линий являются частью более крупной сети. Важно, чтобы эти линии были соединены в правильном порядке для работы приложений навигации. **Кликните на {name} для создания точки пересечения двух линий.**",
                 "retry_intersect": "Эта дорога должна пересекаться с {name}. Попробуй ещё раз!",
                 "continue_line": "Продолжайте рисовать линию для новой дороги. Помните, что Вы можете при необходимости перетаскивать и зуммировать карту.{br}Когда закончите рисовать, кликните на последнем сегменте снова. **Завершить рисование дороги.**",
                 "choose_category_road": "**Выберите {category} из списка.**",
                 "choose_preset_residential": "Существует много различных типов дорог, но в данном случае это дорога вдоль жилых зон. **Выберите тип дороги «{preset}»**",
                 "retry_preset_residential": "Вы не выбрали тип  {preset}. **Щёлкните здесь, чтобы выбрать заново.**",
-                "name_road": "**Дайте этой дороге название, затем нажмите escape, enter или щёлкните {button} кнопку, чтобы закрыть редактор свойств.**",
+                "name_road": "**Дайте этой дороге название, затем нажмите escape, enter или щёлкните кнопку {button}, чтобы закрыть редактор свойств.**",
                 "did_name_road": "Замечательно! Теперь мы изучим как изменить форму линии.",
                 "update_line": "Иногда вам потребуется изменить форму существующей линии. Вот эта дорога явно выглядит не совсем правильно.",
-                "add_node": "Мы можем добавить сегментов к этой линии для улучшения ее формы. Один из способов добавить сегмент это двойной клик по линии там, где вы хотите разместить этот сегмент. **Двойной клик по линии для создания нового сегмента.**",
+                "add_node": "Мы можем добавить сегментов к этой линии для улучшения ее формы. Один из способов добавить сегмент это двойной клик по линии там, где вы хотите разместить начало нового сегмента. **Двойной клик по линии для создания нового сегмента.**",
                 "start_drag_endpoint": "Когда линия выделена, можно перетаскивать любой ее сегмент, кликнув и удерживая левую кнопку мыши. **Перетащите конечную точку к месту, где эти дороги должны пересекаться.**",
                 "finish_drag_endpoint": "Вот неплохое место. **Отпустите левую кнопку мыши чтобы завершить перемещение.**",
                 "start_drag_midpoint": "Маленькие треугольники нарисованы по центру сегментов. Другой способ создать новый сегмент - это перетащить точку по центру сегмента на новую позицию. ** Перетащите треугольник в середине сегмента для создания нового сегмента вдоль изгиба дороги.**",
+                "continue_drag_midpoint": "Линия выглядит намного лучше! Продолжайте уточнять линию двойным кликом или перетаскиванием серединным точек, пока кривая не совпадет с формой дороги. **Когда вы будете удовлетворены формой линии, нажмите ОК**",
+                "delete_lines": "Удалять линии дорог, которых не существуют в реальным мире — нормально. Здесь вы видите пример того, что город планировал  {street}, но так и не построил. Мы можем улучшить эту часть карты, удалив лишние линии.",
+                "rightclick_intersection": "Последняя построенная улица — {street1}, поэтому мы *разделим* {street2} в точке пересечения и удалим линни сверху. **Нажмите правой кнопкой на точке пересечения.**",
                 "split_intersection": "**Щелкните кнопку {button} чтобы разделить {street}.**",
                 "retry_split": "Вы не щелкнули кнопку «Разделить». Попробуйте снова.",
-                "retry_delete": "Вы не щелкнули кнопку «Удалить». Попробуйте снова."
+                "did_split_multi": "Отличная работа! {street1} теперь разделена на две части. Верхнюю часть можно удалить. **Щелкните на верхней части {street2} чтобы выделить ее.**",
+                "did_split_single": "**Щелкните на верхней части {street2} чтобы выделить ее.**",
+                "multi_select": "Линия {selected} теперь выбрана. Давайте выделим ещё и {other1}. Вы можете выделять несколько линий щелчком с нажатой клавишей Shift. **Нажмите Shift и щёлкните на {other2}.**",
+                "multi_rightclick": "Хорошо. Теперь выделены обе линии, которые нужно удалить. **Нажмите правой кнопкой мыши на любой из этих линий, чтобы перейти к меню редактирования объекта.**",
+                "multi_delete": "**Щёлкните по кнопке {button} чтобы удалить эти линии.**",
+                "retry_delete": "Вы не щелкнули кнопку «Удалить». Попробуйте снова.",
+                "play": "Великолепно! Используя полученные навыки, потренируйтесь в редактировании других линий. **Когда будете готовы перейти к следующей главе, нажмите '{next}'.**"
             },
             "buildings": {
                 "title": "Здания",
+                "add_building": "OpenStreetMap — крупнейшая в мире база данных о зданиях.{br}Вы можете добавить ещё не внесенные здания. **Нажмите кнопку {button} Область, чтобы добавить новую область**",
+                "start_building": "Давайте обведём контур этого дома, чтобы добавить его на карту.{br}Здания нужно обводить по фундаменту с максимальной точностью. **Щелкните или нажмите пробел на одном из углов здания, чтобы создать первую точку.**",
+                "continue_building": "Добавьте точки на остальные углы дома. Можете увеличить изображение, чтобы видеть больше деталей.{br}Нажмите пробел или еще раз щёлкните на первой или последней точке контура чтобы завершить здание. **Завершите рисование здания.**",
+                "retry_building": "Похоже, что Вы отметили не все углы здания. Попробуйте ещё раз!",
                 "choose_category_building": "**Выберите {category} из списка.**",
+                "choose_preset_house": "Существует много типов зданий, но этот дом точно частный жилой.{br}Если Вы точно не знаете тип дома, можно выбирать *Здание без конкретного типа*. **Выберите тип {preset}.**",
+                "close": "**Нажмите Esc или кнопку {button} , чтобы закрыть редактор свойств.**",
+                "rightclick_building": "**Нажмите правой кнопкой мыши на добавленном здании, чтобы перейти к меню редактирования объекта.**",
                 "square_building": "Дом, который вы только что добавили, будет выглядеть еще лучше с идеально прямыми углами. **Нажмите кнопку {button} чтобы спрямить форму здания.**",
                 "retry_square": "Вы не щелкнули кнопку «Спрямить углы». Попробуйте снова.",
+                "done_square": "Видите как углы здания передвинулись на другое место? Давайте освоим еще один полезный приём.",
                 "add_tank": "Теперь мы обрисуем этот круглый резервуар. **Нажмите {button} кнопку «Область» чтобы добавить новую область.**",
+                "start_tank": "Не волнуйтесь, не придётся рисовать идеальный круг. Просто нарисуйте область с точками на контуре резервуара. **Щёлкните или нажмите пробел на контуре резервуара, чтобы создать первую точку.**",
+                "continue_tank": "Добавьте еще несколько точек на контуре. Нарисованные точки образуют круглую область.{br}Нажмите Enter или щёлкните ещё раз на первой или последней точке, чтобы закончить рисование. **Завершите обведение резервуара.**",
                 "search_tank": "**Искать '{preset}'.**",
                 "choose_tank": "**Выберите {preset} из списка**",
+                "circle_tank": "**Нажмите кнопку {button}, чтобы сделать резервуар круглым.**",
                 "retry_circle": "Вы не щелкнули кнопку «Скруглить». Попробуйте снова.",
                 "play": "Замечательно! Потренируйтесь обводить ещё несколько зданий, и попробуйте другие команды в меню редактирования. **Нажмите '{next}' когда будете готовы перейти к следующей главе.**"
             },
             "startediting": {
                 "title": "Редактировать",
+                "help": "Теперь можно приступать к редактированию OpenStreetMap!{br}Вы можете повторить это обучение или ознакомиться с более подробной документацией, нажав кнопку справки {button} или клавишу '{key}'.",
+                "shortcuts": "Вы можете посмотреть список команд вместе с их горячими клавишами. Нажмите кнопку '{key}'.",
                 "save": "Не забывайте регулярно сохранять свои изменения!",
                 "start": "Рисовать карту!"
             }
@@ -889,8 +924,12 @@
         "shortcuts": {
             "title": "Горячие клавиши",
             "tooltip": "Справка по горячим клавишам",
+            "toggle": {
+                "key": "?"
+            },
             "key": {
                 "alt": "Alt",
+                "backspace": "Backspace",
                 "cmd": "Cmd",
                 "ctrl": "Ctrl",
                 "delete": "Delete",
@@ -907,6 +946,9 @@
                 "shift": "Shift",
                 "space": "Пробел"
             },
+            "gesture": {
+                "drag": "drag"
+            },
             "or": "-или-",
             "browsing": {
                 "title": "Просмотр",
@@ -972,6 +1014,8 @@
                     "rotate": "Повернуть выделенные объекты",
                     "orthogonalize": "Выпрямить линию / Сделать область прямоугольной",
                     "circularize": "Сделать замкнутую линию или область кругом",
+                    "reflect_long": "Отразить объекты по их длинной оси. ",
+                    "reflect_short": "Отразить объекты по их короткой оси. ",
                     "delete": "Удалить выделенные объекты"
                 },
                 "commands": {
@@ -1231,12 +1275,19 @@
                 "board_type": {
                     "label": "Тип"
                 },
+                "boules": {
+                    "label": "Тип"
+                },
                 "boundary": {
                     "label": "Тип границы"
                 },
                 "brand": {
                     "label": "Бренд"
                 },
+                "bridge": {
+                    "label": "Тип моста",
+                    "placeholder": "По умолчанию"
+                },
                 "building": {
                     "label": "Тип здания / конструкция"
                 },
@@ -1246,6 +1297,9 @@
                 "bunker_type": {
                     "label": "Тип"
                 },
+                "cables": {
+                    "placeholder": "1, 2, 3…"
+                },
                 "camera/direction": {
                     "label": "Направление (в градусах по часовой стрелке)",
                     "placeholder": "45, 90, 180, 270"
@@ -1319,6 +1373,9 @@
                     "label": "Адрес камеры",
                     "placeholder": "http://example.com/"
                 },
+                "content": {
+                    "label": "Содержимое"
+                },
                 "country": {
                     "label": "Страна"
                 },
@@ -1328,6 +1385,12 @@
                 "craft": {
                     "label": "Тип мастерской"
                 },
+                "crane/type": {
+                    "label": "Тип крана",
+                    "options": {
+                        "portal_crane": "Портальный кран"
+                    }
+                },
                 "crop": {
                     "label": "Выращивается"
                 },
@@ -1340,6 +1403,10 @@
                 "currency_multi": {
                     "label": "Типы валюты"
                 },
+                "cutting": {
+                    "label": "Тип вырубки",
+                    "placeholder": "По умолчанию"
+                },
                 "cycle_network": {
                     "label": "Сеть"
                 },
@@ -1396,6 +1463,9 @@
                 "description": {
                     "label": "Описание"
                 },
+                "devices": {
+                    "placeholder": "1, 2, 3…"
+                },
                 "diaper": {
                     "label": "Доступно пеленание"
                 },
@@ -1408,6 +1478,10 @@
                 "drive_through": {
                     "label": "Доступен без выхода из машины"
                 },
+                "duration": {
+                    "label": "Продолжительность",
+                    "placeholder": "00:00"
+                },
                 "electrified": {
                     "label": "Электрификация",
                     "options": {
@@ -1425,6 +1499,10 @@
                     "label": "Email",
                     "placeholder": "example@example.com"
                 },
+                "embankment": {
+                    "label": "Тип насыпи",
+                    "placeholder": "По умолчанию"
+                },
                 "emergency": {
                     "label": "Экстренные службы"
                 },
@@ -1462,9 +1540,19 @@
                         "wall": "Настенный"
                     }
                 },
+                "fitness_station": {
+                    "label": "Тип снаряжения"
+                },
                 "fixme": {
                     "label": "Исправь меня"
                 },
+                "ford": {
+                    "label": "Тип брода",
+                    "placeholder": "По умолчанию"
+                },
+                "frequency": {
+                    "label": "Частота действий"
+                },
                 "fuel": {
                     "label": "Топливо"
                 },
@@ -1496,6 +1584,9 @@
                 "generator/type": {
                     "label": "Тип"
                 },
+                "government": {
+                    "label": "Тип"
+                },
                 "grape_variety": {
                     "label": "Сорта винограда"
                 },
@@ -1506,6 +1597,16 @@
                 "handrail": {
                     "label": "Поручни"
                 },
+                "hashtags": {
+                    "label": "Предлагаемые хештеги",
+                    "placeholder": "#пример"
+                },
+                "healthcare": {
+                    "label": "Тип"
+                },
+                "healthcare/speciality": {
+                    "label": "Специальности"
+                },
                 "height": {
                     "label": "Высота (метры)"
                 },
@@ -1547,6 +1648,9 @@
                 "inscription": {
                     "label": "Надпись"
                 },
+                "intermittent": {
+                    "label": "Прерывистый"
+                },
                 "internet_access": {
                     "label": "Доступ в Интернет",
                     "options": {
@@ -1563,6 +1667,9 @@
                 "internet_access/ssid": {
                     "label": "SSID (Название сети)"
                 },
+                "kerb": {
+                    "label": "Бордюр"
+                },
                 "lamp_type": {
                     "label": "Тип"
                 },
@@ -1574,7 +1681,8 @@
                     "placeholder": "1, 2, 3…"
                 },
                 "layer": {
-                    "label": "Слой"
+                    "label": "Слой",
+                    "placeholder": "0"
                 },
                 "leaf_cycle": {
                     "label": "Цикл листвы у деревьев",
@@ -1634,6 +1742,9 @@
                 "man_made": {
                     "label": "Тип"
                 },
+                "manhole": {
+                    "label": "Тип"
+                },
                 "map_size": {
                     "label": "Покрытие"
                 },
@@ -1654,6 +1765,13 @@
                 "maxweight": {
                     "label": "Макс. вес"
                 },
+                "memorial": {
+                    "label": "Тип памятника"
+                },
+                "milestone_position": {
+                    "label": "Положение километрового столба",
+                    "placeholder": "Расстояние с точностью до одного знака (123.4)"
+                },
                 "mtb/scale": {
                     "label": "Сложность трассы для горного велосипеда",
                     "options": {
@@ -1692,7 +1810,7 @@
                 },
                 "name": {
                     "label": "Название",
-                    "placeholder": "Местное название (если имеется)"
+                    "placeholder": "Имя собственное, без описаний (если есть)"
                 },
                 "natural": {
                     "label": "Природные объекты"
@@ -1793,6 +1911,10 @@
                 "payment_multi": {
                     "label": "Способы оплаты"
                 },
+                "phases": {
+                    "label": "Количество фаз",
+                    "placeholder": "1, 2, 3…"
+                },
                 "phone": {
                     "label": "Телефон",
                     "placeholder": "+7 495 1234567"
@@ -1863,6 +1985,9 @@
                 "railway": {
                     "label": "Тип"
                 },
+                "rating": {
+                    "label": "Трансформаторная мощность"
+                },
                 "recycling_accepts": {
                     "label": "Принимает"
                 },
@@ -1873,6 +1998,31 @@
                         "container": "Контейнер для приема отходов на переработку"
                     }
                 },
+                "ref_aeroway_gate": {
+                    "label": "Номер ворот"
+                },
+                "ref_golf_hole": {
+                    "label": "Номер лунки",
+                    "placeholder": "1-18"
+                },
+                "ref_highway_junction": {
+                    "label": "Номер съезда"
+                },
+                "ref_platform": {
+                    "label": "Номер платформы"
+                },
+                "ref_road_number": {
+                    "label": "Номер дороги"
+                },
+                "ref_route": {
+                    "label": "Номер маршрута"
+                },
+                "ref_runway": {
+                    "label": "Номер полосы"
+                },
+                "ref_stop_position": {
+                    "label": "Номер остановки"
+                },
                 "relation": {
                     "label": "Тип отношения"
                 },
@@ -2028,9 +2178,18 @@
                     },
                     "placeholder": "не указано"
                 },
+                "structure_waterway": {
+                    "label": "Тип тоннеля",
+                    "options": {
+                        "tunnel": "Туннель, арка в доме"
+                    }
+                },
                 "studio": {
                     "label": "Тип"
                 },
+                "substance": {
+                    "label": "Перекачиваемое вещество"
+                },
                 "substation": {
                     "label": "Тип"
                 },
@@ -2057,6 +2216,12 @@
                 "surveillance/zone": {
                     "label": "Область наблюдения"
                 },
+                "switch": {
+                    "label": "Тип",
+                    "options": {
+                        "earthing": "Заземление"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Тактильное покрытие"
                 },
@@ -2087,6 +2252,9 @@
                 "tourism": {
                     "label": "Тип"
                 },
+                "tourism_attraction": {
+                    "label": "Туризм"
+                },
                 "tower/construction": {
                     "label": "Тип конструкции",
                     "placeholder": "На растяжках, Решетчатая, Скрытая, …"
@@ -2105,6 +2273,9 @@
                     },
                     "placeholder": "Твердая, скорее твёрдая, мягкая"
                 },
+                "trade": {
+                    "label": "Тип"
+                },
                 "traffic_calming": {
                     "label": "Тип"
                 },
@@ -2123,9 +2294,26 @@
                     },
                     "placeholder": "Отличная, хорошая, плохая…"
                 },
+                "transformer": {
+                    "label": "Тип",
+                    "options": {
+                        "auto": "Автотрансформатор",
+                        "auxiliary": "Вспомогательный",
+                        "converter": "Конвертер",
+                        "distribution": "Распределительный",
+                        "generator": "Генератор",
+                        "phase_angle_regulator": "Фазоповоротный",
+                        "traction": "Тяговый",
+                        "yes": "Неизвестный"
+                    }
+                },
                 "trees": {
                     "label": "Деревья"
                 },
+                "tunnel": {
+                    "label": "Тип тоннеля",
+                    "placeholder": "По умолчанию"
+                },
                 "vending": {
                     "label": "Тип товаров"
                 },
@@ -2137,6 +2325,33 @@
                         "street": "От 5 до 20 м"
                     }
                 },
+                "volcano/status": {
+                    "label": "Статус вулкана",
+                    "options": {
+                        "active": "Активный",
+                        "dormant": "Бездействующий",
+                        "extinct": "Потухший"
+                    }
+                },
+                "volcano/type": {
+                    "label": "Тип вулкана",
+                    "options": {
+                        "scoria": "Шлаковый",
+                        "shield": "Щитовидный"
+                    }
+                },
+                "voltage": {
+                    "label": "Напряжение"
+                },
+                "voltage/primary": {
+                    "label": "Напряжение первичной обмотки"
+                },
+                "voltage/secondary": {
+                    "label": "Напряжение вторичной обмотки"
+                },
+                "voltage/tertiary": {
+                    "label": "Напряжение третичной обмотки"
+                },
                 "wall": {
                     "label": "Тип"
                 },
@@ -2164,6 +2379,17 @@
                 },
                 "wikipedia": {
                     "label": "Википедия"
+                },
+                "windings": {
+                    "label": "Обмотки",
+                    "placeholder": "1, 2, 3…"
+                },
+                "windings/configuration": {
+                    "label": "Конфигурация обмоток",
+                    "options": {
+                        "open": "Открытый",
+                        "zigzag": "Зиг Заг"
+                    }
                 }
             },
             "presets": {
@@ -2677,6 +2903,9 @@
                     "name": "Ветеринар",
                     "terms": "ветеринар, ветеринарный врач, ветеринарная клиника"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "Урна для экскрементов собак"
+                },
                 "amenity/waste_basket": {
                     "name": "Мусорная корзина",
                     "terms": "мусорная корзина, урна, мусорка"
@@ -2705,19 +2934,29 @@
                     "terms": "дорожное покрытие"
                 },
                 "attraction/animal": {
-                    "name": "Животные"
+                    "name": "Животные",
+                    "terms": "зоопарк, лев, тигр, обезьяна"
                 },
                 "attraction/big_wheel": {
-                    "name": "Колесо обозрения"
+                    "name": "Колесо обозрения",
+                    "terms": "Колесо обозрения"
                 },
                 "attraction/bumper_car": {
                     "name": "Автодром (бамперные машинки)"
                 },
                 "attraction/bungee_jumping": {
-                    "name": "Банджи-джампинг"
+                    "name": "Банджи-джампинг",
+                    "terms": "Батут"
                 },
                 "attraction/carousel": {
-                    "name": "Карусель"
+                    "name": "Карусель",
+                    "terms": "Карусель, Колесо обозрения, Аттракционы"
+                },
+                "attraction/pirate_ship": {
+                    "name": "Пиратский корабль"
+                },
+                "attraction/train": {
+                    "name": "Аттракцион \"туристический поезд\""
                 },
                 "barrier": {
                     "name": "Преграда",
@@ -2980,6 +3219,9 @@
                     "name": "Мастерская часовщика",
                     "terms": "часовщик"
                 },
+                "craft/confectionery": {
+                    "name": "Кондитерская"
+                },
                 "craft/dressmaker": {
                     "name": "Портной",
                     "terms": "портной, швея, портниха, модистка, одежда"
@@ -3076,10 +3318,6 @@
                     "name": "Изготовление или продажа строительных лесов",
                     "terms": "такелаж, груз, строительные леса, блок, трос"
                 },
-                "craft/sculpter": {
-                    "name": "Скульптор",
-                    "terms": "скульптура, лепить, памятник,"
-                },
                 "craft/shoemaker": {
                     "name": "Мастерская сапожника",
                     "terms": "сапожник, башмачник"
@@ -3088,10 +3326,6 @@
                     "name": "Каменщик",
                     "terms": "каменщик, кладка, камень, кирпич, строительство, каменотёс"
                 },
-                "craft/sweep": {
-                    "name": "Трубочист",
-                    "terms": "труба, сажа, дымоход, дым, трубочист"
-                },
                 "craft/tailor": {
                     "name": "Портной"
                 },
@@ -3215,9 +3449,19 @@
                 "golf/water_hazard_line": {
                     "name": "Водная преграда"
                 },
+                "healthcare": {
+                    "name": "Здравоохранение"
+                },
+                "healthcare/birthing_center": {
+                    "name": "Роддом",
+                    "terms": "Роддом, родильный дом"
+                },
                 "healthcare/blood_donation": {
                     "name": "Станция переливания крови"
                 },
+                "healthcare/hospice": {
+                    "name": "Хоспис"
+                },
                 "highway": {
                     "name": "Дорога"
                 },
@@ -3279,10 +3523,6 @@
                     "name": "Тропа",
                     "terms": "Тропа, Тропинка, Тропка"
                 },
-                "highway/pedestrian": {
-                    "name": "Пешеходная улица",
-                    "terms": "Пешеходная зона"
-                },
                 "highway/primary": {
                     "name": "Дорога регионального значения",
                     "terms": "первичная, региональная"
@@ -3499,7 +3739,7 @@
                     "terms": "промзона, завод"
                 },
                 "landuse/landfill": {
-                    "name": "Стихийная свалка / промышленные отходы",
+                    "name": "Свалка",
                     "terms": "свалка, отходы"
                 },
                 "landuse/meadow": {
@@ -3723,6 +3963,10 @@
                     "name": "Беговая дорожка",
                     "terms": "Легкоатлетический стадион"
                 },
+                "leisure/sauna": {
+                    "name": "Сауна",
+                    "terms": "баня"
+                },
                 "leisure/slipway": {
                     "name": "Стапель",
                     "terms": "Стапель"
@@ -3773,6 +4017,10 @@
                     "name": "Дымовая труба",
                     "terms": "дымовая труба, труба, заводская труба"
                 },
+                "man_made/crane": {
+                    "name": "Подъемный кран",
+                    "terms": "кран"
+                },
                 "man_made/cutline": {
                     "name": "Просека",
                     "terms": "просека"
@@ -3988,17 +4236,12 @@
                     "name": "Офисы",
                     "terms": "Офисы, Офис, Контора, Канцелярия"
                 },
-                "office/accountant": {
-                    "name": "Бухгалтерская контора",
-                    "terms": "Бухгалтерская фирма, Бухгалтерский учёт, Аудит"
-                },
                 "office/administrative": {
                     "name": "Местная администрация и надзирающие органы",
                     "terms": "канцелярия, офис"
                 },
-                "office/architect": {
-                    "name": "Архитектурная мастерская",
-                    "terms": "Архитектурная студия, Дизайнерское бюро, Архитектор"
+                "office/advertising_agency": {
+                    "name": "Рекламное агенство"
                 },
                 "office/company": {
                     "name": "Офис компании или организации",
@@ -4036,8 +4279,7 @@
                     "terms": "Страховой агент, Страхование, Автострахование, Полис, ОМС, КАСКО, ОСАГО, Страховка,"
                 },
                 "office/it": {
-                    "name": "IT-офис",
-                    "terms": "IT-офис, ИТ-офис, офис IT, офис IT-специалиста, офис ИТ, офис ИТ-специалиста"
+                    "name": "Офис IT компании"
                 },
                 "office/lawyer": {
                     "name": "Юридические услуги",
@@ -4047,13 +4289,15 @@
                     "name": "Нотариус"
                 },
                 "office/newspaper": {
-                    "name": "Редакция газеты",
-                    "terms": "Редакция журнала, Газета, Журнал, Периодическое издание, Редакция периодического издания"
+                    "name": "Редакция газеты"
                 },
                 "office/ngo": {
                     "name": "Общественная организация",
                     "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение,"
                 },
+                "office/notary": {
+                    "name": "Нотариус"
+                },
                 "office/physician": {
                     "name": "Врач"
                 },
@@ -4061,6 +4305,10 @@
                     "name": "Политическая партия",
                     "terms": "политическая партия"
                 },
+                "office/private_investigator": {
+                    "name": "Частный сыщик",
+                    "terms": "Частный сыщик"
+                },
                 "office/research": {
                     "name": "Научно-исследовательская организация",
                     "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки, нии"
@@ -4069,10 +4317,6 @@
                     "name": "Офис телекоммуникационной компании",
                     "terms": "Телеком"
                 },
-                "office/therapist": {
-                    "name": "Терапевт",
-                    "terms": "терапевт, врач, доктор"
-                },
                 "office/travel_agent": {
                     "name": "Турагентство"
                 },
@@ -4373,8 +4617,8 @@
                     "terms": "магазин сыра, магазин сыров, сыр, сыры, сырный магазин"
                 },
                 "shop/chemist": {
-                    "name": "Аптека",
-                    "terms": "Медикаменты"
+                    "name": "Бытовая химия",
+                    "terms": "Предметы личной гигиены, косметика"
                 },
                 "shop/chocolate": {
                     "name": "Магазин шоколада",
@@ -4401,8 +4645,8 @@
                     "terms": "Продуктовый магазин, Магазин шаговой доступности"
                 },
                 "shop/copyshop": {
-                    "name": "Магазин ксерокопирования, печати",
-                    "terms": "ксерокопирование, распечатка текстов"
+                    "name": "Магазин копирования, печати",
+                    "terms": "копирование, распечатка текстов"
                 },
                 "shop/cosmetics": {
                     "name": "Магазин косметики",
@@ -4770,10 +5014,6 @@
                     "name": "Стоянка автодомов",
                     "terms": "караван-парк"
                 },
-                "tourism/chalet": {
-                    "name": "Сельский домик, шале",
-                    "terms": "Шале,Коттедж"
-                },
                 "tourism/gallery": {
                     "name": "Картинная галерея",
                     "terms": "Галерея искусств"
@@ -4828,6 +5068,10 @@
                     "name": "Обзорная точка",
                     "terms": "площадка, обозрение, точка обзора, смотровая площадка"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Охотничий домик",
+                    "terms": "Заимка, избушка, зимовье, хижина, землянка"
+                },
                 "tourism/zoo": {
                     "name": "Зоопарк",
                     "terms": "зоопарк"
@@ -5017,6 +5261,9 @@
                     "name": "Ручей",
                     "terms": "Ручей"
                 },
+                "waterway/stream_intermittent": {
+                    "name": "Пересыхающий ручей"
+                },
                 "waterway/water_point": {
                     "name": "Морская питьевая вода",
                     "terms": "Морская питьевая вода"
@@ -5043,6 +5290,11 @@
                 "description": "Премиум спутниковые снимки DigitalGlobe.",
                 "name": "Премиум снимки DigitalGlobe."
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Условия и обратная связь"
+                }
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Условия и обратная связь"
@@ -5050,6 +5302,11 @@
                 "description": "Стандартные спутниковые снимки DigitalGlobe.",
                 "name": "Стандартные снимки DigitalGlobe"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Условия и обратная связь"
+                }
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Условия и обратная связь"
diff --git a/dist/locales/si.json b/dist/locales/si.json
index 268232ec5..055821d47 100644
--- a/dist/locales/si.json
+++ b/dist/locales/si.json
@@ -203,7 +203,6 @@
             "localized_translation_language": "භාෂාවක් තෝරාගන්න",
             "localized_translation_name": "නම"
         },
-        "zoom_in_edit": "සංස්කරණය කිරීම සදහා සමීප කරන්න ",
         "logout": "ඉවත් වන්න ",
         "loading_auth": "OpenStreetMap වෙත සම්බන්ද වෙමින්...",
         "feature_info": {
@@ -371,8 +370,7 @@
             "cancel": "අහෝසි කරන්න"
         },
         "splash": {
-            "welcome": "iD OpenStreetMap සංස්කරණ වේදසටහන වෙත සාදරයෙන් පිළිගනිමු",
-            "start": "දෙන සංස්කරණය කරන්න"
+            "welcome": "iD OpenStreetMap සංස්කරණ වේදසටහන වෙත සාදරයෙන් පිළිගනිමු"
         },
         "source_switch": {
             "live": "සජීවී"
@@ -388,10 +386,6 @@
             "untagged_area": "සටහනක් නොයෙදූ ප්‍රදේශයක්",
             "deprecated_tags": "{tags} : බාවිතයෙන් ඉවත් කර ඇත"
         },
-        "zoom": {
-            "in": "විශාලනය වැඩි කරන්න",
-            "out": "විශාලනය අඩු කරන්න"
-        },
         "help": {
             "title": "සහය"
         },
diff --git a/dist/locales/sk.json b/dist/locales/sk.json
index ce68cd349..13dec2a77 100644
--- a/dist/locales/sk.json
+++ b/dist/locales/sk.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Zvoľte jazyk",
             "localized_translation_name": "Meno"
         },
-        "zoom_in_edit": "Priblížiť mapu pre úpravu",
         "login": "prihlásenie",
         "logout": "odhlásiť",
         "loading_auth": "Pripája sa k OpenStreetMap...",
@@ -612,8 +611,7 @@
         "splash": {
             "welcome": "Vitajte v iD editore pre OpenStreetMap",
             "text": "iD je prívetivý ale silný nástroj pre prispievanie do najlepšej slobodnej mapy sveta. Toto je verzia {version}. Pre viac informácií navštívte {website} alebo nahlasujte chyby na {github}.",
-            "walkthrough": "Začni prehliadku",
-            "start": "Upravuj"
+            "walkthrough": "Začni prehliadku"
         },
         "source_switch": {
             "live": "pripojený",
@@ -645,10 +643,6 @@
             "tag_suggests_area": "Označenie {tag} predpokladá, že objekt by mal byť plochou a nie čiarou.",
             "deprecated_tags": "Neschválené označenie: {tags}"
         },
-        "zoom": {
-            "in": "Priblížiť",
-            "out": "Oddialiť"
-        },
         "cannot_zoom": "V tomto móde nemožno viac oddialiť.",
         "full_screen": "Prepni na plnú obrazovku",
         "gpx": {
@@ -2729,8 +2723,7 @@
                     "terms": "Skolsky areal,skola,druzina"
                 },
                 "amenity/scrapyard": {
-                    "name": "Vrakovisko",
-                    "terms": "vrakovisko,smetisko,šrotovisko,srotovisko"
+                    "name": "Vrakovisko"
                 },
                 "amenity/shelter": {
                     "name": "Prístrešok",
@@ -3219,10 +3212,6 @@
                     "name": "Lešenárstvo",
                     "terms": "lesenarstvo,lešenie,lesenie"
                 },
-                "craft/sculpter": {
-                    "name": "Sochár",
-                    "terms": "sochar"
-                },
                 "craft/shoemaker": {
                     "name": "Obuvník",
                     "terms": "buvnik"
@@ -3231,10 +3220,6 @@
                     "name": "Kamenárstvo",
                     "terms": "kamenarstvo,kamenár,kamenar"
                 },
-                "craft/sweep": {
-                    "name": "Kominárstvo",
-                    "terms": "kominarstvo,kominár,kominar"
-                },
                 "craft/tailor": {
                     "name": "Krajčír"
                 },
@@ -3403,10 +3388,6 @@
                     "name": "Cestička",
                     "terms": "cesticka,chodnik,chodník,pešina,pesina"
                 },
-                "highway/pedestrian": {
-                    "name": "Pešia zóna",
-                    "terms": "pesia zona,namestie,námestie"
-                },
                 "highway/primary": {
                     "name": "Cesta 1. triedy",
                     "terms": "cesta prvej triedy,hlavná cesta,hlavna cesta"
@@ -3971,18 +3952,10 @@
                     "name": "Úrad",
                     "terms": "urad"
                 },
-                "office/accountant": {
-                    "name": "Účtovník",
-                    "terms": "uctovnik"
-                },
                 "office/administrative": {
                     "name": "Administratívny úrad",
                     "terms": "administrativny urad"
                 },
-                "office/architect": {
-                    "name": "Architekt",
-                    "terms": "Architekti"
-                },
                 "office/company": {
                     "name": "Firma",
                     "terms": "firmy,spoločnosť,spolocnost"
@@ -4011,18 +3984,10 @@
                     "name": "Poistenie",
                     "terms": "poistenie"
                 },
-                "office/it": {
-                    "name": "IT služby",
-                    "terms": "IT, it sluzby,pocitace,počítače"
-                },
                 "office/lawyer": {
                     "name": "Právna kancelária",
                     "terms": "pravna kancelaria"
                 },
-                "office/newspaper": {
-                    "name": "Noviny",
-                    "terms": "noviny"
-                },
                 "office/ngo": {
                     "name": "Nezisková organizácia",
                     "terms": "neziskova organizacia,neziskovka"
@@ -4042,10 +4007,6 @@
                     "name": "Telekomunikácie",
                     "terms": "telekomunikacie,mobilny operator,mobilný operátor,operator,operátor"
                 },
-                "office/therapist": {
-                    "name": "Terapeut",
-                    "terms": "terapeut"
-                },
                 "office/travel_agent": {
                     "name": "Cestovná agentúra"
                 },
@@ -4680,10 +4641,6 @@
                     "name": "Parkovisko pre karavany",
                     "terms": "parkovisko pre karavany,karavany,parkovisko,tabor,tábor"
                 },
-                "tourism/chalet": {
-                    "name": "Koliba",
-                    "terms": "salas,salaš,chata"
-                },
                 "tourism/gallery": {
                     "name": "Umelecká galéria"
                 },
diff --git a/dist/locales/sl.json b/dist/locales/sl.json
index 452992a14..4ed6dd954 100644
--- a/dist/locales/sl.json
+++ b/dist/locales/sl.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Izbor jezika",
             "localized_translation_name": "Naziv"
         },
-        "zoom_in_edit": "Za urejanje približajte pogled",
+        "zoom_in_edit": "Približaj za urejanje",
         "login": "prijava",
         "logout": "odjava",
         "loading_auth": "Vzpostavljanje povezave z OpenStreetMap ...",
@@ -612,7 +612,7 @@
             "welcome": "Dobrodošli v iD, urejevalniku podatkov OpenStreetMap",
             "text": "Urejevalnik iD je zmogljivo, uporabniku prijazno orodje za vnašanje podatkov na najboljši brezplačni svetovni zemljevid. Uporabljena je zadnja različica {version}. Več podrobnosti o urejevalniku je na voljo na {website}, poročila o hroščih pa se zbirajo na spletišču {github}.",
             "walkthrough": "Predstavitev orodja",
-            "start": "Urejevalnik"
+            "start": "Uredi takoj"
         },
         "source_switch": {
             "live": "objavljeno",
@@ -3115,10 +3115,6 @@
                     "name": "Gradbeni odri",
                     "terms": "postavljalec gradbenih odrov"
                 },
-                "craft/sculpter": {
-                    "name": "Kiparstvo",
-                    "terms": "kipar,rezbar"
-                },
                 "craft/shoemaker": {
                     "name": "Čevljarstvo",
                     "terms": "čevljar"
@@ -3127,10 +3123,6 @@
                     "name": "Klesarstvo",
                     "terms": "klesar"
                 },
-                "craft/sweep": {
-                    "name": "Dimnikarstvo",
-                    "terms": "dimnikar"
-                },
                 "craft/tailor": {
                     "name": "Krojaštvo"
                 },
@@ -3313,9 +3305,6 @@
                     "name": "Pot",
                     "terms": "steza,gaz"
                 },
-                "highway/pedestrian": {
-                    "name": "Ulica namenjena pešcem"
-                },
                 "highway/primary": {
                     "name": "Glavna cesta",
                     "terms": "glavna cesta,primarna cesta"
@@ -4004,18 +3993,10 @@
                     "name": "Urad",
                     "terms": "pisarna"
                 },
-                "office/accountant": {
-                    "name": "Računovodstvo",
-                    "terms": "računovodja,davčno svetovanje,finančno svetovanje"
-                },
                 "office/administrative": {
                     "name": "Upravna enota",
                     "terms": "Upravni urad,upravna pisarna"
                 },
-                "office/architect": {
-                    "name": "Arhitekt",
-                    "terms": "arhitekturni biro"
-                },
                 "office/company": {
                     "name": "Podjetje",
                     "terms": "firma,sedež podjetja,podjetnik"
@@ -4047,10 +4028,6 @@
                     "name": "Zavarovalnica",
                     "terms": "zavarovalniški agent,zavarovalni agent,zavarovalni posrednik"
                 },
-                "office/it": {
-                    "name": "Strokovnjak za informacijske tehnologije",
-                    "terms": "IT strokovnjak,informacijski strokovnjak"
-                },
                 "office/lawyer": {
                     "name": "Pravna pisarna",
                     "terms": "pravni urad,advokat,odvetništvo"
@@ -4058,10 +4035,6 @@
                 "office/lawyer/notary": {
                     "name": "Notarska pisarna"
                 },
-                "office/newspaper": {
-                    "name": "Časopisna hiša",
-                    "terms": "časopis"
-                },
                 "office/ngo": {
                     "name": "Sedež nevladne organizacije",
                     "terms": "nevladna organizacija"
@@ -4081,10 +4054,6 @@
                     "name": "Telekomunikacijska pisarna",
                     "terms": "telekomunikacije,telekom"
                 },
-                "office/therapist": {
-                    "name": "Terapevt",
-                    "terms": "terapevtka,psihoterapevt,psihoterapevtka,psihiater,psihiatrinja"
-                },
                 "office/travel_agent": {
                     "name": "Potovalna agencija"
                 },
@@ -4690,10 +4659,6 @@
                     "name": "Parkirišče za avtodome",
                     "terms": "parkirišče za karavaning"
                 },
-                "tourism/chalet": {
-                    "name": "Apartma",
-                    "terms": "stanovanje"
-                },
                 "tourism/gallery": {
                     "name": "Umetnostna galerija"
                 },
diff --git a/dist/locales/sq.json b/dist/locales/sq.json
index 433d7a9b9..6f6225e13 100644
--- a/dist/locales/sq.json
+++ b/dist/locales/sq.json
@@ -197,7 +197,6 @@
             "localized_translation_language": "Zgjidhni gdjuhën",
             "localized_translation_name": "Emër"
         },
-        "zoom_in_edit": "Zmadhoni për të redaktuar",
         "logout": "dil",
         "loading_auth": "Lidh me OpenStreetMap...",
         "feature_info": {
diff --git a/dist/locales/sr.json b/dist/locales/sr.json
index fa0745866..baae233e7 100644
--- a/dist/locales/sr.json
+++ b/dist/locales/sr.json
@@ -199,11 +199,11 @@
                 "description": {
                     "long": {
                         "single": "Рефлектуј ово обележје преко своје дужинске осе.",
-                        "multiple": "Рефлектуј ова обележја преко њихове дужинске осе."
+                        "multiple": "Одрази ова обележја преко њихове дуже осе."
                     },
                     "short": {
                         "single": "Рефлектуј ово обележје преко своје ширинске осе.",
-                        "multiple": "Рефлектуј ова обележја преко њихове ширинске осе."
+                        "multiple": "Одрази ова обележја преко њихове краће осе."
                     }
                 },
                 "key": {
@@ -213,11 +213,11 @@
                 "annotation": {
                     "long": {
                         "single": "Рефлектовано обележје преко своје дужинске осе.",
-                        "multiple": "Рефлектована обележја преко њихове дужинске осе."
+                        "multiple": "Одражена обележја преко њихове дуже осе."
                     },
                     "short": {
                         "single": "Рефлектовано обележје преко своје ширинске осе.",
-                        "multiple": "Рефлектована обележја преко њихове ширинске осе."
+                        "multiple": "Одражена обележја преко њихове краће осе."
                     }
                 },
                 "incomplete_relation": {
@@ -262,7 +262,7 @@
                 "title": "Преусмери",
                 "description": "Преусмери путању у супротном смеру.",
                 "key": "V",
-                "annotation": "Преусмерена путања."
+                "annotation": "Промењен смер путање."
             },
             "split": {
                 "title": "Раздвој",
@@ -284,6 +284,7 @@
             "restriction": {
                 "help": {
                     "select": "Кликните да бисте изабрали део пута.",
+                    "toggle": "Кликните да бисте укључили / искључили ограничења скретања.",
                     "toggle_on": "Кликните да бисте додали \"{restriction}\" ограничење.",
                     "toggle_off": "Кликните да бисте улонили \"{restriction}\" ограничење."
                 },
@@ -309,7 +310,6 @@
             "localized_translation_language": "Изабери језик",
             "localized_translation_name": "Назив"
         },
-        "zoom_in_edit": "Приближите да бисте уређивали",
         "login": "пријава",
         "logout": "одјава",
         "loading_auth": "Повезивање са Опенстритмап...",
@@ -458,6 +458,7 @@
             "key": "B",
             "percent_brightness": "{opacity}% прозирно",
             "none": "Ниједна",
+            "best_imagery": "Најбољи познати извор слика за овај положај",
             "switch": "Пребаци се на ову позадину",
             "custom": "Прилагођена",
             "custom_button": "Измени прилагођену позадину",
@@ -473,7 +474,7 @@
         },
         "map_data": {
             "title": "Подаци мапе",
-            "description": "Подави мапе",
+            "description": "Подаци мапе",
             "key": "F",
             "data_layers": "Слојеви података",
             "layers": {
@@ -606,8 +607,7 @@
         "splash": {
             "welcome": "Добродошли на iD, уређивач Опенстреетмапа ",
             "text": "ИД је једноставан али моћан алат за допринос најбољој слободној мапи света. Ово је верзија {version}. За више информација погледајте {website} и пријавите грешке на {github}.",
-            "walkthrough": "Покрени упознавање",
-            "start": "Уређуј одмах"
+            "walkthrough": "Покрени упознавање"
         },
         "source_switch": {
             "live": "уживо",
@@ -637,12 +637,8 @@
             "tag_suggests_area": "Ознака {ознака} указује да би линија требало да буде област, али није област",
             "deprecated_tags": "Застареле ознаке: {tags}"
         },
-        "zoom": {
-            "in": "Увеличај",
-            "out": "Умањи"
-        },
         "cannot_zoom": "Не можете даље умањивати у тренутном режиму.",
-        "full_screen": "Пребаци на цео екран",
+        "full_screen": "Укључи / искључи приказ на целом екрану",
         "gpx": {
             "local_layer": "Локална датотека",
             "drag_drop": "Превуците и отпустите .gpx, .geojson или .kml датотеку на страницу или кликните на дугме здесна за претраживање",
@@ -663,10 +659,12 @@
         "help": {
             "title": "Помоћ",
             "key": "H",
-            "help": "# Помоћ\n\nОво је уређивач за [Опенстритмап] (http://www.openstreetmap.org/), бесплатну\nи уредиву мапу света. Можете га користити за додавање и ажурирање\nподатака у вашој области, чинећи мапу света отвореног кода и\nотворених података бољим за свакога.\n\nИзмене које направите на овој мапи ће бити видљиве свима који користе\nОпенстритмап. Да бисте направили измене, мораћете се\n[пријавити] (https://www.openstreetmap.org/login).\n\n[iD изређивач] (http://ideditor.com/) је заједнички пројекат са [изворним\nкодом доступним на Гитхабу] (https://github.com/openstreetmap/iD).\n",
+            "help": "# Помоћ\n\nОво је уређивач за [Опенстритмап](http://www.openstreetmap.org/), бесплатну\nи уредиву мапу света. Можете га користити за додавање и ажурирање\nподатака у вашој области, чинећи мапу света отвореног кода и\nотворених података бољим за свакога.\n\nИзмене које направите на овој мапи ће бити видљиве свима који користе\nОпенстритмап. Да бисте направили измене, мораћете се\n[пријавити](https://www.openstreetmap.org/login).\n\n[iD изређивач](http://ideditor.com/) је заједнички пројекат са [изворним\nкодом доступним на Гитхабу](https://github.com/openstreetmap/iD).\n",
             "editing_saving": "# Уређивање и чување\n\nОвај уређивач је дизајниран првенствено за рад на мрежи, а приступате\nму непосредно преко сајта.\n\n### Избор обележја\n\nДа бисте изабрали обележје мапе, као што су пут или тачка од интереса,\nкликните на обележје на карти. Овим ће се означити изабрано обележје и\nучитати бочну траку са детаљима. Ако кликнете десним тастером миша на\nобележје, приказаће се мени са радњама које можете применити на дато\nобележје.\n\nДа бисте изабрали већи број обележја, држите притиснут тастер \"Shift\".\nЗатим или кликните на обележја која желите да изаберете, или превуците на\nмапи да бисте нацртали контуру око тих обележја. Све тачке унутар превученог\nподручја ће бити изабране.\n\n### Чување измена\n\nКада правите измене попут уређивања путева, зграда и места, оне се\nлокално чувају на рачунару док их не сачувате на серверу. Не брините ако\nнаправите грешку - можете поништити измене кликом на дугме за отказивање\nи поновити измене кликом на дугме Поново.\n\nКликните на 'Сачувај' да бисте довршили групу измена - на пример, ако сте\nзавршили подручје града и волели бисте да започне на новом подручју.\nИмате прилику да прегледате шта сте урадили, а уређивач вам даје корисне\nпредлоге и упозорења ако нешто од измена не изгледа исправно.\n\nАко све изгледа добро, можете додати кратак коментар који објашњава измену\nкоју сте направили и кликните на 'Учитај' да бисте објавили измене на\n[OpenStreetMap.org](http://www.openstreetmap.org/), где ће бити видљиве\nсвим осталим корисницима и доступне другима за надоградњу и побољшање.\n\nАко не можете завршити своје измене током једној сесији, можете оставити\nпрозор уређивача и вратити се (на истом претраживачу и рачунару),\nа уређивачка апликација ће вам понудити да повратите свој рад.\n\n### Коришћење уређивача\n\nМожете прегледати списак пречица на тастатури притиском на тастер `?`.\n",
-            "imagery": "# Снимци\n\nСнимци из ваздуха су важан ресурс за мапирање. Комбинација\nавионских прелета, сателитских приказа и слободно састављених извора су на\nрасполагању у уређивачу испод менија 'Подешавања позадине' са десне стране.\n\nПодразумевано је представљен [Bing Maps] (http://www.bing.com/maps/) слој\nсателитских снимака у уређивачу, али као померате и увећавате мапу на нова географска\nподручја, нови извори ће постати доступни. Неке земље, попут Сједињених\nДржава, Француске и Данске имају веома квалитетне снимке доступна за неке области.\n\nСнимак је некада померен у односу на податке на мапи због грешке од страни\nдобављача снимака. Ако видите много путева померених у односу на позадину,\nнемојте их одмах преместити све да одговарају позадини. Уместо тога можете подесити\nслике тако да одговарају постојећим подацима кликом на 'Поправи поравнање' на\nдну интерфејса Подешавање позадине.\n",
-            "addresses": "# Адресе\n\nАдресе су једне од најкориснијих информација на мапи.\n\nИако су адресе често представљене као делови улица, у Опенстреетмап\nсу забележене као атрибути објеката и места дуж улица.\n\nМожете да додате информације о адреси на местима мапираним као основе зграде\nкао и оних мапираних као појединачне тачке. Оптимални извор података  адреса\nје од премеравања на терену или лично знање - као и са било којим\nдругим објектом, копирање са комерцијалних извора, као што су Гугл мапе је строго\nзабрањено.\n"
+            "roads": "# Путеви\n\nМожете додавати, поправљати и брисати путеве помоћу овог уређивача.\nПутеви могу бити различитих врста: улице, ауто-путеви, стазе, бициклистичке\nстазе и друго - било који често коришћена саобраћајна путања би требало да\nбуде уцртана.\n\n### Избор\n\nКликните на пут да бисте га изабрали. Требало би да постане видљиво\nуоквирен са бочном траком која приказује више информација о путу.\nАко кликнете десним тастером миша на њега, појавиће се мени са\nоперацијама које можете применити на пут.\n\n### Измена\n\nЧесто ћете видети путеве који нису усклађени са сликама иза њих\nили са ГПС путањама. Ове путеве можете прилагодити тако да су у\nисправном положају.\n\nПрво кликните на пут који желите да промените. Овим ћете га обележити\nи приказаће се контролне тачке дуж пута, које можете превући на боље\nположаје. Ако желите додати нове контролне тачке за више детаља, кликните\nдвапут на део пута без чвора, и један ће бити додат.\n\nАко је пут повезан са другим путем, али није правилно повезан на\nмапи, можете превући једну од његових контролних тачака на други пут\nкако би се спојили. Повезивање путева је важно за мапу и суштински за\nдавање упутстава приликом вожње.\n\nТакође можете кликнути десним тастером миша и одабрати алат 'Премести'\nили једноставно притиснути тастер `M`, да бисте од једном померили цео пут,\nа затим кликните поново да бисте сачували померање.\n\n### Брисање\n\nАко је пут у потпуности нетачан - можете видети да не постоји на сателитској\nслици и у најбољем случају локално можете потврдити да није присутан - можете\nга избрисати, чиме се уклања са мапе. Будите опрезни приликом брисања обележја -\nкао и код сваке друге измене, резултате може видети свако, а сателитски снимци\nсу често застарели, тако да пут може једноставно бити новоизграђен.\n\nМожете избрисати пут кликом на њега да бисте га изабрали, а затим притисните\n'Избриши' тастер, или десним тастером миша, а затим кликните на икону за смеће.\n\n### Додавање\n\nПронашли сте место на коме би требало да постоји пут, али није уцртан?\nКликните на дугме 'Путања' у горњем левом углу уређивача, или притисните тастер\n`2`  као пречицу, да бисте започели цртање путање.\n\nКликните на почетак пута на мапи да бисте започели цртање. Ако се пут\nграна са постојећег пута, почните цртање кликом на место где се повезују.\n\nЗатим кликните на тачке дуж пута тако да следи праву путању, према сателитском\nснимку или ГПС путањи. Ако пут који нацртате пресеца други пут, повежите их\nкликом на тачку пресека. Када завршите са цртањем, кликните двапут или\nпритисните \"Return\" или \"Enter\" на вашој тастатури.\n",
+            "imagery": "# Снимци\n\nСнимци из ваздуха су важан ресурс за мапирање. Комбинација\nавионских прелета, сателитских приказа и слободно састављених извора су на\nрасполагању у уређивачу испод менија 'Подешавања позадине' са десне стране.\n\nПодразумевано је представљен [Bing Maps](http://www.bing.com/maps/) слој\nсателитских снимака у уређивачу, али као померате и увећавате мапу на нова географска\nподручја, нови извори ће постати доступни. Неке земље, попут Сједињених\nДржава, Француске и Данске имају веома квалитетне снимке доступна за неке области.\n\nСнимак је некада померен у односу на податке на мапи због грешке од страни\nдобављача снимака. Ако видите много путева померених у односу на позадину,\nнемојте их одмах преместити све да одговарају позадини. Уместо тога можете подесити\nслике тако да одговарају постојећим подацима кликом на 'Поправи поравнање' на\nдну интерфејса Подешавање позадине.\n",
+            "addresses": "# Адресе\n\nАдресе су једне од најкориснијих информација на мапи.\n\nИако су адресе често представљене као делови улица, у Опенстреетмап\nсу забележене као атрибути објеката и места дуж улица.\n\nМожете да додате информације о адреси на местима мапираним као основе зграде\nкао и оних мапираних као појединачне тачке. Оптимални извор података  адреса\nје од премеравања на терену или лично знање - као и са било којим\nдругим објектом, копирање са комерцијалних извора, као што су Гугл мапе је строго\nзабрањено.\n",
+            "buildings": "# Грађевине\n\nОпенстритмап је највећа светска база података о грађевинама. Можете\nдодавати и побољшати ову базу података.\n\n### Избор\n\nМожете изабрати грађевину кликом на њене оквире. Овим ће се обележити\nграђевина и приказати бочна трака са додатним информацијама о објекту.\nАко кликнете десним тастером миша на грађевину, приказаће се мени операција\nкоје можете извршити над објектом.\n\n### Измена\n\nПонекад су грађевине неправилно постављене или имају нетачне ознаке.\n\nДа бисте преместили целу грађевину, изаберите је и притисните тастер 'M',\nили кликните десним тастером миша и изаберите алат 'Премести'. Померите\nпоказивач миша за премештање зграде и кликните када је исправно постављена.\n\nДа бисте поправили специфичан облик грађевине, кликните и превуците\nчворове који формирају границу објекта на боље место.\n\n### Додавање\n\nЈедно од главних недоумица око додавања грађевина на мапу је то што их\nОпенстритмап чува, и као облике, и као чворове. Правило је да  се _дода\nграђевина као облик кад год је то могуће_, и да се мапирају предузећа, куће,\nпогодности и друга обележја као чворове у оквиру грађевине.\n\nПочните да цртате грађевину као облик кликом на дугме 'Област' у горњем левом\nделу уређивача и завршите га притиском на 'Return' на вашој тастатури,\nили кликом на први нацртан чвор, за затварање облика.\n\n### Брисање\n\nАко је грађевина у потпуности нетачна - видећете да не постоји на сателитском\nснимку, и у најбољем случају, потврдили сте локално да није присутна - можете\nје избрисати, чиме се уклања са мапе. Будите опрезни приликом брисања обележја -\nкао и било које друго уређивање, резултате може видети свако, а сателитски снимци\nсу често застарели, па би грађевина могла једноставно бити новоизграђена.\n\nМожете обрисати грађевину кликом на њу да бисте је изабрали, а затим притисните\nтастер 'Delete', или кликните десним тастером миша, а затим на икону за смеће.\n"
         },
         "intro": {
             "done": "готово",
@@ -692,6 +690,7 @@
                 "words": "Овај водич ће вам представити неке нове речи и појмове. Када уводимо нову реч, користићемо *курзив*.",
                 "mouse": "Можете да користите било који улазни уређај за уређивање мапе, али овај водич претпоставља да имате миш са левим и десним тастерима. **Ако желите да додате миша, урадите то сада, а затим кликните на У реду.**",
                 "leftclick": "Када вам овај водич затражи да кликнете једанпут или двапут, мисли се са левим тастером. На тактилној подлози може бити представљено кликом или додиром прста. **Леви клик {num} пута.**",
+                "rightclick": "Понекад ћемо вас замолити да кликнете десним тастером миша. Ово може бити иста као контрол+клик или додир са два прста на додирну таблу. Ваша тастатура може имати чак и 'мени' тастер који се понаша као десни клик. **Десни клик {num} пута.**",
                 "chapters": "Засада је добро! Можете користити дугмад испод да бисте прескочили поглавља у било ком тренутку или да изнова започнете поглавље ако се заглавите. Па почнимо! **Кликните на '{next}' за наставак.**"
             },
             "navigation": {
@@ -731,7 +730,8 @@
                 "choose_preset_house": "Постоји много различитих врста грађевина, али ова је очито кућа.{br}Ако нисте сигурни за врсту, у реду је ако само изаберете општу врсту објекта. **Изаберите {preset} обележје.**",
                 "search_tank": "**Претражите за '{preset}'.**",
                 "choose_tank": "**Изаберите {preset} са списка.**",
-                "circle_tank": "**Кликните на {button} дугме да бисте резервоар учинили кружним.**"
+                "circle_tank": "**Кликните на {button} дугме да бисте резервоар учинили кружним.**",
+                "retry_circle": "Нисте кликнули на Заокружи дугме. Пробајте поново."
             },
             "startediting": {
                 "title": "Почни уређивање",
@@ -742,7 +742,7 @@
         },
         "shortcuts": {
             "title": "Пречице на тастатури",
-            "tooltip": "Прикажи екран за пречице на тастатури.",
+            "tooltip": "Прикажи екран са пречицама на тастатури.",
             "toggle": {
                 "key": "?"
             },
@@ -773,6 +773,8 @@
                 "title": "Прегледање",
                 "navigation": {
                     "title": "Навигација",
+                    "pan": "Померај мапу",
+                    "pan_more": "Померај мапу за величину екрана",
                     "zoom": "Приближи / Удаљи",
                     "zoom_more": "Приближи / Удаљи у више корака"
                 },
@@ -784,27 +786,55 @@
                 "display_options": {
                     "title": "Опције приказа",
                     "background": "Прикажи опције позадине",
-                    "fullscreen": "Прикажи преко целог екрана"
+                    "background_switch": "Пребаци се на претходну позадину",
+                    "map_data": "Прикажи опције података мапе",
+                    "fullscreen": "Прикажи преко целог екрана",
+                    "wireframe": "Укључи / искључи попуњавање области",
+                    "minimap": "Укључи / искључи мини-мапу"
                 },
                 "selecting": {
                     "title": "Избор обележја",
                     "select_one": "Избор појединачног обележја",
-                    "select_multi": "Избор вишеструких обележја"
+                    "select_multi": "Избор вишеструких обележја",
+                    "lasso": "Исцртај подручје избора обележја"
+                },
+                "with_selected": {
+                    "title": "Са изабраним обележјем",
+                    "edit_menu": "Укључи / искључи мени операција"
                 },
                 "vertex_selected": {
+                    "title": "Са изабраним чвором",
                     "previous": "Скочи до претходног чвора",
                     "next": "Скочи до следећег чвора",
                     "first": "Скочи до првог чвора",
-                    "last": "Скочи до последњег чвора"
+                    "last": "Скочи до последњег чвора",
+                    "change_parent": "Промени родитељску путању"
                 }
             },
             "editing": {
                 "title": "Уређивање",
                 "drawing": {
-                    "title": "Цртање"
+                    "title": "Цртање",
+                    "add_point": "Додај чвор",
+                    "add_line": "Додај путању",
+                    "add_area": "Додај област",
+                    "place_point": "Постави чвор",
+                    "disable_snap": "Задржи за онемогућавање померања чвора",
+                    "stop_line": "Заврши цртање путање или области"
                 },
                 "operations": {
                     "title": "Операције",
+                    "continue_line": "Настави путању на изабраном чвору",
+                    "merge": "Комбинуј (спој) изабрана обележја",
+                    "disconnect": "Раздвој обележја на изабраном чвору",
+                    "split": "Раздвој путању на две на изабраном чвору",
+                    "reverse": "Промени смер путање",
+                    "move": "Помери изабрана обележја",
+                    "rotate": "Заокрени изабрана обележја",
+                    "orthogonalize": "Исправи путању / нормализуј углове области",
+                    "circularize": "Заокружи затворену путању или област",
+                    "reflect_long": "Одрази обележја преко дуже осе",
+                    "reflect_short": "Одрази обележја преко краће осе",
                     "delete": "Избриши изабрана обележја"
                 },
                 "commands": {
@@ -819,7 +849,12 @@
             "tools": {
                 "title": "Алати",
                 "info": {
-                    "title": "Информације"
+                    "title": "Информације",
+                    "all": "Укључи / искључи све инфо-картице",
+                    "background": "Укључи / искључи инфо-картицу позадине",
+                    "history": "Укључи / искључи инфо-картицу историје",
+                    "location": "Укључи / искључи инфо-картицу положаја",
+                    "measurement": "Укључи / искључи инфо-картицу мерења"
                 }
             }
         },
@@ -2187,8 +2222,7 @@
                     "name": "Школско двориште"
                 },
                 "amenity/scrapyard": {
-                    "name": "Ауто-отпад",
-                    "terms": "ауто-отпад,старо гвожђе,прикупљање строг гвожђа"
+                    "name": "Ауто-отпад"
                 },
                 "amenity/shelter": {
                     "name": "Склониште"
@@ -2594,19 +2628,12 @@
                 "craft/scaffolder": {
                     "name": "Скелар"
                 },
-                "craft/sculpter": {
-                    "name": "Вајар"
-                },
                 "craft/shoemaker": {
                     "name": "Обућар"
                 },
                 "craft/stonemason": {
                     "name": "Каменорезац"
                 },
-                "craft/sweep": {
-                    "name": "Oџачар",
-                    "terms": "оџачар,димничар"
-                },
                 "craft/tailor": {
                     "name": "Kројач"
                 },
@@ -2744,9 +2771,6 @@
                 "highway/path": {
                     "name": "Стаза"
                 },
-                "highway/pedestrian": {
-                    "name": "Пешачка улица"
-                },
                 "highway/primary": {
                     "name": "Главни пут"
                 },
@@ -3241,12 +3265,6 @@
                 "office": {
                     "name": "Канцеларија"
                 },
-                "office/accountant": {
-                    "name": "Рачуновођа"
-                },
-                "office/architect": {
-                    "name": "Архитекта"
-                },
                 "office/educational_institution": {
                     "name": "Образовна институција"
                 },
@@ -3263,9 +3281,6 @@
                 "office/political_party": {
                     "name": "Политичка странка"
                 },
-                "office/therapist": {
-                    "name": "Терапеут"
-                },
                 "office/travel_agent": {
                     "name": "Туристичка агенција"
                 },
@@ -3658,9 +3673,6 @@
                 "tourism/caravan_site": {
                     "name": "Камп-парк"
                 },
-                "tourism/chalet": {
-                    "name": "Шале"
-                },
                 "tourism/gallery": {
                     "name": "Галерија слика"
                 },
diff --git a/dist/locales/sv.json b/dist/locales/sv.json
index 32d74abdc..9d9295a68 100644
--- a/dist/locales/sv.json
+++ b/dist/locales/sv.json
@@ -30,8 +30,8 @@
         "operations": {
             "add": {
                 "annotation": {
-                    "point": "Lagt till en punkt.",
-                    "vertex": "Lagt till en nod till en linje.",
+                    "point": "Lade till en punkt.",
+                    "vertex": "Lade till en nod till en linje.",
                     "relation": "Lade till en relation."
                 }
             },
@@ -46,10 +46,10 @@
                 "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.",
+                "multiple": "Flera linjer kan fortsätta härifrån. För att välja en linje, tryck på tangenten Shift och klicka på den för att välja.",
                 "annotation": {
                     "line": "Fortsatte en linje.",
-                    "area": "Fortsatt ett område."
+                    "area": "Fortsatte på ett område."
                 }
             },
             "cancel_draw": {
@@ -84,8 +84,8 @@
                 },
                 "key": "S",
                 "annotation": {
-                    "line": "Gjort hörnen på en linje fyrkantiga.",
-                    "area": "Gjort hörnen på ett område fyrkantiga."
+                    "line": "Gjorde hörnen på en linje fyrkantiga.",
+                    "area": "Gjorde hörnen på ett område fyrkantiga."
                 },
                 "not_squarish": "Denna kan inte rätas upp då den inte är fyrkantig.",
                 "too_large": "Denna kan inte rätas upp då inte tillräckligt är synligt för tillfället.",
@@ -106,12 +106,12 @@
                     "multiple": "Radera dessa objekt permanent."
                 },
                 "annotation": {
-                    "point": "Raderat en punkt.",
-                    "vertex": "Raderat en nod från en väg.",
-                    "line": "Raderat en linje.",
-                    "area": "Raderat ett område.",
-                    "relation": "Raderat en relation.",
-                    "multiple": "Raderat {n} objekt."
+                    "point": "Raderade en punkt.",
+                    "vertex": "Raderade en nod från en väg.",
+                    "line": "Raderade en linje.",
+                    "area": "Raderade ett område.",
+                    "relation": "Raderade en relation.",
+                    "multiple": "Raderade {n} objekt."
                 },
                 "too_large": {
                     "single": "Detta objekt kan inte raderas då inte tillräckligt av det är synligt för tillfället.",
@@ -122,8 +122,8 @@
                     "multiple": "Dessa objekt kan inte raderas då de inte är fullständigt nedladdade."
                 },
                 "part_of_relation": {
-                    "single": "Detta objekt kan inte raderas då det är del i en större relation. Du måste ta bort det från relationen först. ",
-                    "multiple": "Dessa objekt kan inte raderas då de är delar i större relationer. Du måste ta bort dem från relationerna först."
+                    "single": "Detta objekt kan inte raderas då det är del i en relation. Du måste ta bort det från relationen först. ",
+                    "multiple": "Dessa objekt kan inte raderas då de är delar i en relation. Du måste ta bort dem från relationen först."
                 },
                 "connected_to_hidden": {
                     "single": "Detta objekt kan inte raderas då det är kopplat till ett dolt objekt.",
@@ -131,27 +131,27 @@
                 }
             },
             "add_member": {
-                "annotation": "Lagt till en medlem till en relationen."
+                "annotation": "Lade till en medlem till en relationen."
             },
             "delete_member": {
-                "annotation": "Raderat en medlem från en relationen."
+                "annotation": "Raderade en medlem från en relationen."
             },
             "connect": {
                 "annotation": {
-                    "point": "Kopplat en väg till en punkt.",
-                    "vertex": "Kopplat en väg till en annan väg.",
-                    "line": "Kopplat en väg till en linje.",
-                    "area": "Kopplat en väg till ett område."
+                    "point": "Kopplade en väg till en punkt.",
+                    "vertex": "Kopplade en väg till en annan väg.",
+                    "line": "Kopplade en väg till en linje.",
+                    "area": "Kopplade en väg till ett område."
                 }
             },
             "disconnect": {
-                "title": "Bryt av",
-                "description": "Bryt av dessa linjer/områden från varandra.",
+                "title": "Koppla isär",
+                "description": "Koppla isär dessa linjer/områden från varandra.",
                 "key": "D",
-                "annotation": "Bröt av linjer/områden.",
-                "not_connected": "Det finns inte tillräckligt med linjer/områden här att koppla ifrån.",
-                "connected_to_hidden": "Detta kan inte brytas av då det är kopplat till ett dolt objekt.",
-                "relation": "Detta kan inte brytas av då den kopplar ihop medlemmar i en relation."
+                "annotation": "Kopplade isär linjer/områden.",
+                "not_connected": "Det finns inte tillräckligt med linjer/områden här att sära på.",
+                "connected_to_hidden": "Detta kan inte kopplas isär då det är kopplat till ett dolt objekt.",
+                "relation": "Detta kan inte kopplas isär då den kopplar ihop medlemmar i en relation."
             },
             "merge": {
                 "title": "Sammanfoga",
@@ -198,12 +198,12 @@
                 },
                 "description": {
                     "long": {
-                        "single": "Spegla detta objekt längst dess långa axel.",
-                        "multiple": "Spegla dessa objekt längst dess långa axel."
+                        "single": "Spegla detta objekt längs dess långa axel.",
+                        "multiple": "Spegla dessa objekt längs deras gemensamma långa axel."
                     },
                     "short": {
-                        "single": "Spegla detta objekt längst dess korta axel.",
-                        "multiple": "Spegla dessa objekt längst dess korta axel."
+                        "single": "Spegla detta objekt längs dess korta axel.",
+                        "multiple": "Spegla dessa objekt längs deras gemensamma korta axel."
                     }
                 },
                 "key": {
@@ -213,11 +213,11 @@
                 "annotation": {
                     "long": {
                         "single": "Speglade ett objekt längs dess långa axel.",
-                        "multiple": "Speglade flera objekt längst dess långa axel."
+                        "multiple": "Speglade flera objekt längs deras långa axel."
                     },
                     "short": {
                         "single": "Speglade ett objekt längs dess korta axel.",
-                        "multiple": "Speglade flera objekt längst dess korta axel."
+                        "multiple": "Speglade flera objekt längs deras korta axel."
                     }
                 },
                 "incomplete_relation": {
@@ -237,13 +237,13 @@
                 "title": "Rotera",
                 "description": {
                     "single": "Rotera detta objekt runt dess centrumpunkt.",
-                    "multiple": "Rotera dessa objekt runt dess centrumpunkt."
+                    "multiple": "Rotera dessa objekt runt deras gemensamma centrumpunkt."
                 },
                 "key": "R",
                 "annotation": {
                     "line": "Roterade en linje.",
                     "area": "Roterade ett område.",
-                    "multiple": "Rotera flera objekt."
+                    "multiple": "Roterade flera objekt."
                 },
                 "incomplete_relation": {
                     "single": "Detta objekt kan inte roteras då det inte har laddats ned fullständigt.",
@@ -273,9 +273,9 @@
                 },
                 "key": "X",
                 "annotation": {
-                    "line": "Dela en linje.",
-                    "area": "Dela gränsen för ett område.",
-                    "multiple": "Dela gränsen för {n} linjer/områden."
+                    "line": "Delade linje.",
+                    "area": "Delade gränsen för ett område.",
+                    "multiple": "Delade gränsen för {n} linjer/områden."
                 },
                 "not_eligible": "Linjer kan inte delas vid deras början eller slut.",
                 "multiple_ways": "Det är för många linjer här för att kunna dela dem.",
@@ -289,8 +289,8 @@
                     "toggle_off": "Klicka för att ta bort \"{restriction}\"-restriktionen."
                 },
                 "annotation": {
-                    "create": "Lagt till en svängrestriktion",
-                    "delete": "Tagit bort en svängrestriktion"
+                    "create": "Lade till en svängrestriktion",
+                    "delete": "Tog bort en svängrestriktion"
                 }
             }
         },
@@ -324,7 +324,7 @@
             "error": "Kan inte ansluta till API:et.",
             "offline": "API:et är inte tillgängligt. Vänligen försök redigera senare.",
             "readonly": "API:et är skrivskyddat. Du måste vänta innan du kan spara dina ändringar.",
-            "rateLimit": "API:t är begränsat för anonyma anslutningar. Du kan fixa detta genom att logga in."
+            "rateLimit": "API:t är begränsat för anonyma anslutningar. Du kan lösa detta genom att logga in."
         },
         "commit": {
             "title": "Ladda upp till OpenStreetMap",
@@ -334,6 +334,7 @@
             "save": "Ladda upp",
             "cancel": "Avbryt",
             "changes": "{count} ändringar",
+            "download_changes": "Ladda ned osmChange-fil",
             "warnings": "Varningar",
             "modified": "Ändrat",
             "deleted": "Raderat",
@@ -360,7 +361,9 @@
                 "accuracy": "Precision",
                 "unknown": "Okänt",
                 "show_tiles": "Visa kartrutor",
-                "hide_tiles": "Dölj kartrutor"
+                "hide_tiles": "Dölj kartrutor",
+                "show_vintage": "Visa ålder",
+                "hide_vintage": "Dölj ålder"
             },
             "history": {
                 "key": "H",
@@ -395,9 +398,9 @@
             }
         },
         "geometry": {
-            "point": "Punkt",
-            "vertex": "Hörn",
-            "line": "Linje",
+            "point": "punkt",
+            "vertex": "hörn",
+            "line": "linje",
             "area": "område",
             "relation": "relation"
         },
@@ -479,6 +482,12 @@
             "description": "Kartdata",
             "key": "F",
             "data_layers": "Datalager",
+            "layers": {
+                "osm": {
+                    "tooltip": "Kartdata från OpenStreetMap",
+                    "title": "OpenStreetMap-data"
+                }
+            },
             "fill_area": "Fyllda områden",
             "map_features": "Kartobjekt",
             "autohidden": "Dessa objekt har dolts automatiskt då för mycket annars skulle ha visats på skärmen. Du kan zooma in för att redigera dem. ",
@@ -490,7 +499,7 @@
                 "tooltip": "Intressanta platser"
             },
             "traffic_roads": {
-                "description": "Trafikvägar",
+                "description": "Vägar",
                 "tooltip": "Landsväg, gata m.m."
             },
             "service_roads": {
@@ -503,7 +512,7 @@
             },
             "buildings": {
                 "description": "Byggnader",
-                "tooltip": "Byggnader, skydd, garage, m-m-"
+                "tooltip": "Byggnader, skydd, garage, m.m."
             },
             "landuse": {
                 "description": "Markanvändning",
@@ -536,21 +545,21 @@
         },
         "area_fill": {
             "wireframe": {
-                "description": "Ingen ifyllnad (trådram)",
+                "description": "Ingen fyllning (trådram)",
                 "tooltip": "Genom att använda trådram blir det enklare att se bakomliggande flygfoto.",
                 "key": "W"
             },
             "partial": {
-                "description": "Delvist fylld",
-                "tooltip": "Områden ritas med fyllnad enbart längst insidan av kanterna. (Rekommenderas för nybörjare)"
+                "description": "Delvis ifyllda",
+                "tooltip": "Områden ritas med fyllning enbart längs insidan av kanterna. (Rekommenderas för nybörjare)"
             },
             "full": {
-                "description": "Full ifyllnad",
+                "description": "Fullt ifyllda",
                 "tooltip": "Områden är ritade fullt ifyllda."
             }
         },
         "restore": {
-            "heading": "Du har icke-sparade ändringar.",
+            "heading": "Du har osparade ändringar.",
             "description": "Du har ändringar från förra sessionen som inte har sparats. Vill du hämta dessa ändringar?",
             "restore": "Återställ mina ändringar",
             "reset": "Ta bort mina ändringar"
@@ -560,10 +569,10 @@
             "help": "Granska dina ändringar och ladda upp dem till OpenStreetMap för att göra dem synliga för andra användare.",
             "no_changes": "Inga ändringar att spara.",
             "error": "Något gick fel vid sparandet",
-            "status_code": "Server returnerade statuskoden {code}",
+            "status_code": "Servern returnerade statuskoden {code}",
             "unknown_error_details": "Kontrollera att du är ansluten till Internet.",
             "uploading": "Laddar upp ändringar till OpenStreetMap...",
-            "unsaved_changes": "Du har icke-sparade ändringar.",
+            "unsaved_changes": "Du har osparade ändringar.",
             "conflict": {
                 "header": "Lös motstridiga ändringar",
                 "count": "Konflikt {num} av {total}",
@@ -573,8 +582,9 @@
                 "keep_remote": "Använd deras",
                 "restore": "Återställ",
                 "delete": "Låt vara raderad",
+                "download_changes": "Eller ladda ned osmChange-fil",
                 "done": "Alla konflikter lösta!",
-                "help": "En annan användare har ändrat på samma objekt som du har ändrat.\nKlicka på vardera objekt nedan för ytterligare detaljer om respektive konflikt, och välj om dina eller\nden andra användarens ändringar ska behållas.\n"
+                "help": "En annan användare har ändrat på samma objekt som du har ändrat.\nKlicka på objekten nedan för ytterligare detaljer om respektive konflikt, och välj om dina eller\nden andra användarens ändringar ska behållas.\n"
             }
         },
         "merge_remote_changes": {
@@ -587,7 +597,7 @@
             }
         },
         "success": {
-            "edited_osm": "Redigerat OSM!",
+            "edited_osm": "Redigerade OSM!",
             "just_edited": "Du har nu redigerat OpenStreetMap!",
             "view_on_osm": "Visa på OSM",
             "facebook": "Dela på Facebook",
@@ -605,11 +615,11 @@
             "welcome": "Välkommen till iD OpenStreetMap-redigeraren",
             "text": "iD är ett användarvänligt och kraftfullt verktyg för att bidra till världens bästa fria karta. Detta är version {version}. För mer information besök {website} eller rapportera fel på {github}.",
             "walkthrough": "Starta genomgången",
-            "start": "Ändra nu"
+            "start": "Redigera nu"
         },
         "source_switch": {
             "live": "live",
-            "lose_changes": "Du har icke-sparade ändringar som kommer gå förlorade vid byte av kartserver. Är du säker att du vill byta server?",
+            "lose_changes": "Du har osparade ändringar som kommer gå förlorade vid byte av kartserver. Är du säker att du vill byta server?",
             "dev": "dev"
         },
         "version": {
@@ -621,8 +631,8 @@
             "used_with": "används med {type}"
         },
         "validations": {
-            "disconnected_highway": "Ej kopplad väg",
-            "disconnected_highway_tooltip": "Vägar bör vara kopplade till andra vägar eller entréer i byggnader.",
+            "disconnected_highway": "Ej ansluten väg",
+            "disconnected_highway_tooltip": "Vägar bör vara anslutna till andra vägar eller entréer i byggnader.",
             "old_multipolygon": "Multipolygontaggar på yttre väg",
             "old_multipolygon_tooltip": "Denna typ av multipolygon är föråldrad. Istället för att ha taggar på den yttre vägen, flytta dem till dess överliggande multipolygonen.",
             "untagged_point": "Otaggad punkt",
@@ -660,14 +670,25 @@
         "mapillary": {
             "view_on_mapillary": "Visa denna bild på Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Gatubilder från OpenStreetCam",
+            "title": "Bildlager (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Visa denna bild på OpenStreetCam"
+        },
         "help": {
             "title": "Hjälp",
             "key": "H",
-            "help": "# Hjälp\n\nDetta är en redigerare för [OpenStreetMap](http://www.openstreetmap.org/),\nen gratis och redigerbar karta över världen. Du kan använda den för att lägga till och ändra\ndata i ditt område, allt för att göra en världsomspännande karta baserad på\nöppen källkod och öppen data bättre för alla.\n\nRedigeringar du gör på kartan kommer att visas för alla som använder\nOpenStreetMap. För att göra en redigering måste du\n[log in](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) är ett gemensamt projekt med [källkod\ntillgänglig på GitHub](https://github.com/openstreetmap/iD).\n",
-            "gps": "# GPS\n\nInsamlade GPS-spår är en värdefull källan för data till OpenStreetMap. Denna redigeraren\nstöder lokala spår - .gpx-filer på din lokala dator. Du kan samla\nin denna typ av GPS-spår med ett antal olika appar till din smartphone eller en GPS-enhet.\n\nFör information om du du gör en GPS-uppmätning, läs\n[Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nFör att använda ett GPX-spår för att kartlägga, dra och släpp GPX-filen på kartredigeraren.\nOm den accepteras kommer det att läggas till på kartan som en ljuslila\nlinje. Klicka på menyn Kartdata till höger för att aktivera,\navaktivera eller zooma in till detta nya GPX-skapade lager.\n\nGPX-spåret laddas inte direkt upp till OpenStreetMap - bästa sätet att använda\ndet är att rita på kartan och använda det som en guide för att lägga till ny information,\nmen också för att [ladda upp det till OpenStreetMap] (http://www.openstreetmap.org/trace/create)\nså att andra kan använda det.\n",
-            "imagery": "# Flygfoton\n\nFlygfoton är en viktig källa vid kartläggning. En kombination av bilder från flygplan, satelliter och andra fria källor finns tillgängliga i redigeraren i menyn 'Bakgrundsinställningar' till höger.\n\nNormalt visas ett satellitlager från  [Bing Maps](http://www.bing.com/maps/) i redigeraren, men när du förflytta dig runt och zooma till nya geografiska områden kommer nya källor bli tillgängliga. Vissa länder, som t.ex. USA, Frankrike och Danmark har bilder av väldigt hög kvalité tillgängliga för vissa områden.\n\nFlygfotona är ibland förskjutna till kartan på grund av misstag från leverantören av flygfoton. Om du ser att många vägar är förskjutna i förhållande till flygfotot, flytta dem inte direkt för att matcha bakgrunden. Istället kan du justera flygfotot så att det matchar med existerande data genom att klicka 'Justera bildplacering' längst ned i menyn för Bakgrundsinställningar.\n",
-            "addresses": "# Adresser\n\nAdresser är bland den mest användbara informationen på kartan.\n\nÄven om adresser normalt oftast är relaterade till segment av gatan är de i OpenStreetMap hanterade som attribut på byggnader och platser längst gatan.\n\nDu kan lägga till adressinformation både på platser kartlagda som byggnadskonturer och på platser kartlagda som enskilda punkter.\nDen bästa källan för adressinformation är från egen kunskap eller genom att besöka platsen - precis som för allt annat, att kopiera från kommersiella källor som Google Maps är strikt förbjudet.\n",
-            "inspector": "# Använda objektredigeraren\n\nObjektredigeraren är området till vänster på sidan som låter dig\nändra detaljerna för valt objekt.\n\n### Välj objekttyp\n\nEfter att du lagt till en punkt, linje eller område kan du välja vad för typ av objekt det\när, t.ex. om det är en huvudväg eller bostadsgata, shoppingcenter eller café.\nobjektredigeraren visar knappar för vanliga objekttyper, och du kan\nsöka efter andra typer i sökfönstret.\n\nKlicka på 'i' i nedre högra hörnet för en objekttyp för\natt läsa mer om det. Klicka på en knapp för att välja typ.\n\n### Använda formulär och ändra taggar\n\nEfter att du valt en objekttyp, eller om du väljer ett objekt som redan\nhar en typ associerad, kommer objektredigeraren visa fält med detaljer om objekttypen så som namn och adress.\n\nUnder fälten du ser kan du klicka på menyn 'Lägg till fält\" för att lägga till\nandra detaljer, som t.ex. Wikipedia-länk, handikappanpassning m.m.\n\nLängst ned i objektredigeraren, klicka på 'Alla taggar' för att lägga till ytterligare godtyckliga\ntaggar till objektet. [Taginfo](http://taginfo.openstreetmap.org/) är en\nbra resurs för att lära dig mer om populära tagg-kombinationer.\n\nÄndringar du gör i objektredigeraren visas automatiskt på kartan.\nDu kan ångra dem när du vill genom att klicka på 'Ånga'-knappen.\n"
+            "help": "# Hjälp\n\nDetta är en redigerare för [OpenStreetMap](http://www.openstreetmap.org/),\nen gratis och redigerbar karta över världen. Du kan använda den för att lägga till och ändra\ndata i ditt område, allt för att göra en världsomspännande karta baserad på\nöppen källkod och öppen data bättre för alla.\n\nRedigeringar du gör på kartan kommer att visas för alla som använder\nOpenStreetMap. För att göra en redigering måste du\n[logga in](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) är ett gemensamt projekt med [källkod\ntillgänglig på GitHub](https://github.com/openstreetmap/iD).\n",
+            "editing_saving": "# Redigera & spara\n\nDenna redigerare är främst gjord för att fungera online, och du använder den via en webbsida just nu.\n\n### Markera objekt\n\nFör att välja ett kartobjekt, t.ex. en väg eller en punkt, klicka på det på kartan. Detta markerar det valda objektet och laddar en sidopanel med detaljer om det. Om du högerklickar på det visas en meny med saker du kan göra med objektet.\n\nFör att markera flera objekt, håll ned Shift-tangenten. Klicka sedan på objekten du vill markera eller dra på kartan för att rita en kontur runt objekten. Alla punkter inuti ritat område kommer att markeras .\n\n### Spara redigeringar\n\nNär du gör ändringar såsom att ändra på en väg, byggnad eller plats är detta lagrat lokalt fram till att du sparar det på servern. Oroa dig inte om du gör ett misstag, du kan alltid ångra en ändring genom att klicka på Ångra-knappen och göra om din förändring genom att klicka på Gör om-knappen.\n\nKlicka på Spara för att slutföra en samling förändringar, t.ex. om du har gjort färdigt ett område i en stad och vill börja ändra i ett annat område. Du får möjlighet att granska vad du har gjort och redigeraren ger dig hjälpsamma förslag och varningar om någon ändring inte verkar korrekt.\n\nOm allt ser bra ut kan du ange en kort kommentar som förklarar vad du har gjort, och sedan klicka på 'Ladda upp' för att skicka ändringarna till [OpenStreetMap.org](http://www.openstreetmap.org/) där de blir synliga för alla andra användare och tillgängliga för andra att jobba vidare med.\n\nOm du inte kan slutföra din ändring på en gång kan du lämna redigeringsfönstret öppet och komma tillbaka (i samma webbläsare på samma dator) och redigeringsprogrammet kommer att ge dig möjlighet att återuppta ditt arbete.\n\n### Använda redigeraren\n\nDu kan se en lista med kortkommandon genom att trycka på tangenten `?`\n",
+            "roads": "# Vägar\n\nDu kan skapa, fixa och ta bort vägar med denna redigerare. Vägar kan vara alla typer av: stigar, bilvägar, spår, cykelvägar m.m. - alla välanvända segment ska kartläggas.\n\n### Markering\n\nKlicka på en väg för att välja den. En markering blir då synlig tillsammans med en sidopanel som visar mer information om vägen. Om du högerklickar på den får du en meny med åtgärder du kan utföra på vägen.\n\n### Modifiering\n\nOfta ser du vägar som inte är justerade till bakgrundsbilden eller till ett GPS-spår. Du kan justera dessa vägar så att de hamnar på rätt plats.\n\nKlicka först på vägen du vill ändra. Detta kommer att markera den och visa kontrollpunkter längs den som du kan dra i för att justera den. Om du vill lägga till en ny kontrollpunkt för högre detaljrikedom, dubbelklicka på en del av vägen utan en punkt så kommer en kontrollpunkt att läggas till.\n\nOm vägen är ansluten till en annan väg, men inte är det på kartan, kan du dra en av dess kontrollpunkter till den andra vägen för att koppla ihop dem. Att vägarna är kopplade till varandra är viktigt för kartan och avgörande för att kunna ge korrekta körinstruktioner.\n\nDu kan också högerklicka på den och välja 'Flytta', eller helt enkelt trycka på tangenten 'M' på tangentbordet, för att flytta en hel väg på en gång, och sedan klicka igen för att spara flytten.\n\n### Radering\n\nOm hela vägen är helt fel - du kan se att den inte existerar på satellitbilderna och har helst bekräftat i verkligheten att den inte finns - kan du radera den, vilket tar bort den från kartan. Var försiktigt när du raderar objekt - precis som vid all redigering kan alla se resultatet och satellitbilderna är ofta gamla, så vägen kan helt enkelt vara nybyggd.\n\nDu kan radera en väg genom att klicka på den för att markera den, och sedan trycka på tangenten 'Delete' eller högerklicka på den och klicka på soptunnan.\n\n### Skapa\n\nHar du hittat någonstans att det borde finnas en väg där det inte finns en? Klicka på ikonen 'Linje' högst upp till vänster i redigeringsfönstret eller klicka på knappen '2' på tangentbordet för att börja rita en linje.\n\nKlicka på början av vägen på kartan för att påbörja ritningen. Om vägen viker av från en existerande väg, starta genom att klicka där de ansluter till varandra.\n\nKlicka sedan på punkter längs vägen så att den följer vägens sträckning enligt satellitbilder eller GPS-spår. Om vägen du ritar korsar en annan väg, anslut dem genom att klicka där de korsar varandra. När du är klar med att rita in vägen, dubbelklicka eller tryck 'Enter' på tangentbordet.\n",
+            "gps": "# GPS\n\nInsamlade GPS-spår är en värdefull källa för data till OpenStreetMap. Den här redigeraren\nstöder lokala spår - .gpx-filer på din lokala dator. Du kan samla\nin denna typ av GPS-spår med ett antal olika appar till din smartphone eller en GPS-enhet.\n\nFör information om hur du gör en GPS-uppmätning, läs\n[Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nFör att använda ett GPX-spår för att kartlägga, dra och släpp GPX-filen på kartredigeraren.\nOm den accepteras kommer det att läggas till på kartan som en ljuslila\nlinje. Klicka på menyn Kartdata till höger för att aktivera,\navaktivera eller zooma in till detta nya GPX-skapade lager.\n\nGPX-spåret laddas inte direkt upp till OpenStreetMap - bästa sättet att använda\ndet är att rita på kartan och använda det som en guide för att lägga till ny information,\nmen också för att [ladda upp det till OpenStreetMap] (http://www.openstreetmap.org/trace/create)\nså att andra kan använda det.\n",
+            "imagery": "# Flygfoton\n\nFlygfoton är en viktig källa vid kartläggning. En kombination av bilder från flygplan, satelliter och andra fria källor finns tillgängliga i redigeraren i menyn 'Bakgrundsinställningar' till höger.\n\nNormalt visas ett satellitlager från [Bing Maps](http://www.bing.com/maps/) i redigeraren, men när du förflyttar dig runt och zoomar till nya geografiska områden kommer nya källor att bli tillgängliga. Vissa länder, som t.ex. USA, Frankrike och Danmark har bilder av väldigt hög kvalitet tillgängliga för vissa områden.\n\nFlygfotona är ibland förskjutna jämfört med kartan på grund av misstag från leverantören av flygfoton. Om du ser att många vägar är förskjutna i förhållande till flygfotot, flytta dem inte direkt för att matcha bakgrunden. Istället kan du justera flygfotot så att det matchar med existerande data genom att klicka 'Justera bildplacering' längst ned i menyn för Bakgrundsinställningar.\n",
+            "addresses": "# Adresser\n\nAdresser är bland den mest användbara informationen på kartan.\n\nÄven om adresser normalt är relaterade till segment av gatan är de i OpenStreetMap hanterade som attribut på byggnader och platser längs gatan.\n\nDu kan lägga till adressinformation både på platser kartlagda som byggnadskonturer och på platser kartlagda som enskilda punkter.\nDen bästa källan för adressinformation är från egen kunskap eller genom att besöka platsen - precis som för allt annat; att kopiera från kommersiella källor som Google Maps är strikt förbjudet.\n",
+            "inspector": "# Använda objektredigeraren\n\nObjektredigeraren är området till vänster på sidan som låter dig\nändra detaljerna för valt objekt.\n\n### Välj objekttyp\n\nEfter att du har lagt till en punkt, linje eller ett område kan du välja vad för typ av objekt det\när, t.ex. om det är en huvudväg eller bostadsgata, shoppingcenter eller café.\nObjektredigeraren visar knappar för vanliga objekttyper, och du kan\nsöka efter andra typer i sökfönstret.\n\nKlicka på 'i' i nedre högra hörnet för en objekttyp för\natt läsa mer om det. Klicka på en knapp för att välja typ.\n\n### Använda formulär och ändra taggar\n\nEfter att du har valt en objekttyp, eller om du väljer ett objekt som redan\nhar en typ associerad, kommer objektredigeraren att visa fält med detaljer om objekttypen såsom namn och adress.\n\nUnder fälten du ser kan du klicka på menyn 'Lägg till fält\" för att lägga till\nandra detaljer, som t.ex. Wikipedia-länk, handikappanpassning m.m.\n\nLängst ned i objektredigeraren, klicka på 'Alla taggar' för att lägga till ytterligare godtyckliga\ntaggar till objektet. [Taginfo](http://taginfo.openstreetmap.org/) är en\nbra resurs för att lära dig mer om populära tagg-kombinationer.\n\nÄndringar du gör i objektredigeraren visas automatiskt på kartan.\nDu kan ångra dem när du vill genom att klicka på 'Ångra'-knappen.\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 byggnaden och ladda en sidopanel som visar mer information om byggnaden. Om du högerklickar på den, kommer det att visas en meny med åtgärder du kan utföra på 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 tryck på tangenten 'M', eller högerklicka och välj alternativet 'Flytta'. Rör på musen 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,\nfaciliteter, och andra saker finns i byggnaderna 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å \"Enter\" på tangentbordet\neller genom att klicka på den först ritade noden för att sluta formen.\n\n### Radering\n\nOm en byggnad är helt fel – du kan se att den inte finns med i någon satellitbild\noch har helst bekräftat lokalt att den inte finns – kan du ta bort\nden, vilket tar bort den 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åldrade, 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å tangenten 'Delete', eller högerklicka och på den och sedan klicka på soptunnan.\n",
+            "relations": "# Relationer\n\nEn relation är en speciell typ av egenskap i OpenStreetMap som grupperar objekt. Två vanliga relationstyper är t.ex. *ruttrelation* som grupperar vägsträckor som tillhör en specifik riksväg eller motorväg, och *multipolygoner* som grupperar linjer som definierar ett komplext område (som t.ex. har flera delar eller hål i sig)\n\nObjekten i en relation kallas *medlemmar*. Längst ned i sidopanelen kan du se vilka relationer ett objekt är medlem i, och ett klick på en relation kommer att markera den. När relationen är markerad kan du se alla medlemmar listade i sidopanelen och markerade på kartan.\n\nFör det mesta kommer iD att ta hand om relationerna automatiskt när du redigerar. Det viktigaste du måste veta om är att om du tar bort en vägsträcka för att rita om den mer exakt, måste du se till att den nya sträckan är medlem i samma relation som originalet.\n\n## Redigera relationer\n\nOm du vill redigera relationer är här grunderna.\n\nFör att lägga till ett objekt i en relation, markera objektet och klicka på \"+\"-knappen i sektionen \"Alla relationer\" i sidopanelen, och välj sedan eller skriv namnet på relationen.\n\nFör att skapa en ny relation, markera det första objektet som ska vara medlem i relationen, klicka på \"+\"-knappen i sektionen \"Alla relationer\" och välj \"Ny relation...\"\n\nFör att ta bort ett objekt från en relation, markera objektet och klicka på soptunnan bredvid relationen du vill ta bort den från.\n\nDu kan skapa multipolygoner med hål i sig med verktyget \"sammanfoga\". Rita två områden (inre och yttre), håll ned shift-tangenten och klicka på var och en av dem för att markera båda, tryck sedan på tangenten 'C'. Ett annat alternativ är att markera båda, och sedan högerklicka på en av dem och sedan klicka på knappen 'Sammanfoga' (+).\n"
         },
         "intro": {
             "done": "klar",
@@ -750,7 +771,7 @@
                     "morris-avenue": "Tvärvägen",
                     "mural-mall": "Målargränd",
                     "paisanos-bar-and-grill": "Paisano's Bar och Grill",
-                    "paisley-emporium": "Begagnadsmarknad",
+                    "paisley-emporium": "Begagnatmarknad",
                     "paparazzi-tattoo": "Paparazzi Tattoo",
                     "pealer-street": "Falkvägen",
                     "pine-street": "Tallgatan",
@@ -800,8 +821,8 @@
             "welcome": {
                 "title": "Välkommen",
                 "welcome": "Välkommen! Denna genomgång kommer att lära dig grunderna i att redigera på OpenStreetMap.",
-                "practice": "Allt i denna genomgång är enbart för träningssyfte, ingen redigering du gör i genomgången kommer att sparas.",
-                "words": "Denna genomgång kommer att introducera några nya ord och koncept. När vi introducerar ett nytt ord kommer vi använda *kursiv* text. ",
+                "practice": "Allt i denna genomgång är enbart i träningssyfte; ingen redigering du gör i genomgången kommer att sparas.",
+                "words": "Denna genomgång kommer att introducera några nya ord och koncept. När vi introducerar ett nytt ord kommer vi att använda *kursiv* text. ",
                 "mouse": "Du kan använda valfri inmatningshårdvara för att redigera kartan, men genomgången kommer att utgå från att du har en mus med vänster- och högerknappar. **Om du vill ansluta en mus, gör det nu och klicka OK.**",
                 "leftclick": "När genomgången ber dig att klicka eller dubbelklicka, syftar vi på vänsterknappen. På en styrplatta kan det vara enkelklick eller tryck med ett finger. **Tryck med vänster musknapp {num} gånger.**",
                 "rightclick": "Ibland kommer vi också be dig att högerklicka. Detta kan vara samma sak som att kontroll-klicka eller klicka med två fingrar på en styrplatta.  Ditt tangentbord kanske även har en 'meny'-knapp som fungerar som högerklick. **Högerklicka {num} gånger.**",
@@ -809,80 +830,80 @@
             },
             "navigation": {
                 "title": "Navigation",
-                "drag": "Huvudkartsområdet visar OpenStreetMap-data ovanpå en bakgrund. {br}Du kan dra kartan genom att hålla ned vänster musknapp medan du flyttar musen. Du kan också använda piltangenterna på tangentbordet. **Dra kartan!**",
+                "drag": "Huvudkartområdet visar OpenStreetMap-data ovanpå en bakgrund. {br}Du kan dra kartan genom att hålla ned vänster musknapp medan du flyttar musen. Du kan också använda piltangenterna på tangentbordet. **Dra kartan!**",
                 "zoom": "Du kan zooma in eller ut genom att rulla med mushjulet eller styrplattan eller genom att klicka på knapparna {plus} / {minus}. **Zooma kartan!**",
                 "features": "Vi använder ordet *objekt* för att beskriva saker som förekommer på kartan. Allt i den verkliga världen kan karteras som ett objekt på OpenStreetMap.",
                 "points_lines_areas": "Kartobjekt representeras med *punkter, linjer och områden.*",
                 "nodes_ways": "I OpenStreetMap kallas ibland punkter för *noder*, och linjer och områden kallas ibland för *vägar*.",
                 "click_townhall": "Alla objekt på kartan kan markeras genom att klicka på dem. **Klicka på punkten och markera den.**",
-                "selected_townhall": "Vad bra! Punkten är nu markerad. Markerat objekt är nu ritat med ett pulserande glöd.",
+                "selected_townhall": "Vad bra! Punkten är nu markerad. Markerade objekt visas med en pulserande glödande ram.",
                 "editor_townhall": "När ett objekt är markerat visas *objektredigeraren* bredvid kartan.",
                 "preset_townhall": "Högst upp i objektredigeraren visas objekttyp. Denna punkt representerar ett {preset}.",
-                "fields_townhall": "Mittdelen av objektredigeraren innehåller *fält* som visar objektets attribut, så som namn och adress. ",
+                "fields_townhall": "Mittdelen av objektredigeraren innehåller *fält* som visar objektets attribut, såsom namn och adress. ",
                 "close_townhall": "**Stäng objektredigeraren genom att trycka på Escape på tangentbordet eller genom att trycka på knappen {button} i övre högra hörnet. ",
                 "search_street": "Du kan också söka efter objekt i aktuell vy eller globalt. **Sök efter '{name}'.**",
                 "choose_street": "**Välj {name} i listan för att markera den.**",
                 "selected_street": "Vad bra! {name} är nu markerad.",
-                "editor_street": "Fälten som visas för en väg är annorlunda mot fälten som visades för kommunhuset.{br}För markerad gata visar objektredigeraren fälts så som '{field1}' och '{field2}'. **Stäng objektredigeraren genom att trycka Escape eller trycka på knappen {button}.",
+                "editor_street": "Fälten som visas för en väg är annorlunda mot fälten som visades för kommunhuset.{br}För markerad gata visar objektredigeraren fält som '{field1}' och '{field2}'. **Stäng objektredigeraren genom att trycka Escape eller trycka på knappen {button}.",
                 "play": "Prova att flytta runt på kartan och klicka på några andra objekt för att se vad för typ av saker som kan läggas till i OpenStreetMap. **När du är redo att fortsätta till nästa kapitel, tryck '{next}'.**"
             },
             "points": {
                 "title": "Punkter",
-                "add_point": "*Punkter* kan användas för att representera objekt så som affärer, restauranger och monument.{br}De markerar en specifik position och beskriver vad det är. **Klicka på knappen {button} Punkt för att lägga till en ny punkt.**",
+                "add_point": "*Punkter* kan användas för att representera objekt såsom affärer, restauranger och monument.{br}De markerar en specifik position och beskriver vad det är. **Klicka på knappen {button} Punkt för att lägga till en ny punkt.**",
                 "place_point": "För att placera den nya punkten på kartan, placera din muspekare där punkten ska vara och vänsterklicka eller tryck på mellanslagstangenten.  **Flytta muspekaren till denna byggnad, vänsterklicka sedan eller tryck på mellanslag.**",
                 "search_cafe": "Det finns många olika typer av objekt som kan representeras med punkter. Punkten du just lade till är ett café. **Sök efter '{preset}'.**",
                 "choose_cafe": "**Välj {preset} i listan.**",
                 "feature_editor": "Punkten är nu markerad som ett café. Med hjälp av objektredigeraren kan vi lägga till mer information om caféet. ",
-                "add_name": "På OpenStreetMap är alla fält valfria, och det är ok att lämna ett fält tomt om du är osäker.{br}Låt oss låssas att du har lokalkännedom om caféet och vet dess namn. **Lägg till ett namn på caféet.**",
-                "add_close": "Objektredigeraren komma ihåg alla dina ändringar automatiskt. **När du är klar med att lägga till ett namn, tryck Escape, Enter eller klicka på knappen {button} för att stänga objektredigeraren.**",
+                "add_name": "På OpenStreetMap är alla fält valfria, och det är ok att lämna ett fält tomt om du är osäker.{br}Låt oss låtsas att du har lokalkännedom om caféet och vet dess namn. **Lägg till ett namn på caféet.**",
+                "add_close": "Objektredigeraren kommer ihåg alla dina ändringar automatiskt. **När du är klar med att lägga till ett namn, tryck Escape, Enter eller klicka på knappen {button} för att stänga objektredigeraren.**",
                 "reselect": "Ofta existerar redan punkter men är felaktiga eller ofullständiga. Vi kan ändra redan existerande punkter. **Klicka för att markera caféet du just skapade.**",
-                "update": "Låt oss fylla i lite mer information om caféet. Du kan ändra dess namn, ange vad för typ av mat som serveras eller lägga till en address. **Ändra information om caféet.**",
+                "update": "Låt oss fylla i lite mer information om caféet. Du kan ändra dess namn, ange vad för typ av mat som serveras eller lägga till en adress. **Ändra information om caféet.**",
                 "update_close": "**När du är färdig med att uppdatera caféet, tryck Escape, Enter eller klicka på knappen {button} för att stänga objektredigeraren.**",
-                "rightclick": "Du kan högerklicka på valfritt objekt för att se menyn *redigera*, vilken innehåller en lista av operationer som kan utföra. **Högerklicka för att markera punkten du skapade och för att visa redigerarmenyn.**",
+                "rightclick": "Du kan högerklicka på valfritt objekt för att se *redigeringsmenyn*, vilken innehåller en lista med operationer som kan utföras. **Högerklicka för att markera punkten du skapade och för att visa redigeringsmenyn.**",
                 "delete": "Det är ok att radera objekt som inte existerar i verkligheten.{br}Genom att radera ett objekt på OpenStreetMap tas det bort från kartan som alla använder, så du bör försäkra dig om att objektet verkligen är borta innan du raderar det. **Klicka på knappen {button} för att radera punkten.**",
-                "undo": "Du kan alltid ångra alla ändringar fram tills dess att du sparar dina redigeringar till OpenStreetMap. **Klicka på knappen {button} för att ångra raderingen och få tillbaka punkten.**",
-                "play": "Nu när du vet hur du skapar och redigerar punkter, prova att skapa några fler punkter för övningen skull! **När du är redo att fortsätta till nästa kapitel, klicka på '{next}'.**"
+                "undo": "Du kan alltid ångra alla ändringar fram till att du sparar dina redigeringar till OpenStreetMap. **Klicka på knappen {button} för att ångra raderingen och få tillbaka punkten.**",
+                "play": "Nu när du vet hur du skapar och redigerar punkter, prova att skapa några fler punkter för övnings skull! **När du är redo att fortsätta till nästa kapitel, klicka på '{next}'.**"
             },
             "areas": {
                 "title": "Områden",
-                "add_playground": "*Områden* används för att visa avgränsningar för objekt så som sjöar, byggnader och bostadsområden.{br}De kan också används för mer detaljerad kartering av många objekt som du kanske normalt skulle kartera som punkter. **Klicka på knappen {button} Område för att skapa ett nytt område.**",
+                "add_playground": "*Områden* används för att visa avgränsningar för objekt så som sjöar, byggnader och bostadsområden.{br}De kan också användas för mer detaljerad kartläggning av många objekt som du kanske normalt skulle kartlägga som punkter. **Klicka på knappen {button} Område för att skapa ett nytt område.**",
                 "start_playground": "Låt oss lägga till denna lekplats på kartan genom att rita ett område. Områden ritas genom att placera *noder* längs yttre kanten av objektet. **Klicka eller tryck mellanslag för att placera en startnod på ett av hörnen av lekplatsen.**",
                 "continue_playground": "Fortsätt rita området genom att placera noder längs kanten på lekplatsen. Det är ok att ansluta området till existerande gångvägar.{br}Tips: Du kan hålla ned '{alt}'-tangenten för att förhindra att noder kopplas ihop med andra objekt. **Fortsätt att rita ett område runt lekplatsen.**",
                 "finish_playground": "Slutför området genom att trycka Enter eller genom att trycka igen på antingen första eller sista noden. **Rita färdigt området för lekplatsen.**",
                 "search_playground": "**Sök efter '{preset}'.**",
                 "choose_playground": "**Välj {preset} i listan.**",
-                "add_field": "Denna lekplats har inget officiellt namn, så vi anger inget i namnfältet.{br}Låt oss lägga till lite andra detaljer om lekplatsen till fältet Beskrivning. **Öppna listan för Lägg till fält.**",
-                "choose_field": "*'Välj {field} i listan.**",
+                "add_field": "Denna lekplats har inget officiellt namn, så vi anger inget i namnfältet.{br}Låt oss lägga till lite andra detaljer om lekplatsen i fältet Beskrivning. **Öppna listan för Lägg till fält.**",
+                "choose_field": "**Välj {field} i listan.**",
                 "retry_add_field": "Du valde inte fältet {field}. Låt oss försöka igen.",
                 "describe_playground": "**Ange en beskrivning och klicka sedan på knappen {button} för att stänga objektredigeraren.**",
                 "play": "Bra jobbat! Prova att rita lite fler områden för att se vad för typ av områden du kan lägga till på OpenStreetMap. **När du är redo att fortsätta till nästa kapitel, klicka på '{next}'.**"
             },
             "lines": {
                 "title": "Linjer",
-                "add_line": "*Linjer* används för att representera objekt så som vägar, järnvägar och floder. **Klicka på knappen {button} Linje för att lägga till en ny linje.**",
-                "start_line": "Här är en väg som saknas. Låt oss lägga till den!{br}På OpenStreetMap bör linjer ritas längst mitten av vägen. Du kan dra och zooma kartan medan du ritar om det är nödvändigt. **Påbörja en ny linje genom att klicka på den övre änden av den saknade vägen.**",
-                "intersect": "Klicka eller tryck mellanslag för att lägga till fler noder på linjen.{br}Vägar, och många andra typer av linjer, tillhör ett stort nätverk. Det är viktigt för dessa typer av linjer är korrekt anslutna till varandra för att navigationsappar ska fungera. **Klicka på {name} för att skapa en korsning som sammanbinder de två linjerna.**",
+                "add_line": "*Linjer* används för att representera objekt såsom vägar, järnvägar och floder. **Klicka på knappen {button} Linje för att lägga till en ny linje.**",
+                "start_line": "Här är en väg som saknas. Låt oss lägga till den!{br}På OpenStreetMap bör linjer ritas längs mitten av vägen. Du kan dra och zooma kartan medan du ritar om det är nödvändigt. **Påbörja en ny linje genom att klicka på den övre änden av den saknade vägen.**",
+                "intersect": "Klicka eller tryck mellanslag för att lägga till fler noder på linjen.{br}Vägar och många andra typer av linjer bildar större nätverk. Det är viktigt att de linjerna är korrekt anslutna till varandra för att navigationsappar ska fungera. **Klicka på {name} för att skapa en korsning som sammanbinder de två linjerna.**",
                 "retry_intersect": "Vägen måste sammanbindas med {name}. Försök igen!",
-                "continue_line": "Fortsätt rita linjen för den nya vägen. Komihåg att du kan dra och zooma karta om du behöver.{br}När du ritat färdigt, klicka på sista noden igen. **Rita färdigt vägen.**",
+                "continue_line": "Fortsätt att rita linjen för den nya vägen. Kom ihåg att du kan dra och zooma kartan om du behöver.{br}När du har ritat färdigt, klicka på den sista noden igen. **Rita färdigt vägen.**",
                 "choose_category_road": "**Välj {category} i listan.**",
                 "choose_preset_residential": "Det finns många typer av vägar, men detta är en bostadsgata. **Välj typen {preset}.**",
                 "retry_preset_residential": "Du valde inte typen {preset}. **Klicka här för att välja igen.**",
                 "name_road": "**Ge vägen ett namn. Klicka sedan Escape, Enter eller knappen {button} för att stänga objektredigeraren.**",
-                "did_name_road": "Ser bra ut! Nu kommer vi lära oss hur vi uppdatera formen på en linje. ",
-                "update_line": "Ibland måste du ändra formen på en existerande linje. Här är en väg som inte ser helt rätt ut.",
+                "did_name_road": "Ser bra ut! Nu ska vi lära oss hur vi uppdaterar formen på en linje. ",
+                "update_line": "Ibland måste du ändra formen på en befintlig linje. Här är en väg som inte ser helt rätt ut.",
                 "add_node": "Vi kan lägga till några noder på linjen för att förbättra dess form. Ett sätt att lägga till noder är genom att dubbelklicka på linjen där du vill lägga till en nod. **Dubbelklicka på linjen för att skapa en ny nod.**",
                 "start_drag_endpoint": "När en linje är markerad, kan du flytta dess noder genom att klicka och hålla ned vänster musknapp samtidigt som du drar. **Flytta slutpunkten till platsen där korsningen bör vara.**",
-                "finish_drag_endpoint": "Denna platsen ser bra ut. **Släpp vänster musknapp för att slutföra förflyttningen.**",
-                "start_drag_midpoint": "Små trianglar ritas på \"mittpunkten\" mellan noder. Ett annat sätt att skapa en ny nod är genom att dra en mittpunkt till en ny position. **Dra triangeln i mittpunkten för att skapa en ny nod längst kurvan för vägen.**",
+                "finish_drag_endpoint": "Den här platsen ser bra ut. **Släpp vänster musknapp för att slutföra förflyttningen.**",
+                "start_drag_midpoint": "Små trianglar ritas på \"mittpunkten\" mellan noder. Ett annat sätt att skapa en ny nod är genom att dra en mittpunkt till en ny position. **Dra triangeln i mittpunkten för att skapa en ny nod längs kurvan för vägen.**",
                 "continue_drag_midpoint": "Linjen ser mycket bättre ut nu! Fortsätt att justera linjen genom att dubbelklicka eller dra i mittpunkten tills kurvan matchar vägens sträckning. **När du är nöjd med hur linjen ser ut, tryck OK.**",
                 "delete_lines": "Det är ok att radera linjer för vägar som inte existerar i verkligheten.{br}Här är ett exempel där staden planerade den {street} som sedan aldrig byggdes. Vi kan förbättra denna del av kartan genom att radera denna överflödiga linje. ",
-                "rightclick_intersection": "Den sista verkliga gatan är {street1}, så vi kommer att *dela* {street2} vid denna korsningen och radera allt ovanför den. **Högerklicka på noden i korsningen.**",
+                "rightclick_intersection": "Den sista verkliga gatan är {street1}, så vi kommer att *dela* {street2} vid den här korsningen och radera allt ovanför den. **Högerklicka på noden i korsningen.**",
                 "split_intersection": "**Klicka på knappen {button} för att dela {street}.**",
-                "retry_split": "Du tryckte inte på knappen Dela upp. försök igen.",
+                "retry_split": "Du tryckte inte på knappen Dela upp. Försök igen.",
                 "did_split_multi": "Bra jobbat! {street1} är nu delad i två delar. Den övre delen kan raderas. **Klicka på den övre delen av {street2} för att markera den.**",
                 "did_split_single": "**Klicka på övre delen av {street2} för att markera den.**",
                 "multi_select": "{selected} är nu markerad. Låt oss även markera {other1}. Du kan shift-klicka för att markera flera saker. **Håll ned Shift och klicka på {other2}.**",
-                "multi_rightclick": "Bra! Båda linjerna som ska raderas är nu markerade. **Högerklicka på en av linjerna för att visa redigeramenyn.**",
+                "multi_rightclick": "Bra! Båda linjerna som ska raderas är nu markerade. **Högerklicka på en av linjerna för att visa redigeringsmenyn.**",
                 "multi_delete": "**Klicka på knappen {button} för att radera de överflödiga linjerna.**",
                 "retry_delete": "Du klickade inte på knappen Radera. Försök igen.",
                 "play": "Bra! Använd de färdigheter som du har lärt dig i det här kapitlet för att öva på att redigera några fler linjer. ** När du är redo att fortsätta till nästa kapitel, klicka på \"{next}\". **"
@@ -890,29 +911,29 @@
             "buildings": {
                 "title": "Byggnader",
                 "add_building": "OpenStreetMap har världens största databas över byggnader.{br}Du kan hjälpa till att förbättra denna databas genom att rita in byggnader som inte redan är karterade. **Klicka på knappen {button} Område för att lägga till ett nytt område.**",
-                "start_building": "Låt oss lägga till detta hus på kartan genom att rita av dess kontur.{br}Byggnader bör ritas efter hur dess kontur ser ut vid marknivå så gott det går. **Klicka eller tryck mellanslag för att placera en startnod vid ett av hörnen på byggnaden.**",
-                "continue_building": "Fortsätt att lägga till fler noder för att markera byggnadens kontur. Komihåg att du kan zooma in om du vill lägga till fler detaljer.{br}Slutför byggnaden genom att trycka Enter eller genom att klicka igen på antingen första eller sista noden. **Slutför byggnaden.**",
+                "start_building": "Låt oss lägga till detta hus på kartan genom att rita av dess kontur.{br}Byggnader bör ritas efter hur deras kontur ser ut vid marknivå, så gott det går. **Klicka eller tryck mellanslag för att placera en startnod vid ett av hörnen på byggnaden.**",
+                "continue_building": "Fortsätt att lägga till fler noder för att markera byggnadens kontur. Kom ihåg att du kan zooma in om du vill lägga till fler detaljer.{br}Slutför byggnaden genom att trycka Enter eller genom att klicka igen på antingen den första eller sista noden. **Slutför byggnaden.**",
                 "retry_building": "Det ser ut som att du har problem med att placera ut noderna vid byggnadens hörn. Försök igen!",
                 "choose_category_building": "**Välj {category} i listan.**",
-                "choose_preset_house": "Det finns många olika typer av byggnader, men detta är uppenbarligen ett enfamiljshus.{br}Om du inte är säker på typen, är det helt ok att ange det som en en odefinierad Byggnad. **Välj typen {preset}.**",
+                "choose_preset_house": "Det finns många olika typer av byggnader, men detta är uppenbarligen ett enfamiljshus.{br}Om du inte är säker på typen är det helt ok att ange det som en odefinierad \"Byggnad\". **Välj typen {preset}.**",
                 "close": "**Tryck Escape eller klicka på knappen {button} för att stänga objektredigeraren.**",
-                "rightclick_building": "**Högerklicka för att markera byggnaden du skapade och visa redigeramenyn.**",
+                "rightclick_building": "**Högerklicka för att markera byggnaden du skapade och visa redigeringsmenyn.**",
                 "square_building": "Huset du just skapade kommer att se ännu bättre ut med perfekt vinkelräta hörn. **Klicka på knappen {button} för att göra hörnen på byggnaden vinkelräta.**",
                 "retry_square": "Du klickade inte på knappen Räta upp. Försök igen.",
-                "done_square": "Såg du hur byggnadens hörn justerades? Låt oss lära oss ytterligare ett användbart trycks. ",
-                "add_tank": "Nu ska vi rita av konturerna på denna cirkulära lagringstank. **Klicka på knappen {button} Område för att lägga till ett nytt område.**",
-                "start_tank": "Oroa dig inte, du behöver inte rita en perfekt cirkel. Rita bara ett område inuti tanken som nudda vid dess kanter. **Klicka eller tryck mellanslag för att placera en startnod vid kanten av tanken.**",
-                "continue_tank": "Lägg till några fler noder längst kanten. Cirkeln kommer att skapas utanför noderna du just ritade.{br}Slutför området genom att trycka Enter eller genom att trycka igen på antingen första eller sista noden. **Slutför tanken.**",
+                "done_square": "Såg du hur byggnadens hörn justerades? Nu kommer ytterligare ett användbart trick.",
+                "add_tank": "Nu ska vi rita av konturen på denna cirkulära lagringstank. **Klicka på knappen {button} Område för att lägga till ett nytt område.**",
+                "start_tank": "Oroa dig inte, du behöver inte rita en perfekt cirkel. Rita bara ett område inuti tanken som nuddar vid dess kanter. **Klicka eller tryck mellanslag för att placera en startnod vid kanten av tanken.**",
+                "continue_tank": "Lägg till några fler noder längs kanten. Cirkeln kommer sedan att skapas utanför de noder du ritar.{br}Slutför området genom att trycka Enter eller genom att trycka igen på antingen första eller sista noden. **Slutför tanken.**",
                 "search_tank": "**Sök efter '{preset}'.**",
                 "choose_tank": "**Välj {preset} i listan.**",
-                "rightclick_tank": "**Högerklicka för att markera lagringstanken du skapade och för att visa redigeramenyn.**",
+                "rightclick_tank": "**Högerklicka för att markera lagringstanken du skapade och för att visa redigeringsmenyn.**",
                 "circle_tank": "**Klicka på knappen {button} för att göra tanken cirkulär.**",
                 "retry_circle": "Du tryckte inte på knappen Gör till cirkel. Försök igen.",
-                "play": "Bra jobbat! Öva dig genom att rita av några fler byggnader och prova några fler av kommandona i redigeramenyn. **När du är redo att fortsätta till nästa kapitel, klicka på '{next}'.**"
+                "play": "Bra jobbat! Öva dig genom att rita av några fler byggnader och prova några fler av kommandona i redigeringsmenyn. **När du är redo att fortsätta till nästa kapitel, klicka på '{next}'.**"
             },
             "startediting": {
                 "title": "Börja redigera",
-                "help": "Du är nu redo att redigera OpenStreetMap!{br}Du kan göra om denna genomgång när du vill, eller läsa mer i dokumentationen genom att klicka på knappen {button} Hjälp eller trycka på '{key}'-tangenten.",
+                "help": "Du är nu redo att redigera OpenStreetMap!{br}Du kan repetera denna genomgång när du vill, eller läsa mer i dokumentationen genom att klicka på knappen {button} Hjälp eller trycka på '{key}'-tangenten.",
                 "shortcuts": "Du kan se en lista med kommandon tillsammans med deras kortkommandon genom att trycka på tangenten '{key}'.",
                 "save": "Glöm inte att regelbundet spara dina ändringar!",
                 "start": "Börja kartera!"
@@ -1004,15 +1025,15 @@
                     "title": "Operationer",
                     "continue_line": "Fortsätt en linje från markerad nod",
                     "merge": "Kombinera (sammanfoga) markerade objekt",
-                    "disconnect": "Bryt av objekt vid markerad nod",
+                    "disconnect": "Koppla isär objekt vid markerad nod",
                     "split": "Dela en linje i två vid markerad nod",
                     "reverse": "Byt riktning på en linje",
                     "move": "Flytta markerade objekt",
                     "rotate": "Rotera markerade objekt",
                     "orthogonalize": "Räta ut linje / Räta upp hörnen på område",
-                    "circularize": "Gör en stängd linje eller ett område cirkulär. ",
-                    "reflect_long": "Spegla objekt längst dess långa axel",
-                    "reflect_short": "Spegla objekt längst dess korta axel",
+                    "circularize": "Gör en sluten linje eller ett område cirkulär. ",
+                    "reflect_long": "Spegla objekt längs dess långa axel",
+                    "reflect_short": "Spegla objekt längs deras korta axel",
                     "delete": "Radera markerade objekt"
                 },
                 "commands": {
@@ -1205,6 +1226,9 @@
                 "aeroway": {
                     "label": "Typ"
                 },
+                "agrarian": {
+                    "label": "Produkter"
+                },
                 "amenity": {
                     "label": "Typ"
                 },
@@ -1273,6 +1297,9 @@
                 "board_type": {
                     "label": "Typ"
                 },
+                "boules": {
+                    "label": "Typ"
+                },
                 "boundary": {
                     "label": "Typ"
                 },
@@ -1292,6 +1319,10 @@
                 "bunker_type": {
                     "label": "Typ"
                 },
+                "cables": {
+                    "label": "Kablar",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Riktning (grader medurs)",
                     "placeholder": "45, 90, 180, 270"
@@ -1377,6 +1408,14 @@
                 "craft": {
                     "label": "Typ"
                 },
+                "crane/type": {
+                    "label": "Krantyp",
+                    "options": {
+                        "floor-mounted_crane": "Golvmonterad kran",
+                        "portal_crane": "Portalkran",
+                        "travel_lift": "Traverslift"
+                    }
+                },
                 "crop": {
                     "label": "Grödor"
                 },
@@ -1449,6 +1488,10 @@
                 "description": {
                     "label": "Beskrivning"
                 },
+                "devices": {
+                    "label": "Enheter",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Skötbord tillgängligt"
                 },
@@ -1523,6 +1566,9 @@
                         "wall": "Vägg"
                     }
                 },
+                "fitness_station": {
+                    "label": "Typ av utrustning"
+                },
                 "fixme": {
                     "label": "Fixa mig"
                 },
@@ -1530,6 +1576,9 @@
                     "label": "Typ",
                     "placeholder": "Standard"
                 },
+                "frequency": {
+                    "label": "Arbetsfrekvens"
+                },
                 "fuel": {
                     "label": "Bränsle"
                 },
@@ -1561,6 +1610,9 @@
                 "generator/type": {
                     "label": "Typ"
                 },
+                "government": {
+                    "label": "Typ"
+                },
                 "grape_variety": {
                     "label": "druvsorter"
                 },
@@ -1572,6 +1624,7 @@
                     "label": "Ledstång"
                 },
                 "hashtags": {
+                    "label": "Föreslagna hashtag",
                     "placeholder": "#exempel"
                 },
                 "healthcare": {
@@ -1710,7 +1763,7 @@
                     "placeholder": "2, 4, 6..."
                 },
                 "lit": {
-                    "label": "Upplyst"
+                    "label": "Belysning"
                 },
                 "location": {
                     "label": "Lokalisering"
@@ -1887,6 +1940,10 @@
                 "payment_multi": {
                     "label": "Betalningssätt"
                 },
+                "phases": {
+                    "label": "Faser",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Telefon",
                     "placeholder": "+46 31 123 4567"
@@ -1939,6 +1996,15 @@
                     "label": "Effektuttaget",
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
+                "playground/baby": {
+                    "label": "Babygunga"
+                },
+                "playground/max_age": {
+                    "label": "Högsta ålder"
+                },
+                "playground/min_age": {
+                    "label": "Lägsta ålder"
+                },
                 "population": {
                     "label": "Folkmängd"
                 },
@@ -1957,6 +2023,9 @@
                 "railway": {
                     "label": "Typ"
                 },
+                "rating": {
+                    "label": "Märkeffekt"
+                },
                 "recycling_accepts": {
                     "label": "Accepterar"
                 },
@@ -2155,9 +2224,19 @@
                     },
                     "placeholder": "Okänt"
                 },
+                "structure_waterway": {
+                    "label": "Struktur",
+                    "options": {
+                        "tunnel": "Tunnel"
+                    },
+                    "placeholder": "Okänd"
+                },
                 "studio": {
                     "label": "Typ"
                 },
+                "substance": {
+                    "label": "Substans"
+                },
                 "substation": {
                     "label": "Typ"
                 },
@@ -2184,6 +2263,15 @@
                 "surveillance/zone": {
                     "label": "Övervakningsområde"
                 },
+                "switch": {
+                    "label": "Typ",
+                    "options": {
+                        "circuit_breaker": "Effektbrytare",
+                        "disconnector": "Frånskiljare",
+                        "earthing": "Enpelarjordningskopplare",
+                        "mechanical": "Lastbrytare"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Ledstråk"
                 },
@@ -2235,6 +2323,9 @@
                     },
                     "placeholder": "Fast, Mestadels fast, Mjuk ..."
                 },
+                "trade": {
+                    "label": "Typ"
+                },
                 "traffic_calming": {
                     "label": "Typ"
                 },
@@ -2253,6 +2344,19 @@
                     },
                     "placeholder": "Utmärkt, bra, dåligt..."
                 },
+                "transformer": {
+                    "label": "Typ",
+                    "options": {
+                        "auto": "Enkellindad transformator",
+                        "auxiliary": "Lokaltransformator",
+                        "converter": "Konverterare",
+                        "distribution": "Distribution",
+                        "generator": "Generator",
+                        "phase_angle_regulator": "Fasregulator",
+                        "traction": "Enfastransformator",
+                        "yes": "Okänd"
+                    }
+                },
                 "trees": {
                     "label": "Träd"
                 },
@@ -2287,6 +2391,18 @@
                         "stratovolcano": "Stratovulkan"
                     }
                 },
+                "voltage": {
+                    "label": "Spänning"
+                },
+                "voltage/primary": {
+                    "label": "Primärspänning"
+                },
+                "voltage/secondary": {
+                    "label": "Sekundärspänning"
+                },
+                "voltage/tertiary": {
+                    "label": "Tertiärspänning"
+                },
                 "wall": {
                     "label": "Typ"
                 },
@@ -2314,6 +2430,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Lindningar",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Lindningskonfiguration",
+                    "options": {
+                        "delta": " D-koppling",
+                        "leblanc": " Leblanc-koppling",
+                        "open": "Öppna lindningar",
+                        "open-delta": "Öppen D-koppling",
+                        "scott": " Scott-koppling",
+                        "star": " Y-koppling",
+                        "zigzag": " Z-koppling"
+                    }
                 }
             },
             "presets": {
@@ -2518,6 +2650,10 @@
                     "name": "Abortklinik",
                     "terms": "abort, abortklinik, framkallat missfall, missfall, fosterfördrivning, avbrytande av havandeskap"
                 },
+                "amenity/clinic/fertility": {
+                    "name": "Fertilitetsklinik",
+                    "terms": "Fertilitetsklinik, Fertilitet, IVF, Fertilitetscentrum, Insemination, Äggfrys, barnlöshet, befruktning, äggdonation, spermadonation, spermie, fortplantning, reproduktion, ägglossning"
+                },
                 "amenity/clock": {
                     "name": "Klocka",
                     "terms": "Klocka, ur, urtavla, kyrkklocka, tidur, solur, väggur, väggklocka"
@@ -2633,6 +2769,10 @@
                     "name": "Motorcykelparkering",
                     "terms": "Motorcykelparkering, parkering motorcykel, ställplats, motorcykelställ, parkering, motorcykel, parkeringsplats, parkeringsplats motorcykel"
                 },
+                "amenity/music_school": {
+                    "name": "Musikskola",
+                    "terms": "musikskola, musik, kultur, kulturskola, sångskola, instrumentskola, instrument, musikinstrument, kör, sång"
+                },
                 "amenity/nightclub": {
                     "name": "Nattklubb",
                     "terms": "Nattklubb, disko*, diskotek, klubb, nöjeslokal, dansställe, bar, disco, dans, dansklubb"
@@ -2756,8 +2896,7 @@
                     "terms": "Skolgård, skolområde, Campus, universitetsområde, högskoleområde, universitet, högskola, grundskola, mellanstadium, lågstadium, högstadium, gymnasium"
                 },
                 "amenity/scrapyard": {
-                    "name": "Bilskrot",
-                    "terms": "Bilskrot, skrot, bil, fordon, metall, bärgning, vrak, bildemontering, metallavfall, metallskräp, metallskrot, skrotupplag, skrotningsanläggning"
+                    "name": "Bilskrot"
                 },
                 "amenity/shelter": {
                     "name": "Väderskydd",
@@ -2838,6 +2977,10 @@
                     "name": "Bajspåsar",
                     "terms": "Bajspåsar, hundbajspåsar, hundpåsar, hundbajs, hundskit, skitpåse, avföringspåse, bajs, hund, djur"
                 },
+                "amenity/vending_machine/feminine_hygiene": {
+                    "name": "Varumaskin för mensskydd",
+                    "terms": "Varumaskin för mensskydd, mensskydd, kondom, tampong, bindor, binda, kvinna, kvinnor, mens, menstruation"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Tidningsautomat"
                 },
@@ -3217,6 +3360,10 @@
                     "name": "Urmakare (väggur)",
                     "terms": "Urmakare, klockmakare"
                 },
+                "craft/confectionery": {
+                    "name": "Godistillverkare",
+                    "terms": "Godistillverkare, sötsaker, godis, karameller, godisfabrik, godsaker, konfekt, konfektyrer, choklad, pastiller"
+                },
                 "craft/distillery": {
                     "name": "Destilleri",
                     "terms": "alkohol,bourbon,sprit,brandy,gin,sprit,mezcal,spritdryck,rom,scotch,sprit,tequila,vodka,whisky,whisky, Destilleri, spritdestillering, hembränning, alkoholdestillering, sprittillverkning, alkoholtillverkning"
@@ -3318,9 +3465,9 @@
                     "name": "Ställningsbyggare",
                     "terms": "Ställningsbyggare, byggnadsställning, ställning"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Skulptör",
-                    "terms": "Skulptör, staty, skulptur, stenskulptör, bildhuggare, bildsnidare"
+                    "terms": "skulptör, bildhuggare, skulpturer, skulptur, bildsnidare, staty"
                 },
                 "craft/shoemaker": {
                     "name": "Skomakare",
@@ -3330,10 +3477,6 @@
                     "name": "Stenhuggare",
                     "terms": "Stenhuggare, stenbrott"
                 },
-                "craft/sweep": {
-                    "name": "Sotare",
-                    "terms": "Sotare, skorstensfejare"
-                },
                 "craft/tailor": {
                     "name": "Skräddare"
                 },
@@ -3411,10 +3554,18 @@
                     "name": "Vägpassage",
                     "terms": "Vägövergång, övergångsställe, vägpassage, gångvägspassage, gångpassage"
                 },
+                "footway/crossing-raised": {
+                    "name": "Upphöjd vägkorsning",
+                    "terms": "Upphöjd vägkorsning, vägövergång, farthinder, fartdämpare, gupp, upphöjd"
+                },
                 "footway/crosswalk": {
                     "name": "Övergångsställe för gående",
                     "terms": "Övergångsställe för gående, övergångsställe, Vägövergång, vägpassage, gångvägspassage, gångpassage"
                 },
+                "footway/crosswalk-raised": {
+                    "name": "Upphöjt övergångsställe",
+                    "terms": "Upphöjd vägkorsning, Upphöjt övergångsställe, vägövergång, övergångsställe, farthinder, fartdämpare, gupp, upphöjd"
+                },
                 "footway/sidewalk": {
                     "name": "Trottoar",
                     "terms": "Trottoar, gångbana, gångväg"
@@ -3463,10 +3614,66 @@
                     "name": "Vattenhinde",
                     "terms": "Vattenhinde, golf"
                 },
+                "healthcare": {
+                    "name": "Hälsovård",
+                    "terms": "Hälsovård, klinik, mottagning, doktor, läkare, sjukdom, hälsa, institution, sjuk, kirurgi, välmående"
+                },
+                "healthcare/alternative": {
+                    "name": "Alternativmedicin",
+                    "terms": "Alternativmedicin, alternativ medicin, akupunktur, antroposofisk, tillämpad kinesiologi, aromaterapi, ayurveda, herbalism, örtmedicin, homeopati, hydroterapi, hypnos, naturopati, osteopati, reflexologi, reiki, shiatsu, traditionell, tuina, unani"
+                },
+                "healthcare/alternative/chiropractic": {
+                    "name": "Kiropraktik (rygg)",
+                    "terms": "Kiropraktor, Kiropraktik, ryggbesvär, ryggen, smärta, ryggsmärta, ryggrad, Kotknackare"
+                },
+                "healthcare/audiologist": {
+                    "name": "Audionomi (hörsel)",
+                    "terms": "Audionomist, Audionomi, Audionom, öra, örat, hörsel, ljud, hörapparat"
+                },
+                "healthcare/birthing_center": {
+                    "name": "Förlossning",
+                    "terms": "Förlossning, Förlossningsavdelning, Barnbördshus , BB, barn, baby, bäbis, bebis,  förlossning, graviditet, barnafödsel"
+                },
                 "healthcare/blood_donation": {
                     "name": "Blodgivarcentral",
                     "terms": "Blodgivarcentral, blodcentral, blodgivare, blodgivning, bloddonation, ge blod, donera blod, blodbank, blodtransfusion, aferes, plasmaferes, Plateletpheresis, stamcellsdonation"
                 },
+                "healthcare/hospice": {
+                    "name": "Hospis (palliativ vård)",
+                    "terms": "Hospis, Palliativ vård, död, döende, terminalvård "
+                },
+                "healthcare/midwife": {
+                    "name": "Barnmorska",
+                    "terms": "Barnmorska,  jordemo, ackuschörska, mödrahälsovård, mödravårdscentra, gynekolog, Gynekologi, Preventivmedel, ungdomsmottagning"
+                },
+                "healthcare/occupational_therapist": {
+                    "name": "Arbetsterapi",
+                    "terms": "Arbetsterapi, terapeut, terapi, rehabilitering, ergonomi, hjälpmedel"
+                },
+                "healthcare/optometrist": {
+                    "name": "Optometri (ögon)",
+                    "terms": "Optometri, Optometrier , ögon, glasögon, ögonlaser, linser, syn, synfel, korrektionsglas, synhjälpmedel"
+                },
+                "healthcare/physiotherapist": {
+                    "name": "Fysioterapi (sjukgymnastik)",
+                    "terms": "Fysioterapeut, Fysioterapi, sjukgymnastik, fysisk, terapeut, terapi"
+                },
+                "healthcare/podiatrist": {
+                    "name": "Podiatri (fötter)",
+                    "terms": "Podiatri, podiatriker, fot, fötter, naglar, fothälsa, fotkirurgi"
+                },
+                "healthcare/psychotherapist": {
+                    "name": "Psykoterapi",
+                    "terms": "Psykoterapi, Psykoterapeut, psykologisk behandling, ångest, rådgivare, depression, mental hälsa, sinne, självmord, terapeut, terapi, psykolog,  kuratorer"
+                },
+                "healthcare/rehabilitation": {
+                    "name": "Rehabilitering",
+                    "terms": "Rehabilitering, Rehab, terapeut, terapi"
+                },
+                "healthcare/speech_therapist": {
+                    "name": "Logoped (röst/tal)",
+                    "terms": "Logoped, tal, terapeut, terapi, röst, språk, språkstörning, talstörning, röststörning, dysfagi"
+                },
                 "highway": {
                     "name": "Väg"
                 },
@@ -3486,10 +3693,18 @@
                     "name": "Vägkorsning",
                     "terms": "Korsning, kryss, vägkors, kors, vägskäl, gatukorsning, plankorsning, vägpassage"
                 },
+                "highway/crossing-raised": {
+                    "name": "Upphöjd vägkorsning",
+                    "terms": "Upphöjd vägkorsning, vägövergång, farthinder, fartdämpare, gupp, upphöjd"
+                },
                 "highway/crosswalk": {
                     "name": "Övergångsställe för gående",
                     "terms": "Övergångsställe för gående, övergångsställe, Vägövergång, vägpassage, gångvägspassage, gångpassage"
                 },
+                "highway/crosswalk-raised": {
+                    "name": "Upphöjt övergångsställe",
+                    "terms": "Upphöjd vägkorsning, Upphöjt övergångsställe, vägövergång, övergångsställe, farthinder, fartdämpare, gupp, upphöjd"
+                },
                 "highway/cycleway": {
                     "name": "Cykelväg",
                     "terms": "cykelväg, cykelled, gc-väg, gång- och cykelväg, cykel"
@@ -3530,9 +3745,13 @@
                     "name": "Stig",
                     "terms": "Stig, gång, led, spår, gångväg, vandringsled, vandra, vandring, promenad, löparbana, motionsspår"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Gångfartsområde",
+                    "terms": "Gångfartsområde, gångfart, centrum, plaza, torg, gångväg, gångområde, gågata, gårdsgata"
+                },
+                "highway/pedestrian_line": {
                     "name": "Gågata",
-                    "terms": "Gågata, gångbana, gående, fotgängare, gånggata, affärsgata, shoppinggata"
+                    "terms": "Gågata, centrum, plaza, torg, gångväg, gångområde, gång, promenad, gångbana, gående, fotgängare, affärsgata, shoppinggata"
                 },
                 "highway/primary": {
                     "name": "Primär väg",
@@ -3710,6 +3929,10 @@
                     "name": "Avrinningsområde",
                     "terms": "avrinning, avrinningsområde, bassäng, infiltration, infiltrering, dagvatten, dagvattenbassäng"
                 },
+                "landuse/brownfield": {
+                    "name": "Övergivet industriområde (Brownfield)",
+                    "terms": "Industriområde, övergivet, rivet, rivningstomt, förorenat, industri, ödetomt, byggtomt, Brownfield"
+                },
                 "landuse/cemetery": {
                     "name": "Gravfällt",
                     "terms": "Kyrkogård, begravningsplats, gravfält, griftegård, grav"
@@ -3749,6 +3972,10 @@
                     "name": "Gräs",
                     "terms": "Gräs, klippt gräs, refug, rondell, mittremsa"
                 },
+                "landuse/greenfield": {
+                    "name": "Planerad byggnation",
+                    "terms": "Greenfield, planerad byggnation, framtid, urbanisering"
+                },
                 "landuse/harbour": {
                     "name": "Hamn",
                     "terms": "Hamn, kaj, marin, båt, båtplats, båtterminal"
@@ -3757,6 +3984,14 @@
                     "name": "Industriområde",
                     "terms": "Industriområde, fabriksområde, fabriksdistrikt, industricentrum"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Skrotupplag",
+                    "terms": "Bilskrot, skrot, bil, fordon, metall, bärgning, vrak, bildemontering, metallavfall, metallskräp, metallskrot, skrotupplag, skrotningsanläggning, skräp, metallåtervinning"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Slaktare",
+                    "terms": "Slaktare, slakteri, slakthus, slakt, styckning, styckare, kött, chark, styckningsanläggning, nötkött, slaktare, kalv, kyckling, ko, gris, fläsk, fjäderfän"
+                },
                 "landuse/landfill": {
                     "name": "Soptipp",
                     "terms": "Soptipp, återvinningscentral, avskrädeshög, avfallsanläggning, tipp"
@@ -3833,6 +4068,10 @@
                     "name": "Rekreationsområde",
                     "terms": "Park, parkområde, rekreationsområde, friluftsområde, trädgård, grönområde, parkanläggning"
                 },
+                "landuse/religious": {
+                    "name": "Religiöst område",
+                    "terms": "Religiöst område, religiös, religion, tillbedjan, kyrka, moské, synagoga, kyrkogård, religiös anläggning, tempelområde, tempel, böneplats, andligt område"
+                },
                 "landuse/residential": {
                     "name": "Bostadsområde",
                     "terms": "Bostadsområde, villaområde, lägenhetsområde, getto, miljonområde, förort, "
@@ -3889,6 +4128,43 @@
                     "name": "Utomhusgym",
                     "terms": "Utomhusgym, utegym, gym, fitness, träning"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Balansbom (träning)",
+                    "terms": "Balansbom, balans, träning, fitness, gym, träningsspår"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Träningsplattform",
+                    "terms": "låda, hoppövning, plattform, hopp, träning, fitness, gym, träningsbana"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Räck (träning)",
+                    "terms": "räck, bar, träning, fitness, gym, pullup, träningsbana"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Armgång"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Ryggsträckare"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Barrpress",
+                    "terms": "Dips, Barrpress, barr, motion, fitness, gym"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Armhävningsstation"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Ringar"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Instruktionsskylt"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Situps-station"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Träningstrappa"
+                },
                 "leisure/garden": {
                     "name": "Trädgård",
                     "terms": "Trädgård, park, plantering, örtgård, odlingslott, botanisk trädgård, botanisk, botanik, zoologisk trädgård"
@@ -3897,6 +4173,10 @@
                     "name": "Golfbana",
                     "terms": "Golfbana, golf, golfanläggning, golfcenter"
                 },
+                "leisure/hackerspace": {
+                    "name": "Hackerspace",
+                    "terms": "hackerspace, hackare, hackers, lan, makerspace, hacklab, projekt"
+                },
                 "leisure/horse_riding": {
                     "name": "Ridskola",
                     "terms": "Ridskola, häst, hästridning, ridning, rida, stall, ryttare, häst*, ridklubb, ridhus, "
@@ -3945,6 +4225,10 @@
                     "name": "Beachvolleyplan",
                     "terms": "beachvolleyplan, beachplan, beachvolley, beachhandboll, beachfotboll, Beachvolleyboll, strandvolleyboll, volleyboll, Beachhall, Beachvolleyhall"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Boule/Bocce-plan",
+                    "terms": "Boule, Bocce, Boule, pétanque, lyonnaise"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Bowlsplan",
                     "terms": "Bowls, Shortmat"
@@ -3997,6 +4281,10 @@
                     "name": "Kapplöpningsbana",
                     "terms": "Kapplöpningsbana, löpbana, motionsspår, Löparbana "
                 },
+                "leisure/sauna": {
+                    "name": "Bastu",
+                    "terms": "Bastu, sauna, badstuga, kölna"
+                },
                 "leisure/slipway": {
                     "name": "Stapelbädd",
                     "terms": "Stapelbädd, Sjösättningsplats, staplar, varv, docka, fartygsdocka, torrdocka, båtramp, sjösättning, båtramp"
@@ -4049,6 +4337,10 @@
                     "name": "Skorsten",
                     "terms": "skorsten, rökgång"
                 },
+                "man_made/crane": {
+                    "name": "Kran",
+                    "terms": "Kran, lyftkran, vinsch, travers, telfer"
+                },
                 "man_made/cutline": {
                     "name": "Snittlinje i skog",
                     "terms": "Snittlinje, skiljelinje, rågång, gränslinje, gräns, brandgata, skogssektion, skidspår, pipeline, rörgata, pipelinegata, jaktgata,  skogsområde, domän"
@@ -4277,16 +4569,27 @@
                     "terms": "Kontor, tjänster, tjänsteman, tjänstemän, byrå, expedition"
                 },
                 "office/accountant": {
-                    "name": "Revisor",
-                    "terms": "Revisor, revision, räkenskapsgranskare, granskningsman, kontrollant"
+                    "name": "Bokhållare",
+                    "terms": "bokhållare, Redovisningsekonom, bokföring, kontorist, räkenskap, tjänsteman"
                 },
                 "office/administrative": {
                     "name": "Lokal myndighet",
                     "terms": "Lokal myndighet, myndighet, kommun, kommunkontor, kommunbyggnad"
                 },
+                "office/adoption_agency": {
+                    "name": "Adoptionsbyrå"
+                },
+                "office/advertising_agency": {
+                    "name": "Reklambyrå"
+                },
                 "office/architect": {
-                    "name": "Arkitekt",
-                    "terms": "Arkitekt, byggnadskonstnär, byggnadskonst, ritningar"
+                    "name": "Arkitektbyrå"
+                },
+                "office/association": {
+                    "name": "Frivilligorganisation"
+                },
+                "office/charity": {
+                    "name": "Välgörenhetsorganisation"
                 },
                 "office/company": {
                     "name": "Företagskontor",
@@ -4304,6 +4607,10 @@
                     "name": "Arbetsförmedling",
                     "terms": "Arbetsförmedling, arbetsförmedlingen, arbetslös, arbetssökande, förmedling, jobb"
                 },
+                "office/energy_supplier": {
+                    "name": "Energibolag",
+                    "terms": "Energibolag, Elbolag, el, ström, energi, gas"
+                },
                 "office/estate_agent": {
                     "name": "Mäklare/bostadsförmedling",
                     "terms": "Bostadsförmedling, fastighetsförmedling, husförmedling, mäklare, egendom, mark, fastighet, fastighetsmäklare, bostadsuthyrning, fastighetsuthyrning, kontorsuthyrning"
@@ -4312,6 +4619,12 @@
                     "name": "Bankkontor",
                     "terms": "Bankkontor, finanskontor, ekonomi, finans, bank, ekonomisk"
                 },
+                "office/forestry": {
+                    "name": "Skogsbolag"
+                },
+                "office/foundation": {
+                    "name": "Stiftelse"
+                },
                 "office/government": {
                     "name": "Myndighet",
                     "terms": "Myndighet, myndighetskontor, statlig myndighet"
@@ -4320,13 +4633,19 @@
                     "name": "Registreringsbyrå",
                     "terms": "Registreringsbyrå, borgerlig vigsel, stadshus, registrerade enhet, inskrivningskontor, registreringskontor, Folkbokföring, Skattemyndigheten, mantalslängder"
                 },
+                "office/government/tax": {
+                    "name": "Skattekontor"
+                },
+                "office/guide": {
+                    "name": "Guidekontor",
+                    "terms": "Guidekontor, Rundtur, Dykguide, Fjällguide, Turistguide, guide"
+                },
                 "office/insurance": {
                     "name": "Försäkringskontor",
                     "terms": "Försäkringskontor, försäkringar, försäkringsförmedling"
                 },
                 "office/it": {
-                    "name": "IT-kontor",
-                    "terms": "IT-kontor, datorföretag, dataföretag, IT-företag, informationsteknologi, dotcomföretag, IT-konsult, datakonsult, datorkonsult, helpdesk"
+                    "name": "IT-kontor"
                 },
                 "office/lawyer": {
                     "name": "Advokatkontor",
@@ -4336,14 +4655,19 @@
                     "name": "Notariekontor",
                     "terms": "Notariekontor, Notarie, Notarius, Notarius publicus, signatur, fullmakt, namnteckning, påskrift, underskrift, bevittna, testamente, arv, handlingar, kontrakt, avtal, egendom, dödsbo, värdehandlningar"
                 },
+                "office/moving_company": {
+                    "name": "Flyttfirma"
+                },
                 "office/newspaper": {
-                    "name": "Tidningsredaktion",
-                    "terms": "Tidningsredaktion, tidning, nyhetsredaktion, redaktion, tidningslokal, utgivare, tidskrift, magasin"
+                    "name": "Tidningsredaktion"
                 },
                 "office/ngo": {
                     "name": "Icke-statlig organisation",
                     "terms": "Icke-statlig organisation, organisation, hjälporganisation, fackförening, ideell förening, ideell, förening, icke-kommersiell, frivilligorganisation, frivillig, intresseorganisation"
                 },
+                "office/notary": {
+                    "name": "Notarie"
+                },
                 "office/physician": {
                     "name": "Läkare"
                 },
@@ -4351,21 +4675,36 @@
                     "name": "Politiskt parti",
                     "terms": "Politiskt parti, politik, parti"
                 },
+                "office/private_investigator": {
+                    "name": "Privatdetektiv"
+                },
+                "office/quango": {
+                    "name": "Kvasiautonom icke-statlig organisation",
+                    "terms": "Quango, Kvasiautonom, icke-statlig, organisation, kvasi"
+                },
                 "office/research": {
                     "name": "Forskning och utveckling",
                     "terms": "Forskning och utveckling, forskning, utveckling, vetenskapligt studium, vetenskapligt arbete, undersökning, efterforskning, research"
                 },
+                "office/surveyor": {
+                    "name": "Lantmätare"
+                },
+                "office/tax_advisor": {
+                    "name": "Skatterådgivning"
+                },
                 "office/telecommunication": {
                     "name": "Telekom",
                     "terms": "Telekom, telefoni, telefoner, telefon, internet, internetcafé, surfning, surfcafé mobil, mobiltelefon, mobiltelefoni"
                 },
                 "office/therapist": {
-                    "name": "Terapeut",
-                    "terms": "Terapeut, behandling, behandlare, psykolog, psykoterapeut, psykologi, terapi, Arbetsterapi, arbetsterapeut, Fysioterapi,sjukgymnast, logoped, Språkterapi, Talterapi, Röstterapi, Kemoterapi, cellgiftsbehandling, Radioterapi, Farmakoterapi, Samtalsterapi, Psykoterapi, Kognitiv beteendeterapi, beteendeterapi, kbt, Kognitiv terapi, Beteendeterapi, Psykoanalys, Sexterapi, Familjeterapi"
+                    "name": "Terapeut"
                 },
                 "office/travel_agent": {
                     "name": "Resebyrå "
                 },
+                "office/water_utility": {
+                    "name": "Vattenleverantör"
+                },
                 "piste": {
                     "name": "Pist/skidspår",
                     "terms": "Pist, skidspår, skidbacke, slalombacke, skidbana, utförsåkning, längdskidåkning, längdskidspår, skidor, skida, pulka, snowboard, utförsåkning, skoter"
@@ -4388,6 +4727,9 @@
                     "name": "Ö",
                     "terms": "ö, holme, skär, kobbe, klippa, rev, atoll, skärgård, rev"
                 },
+                "place/islet": {
+                    "name": "Holme"
+                },
                 "place/isolated_dwelling": {
                     "name": "Isolerad boplats",
                     "terms": "Isolerad boplats, boplats, bosättning"
@@ -4400,6 +4742,10 @@
                     "name": "Kvarter",
                     "terms": "Kvarter, närområde, bostadsområde, stadsdel, område"
                 },
+                "place/plot": {
+                    "name": "Tomt",
+                    "terms": "tomt, lott, trädgård, hustomt, privat, mark, skifte"
+                },
                 "place/quarter": {
                     "name": "Kvarter / Under-Borough",
                     "terms": "Kvarter, Under-Borough, stadsdel, område, grannskap,"
@@ -4420,6 +4766,52 @@
                     "name": "Mindre samhälle",
                     "terms": "tätort, ort"
                 },
+                "playground/balance_beam": {
+                    "name": "Balansbom (lekplats)",
+                    "terms": "balansbom, balans, bom"
+                },
+                "playground/basket_spinner": {
+                    "name": "Korgkarusell"
+                },
+                "playground/basket_swing": {
+                    "name": "Korggunga"
+                },
+                "playground/climbing_frame": {
+                    "name": "Klätterställning"
+                },
+                "playground/cushion": {
+                    "name": "Hoppkudde"
+                },
+                "playground/horizontal_bar": {
+                    "name": "Räck (lekplats)",
+                    "terms": "bar, räck, lekplats"
+                },
+                "playground/rocker": {
+                    "name": "Fjädergunga",
+                    "terms": "Gungdjur,Fjädergunga"
+                },
+                "playground/roundabout": {
+                    "name": "Karusell"
+                },
+                "playground/sandpit": {
+                    "name": "Sandlåda"
+                },
+                "playground/seesaw": {
+                    "name": "Gungbräda"
+                },
+                "playground/slide": {
+                    "name": "Rutschkana"
+                },
+                "playground/structure": {
+                    "name": "Lekslott"
+                },
+                "playground/swing": {
+                    "name": "Gungställning",
+                    "terms": "Gunga,Gungställning"
+                },
+                "playground/zipwire": {
+                    "name": "Linbana"
+                },
                 "point": {
                     "name": "Punkt",
                     "terms": "Punkt, fläck, läge, ställe, plats"
@@ -4462,6 +4854,10 @@
                     "name": "Fördelningsstation",
                     "terms": "Transformator, elomvandling, elskåp, fördelningsstation, stadsnätstation, elfördelning"
                 },
+                "power/switch": {
+                    "name": "Frånskiljare",
+                    "terms": "Strömbrytare,Frånskiljare"
+                },
                 "power/tower": {
                     "name": "Högspänningsmast",
                     "terms": "Högspänningsmast, kraftledningsstolpe, kraftledningsmast, mast"
@@ -4580,6 +4976,9 @@
                     "name": "Affär",
                     "terms": "Affär, shop, butik"
                 },
+                "shop/agrarian": {
+                    "name": "Jordbruksaffär"
+                },
                 "shop/alcohol": {
                     "name": "Vin-och-spritaffär",
                     "terms": "Vinaffär, spritaffär, vin- och sprit, vin- och spritaffär, systemet, systembolaget, bolaget, alkohol, öl, vin, sprit"
@@ -5002,6 +5401,10 @@
                     "name": "Biljettförsäljning",
                     "terms": "Biljettförsäljning, biljetter, biljettkassa, biljettsäljare, biljettkontor, biljettlucka, biljettåterförsäljare"
                 },
+                "shop/tiles": {
+                    "name": "Kakelbutik",
+                    "terms": "Kakelbutik, Klinker, kakel, plattor, plattsättare, kakelplatta"
+                },
                 "shop/tobacco": {
                     "name": "Tobaksbutik",
                     "terms": "Tobaksbutik, tobak, rökning, pipa, pipor, snus, cigaretter,  cigarett, cigarr, cigarrer, röktillbehör"
@@ -5010,6 +5413,9 @@
                     "name": "Leksaksaffär",
                     "terms": "Leksaksaffär, leksaker, barnsaker"
                 },
+                "shop/trade": {
+                    "name": "Proffshandel"
+                },
                 "shop/travel_agency": {
                     "name": "Resebyrå",
                     "terms": "Resebyrå, reseagent, biljettförsäljning, charter, charterflyg, charterresa "
@@ -5090,8 +5496,7 @@
                     "terms": "Ställplats, campingplats, camping, husvagnscamping, husbilscamping, fricamping"
                 },
                 "tourism/chalet": {
-                    "name": "Campingstuga",
-                    "terms": "Campingstuga, stuga, sommarstuga"
+                    "name": "Stuga"
                 },
                 "tourism/gallery": {
                     "name": "Konstgalleri",
@@ -5149,6 +5554,9 @@
                     "name": "Utsiktspunkt",
                     "terms": "Utsiktsplats, utsikt, vy"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Stuga (för vandrare o.d.)"
+                },
                 "tourism/zoo": {
                     "name": "Zoo",
                     "terms": "Zoo, zoologisk trädgård, djurpark"
@@ -5189,6 +5597,9 @@
                     "name": "Bullerräfflor",
                     "terms": "Bullerräfflor, Pennsylvaniaräfflor"
                 },
+                "traffic_calming/table": {
+                    "name": "Fartgupp (långt)"
+                },
                 "type/boundary": {
                     "name": "Gräns",
                     "terms": "Gräns, gränslinje, administrativ gräns"
@@ -5292,6 +5703,9 @@
                     "name": "Plats",
                     "terms": "Plats, ställe, läge, anläggning"
                 },
+                "type/waterway": {
+                    "name": "Vattendrag"
+                },
                 "vertex": {
                     "name": "Annat",
                     "terms": "Annat, övrigt"
@@ -5343,6 +5757,9 @@
                     "name": "Bäck",
                     "terms": "vattendrag, bäck, dike, biflöde, flöde, ström, flod, flöde, rännil, biflod"
                 },
+                "waterway/stream_intermittent": {
+                    "name": "Tillfälligt vattendrag"
+                },
                 "waterway/water_point": {
                     "name": "Dricksvatten för båt",
                     "terms": "Dricksvatten för båt, Dricksvatten, vattenpåfyllning, vattentank"
@@ -5364,21 +5781,35 @@
             },
             "DigitalGlobe-Premium": {
                 "attribution": {
-                    "text": "Villkor & feedback"
+                    "text": "Villkor & återkoppling"
                 },
                 "description": "Premium DigitalGlobe-satellitfoton.",
                 "name": "DigitalGlobe Premium-bilder"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Villkor & återkoppling"
+                },
+                "description": "Gränser för flygfoto och fotograferingsdatum. Etiketter visas vid zoomnivå 14 och upp.",
+                "name": "DigitalGlobe Premium flygfotoålder"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
-                    "text": "Villkor & feedback"
+                    "text": "Villkor & återkoppling"
                 },
                 "description": "Standard DigitalGlobe-satellitfoton.",
                 "name": "DigitalGlobe Standard-bilder"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Villkor & återkoppling"
+                },
+                "description": "Gränser för flygfoto och fotograferingsdatum. Etiketter visas vid zoomnivå 14 och upp.",
+                "name": "DigitalGlobe Standard flygfotoålder"
+            },
             "EsriWorldImagery": {
                 "attribution": {
-                    "text": "Villkor & feedback"
+                    "text": "Villkor & återkoppling"
                 },
                 "description": "Esri världsflygfoto.",
                 "name": "Esri världsflygfoto"
@@ -5392,7 +5823,7 @@
             },
             "Mapbox": {
                 "attribution": {
-                    "text": "Villkor & feedback"
+                    "text": "Villkor & återkoppling"
                 },
                 "description": "Satellit- eller flygfoton.",
                 "name": "Mapbox satellit"
@@ -5439,6 +5870,17 @@
                 },
                 "name": "OSM Inspector: Taggning"
             },
+            "US-TIGER-Roads-2012": {
+                "name": "TIGER Roads 2012"
+            },
+            "US-TIGER-Roads-2014": {
+                "description": "Vid zoomnivå 16+, fritt tillgänglig kartdata (public domain) från US Census. Vid lägre zoomnivåer, enbart ändringar sedan 2006 minus ändringar redan införlivats i OpenStreetMap.",
+                "name": "TIGER Roads 2014"
+            },
+            "US-TIGER-Roads-2017": {
+                "description": "Gul = Fritt tillgänglig kartdata (public domain) från US Census. Röd = Data ej hittad i OpenStreetMap",
+                "name": "TIGER Roads 2017"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© Sarah Hoffmann, CC by-SA 3.0, kartdata OpenStreetMaps bidragsgivare, ODbL 1.0"
@@ -5491,7 +5933,7 @@
             },
             "mapbox_locator_overlay": {
                 "attribution": {
-                    "text": "Villkor & feedback"
+                    "text": "Villkor & återkoppling"
                 },
                 "description": "Visa de viktigaste objekten för att hjälpa dig att orientera dig. ",
                 "name": "Bildlager för lokalisering"
diff --git a/dist/locales/ta.json b/dist/locales/ta.json
index d70293c71..d7ceada3b 100644
--- a/dist/locales/ta.json
+++ b/dist/locales/ta.json
@@ -219,16 +219,9 @@
         "confirm": {
             "cancel": "ரத்து"
         },
-        "splash": {
-            "start": "இப்போது திருத்து"
-        },
         "tag_reference": {
             "description": "விளக்கம்"
         },
-        "zoom": {
-            "in": "பெரிதாக்கு",
-            "out": "சிறிதாக்கு"
-        },
         "help": {
             "title": "உதவி"
         },
@@ -1254,12 +1247,6 @@
                 "office": {
                     "name": "அலுவலகம்"
                 },
-                "office/accountant": {
-                    "name": "கணக்காளர்"
-                },
-                "office/newspaper": {
-                    "name": "செய்தித்தாள்"
-                },
                 "place": {
                     "name": "இடம்"
                 },
diff --git a/dist/locales/te.json b/dist/locales/te.json
index 9c32a68ff..c86f360af 100644
--- a/dist/locales/te.json
+++ b/dist/locales/te.json
@@ -187,7 +187,6 @@
             "localized_translation_language": "భాషను ఎంచుకోండి",
             "localized_translation_name": "పేరు"
         },
-        "zoom_in_edit": "మార్చడానికి దగ్గరగా వీక్షించు",
         "logout": "నిష్క్రమించు",
         "loading_auth": "ఓపెన్‌స్ట్రీట్‌మ్యాపుకి అనుసంధానిస్తున్నాం…",
         "help_translate": "అనువాదనకు సహకరించండి",
@@ -314,16 +313,11 @@
             "cancel": "రద్దుచేయి"
         },
         "splash": {
-            "walkthrough": "దర్శన మొదలుపెట్టు",
-            "start": "ఇప్పుడే సవరించండి"
+            "walkthrough": "దర్శన మొదలుపెట్టు"
         },
         "tag_reference": {
             "description": "వివరణ"
         },
-        "zoom": {
-            "in": "దగ్గరగా వీక్షించు",
-            "out": "దూరంగా వీక్షించు"
-        },
         "help": {
             "title": "సహాయం"
         },
diff --git a/dist/locales/th.json b/dist/locales/th.json
index 94ddad6e2..98fe5f105 100644
--- a/dist/locales/th.json
+++ b/dist/locales/th.json
@@ -135,10 +135,6 @@
                 "description": "สิ่งก่อสร้าง"
             }
         },
-        "zoom": {
-            "in": "ขยาย",
-            "out": "ย่อ"
-        },
         "help": {
             "title": "ช่วยเหลือ"
         },
diff --git a/dist/locales/tl.json b/dist/locales/tl.json
index ff15f727f..c53dfdfa7 100644
--- a/dist/locales/tl.json
+++ b/dist/locales/tl.json
@@ -286,7 +286,6 @@
             "localized_translation_language": "Pumili ng wika",
             "localized_translation_name": "Pangalan"
         },
-        "zoom_in_edit": "Mag-zoom-in para makapag-edit",
         "login": "mag-login",
         "logout": "Mag-logout",
         "loading_auth": "Kumokonekta sa OpenStreetMap ...",
@@ -477,8 +476,7 @@
         "splash": {
             "welcome": "Maligayang pagdating sa iD OpenStreetMap editor",
             "text": "Ang iD ay isang simple ngunit magandang editor para sa pag-edit ng libreng mapa ng buong mundo.  Ito ay bersyon {version}. Para sa karagdagang impormasyon tingnan ang {website} at i-ulat ang mga bugs sa {github}.",
-            "walkthrough": "Simulan ang \"Walkthrough\"",
-            "start": "Simulan ang pag-edit"
+            "walkthrough": "Simulan ang \"Walkthrough\""
         },
         "source_switch": {
             "live": "live",
@@ -501,10 +499,6 @@
             "tag_suggests_area": "Ang tag na {tag} ay kalimitang para sa mga area o poligon sublait ito ay nasa linya lamang.",
             "deprecated_tags": "Hindi na ginagamit na \"tag\": {tags}"
         },
-        "zoom": {
-            "in": "i-zoom in",
-            "out": "I-zoom out"
-        },
         "cannot_zoom": "Hindi na pwedeng mag-zoom out sa kasalukuyang \"mode\".",
         "full_screen": "I-fullscreen",
         "help": {
diff --git a/dist/locales/tr.json b/dist/locales/tr.json
index 9c5dcfbd4..2f2db3b6a 100644
--- a/dist/locales/tr.json
+++ b/dist/locales/tr.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "Dil seç",
             "localized_translation_name": "İsim"
         },
-        "zoom_in_edit": "Düzenlemek için görüntüyü yakınlaştır.",
         "login": "giriş yap",
         "logout": "çıkış yap",
         "loading_auth": "OpenStreetMap'e bağlanıyor...",
@@ -346,6 +345,24 @@
             "list": "{users} tarafından yapılmış değişiklikler",
             "truncated_list": "{users} ve {count} başka kişi tarafından yapılmış değişiklikler"
         },
+        "info_panels": {
+            "background": {
+                "zoom": "Yakınlaştırma",
+                "source": "Kaynak",
+                "description": "Açıklama",
+                "resolution": "Çözüm",
+                "accuracy": "Doğruluk",
+                "unknown": "Bilinmeyen"
+            },
+            "history": {
+                "version": "Versiyon",
+                "changeset": "Değişiklik Kümesi"
+            },
+            "measurement": {
+                "title": "Ölçüm",
+                "length": "Uzunluk"
+            }
+        },
         "geometry": {
             "point": "nokta",
             "vertex": "köşe",
@@ -552,8 +569,7 @@
         "splash": {
             "welcome": "OpenStreetMap Editörü iD'ye Hoşgeldin",
             "text": "iD, dünyanın en iyi ve bedava haritasına katkıda bulunmak için, kullanılması kolay ve güçlü bir araç. Bu sürüm {version}. Daha çok bilgi için {website} sayfasına git ve hataları {github} aracılığıyla bildir.",
-            "walkthrough": "Eğitime Başla",
-            "start": "Şimdi Düzenle"
+            "walkthrough": "Eğitime Başla"
         },
         "source_switch": {
             "live": "canlı",
@@ -583,10 +599,6 @@
             "tag_suggests_area": "{tag} etiketi buranın alan olmasını ima ediyor, ama burası alan değil.",
             "deprecated_tags": "Kullanımdan kaldırılmış etiketler: {tags}"
         },
-        "zoom": {
-            "in": "Yaklaş",
-            "out": "Uzaklaş"
-        },
         "cannot_zoom": "Bu modda daha fazla uzaklaşılamaz.",
         "full_screen": "Tam Ekran",
         "gpx": {
@@ -1206,6 +1218,9 @@
                         "clockwise": "Saat Yönünde"
                     }
                 },
+                "clothes": {
+                    "label": "Çamaşırlar"
+                },
                 "club": {
                     "label": "Cins"
                 },
@@ -2012,6 +2027,11 @@
                     },
                     "placeholder": "Bilinmiyor"
                 },
+                "structure_waterway": {
+                    "options": {
+                        "tunnel": "Tünel"
+                    }
+                },
                 "studio": {
                     "label": "Tür"
                 },
@@ -2601,8 +2621,7 @@
                     "terms": "Okul, Okul Bahçesi"
                 },
                 "amenity/scrapyard": {
-                    "name": "Hurdalık",
-                    "terms": "Hurdalık, Hurda Toplama Yeri"
+                    "name": "Hurdalık"
                 },
                 "amenity/shelter": {
                     "name": "Barınak",
@@ -3147,10 +3166,6 @@
                     "name": "İskeleci",
                     "terms": "İskeleci, Yapı Kurma Ustası"
                 },
-                "craft/sculpter": {
-                    "name": "Heykeltraş",
-                    "terms": "Heykeltraş"
-                },
                 "craft/shoemaker": {
                     "name": "Ayakkabıcı",
                     "terms": "Ayakkabıcı"
@@ -3159,10 +3174,6 @@
                     "name": "Duvarcı",
                     "terms": "Duvarcı"
                 },
-                "craft/sweep": {
-                    "name": "Baca Temizleyicisi",
-                    "terms": "Baca Temizleyicisi"
-                },
                 "craft/tailor": {
                     "name": "Terzi"
                 },
@@ -3363,10 +3374,6 @@
                     "name": "Patika",
                     "terms": "Patika, Yol"
                 },
-                "highway/pedestrian": {
-                    "name": "Yaya Yolu",
-                    "terms": "Yaya Yolu, Çarşı"
-                },
                 "highway/primary": {
                     "name": "Anayol",
                     "terms": "Anayol"
@@ -4097,18 +4104,10 @@
                     "name": "Ofis",
                     "terms": "Ofis, Büro"
                 },
-                "office/accountant": {
-                    "name": "Muhasebeci",
-                    "terms": "Muhasebeci"
-                },
                 "office/administrative": {
                     "name": "İdari Ofis",
                     "terms": "İdari Ofis"
                 },
-                "office/architect": {
-                    "name": "Mimar",
-                    "terms": "Mimar"
-                },
                 "office/company": {
                     "name": "Şirket",
                     "terms": "Şirket"
@@ -4145,10 +4144,6 @@
                     "name": "Sigorta Acentesi",
                     "terms": "Sigorta Acentesi"
                 },
-                "office/it": {
-                    "name": "Bilgi Teknolojileri Ofisi",
-                    "terms": "Bilgi Teknolojileri Ofisi"
-                },
                 "office/lawyer": {
                     "name": "Hukuk Bürosu",
                     "terms": "Hukuk Bürosu"
@@ -4157,10 +4152,6 @@
                     "name": "Noter",
                     "terms": "Noter"
                 },
-                "office/newspaper": {
-                    "name": "Gazete",
-                    "terms": "Gazete"
-                },
                 "office/ngo": {
                     "name": "Sivil Toplum Örgütü",
                     "terms": "Sivil Toplum Örgütü"
@@ -4180,10 +4171,6 @@
                     "name": "Haberleşme Bürosu",
                     "terms": "Haberleşme Bürosu, Telekomünikasyon Bürosu, Telekom Bürosu"
                 },
-                "office/therapist": {
-                    "name": "Terapist",
-                    "terms": "Terapist"
-                },
                 "office/travel_agent": {
                     "name": "Seyahat Acentesi"
                 },
@@ -4878,10 +4865,6 @@
                     "name": "Karavan Parkı",
                     "terms": "Karavan Parkı"
                 },
-                "tourism/chalet": {
-                    "name": "Tatil Evi",
-                    "terms": "Tatil Evi, Yayla Evi, Ahşap Ev, Dağ Evi, Küçük Köşk"
-                },
                 "tourism/gallery": {
                     "name": "Sanat Galerisi",
                     "terms": "Sanat Galerisi"
@@ -5197,22 +5180,26 @@
             "OSM_Inspector-Addresses": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, OpenStreetMap destekçileri, CC-BY-SA"
-                }
+                },
+                "name": "OSM Müfettişi: Adresler"
             },
             "OSM_Inspector-Geometry": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, OpenStreetMap destekçileri, CC-BY-SA"
-                }
+                },
+                "name": "OSM Müfettişi: Geometri"
             },
             "OSM_Inspector-Highways": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, OpenStreetMap destekçileri, CC-BY-SA"
-                }
+                },
+                "name": "OSM Müfettişi: Karayolları"
             },
             "OSM_Inspector-Multipolygon": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, OpenStreetMap destekçileri, CC-BY-SA"
-                }
+                },
+                "name": "OSM Müfettiş: Alan"
             },
             "OSM_Inspector-Places": {
                 "attribution": {
@@ -5274,6 +5261,12 @@
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "Şartlar & Geri Bildirim"
+                },
+                "name": "Yer Belirleyici Yerleşimi"
+            },
+            "openpt_map": {
+                "attribution": {
+                    "text": "© OpenStreetMap katkıda bulunan kullanıcılar, CC-BY-SA"
                 }
             },
             "osm-gps": {
diff --git a/dist/locales/uk.json b/dist/locales/uk.json
index 0105ba638..568d49da3 100644
--- a/dist/locales/uk.json
+++ b/dist/locales/uk.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Обрати мову",
             "localized_translation_name": "Назва"
         },
-        "zoom_in_edit": "Необхідно збільшити масштаб, щоб редагувати",
+        "zoom_in_edit": "Наблизтесь, щоб редагувати",
         "login": "вхід",
         "logout": "вийти",
         "loading_auth": "З’єднання з OpenStreetMap…",
@@ -361,7 +361,9 @@
                 "accuracy": "Точність",
                 "unknown": "Невідомо",
                 "show_tiles": "Показати тайли",
-                "hide_tiles": "Сховати тайли"
+                "hide_tiles": "Сховати тайли",
+                "show_vintage": "Показати Vintage",
+                "hide_vintage": "Приховати Vintage"
             },
             "history": {
                 "key": "Р",
@@ -668,6 +670,13 @@
         "mapillary": {
             "view_on_mapillary": "Переглянути цей знімок на Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Знімки з вулиць від OpenStreetCam",
+            "title": "Фото-шар (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Переглянути цей знімок на OpenStreetCam"
+        },
         "help": {
             "title": "Довідка",
             "key": "H",
@@ -1217,6 +1226,9 @@
                 "aeroway": {
                     "label": "Тип"
                 },
+                "agrarian": {
+                    "label": " Продукція"
+                },
                 "amenity": {
                     "label": "Тип"
                 },
@@ -1285,6 +1297,9 @@
                 "board_type": {
                     "label": "Тип"
                 },
+                "boules": {
+                    "label": "Тип"
+                },
                 "boundary": {
                     "label": "Тип"
                 },
@@ -1304,6 +1319,10 @@
                 "bunker_type": {
                     "label": "Тип"
                 },
+                "cables": {
+                    "label": "Дроти",
+                    "placeholder": "1, 2, 3…"
+                },
                 "camera/direction": {
                     "label": "Напрямок (в градусах за годинниковою стрілкою)",
                     "placeholder": "45, 90, 180, 270"
@@ -1469,6 +1488,10 @@
                 "description": {
                     "label": "Опис"
                 },
+                "devices": {
+                    "label": "Пристрої",
+                    "placeholder": "1, 2, 3…"
+                },
                 "diaper": {
                     "label": "Сповивальний стіл"
                 },
@@ -1543,6 +1566,9 @@
                         "wall": "Настінний"
                     }
                 },
+                "fitness_station": {
+                    "label": "Вид спорядження"
+                },
                 "fixme": {
                     "label": "Потребує виправлення"
                 },
@@ -1550,6 +1576,9 @@
                     "label": "Тип",
                     "placeholder": "Типово"
                 },
+                "frequency": {
+                    "label": "Робоча частота"
+                },
                 "fuel": {
                     "label": "АЗС"
                 },
@@ -1581,6 +1610,9 @@
                 "generator/type": {
                     "label": "Тип"
                 },
+                "government": {
+                    "label": "Тип"
+                },
                 "grape_variety": {
                     "label": "Сорти винограду"
                 },
@@ -1908,6 +1940,10 @@
                 "payment_multi": {
                     "label": "Види розрахунків"
                 },
+                "phases": {
+                    "label": "Фази",
+                    "placeholder": "1, 2, 3…"
+                },
                 "phone": {
                     "label": "Телефон",
                     "placeholder": "+31 42 123 4567"
@@ -1987,6 +2023,9 @@
                 "railway": {
                     "label": "Тип"
                 },
+                "rating": {
+                    "label": "Потужність"
+                },
                 "recycling_accepts": {
                     "label": "Приймається"
                 },
@@ -2195,6 +2234,9 @@
                 "studio": {
                     "label": "Тип"
                 },
+                "substance": {
+                    "label": "Речовина"
+                },
                 "substation": {
                     "label": "Тип"
                 },
@@ -2221,6 +2263,15 @@
                 "surveillance/zone": {
                     "label": "Зона спостереження"
                 },
+                "switch": {
+                    "label": "Тип",
+                    "options": {
+                        "circuit_breaker": "Автоматичний вимикач",
+                        "disconnector": "Розʼєднувач",
+                        "earthing": "Заземлення",
+                        "mechanical": "Механічний"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Тактильне покриття"
                 },
@@ -2293,6 +2344,19 @@
                     },
                     "placeholder": "Відмінна, Хороша, Погана,..."
                 },
+                "transformer": {
+                    "label": "Тип",
+                    "options": {
+                        "auto": "Автотрансформатор",
+                        "auxiliary": "Допоміжний",
+                        "converter": "Перетворювач",
+                        "distribution": "Розподільчий",
+                        "generator": "Генератор",
+                        "phase_angle_regulator": "Регулятор фазового зсуву",
+                        "traction": "Силовий",
+                        "yes": "Невідомо"
+                    }
+                },
                 "trees": {
                     "label": "Дерева"
                 },
@@ -2327,6 +2391,18 @@
                         "stratovolcano": "Стратовулкан"
                     }
                 },
+                "voltage": {
+                    "label": "Напруга"
+                },
+                "voltage/primary": {
+                    "label": "Напруга первинної обмотки"
+                },
+                "voltage/secondary": {
+                    "label": "Напруга вторинної обмотки"
+                },
+                "voltage/tertiary": {
+                    "label": "Напруга третинної обмотки"
+                },
                 "wall": {
                     "label": "Тип"
                 },
@@ -2354,6 +2430,22 @@
                 },
                 "wikipedia": {
                     "label": "Вікіпедія"
+                },
+                "windings": {
+                    "label": "Обмотки",
+                    "placeholder": "1, 2, 3…"
+                },
+                "windings/configuration": {
+                    "label": "Конфігурація обмоток",
+                    "options": {
+                        "delta": "Трикутник",
+                        "leblanc": "зʼєднання Лебланк",
+                        "open": "Незалежні",
+                        "open-delta": "Відкритий трикутник",
+                        "scott": "зʼєднання Скотта",
+                        "star": "Зірка",
+                        "zigzag": "Зиг-Заг"
+                    }
                 }
             },
             "presets": {
@@ -2677,6 +2769,10 @@
                     "name": "Стоянка для мотоциклів",
                     "terms": "стоянка,мотоцикл"
                 },
+                "amenity/music_school": {
+                    "name": "Музична школа",
+                    "terms": "музика,школа,навчання,інструмент,гітара,піаніно,фортепіано,рояль,скрипка,труба"
+                },
                 "amenity/nightclub": {
                     "name": "Нічний клуб",
                     "terms": "Nightclub, ysxybq rke, нічний клуб, розваги, дискотека, бар"
@@ -2800,8 +2896,7 @@
                     "terms": "School grounds, nthbnjhsz irjkb, шкільний двір, школа"
                 },
                 "amenity/scrapyard": {
-                    "name": "Авторозборка",
-                    "terms": "авто,розборка,б/у,вживані,деталі,свалка"
+                    "name": "Авторозборка"
                 },
                 "amenity/shelter": {
                     "name": "Притулок",
@@ -3261,6 +3356,10 @@
                     "name": "Організація банкетів",
                     "terms": "постачання, їжа, бенкети, обслуговування, кейтерінг"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Сажотрус",
+                    "terms": "сажа,димар,чистити,труба,димохід"
+                },
                 "craft/clockmaker": {
                     "name": "Годинникар",
                     "terms": "годинник, ремонт, годинникар, час"
@@ -3370,9 +3469,9 @@
                     "name": "Такелажник",
                     "terms": "такелаж, вантаж, будівельні ліси"
                 },
-                "craft/sculpter": {
+                "craft/sculptor": {
                     "name": "Скульптор",
-                    "terms": "скульптура, ліпити, пам’ятник, "
+                    "terms": "майстерня,скульптура,творець"
                 },
                 "craft/shoemaker": {
                     "name": "Чоботар",
@@ -3382,10 +3481,6 @@
                     "name": "Каменяр",
                     "terms": "каменяр, кладка, камінь, цегла, будівництво"
                 },
-                "craft/sweep": {
-                    "name": "Сажотрус",
-                    "terms": "труба, димар, сажа, димохід, дим, трубочист"
-                },
                 "craft/tailor": {
                     "name": "Кравець"
                 },
@@ -3654,9 +3749,13 @@
                     "name": "Стежка",
                     "terms": "Path, cntrf, тропа"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
                     "name": "Пішохідна зона",
-                    "terms": "Pedestrian Street,пішохідна,тротуар,люди,вулиця,площа,майдан"
+                    "terms": "майдан,площа,пішохід,зона,територія"
+                },
+                "highway/pedestrian_line": {
+                    "name": "Пішохідна вулиця",
+                    "terms": "пішохід,площа,майдан,плац"
                 },
                 "highway/primary": {
                     "name": "Головна дорога",
@@ -3834,6 +3933,10 @@
                     "name": "Водойма",
                     "terms": "Basin, djljqvf, резервуар, водойма"
                 },
+                "landuse/brownfield": {
+                    "name": "Очищене місце під забудову",
+                    "terms": "будівництво,ділянка,пустир,місце,реконструкція"
+                },
                 "landuse/cemetery": {
                     "name": "Кладовище",
                     "terms": "Cemetery, rkfljdbot, цвинтар"
@@ -3873,6 +3976,10 @@
                     "name": "Трава",
                     "terms": "Grass, nhfdf, трава"
                 },
+                "landuse/greenfield": {
+                    "name": "Ділянка під нову забудову",
+                    "terms": "будівництво,ділянка,місце,план"
+                },
                 "landuse/harbour": {
                     "name": "Гавань",
                     "terms": "гавань,затока,порт,притулок"
@@ -3881,6 +3988,14 @@
                     "name": "Промислова зона",
                     "terms": "завод, фабрика, промисловість, виробництво, робоа, підприємство"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Авторозборка",
+                    "terms": "автомобіль,вживаний,частина,запасна,брухт"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Скотобійня",
+                    "terms": "бійня,скот,гов'ядина,телятина,свинина,баранина,м'ясо"
+                },
                 "landuse/landfill": {
                     "name": "Звалище",
                     "terms": "Landfill, Pdfkbot, смітник, звалище, полігон"
@@ -3957,6 +4072,10 @@
                     "name": "Зона відпочинку",
                     "terms": "газон,поле,майданчик,відпочинок,дозвілля,громада"
                 },
+                "landuse/religious": {
+                    "name": "Територія відправлення релігійних обрядів",
+                    "terms": "храм,церква,костьол,монастир,релігія,обряд,собор"
+                },
                 "landuse/residential": {
                     "name": "Житлова зона",
                     "terms": "житло,помешкання,будинок,маєток,садиба,город"
@@ -4013,6 +4132,50 @@
                     "name": "Тренажери на вулиці",
                     "terms": "спорт,качалка,тренування,гімнастика,фітнес"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Бревно",
+                    "terms": "бревно,балансування,гімнастика,фітнес,фізкультура,спорт,майданчик"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Козел",
+                    "terms": "козел,стрибати,гімнастичний,фітнес,майданчик"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Перекладина",
+                    "terms": "перекладина,турник,підтягування,фітнес,майданчик,спорт"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Рукохід",
+                    "terms": "горизонтальна,драбина,фітнес,майданчик,руки,ходити,спорт"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Гіперекстензія",
+                    "terms": "фітнес,майданчик,тренажер,спорт,спина,прес"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Бруси",
+                    "terms": "паралельні,бруси,віджимання,фітнес,майданчик,спорт,тренажер"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Низька перекладина",
+                    "terms": "перекладина,віджимання,фітнес,майданчик,спорт,тренажер"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Кільця",
+                    "terms": "кільця,гімнастика,фітнес,майданчик,спорт,тренажер"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Знак",
+                    "terms": "фітнес,майданчик,спорт,знак,опис,вправа"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Прес",
+                    "terms": "прес,фітнес,майданчик,тренажер,спорт"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Сходи",
+                    "terms": "сходи,фітнес,майданчик,спорт,тренажер"
+                },
                 "leisure/garden": {
                     "name": "Сад",
                     "terms": "Garden, cfl, сад"
@@ -4073,6 +4236,10 @@
                     "name": "Пляжний волейбол",
                     "terms": "майданчик,площадка,волейбол,пляж,спорт,дозвілля.гра"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Буль/Боке",
+                    "terms": "спорт,майданчик,шар,буль,боке"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Боулз",
                     "terms": "болуз,спорт,трава,кулі,джек,кітті,вудз,бола"
@@ -4125,6 +4292,10 @@
                     "name": "Бігова доріжка (бігуни)",
                     "terms": "біг,трек,спрінт,перегони"
                 },
+                "leisure/sauna": {
+                    "name": "Сауна",
+                    "terms": "сауна,баня,лазня,чан"
+                },
                 "leisure/slipway": {
                     "name": "Стапель",
                     "terms": "Slipway, cnfgtkm, стапель"
@@ -4409,16 +4580,32 @@
                     "terms": "Office, jasc, офіс"
                 },
                 "office/accountant": {
-                    "name": "Бухгалтерська або аудиторська фірма",
-                    "terms": "Бухгалтерська або аудиторська фірма, eufknthcmrf fj felbnjhcmrf ashvf, Accountant, аудит, бухгалтер"
+                    "name": "Бухгалтер",
+                    "terms": "облік,фінанси,аудит,послуги,бухгалтерія"
                 },
                 "office/administrative": {
                     "name": "Канцелярія",
                     "terms": "канцелярія, офіс"
                 },
+                "office/adoption_agency": {
+                    "name": "Агенція з усиновлення",
+                    "terms": "офіс,усиновлення,опіка,агенція,сирота"
+                },
+                "office/advertising_agency": {
+                    "name": "Рекламна агенція",
+                    "terms": "реклама,оголошення,теле,відео,радіо,преса"
+                },
                 "office/architect": {
-                    "name": "Архітектурне або дизайнерське бюро",
-                    "terms": "архітектор, Архітектурне або дизайнерське бюро, fhsntrnehyt fj lbpfqythcmrt hj, Architect"
+                    "name": "Архітектор",
+                    "terms": "бюро,архітектура,будівництво,проектування"
+                },
+                "office/association": {
+                    "name": "Неприбуткова організація",
+                    "terms": "спілка,фундація,фонд,НГО,рада"
+                },
+                "office/charity": {
+                    "name": "Благодійна організація",
+                    "terms": "допомога,офіс"
                 },
                 "office/company": {
                     "name": "Офіс компанії",
@@ -4436,6 +4623,10 @@
                     "name": "Кадрова агенція",
                     "terms": "працевлаштування, робота, пошук роботи, рекрутингова агенція, Кадрова агенція, rflhjdf futywsz, Employment Agency"
                 },
+                "office/energy_supplier": {
+                    "name": "Електропостачальна компанія",
+                    "terms": "електрика,споживачі,постачання,офіс,контора"
+                },
                 "office/estate_agent": {
                     "name": "Агенція з нерухомості",
                     "terms": "ріелтор, Агенція з нерухомості, futywsz p ythejvjcns, Real Estate Office"
@@ -4444,6 +4635,14 @@
                     "name": "Фінансове управління",
                     "terms": "відділ, банк, департамент"
                 },
+                "office/forestry": {
+                    "name": "Лісництво",
+                    "terms": "лісництво,контора"
+                },
+                "office/foundation": {
+                    "name": "Фундація",
+                    "terms": "фундація,фонд,пожертва"
+                },
                 "office/government": {
                     "name": "Уряд",
                     "terms": "правління, "
@@ -4452,13 +4651,21 @@
                     "name": "Відділ державної реєстрації актів цивільного стану",
                     "terms": "реєстрація,актів,цивільного,стану,народження,смерть,шлюб,зміна,імені,призвіща,розлучення,громадянин"
                 },
+                "office/government/tax": {
+                    "name": "Фіскальна служба",
+                    "terms": "податки,фіскальна,інспекція,служба"
+                },
+                "office/guide": {
+                    "name": "Гід",
+                    "terms": "гід,туризм,лекція,супровід"
+                },
                 "office/insurance": {
                     "name": "Страхове бюро",
                     "terms": "страхування"
                 },
                 "office/it": {
-                    "name": "Офіс ІТ компанії ",
-                    "terms": "інформаційні технології"
+                    "name": "ІТ компанія",
+                    "terms": "інформаційні,технології,офіс,компанія"
                 },
                 "office/lawyer": {
                     "name": "Адвокатське бюро",
@@ -4468,14 +4675,22 @@
                     "name": "Нотаріус",
                     "terms": "нотаріус,контора,офіс"
                 },
+                "office/moving_company": {
+                    "name": "Перевезення речей",
+                    "terms": "компанія,речі,переїзд,послуги"
+                },
                 "office/newspaper": {
-                    "name": "Газета",
-                    "terms": "новини, видавництво"
+                    "name": "Редакція газети",
+                    "terms": "газета,редакція,новини,агенція"
                 },
                 "office/ngo": {
                     "name": "Недержавна громадська організація",
                     "terms": "офіс неурядової організації"
                 },
+                "office/notary": {
+                    "name": "Нотаріус",
+                    "terms": "нотаріус,договір,купівля,продаж,нерухомість,заповіт,спадщина,довіреність"
+                },
                 "office/physician": {
                     "name": "Лікар"
                 },
@@ -4483,21 +4698,41 @@
                     "name": "Політична партія",
                     "terms": "політика, партія"
                 },
+                "office/private_investigator": {
+                    "name": "Приватний детектив",
+                    "terms": "офіс,детектив,приватний,розшук,спостереження"
+                },
+                "office/quango": {
+                    "name": "Квазі-НГО",
+                    "terms": "офіс,НГО,громадська,організація,некомерційна,державна"
+                },
                 "office/research": {
                     "name": "Дослідницька лабораторія",
                     "terms": "лабораторія, дослідт, випробування, експерименти"
                 },
+                "office/surveyor": {
+                    "name": "Експет-оцінщик",
+                    "terms": "експертна,оцінка,будівлі,споруди,траспорт,автомобіль,земельна,ділянка"
+                },
+                "office/tax_advisor": {
+                    "name": "Податкова консультація",
+                    "terms": "податки,консультант,оптимізація,фінансовий,експерт"
+                },
                 "office/telecommunication": {
                     "name": "Телекомунікаційна компанія",
                     "terms": "Зв’язок, телекомунікації"
                 },
                 "office/therapist": {
-                    "name": "Терапевт",
-                    "terms": "терапевт, лікар, доктор"
+                    "name": "Фізіотерапевт",
+                    "terms": "лікування,процедури,лікарня,лікар,неврологія"
                 },
                 "office/travel_agent": {
                     "name": "Туристична агенція"
                 },
+                "office/water_utility": {
+                    "name": "Водоканал",
+                    "terms": "водопостачання,водовідведення,каналізація,послуги"
+                },
                 "piste": {
                     "name": "Трек / Лижна траса",
                     "terms": "доріжка, з’їзд, спуск "
@@ -4520,6 +4755,10 @@
                     "name": "Острів",
                     "terms": "Island, jcnhsd, архіпелаг, атол, мис, бар’єр, мілина, острівець, риф, коса, острів"
                 },
+                "place/islet": {
+                    "name": "Острівець",
+                    "terms": "острів,малий,острівець,риф,банка,атол"
+                },
                 "place/isolated_dwelling": {
                     "name": "Маєток",
                     "terms": "Isolated Dwelling,dsljrhtvktyt bnkj,відокремлене житло,маєток"
@@ -4532,6 +4771,10 @@
                     "name": "Околиці",
                     "terms": "місцевість, район "
                 },
+                "place/plot": {
+                    "name": "Ділянка",
+                    "terms": "ділянка,дача,участок,город"
+                },
                 "place/quarter": {
                     "name": "Мікро-район/Квартал",
                     "terms": "мікрорайон,квартал,оклоток"
@@ -4554,7 +4797,7 @@
                 },
                 "playground/balance_beam": {
                     "name": "Бревно",
-                    "terms": "бревно,баланс,балка,рівновага,балансування"
+                    "terms": "ігровий,майданчик,бревно,розваги"
                 },
                 "playground/basket_spinner": {
                     "name": "Кошик карусель",
@@ -4573,8 +4816,12 @@
                     "terms": "забавка,ігровий,майданчик,діти,дитячий,замок,надувний,горка,пригалка"
                 },
                 "playground/horizontal_bar": {
-                    "name": "Турнік",
-                    "terms": "забавка,ігровий,майданчик,діти,дитячий,турнік"
+                    "name": "Перекладина",
+                    "terms": "турник"
+                },
+                "playground/rocker": {
+                    "name": "Пружинна гойдалка",
+                    "terms": "забавка,ігровий,майданчик,діти,дитячий,гойдалка,конячка,літачок,мотоцикл,пружина"
                 },
                 "playground/roundabout": {
                     "name": "Карусель",
@@ -4646,6 +4893,10 @@
                     "name": "Підстанція",
                     "terms": "підстанція"
                 },
+                "power/switch": {
+                    "name": "Розʼєднувач",
+                    "terms": "електричний,роз'єднувач"
+                },
                 "power/tower": {
                     "name": "Опора ЛЕП",
                     "terms": "High-Voltage Tower, jgjhf KTG, опора ЛЕП"
@@ -4764,6 +5015,10 @@
                     "name": "Магазини/Майстерні",
                     "terms": "Shop, vfufpbyb vfqcnthys, продаж, послуги, крамниця, магазин"
                 },
+                "shop/agrarian": {
+                    "name": "Сільгосптовари",
+                    "terms": "насіння,добрива,пестициди,хімікати,садженці,запасні,частини"
+                },
                 "shop/alcohol": {
                     "name": "Алкогольні напої",
                     "terms": "Liquor Store, fkrjujkmys yfgj, алкоголь"
@@ -5283,7 +5538,7 @@
                 },
                 "tourism/chalet": {
                     "name": "Шале",
-                    "terms": "Chalet, ifkt, шале"
+                    "terms": "котедж,туризм"
                 },
                 "tourism/gallery": {
                     "name": "Художня галерея",
@@ -5341,6 +5596,10 @@
                     "name": "Оглядовий майданчик",
                     "terms": "Viewpoint, jukzljddbq vfqlfyxbr, оглядовий майданчик"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Лісова хатинка",
+                    "terms": "притулок,халупа,хатка"
+                },
                 "tourism/zoo": {
                     "name": "Зоопарк",
                     "terms": "Zoo,pjjgfhr, зоопарк"
@@ -5573,6 +5832,13 @@
                 "description": "Супутникові знімки DigitalGlobe Premium",
                 "name": "Знімки DigitalGlobe Premium"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Умови використання та Відгуки"
+                },
+                "description": "Межі та дати знімків. Підписи з'являються з 14 рівня масштабування. ",
+                "name": "Знімки DigitalGlobe Premium Vintage"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Умови використання та Відгуки"
@@ -5580,6 +5846,13 @@
                 "description": "Супутникові знімки DigitalGlobe Standard.",
                 "name": "Знімки DigitalGlobe Standard"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Умови використання та Відгуки"
+                },
+                "description": "Межі та дати знімків. Підписи з'являються з 14 рівня масштабування. ",
+                "name": "Знімки DigitalGlobe Standard Vintage"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Умови використання та Відгуки"
diff --git a/dist/locales/vi.json b/dist/locales/vi.json
index cc41cfbd4..82a20347b 100644
--- a/dist/locales/vi.json
+++ b/dist/locales/vi.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "Chọn ngôn ngữ",
             "localized_translation_name": "Tên"
         },
-        "zoom_in_edit": "Phong to để Sửa đổi",
+        "zoom_in_edit": "Phong to để sửa đổi",
         "login": "đăng nhập",
         "logout": "đăng xuất",
         "loading_auth": "Đang kết nối với OpenStreetMap…",
@@ -361,7 +361,9 @@
                 "accuracy": "Độ chính xác",
                 "unknown": "Không rõ",
                 "show_tiles": "Hiện các Mảnh",
-                "hide_tiles": "Ẩn các Mảnh"
+                "hide_tiles": "Ẩn các Mảnh",
+                "show_vintage": "Hiện Lúc Chụp",
+                "hide_vintage": "Ẩn Lúc Chụp"
             },
             "history": {
                 "key": "L",
@@ -668,6 +670,13 @@
         "mapillary": {
             "view_on_mapillary": "Xem hình này trên Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Hình ảnh từ con đường do OpenStreetCam cung cấp",
+            "title": "Lớp phủ Hình ảnh (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "Xem hình này trên OpenStreetCam"
+        },
         "help": {
             "title": "Trợ giúp",
             "key": "H",
@@ -1122,6 +1131,9 @@
                 "aeroway": {
                     "label": "Loại"
                 },
+                "agrarian": {
+                    "label": "Sản phẩm"
+                },
                 "amenity": {
                     "label": "Loại"
                 },
@@ -1190,6 +1202,9 @@
                 "board_type": {
                     "label": "Kiểu"
                 },
+                "boules": {
+                    "label": "Kiểu"
+                },
                 "boundary": {
                     "label": "Kiểu"
                 },
@@ -1209,6 +1224,10 @@
                 "bunker_type": {
                     "label": "Kiểu"
                 },
+                "cables": {
+                    "label": "Số Cáp",
+                    "placeholder": "1, 2, 3…"
+                },
                 "camera/direction": {
                     "label": "Hướng (Độ theo Chiều Kim Đồng hồ)",
                     "placeholder": "45, 90, 180, 270"
@@ -1374,6 +1393,10 @@
                 "description": {
                     "label": "Miêu tả"
                 },
+                "devices": {
+                    "label": "Số Thiết bị",
+                    "placeholder": "1, 2, 3…"
+                },
                 "diaper": {
                     "label": "Có Bàn Thay Tã"
                 },
@@ -1448,6 +1471,9 @@
                         "wall": "Tường"
                     }
                 },
+                "fitness_station": {
+                    "label": "Loại Thiết bị"
+                },
                 "fixme": {
                     "label": "Cần Sửa chữa"
                 },
@@ -1455,6 +1481,9 @@
                     "label": "Kiểu",
                     "placeholder": "Bình thường"
                 },
+                "frequency": {
+                    "label": "Tần số Hoạt động"
+                },
                 "fuel": {
                     "label": "Nhiên liệu"
                 },
@@ -1486,6 +1515,9 @@
                 "generator/type": {
                     "label": "Kiểu"
                 },
+                "government": {
+                    "label": "Cấp"
+                },
                 "grape_variety": {
                     "label": "Loại Nho"
                 },
@@ -1813,6 +1845,10 @@
                 "payment_multi": {
                     "label": "Phương thức Thanh toán"
                 },
+                "phases": {
+                    "label": "Số Pha",
+                    "placeholder": "1, 2, 3…"
+                },
                 "phone": {
                     "label": "Số Điện thoại",
                     "placeholder": "+84 1 234 5678"
@@ -1892,6 +1928,9 @@
                 "railway": {
                     "label": "Kiểu"
                 },
+                "rating": {
+                    "label": "Công suất"
+                },
                 "recycling_accepts": {
                     "label": "Nhận"
                 },
@@ -2100,6 +2139,9 @@
                 "studio": {
                     "label": "Kiểu"
                 },
+                "substance": {
+                    "label": "Chất"
+                },
                 "substation": {
                     "label": "Kiểu"
                 },
@@ -2126,6 +2168,15 @@
                 "surveillance/zone": {
                     "label": "Phạm vi Quan sát"
                 },
+                "switch": {
+                    "label": "Kiểu",
+                    "options": {
+                        "circuit_breaker": "Cầu dao",
+                        "disconnector": "Cầu dao Cách ly",
+                        "earthing": "Cầu dao Tiếp địa",
+                        "mechanical": "Cơ học"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Gạch dành cho Người Khiếm thị"
                 },
@@ -2177,6 +2228,9 @@
                     },
                     "placeholder": "Rất chắc, Khá Chắc, Mềm…"
                 },
+                "trade": {
+                    "label": "Nghề"
+                },
                 "traffic_calming": {
                     "label": "Kiểu"
                 },
@@ -2195,6 +2249,19 @@
                     },
                     "placeholder": "Tốt, Khá, Trung bình…"
                 },
+                "transformer": {
+                    "label": "Kiểu",
+                    "options": {
+                        "auto": "Tự biến áp",
+                        "auxiliary": "Phụ tải",
+                        "converter": "Chuyển đổi",
+                        "distribution": "Phân phối",
+                        "generator": "Phát điện",
+                        "phase_angle_regulator": "Dịch pha",
+                        "traction": "Kéo",
+                        "yes": "Không rõ"
+                    }
+                },
                 "trees": {
                     "label": "Loại cây"
                 },
@@ -2229,6 +2296,18 @@
                         "stratovolcano": "Tầng"
                     }
                 },
+                "voltage": {
+                    "label": "Điện áp"
+                },
+                "voltage/primary": {
+                    "label": "Điện áp Chính"
+                },
+                "voltage/secondary": {
+                    "label": "Điện áp Thứ 2"
+                },
+                "voltage/tertiary": {
+                    "label": "Điện áp Thứ 3"
+                },
                 "wall": {
                     "label": "Kiểu"
                 },
@@ -2256,6 +2335,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Số Cuộn dây",
+                    "placeholder": "1, 2, 3…"
+                },
+                "windings/configuration": {
+                    "label": "Cách Nối Cuộn dây",
+                    "options": {
+                        "delta": "Tam giác",
+                        "leblanc": "Leblanc",
+                        "open": "Hở mạch",
+                        "open-delta": "Tam giác Hở",
+                        "scott": "Scott",
+                        "star": "Sao",
+                        "zigzag": "Chữ chi"
+                    }
                 }
             },
             "presets": {
@@ -2579,6 +2674,10 @@
                     "name": "Chỗ Đậu Xe máy",
                     "terms": "chỗ đậu xe máy, đậu xe máy, chỗ đậu mô-tô, chỗ đậu mô tô, đậu mô-tô, chỗ đậu mô tô, chỗ đậu xe hai bánh, đậu xe hai bánh, chỗ đậu xe ba bánh, đậu xe ba bánh, cho dau xe may, dau xe may, cho dau mo-to, cho dau mo to, dau mo-to, dau mo to, cho dau xe hai banh, dau xe hai banh, cho dau xe ba banh, dau xe ba banh"
                 },
+                "amenity/music_school": {
+                    "name": "Trường Âm nhạc",
+                    "terms": "trường âm nhạc, trường dạy nhạc, trường nhạc, truong am nhac, truong day nhac, truong nhac"
+                },
                 "amenity/nightclub": {
                     "name": "Câu lạc bộ Giải trí",
                     "terms": "câu lạc bộ giải trí, clb giải trí, câu lạc bộ đêm, clb đêm, vũ trường, hộp đêm, câu lạc bộ, sàn nhảy về đêm, cau lac bo giai tri, clb giai tri, cau lac bo dem, clb dem, vu truong, hop dem, cau lac bo, san nhay ve dem"
@@ -2702,8 +2801,7 @@
                     "terms": "sân trường, sân trường học, sân nhà trường, sân trung tâm giáo dục, san truong, san truong hoc, san nha truong, san trung tam giao duc"
                 },
                 "amenity/scrapyard": {
-                    "name": "Bãi Phế liệu",
-                    "terms": "phế liệu, ve chai, rác rưởi, sắt vụn, mảnh sắt, xe hơi, xe cộ, gạch vụn, phe lieu, ve chai, rac ruoi, sat vun, manh sat, xe hoi, xe co, gach vun"
+                    "name": "Bãi Phế liệu"
                 },
                 "amenity/shelter": {
                     "name": "Nhà trú",
@@ -3163,6 +3261,10 @@
                     "name": "Suất ăn",
                     "terms": "người suất ăn, nguoi suat an"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Quét Bồ hóng",
+                    "terms": "người quét bồ hóng, người cạo ống khói, thợ quét bồ hóng, thợ quét ống khói, nguoi quet bo hong, nguoi cao ong khoi, tho quet bo hong, tho quet ong khoi"
+                },
                 "craft/clockmaker": {
                     "name": "Xây Đồng hồ",
                     "terms": "thợ đồng hồ, người làm đồng hồ, người xây đồng hồ, tho dong ho, nguoi lam dong ho, nguoi xay dong ho"
@@ -3272,9 +3374,9 @@
                     "name": "Xây Giàn",
                     "terms": "người xây giàn, người lắp dựng giàn, nguoi xay gian, nguoi lap dung gian"
                 },
-                "craft/sculpter": {
-                    "name": "Điêu khắc",
-                    "terms": "nhà điều khắc, thợ chạm trổ, bức tượng điêu khắc, nha dieu khac, tho cham tro, buc tuong dieu khac"
+                "craft/sculptor": {
+                    "name": "Nhà Điêu khắc",
+                    "terms": "nhà điêu khắc, thợ chạm, nha dieu khac, tho cham"
                 },
                 "craft/shoemaker": {
                     "name": "Đóng Giày",
@@ -3284,10 +3386,6 @@
                     "name": "Xây Đá",
                     "terms": "thợ xây đá, người xây đá, tho xay da, nguoi xay da"
                 },
-                "craft/sweep": {
-                    "name": "Quét Bồ hóng",
-                    "terms": "người quét bồ hóng, người cạo ống khói, thợ quét bồ hóng, thợ quét ống khói, nguoi quet bo hong, nguoi cao ong khoi, tho quet bo hong, tho quet ong khoi"
-                },
                 "craft/tailor": {
                     "name": "May Quần áo"
                 },
@@ -3556,7 +3654,11 @@
                     "name": "Lối",
                     "terms": "đường mòn, duong mon"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Khu vực Đi bộ",
+                    "terms": "khu vực đi bộ, quảng trường, khu vuc di bo, quang truong"
+                },
+                "highway/pedestrian_line": {
                     "name": "Đường Đi bộ",
                     "terms": "đường đi bộ, đường dành cho người đi bộ, duong di bo, duong danh cho nguoi di bo"
                 },
@@ -3736,6 +3838,10 @@
                     "name": "Lưu vực",
                     "terms": "lưu vực, lưu vực sông, luu vuc, luu vuc song"
                 },
+                "landuse/brownfield": {
+                    "name": "Đất Bỏ hoang",
+                    "terms": "đất bỏ hoang, dat bo hoang"
+                },
                 "landuse/cemetery": {
                     "name": "Nghĩa địa",
                     "terms": "nghĩa địa, nghĩa trang, bãi tha ma, mộ, nghia dia, nghia trang, bai tha ma, mo"
@@ -3775,6 +3881,10 @@
                     "name": "Cỏ",
                     "terms": "cỏ, đồng cỏ, bãi cỏ, co, dong co, bai co"
                 },
+                "landuse/greenfield": {
+                    "name": "Đất Chưa Khai khẩn",
+                    "terms": "đất chưa khai khẩn, đất không khai khẩn, đất chưa phát triển, đất không phát triển, dat chua khai khan, dat khong khai khan, dat chua phat trien, dat khong phat trien"
+                },
                 "landuse/harbour": {
                     "name": "Cảng",
                     "terms": "cảng, bến tàu, cang, ben tau"
@@ -3783,6 +3893,14 @@
                     "name": "Đất Công nghiệp",
                     "terms": "đất công nghiệp, khu vực công nghiệp, vùng công nghiệp nhà máy, xưởng, dat cong nghiep, khu vuc cong nghiep, vung cong nghiep, nha may, xuong"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Bãi Phế liệu",
+                    "terms": "phế liệu, ve chai, rác rưởi, sắt vụn, mảnh sắt, xe hơi, xe cộ, gạch vụn, phe lieu, ve chai, rac ruoi, sat vun, manh sat, xe hoi, xe co, gach vun"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Lò mổ",
+                    "terms": "lò mổ, lò sát sinh, lò thịt, lo mo, lo sat sinh, lo thit"
+                },
                 "landuse/landfill": {
                     "name": "Bãi rác",
                     "terms": "bãi rác thải, bãi rác, bãi chứa rác, bãi chôn rác, bãi chất thải, bãi chôn chất thải, bai rac thai, bai rac, bai chua rac, bai chon rac, bai chat thai, bai chon chat thai"
@@ -3859,6 +3977,10 @@
                     "name": "Sân Giải trí",
                     "terms": "sân giải trí, sân chơi, san giai tri, san choi"
                 },
+                "landuse/religious": {
+                    "name": "Khu vực Tôn giáo",
+                    "terms": "khu vực tôn giáo, khu vuc ton giao"
+                },
                 "landuse/residential": {
                     "name": "Đất Dân cư",
                     "terms": "đất dân cư, khu vực dân cư, vùng dân cư, khu vực nhà ở, vùng nhà ở, đất dân sinh, khu vực dân sinh, vùng dân sinh, hàng xóm, dat dan cu, khu vuc dan cu, vung dan cu, khu vuc nha o, vung nha o, dat dan sinh, khu vuc dan sinh, vung dan sinh, hang xom"
@@ -4027,6 +4149,10 @@
                     "name": "Đường Chạy",
                     "terms": "đường chạy, đường chạy đua, đường chạy điền kinh, duong chay, duong chay dua, duong chay dien kinh"
                 },
+                "leisure/sauna": {
+                    "name": "Tắm hơi",
+                    "terms": "nhà tắm hơi, phòng tắm hơi, nha tam hoi, phong tam hoi"
+                },
                 "leisure/slipway": {
                     "name": "Đường Trượt tàu",
                     "terms": "đường trượt tàu, duong truot tau"
@@ -4311,16 +4437,32 @@
                     "terms": "văn phòng, sở, van phong, so"
                 },
                 "office/accountant": {
-                    "name": "Tư vấn Kế toán",
+                    "name": "Văn phòng Kế toán",
                     "terms": "tư vấn kế toán, kế toán viên, văn phòng kế toán, nhân viên kế toán, dịch vụ khai thuế, văn phòng khai thuế, tài chính, tài chánh, tu van ke toan, ke toan vien, van phong ke toan, nhan vien ke toan, dich vu khai thue, van phong khai thue, tai chinh, tai chanh"
                 },
                 "office/administrative": {
                     "name": "Cơ quan Địa phương",
                     "terms": "cơ quan địa phương, hội đồng địa phương, công sở địa phương, sở hành chính địa phương, co quan dia phuong, hoi dong dia phuong, cong so dia phuong, so hanh chinh dia phuong"
                 },
+                "office/adoption_agency": {
+                    "name": "Cơ quan Nhận Con nuoi",
+                    "terms": "cơ quan nhận con nuôi, văn phòng nhận con nuôi, co quan nhan con nuoi, van phong nhan con nuoi"
+                },
+                "office/advertising_agency": {
+                    "name": "Cơ sở Quảng cáo",
+                    "terms": "cơ sở quảng cáo, văn phòng quảng cáo, co so quang cao, van phong quang cao"
+                },
                 "office/architect": {
-                    "name": "Kiến trúc sư",
-                    "terms": "kiến trúc sư, kien truc su"
+                    "name": "Văn phòng Kiến trúc sư",
+                    "terms": "văn phòng kiến trúc sư, van phong kien truc su"
+                },
+                "office/association": {
+                    "name": "Tổ chức Phi lợi nhuận",
+                    "terms": "tổ chức phi lợi nhuận, tổ chức bất vụ lợi, to chuc phi loi nhuan, to chuc bat vu loi"
+                },
+                "office/charity": {
+                    "name": "Tổ chức Từ thiện",
+                    "terms": "tổ chức từ thiện, hội từ thiện, to chuc tu thien, hoi tu thien"
                 },
                 "office/company": {
                     "name": "Văn phòng Công ty",
@@ -4346,6 +4488,10 @@
                     "name": "Văn phòng Tài chính",
                     "terms": "văn phòng tài chính, văn phòng tài chánh, van phong tai chinh, van phong tai chanh"
                 },
+                "office/forestry": {
+                    "name": "Văn phòng Lâm nghiệp",
+                    "terms": "văn phòng lâm nghiệp, van phong lam nghiep"
+                },
                 "office/government": {
                     "name": "Công sở",
                     "terms": "công sở, cơ quan chính phủ, cơ quan chính quyền, cong so, co quan chinh phu, co quan chinh quyen"
@@ -4354,13 +4500,17 @@
                     "name": "Văn phòng Hộ tịch",
                     "terms": "văn phòng hộ tịch, phòng hộ tịch, sở hộ tịch, van phong ho tich, phong ho tich, so ho tich"
                 },
+                "office/government/tax": {
+                    "name": "Sở Thuế vụ",
+                    "terms": "sở thuế vụ, văn phòng thuế vụ, văn phòng khai thuế, so thue vu, van phong thue vu, van phong khai thue"
+                },
                 "office/insurance": {
                     "name": "Văn phòng Bảo hiểm",
                     "terms": "văn phòng bảo hiểm, van phong bao hiem"
                 },
                 "office/it": {
                     "name": "Văn phòng Tin học",
-                    "terms": "văn phòng tin học, chuyên viên tin học, văn phòng công nghệ thông tin, văn phòng cntt, van phong tin hoc, chuyen vien tin hoc, van phong cong nghe thong tin, van phong cntt"
+                    "terms": "văn phong tin học, văn phòng công nghệ thông tin, văn phòng cntt, van phong tin hoc, van phong cong nghe thong tin, van phong cntt"
                 },
                 "office/lawyer": {
                     "name": "Văn phòng Luật sư",
@@ -4371,13 +4521,17 @@
                     "terms": "văn phòng công chứng, công chứng viên, di chúc, chứng thư, van phong cong chung, cong chung vien, di chuc, chung thu"
                 },
                 "office/newspaper": {
-                    "name": "Tờ báo",
-                    "terms": "tờ báo, nhật báo, tuần báo, tạp chí, to bao, nhat bao, tuan bao, tap chi"
+                    "name": "Văn phòng Tờ báo",
+                    "terms": "văn phòng tờ báo, trụ sở tờ báo, van phong to bao, tru so to bao"
                 },
                 "office/ngo": {
                     "name": "Tổ chức Phi chính phủ",
                     "terms": "tổ chức phi chính phủ, văn phòng ngo, văn phòng ong, tổ chức phi lợi nhuận, tổ chức bất vụ lợi, quỹ từ thiện, hiệp hội thương mại, to chuc phi chinh phu, van phong ngo, van phong ong, to chuc phi loi nhuan, to chuc bat vu loi, quy tu thien, hiep hoi thuong mai"
                 },
+                "office/notary": {
+                    "name": "Văn phòng Công chứng",
+                    "terms": "văn phòng công chứng, công chứng viên, van phong cong chung, cong chung vien"
+                },
                 "office/physician": {
                     "name": "Văn phòng Bác sĩ"
                 },
@@ -4385,18 +4539,22 @@
                     "name": "Đảng Chính trị",
                     "terms": "văn phòng đảng chính trị, văn phòng đảng chánh trị, van phong dang chinh tri, van phong dang chanh tri"
                 },
+                "office/private_investigator": {
+                    "name": "Văn phòng Thám tử Tư",
+                    "terms": "văn phòng thám tử tư, van phong tham tu tu"
+                },
                 "office/research": {
                     "name": "Văn phòng Nghiên cứu",
                     "terms": "văn phòng nghiên cứu, van phong nghien cuu"
                 },
+                "office/surveyor": {
+                    "name": "Văn phòng Khảo sát",
+                    "terms": "văn phòng khảo sát, văn phòng kiểm sát, văn phòng thanh tra, van phong khao sat, van phong kiem sat, van phong thanh tra"
+                },
                 "office/telecommunication": {
                     "name": "Văn phòng Viễn thông",
                     "terms": "văn phòng viễn thông, tiệm viễn thông, cửa hàng viễn thông, trụ sở công ty viễn thông, trụ sở công ti viễn thông, trụ sở cty viễn thông, van phong vien thong, tiem vien thong, cua hang vien thong, tru so cong ty vien thong, tru so cong ti vien thong, tru so cty vien thong"
                 },
-                "office/therapist": {
-                    "name": "Nhà trị liệu",
-                    "terms": "nhà trị liệu, bác sĩ chuyên khoa, thầy thuốc chuyên khoa, nha tri lieu, bac si chuyen khoa, thay thuoc chuyen khoa"
-                },
                 "office/travel_agent": {
                     "name": "Văn phòng Du lịch"
                 },
@@ -4422,6 +4580,10 @@
                     "name": "Đảo",
                     "terms": "đảo, hòn đảo, quần đảo, đảo san hô, san hô, cồn cát, cồn, đá ngầm, chỗ nông, chỗ cạn, dao, hon dao, quan dao, dao san ho, san ho, con cat, con, da ngam, cho nong, cho can"
                 },
+                "place/islet": {
+                    "name": "Đảo Nhỏ",
+                    "terms": "đảo nhỏ, hòn đảo nhỏ, dao nho, hon dao nho"
+                },
                 "place/isolated_dwelling": {
                     "name": "Chỗ ở Hẻo lánh",
                     "terms": "chỗ ở hẻo lánh, xóm, liên gia, cho o heo lanh, xom, lien gia"
@@ -4434,6 +4596,10 @@
                     "name": "Hàng xóm",
                     "terms": "hàng xóm, khu phố, hang xom, khu pho"
                 },
+                "place/plot": {
+                    "name": "Miếng đất",
+                    "terms": "miếng đất, mảnh đất, mieng dat, manh dat"
+                },
                 "place/quarter": {
                     "name": "Khu",
                     "terms": "khu, phố, pho"
@@ -4454,10 +4620,6 @@
                     "name": "Làng",
                     "terms": "làng, thôn, ấp, lang, thon, ap"
                 },
-                "playground/balance_beam": {
-                    "name": "Cầu thăng bằng",
-                    "terms": "cầu thăng bằng, đòn cân bằng, đòn cân, cau thang bang, don can bang, don can"
-                },
                 "playground/basket_spinner": {
                     "name": "Rổ Quay",
                     "terms": "rổ quay, ro quay"
@@ -4474,10 +4636,6 @@
                     "name": "Đệm Hơi",
                     "terms": "đệm hơi, nệm hơi, dem hoi, nem hoi"
                 },
-                "playground/horizontal_bar": {
-                    "name": "Xà Đơn",
-                    "terms": "xà đơn, xà cao, ba-rơ-phích, xa don, xa cao, ba-ro-phich"
-                },
                 "playground/rocker": {
                     "name": "Thú Nhún Lò xo",
                     "terms": "thú nhún lò xo, thú nhún, thu nhun lo xo, thu nhun"
@@ -4552,6 +4710,10 @@
                     "name": "Trạm Điện Phụ",
                     "terms": "trạm điện phụ, tram dien phu"
                 },
+                "power/switch": {
+                    "name": "Cầu dao",
+                    "terms": "cầu dao, ngắt điện, ngắt mạch, cau dao, ngat dien, ngat mach"
+                },
                 "power/tower": {
                     "name": "Cột điện Cao thế",
                     "terms": "cột điện cao thế, cot dien cao the"
@@ -5092,6 +5254,10 @@
                     "name": "Đại lý Bán Vé",
                     "terms": "đại lý bán vé, đại lí bán vé, văn phòng bán vé, vé buổi hòa nhạc, vé buổi hoà nhạc, vé xe buýt, vé xe lửa, vé máy bay, vé phi cơ, dai ly ban ve, dai li ban ve, van phong ban ve, ve buoi hoa nhac, ve xe buyt, ve xe lua, ve may bay, ve phi co"
                 },
+                "shop/tiles": {
+                    "name": "Tiệm Ngói",
+                    "terms": "tiệm ngói, cửa hàng ngói, tiem ngoi, cua hang ngoi"
+                },
                 "shop/tobacco": {
                     "name": "Tiệm Thuốc lá",
                     "terms": "tiệm thuốc lá, cửa hàng thuốc lá, cửa hiệu thuốc lá, tiệm xì gà, cửa hàng xì gà, cửa hiệu xì gà, tiem thuoc la, cua hang thuoc la, cua hieu thuoc la, tiem xi ga, cua hang xi ga, cua hieu xi ga"
@@ -5100,6 +5266,10 @@
                     "name": "Tiệm Đồ chơi",
                     "terms": "tiệm đồ chơi cho trẻ em, chỗ bán đồ chơi, cửa hàng đồ chơi, cửa hiệu đồ chơi, đồ chơi trẻ nhỏ, tiem do choi cho tre em, cho ban do choi, cua hang do choi, cua hieu do choi, do choi tre nho"
                 },
+                "shop/trade": {
+                    "name": "Tiệm Công nghiệp",
+                    "terms": "tiệm công nghiệp, cửa hàng công nghiệp, tiệm vật liệu công nghiệp, cửa hàng vật liệu công nghiệp, tiệm máy móc công nghiệp, cửa hàng máy móc công nghiệp, tiem cong nghiẹp, cua hang cong nghiep, tiem vat lieu cong nghiep, cua hang vat lieu cong nghiep, tiem may moc cong nghiep, cua hang may moc cong nghiep"
+                },
                 "shop/travel_agency": {
                     "name": "Văn phòng Du lịch",
                     "terms": "văn phòng du lịch, công ty du lịch, công ti du lịch, cty du lịch, đại lý du lịch, đại lí du lịch, du lịch theo nhóm, tour, vé máy bay, van phong du lich, cong ty du lich, cong ti du lich, cty du lich, dai ly du lich, dai li du lich, du lich theo nhom, ve may bay"
@@ -5179,10 +5349,6 @@
                     "name": "Bãi Đậu Nhà lưu động",
                     "terms": "bãi đậu nhà lưu động, sân đậu nhà lưu động, chỗ đậu nhà lưu động, nơi đậu nhà lưu động, khu nhà lưu động, bai dau nha luu dong, san dau nha luu dong, cho dau nha luu dong, noi dau nha luu dong, khu nha luu dong"
                 },
-                "tourism/chalet": {
-                    "name": "Nhà nghỉ Riêng biệt",
-                    "terms": "nhà nghỉ riêng biệt, nhà ván gỗ kiểu thụy sĩ, nhà ván gỗ kiểu thụy sỹ, nhà ván gỗ kiểu thuỵ sĩ, nhà ván gỗ kiểu thuỵ sỹ, nhà nghỉ trên núi tuyết, nha nghi rieng biet, nha van go kieu thuy si, nha van go kieu thuy sy, nha nghi tren nui tuyet"
-                },
                 "tourism/gallery": {
                     "name": "Phòng tranh",
                     "terms": "phòng tranh, phòng triển lãm nghệ thuật, phòng triển lãm nghệ phẩm, phong tranh, phong trien lam nghe thuat, phong trien lam nghe pham"
@@ -5471,6 +5637,13 @@
                 "description": "Hình ảnh thượng hạng chụp từ vệ tinh DigitalGlobe.",
                 "name": "DigitalGlobe Thượng hạng"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Điều khoản & Phản hồi"
+                },
+                "description": "Biên giới và ngày tháng chụp. Các nhãn xuất hiện tại mức thu phóng 14 trở lên.",
+                "name": "Lúc chụp DigitalGlobe Thượng hạng"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Điều khoản & Phản hồi"
@@ -5478,6 +5651,13 @@
                 "description": "Hình ảnh tiêu chuẩn chụp từ vệ tinh DigitalGlobe.",
                 "name": "DigitalGlobe Tiêu chuẩn"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Điều khoản & Phản hồi"
+                },
+                "description": "Biên giới và ngày tháng chụp. Các nhãn xuất hiện tại mức thu phóng 14 trở lên.",
+                "name": "Lúc chụp DigitalGlobe Tiêu chuẩn"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Điều khoản & Phản hồi"
diff --git a/dist/locales/yue.json b/dist/locales/yue.json
index 36fca9083..841c3aa32 100644
--- a/dist/locales/yue.json
+++ b/dist/locales/yue.json
@@ -235,7 +235,6 @@
             "localized_translation_language": "揀話",
             "localized_translation_name": "名"
         },
-        "zoom_in_edit": "放大去改",
         "logout": "簽走",
         "loading_auth": "駁上去公家街圖⋯⋯",
         "report_a_bug": "報錯",
@@ -468,8 +467,7 @@
         "splash": {
             "welcome": "歡迎來到艾第公家街圖造圖。",
             "text": "艾第爾件架生，易用之時，亦功用多多，用來投稿修改去，世界至好，任用嘅世界地圖片。現時版本係{version}。想多啲資料，睇下 {website}同埋去{github}報告出錯。",
-            "walkthrough": "開始逐步解釋",
-            "start": "卽改"
+            "walkthrough": "開始逐步解釋"
         },
         "source_switch": {
             "live": "運行之中",
@@ -491,10 +489,6 @@
             "tag_suggests_area": "{tag}籤話條綫係範圍，實情佢唔係。",
             "deprecated_tags": "廢籤：{tags}"
         },
-        "zoom": {
-            "in": "放大",
-            "out": "縮細"
-        },
         "cannot_zoom": "今下模式，無得再縮。",
         "full_screen": "來回全螢幕",
         "mapillary_images": {
@@ -2367,18 +2361,10 @@
                     "name": "寫字樓",
                     "terms": "Office,寫字樓,辦公室"
                 },
-                "office/accountant": {
-                    "name": "會計師樓",
-                    "terms": "Accountant,會計師樓"
-                },
                 "office/administrative": {
                     "name": "行政樓",
                     "terms": "Administrative Office,行政樓"
                 },
-                "office/architect": {
-                    "name": "則樓",
-                    "terms": "Architect,則師樓,則樓,建築師樓"
-                },
                 "office/company": {
                     "name": "公司寫字樓",
                     "terms": "Company Office,公司,公司寫字樓"
@@ -2407,18 +2393,10 @@
                     "name": "保險公司寫字樓",
                     "terms": "Insurance Office,保險公司,保險公司寫字樓"
                 },
-                "office/it": {
-                    "name": "電腦資訊寫字樓",
-                    "terms": "IT Office,IT公司,資訊工藝寫字樓,資訊技藝寫字樓,資訊科技寫字樓,電腦公司寫字樓"
-                },
                 "office/lawyer": {
                     "name": "律師事務所",
                     "terms": "Law Office,律師事務所"
                 },
-                "office/newspaper": {
-                    "name": "報社",
-                    "terms": "Newspaper,報社,新聞社,通訊社"
-                },
                 "office/ngo": {
                     "name": "志顠機構寫字樓",
                     "terms": "NGO Office,志顠機構寫字樓,非政府組織"
@@ -2438,10 +2416,6 @@
                     "name": "電話公司寫字樓",
                     "terms": "Telecom Office,電信公司,電話公司寫字樓"
                 },
-                "office/therapist": {
-                    "name": "治療師",
-                    "terms": "Therapist,治療師,醫療師"
-                },
                 "office/travel_agent": {
                     "name": "旅行社"
                 },
@@ -2798,10 +2772,6 @@
                     "name": "露營車營地",
                     "terms": "RV Park,房車營地,露營車停車場,露營車營地"
                 },
-                "tourism/chalet": {
-                    "name": "木屋",
-                    "terms": "Chalet,木屋"
-                },
                 "tourism/guest_house": {
                     "name": "賓館",
                     "terms": "Guest House,賓館"
diff --git a/dist/locales/zh-CN.json b/dist/locales/zh-CN.json
index 76713bde5..e12536775 100644
--- a/dist/locales/zh-CN.json
+++ b/dist/locales/zh-CN.json
@@ -2,7 +2,7 @@
     "zh-CN": {
         "modes": {
             "add_area": {
-                "title": "面",
+                "title": "区域",
                 "description": "在地图上添加公园、建筑物、湖泊或其他区域。",
                 "tail": "在地图上单击开始绘制面状要素，如公园、湖泊或建筑物。"
             },
@@ -45,11 +45,11 @@
                 "key": "A",
                 "title": "继续",
                 "description": "继续绘制这条线。",
-                "not_eligible": "这里没有线可以在继续。",
-                "multiple": "多条线可以在此延长。要选定其中一条，按住Shift键并单击以选中它。",
+                "not_eligible": "无法在此继续绘制线段",
+                "multiple": "有多条线段可以在此延长。要选定其中一条，按住Shift键并单击以选中它。",
                 "annotation": {
                     "line": "继续绘制线。",
-                    "area": "继续绘制面状要素。"
+                    "area": "继续绘制区域。"
                 }
             },
             "cancel_draw": {
@@ -59,18 +59,18 @@
                 "annotation": "更改关系成员的角色。"
             },
             "change_tags": {
-                "annotation": "更改标签。"
+                "annotation": "标签已更改。"
             },
             "circularize": {
                 "title": "环状化",
                 "description": {
                     "line": "环状化该线。",
-                    "area": "环状化该面。"
+                    "area": "将此区域变成圆形。"
                 },
                 "key": "O",
                 "annotation": {
                     "line": "使线环状化。",
-                    "area": "使面环状化。"
+                    "area": "将区域变成圆形。"
                 },
                 "not_closed": "它不是首尾相接的线，无法将其环状化。",
                 "too_large": "由于可见部分不足，无法将其环状化。",
@@ -80,12 +80,12 @@
                 "title": "直角化",
                 "description": {
                     "line": "将这条线上的弯角转化成直角。",
-                    "area": "将这个面状要素上的弯角转化成直角。"
+                    "area": "将这个区域上的弯角转化成直角。"
                 },
                 "key": "S",
                 "annotation": {
-                    "line": "拉直线上角的边。",
-                    "area": "已将面要素的弯角换成直角。"
+                    "line": "已将线段上的弯角换成直角。",
+                    "area": "已将区域的弯角换成直角。"
                 },
                 "not_squarish": "因为它不是近似方形的，这不能被直角化。",
                 "too_large": "因为可见部分不足，不能变成方形。",
@@ -106,12 +106,12 @@
                     "multiple": "彻底删除这些要素。"
                 },
                 "annotation": {
-                    "point": "删除点。",
-                    "vertex": "删除路径上的节点。",
-                    "line": "删除线。",
-                    "area": "删除面状要素。",
-                    "relation": "删除关系。",
-                    "multiple": "删除 {n} 个要素。"
+                    "point": "删除了一个点。",
+                    "vertex": "删除了路径上的一个节点。",
+                    "line": "删除了一条线。",
+                    "area": "删除了一个区域。",
+                    "relation": "删除了一个关系。",
+                    "multiple": "删除了 {n} 个要素。"
                 },
                 "too_large": {
                     "single": "该要素暂不能删除，因为该要素在当前视角可视部分太少。",
@@ -131,24 +131,24 @@
                 }
             },
             "add_member": {
-                "annotation": "增加关系中的成员。"
+                "annotation": "关系中增加了一个成员。"
             },
             "delete_member": {
-                "annotation": "删除关系中的成员。"
+                "annotation": "从关系中删除了一个成员。"
             },
             "connect": {
                 "annotation": {
-                    "point": "连接路径到点。",
-                    "vertex": "连接路径到另一路径。",
-                    "line": "连接路径到线。",
-                    "area": "连接条线要素到面要素。"
+                    "point": "已连接路径到一个点。",
+                    "vertex": "已连接路径到另一路径。",
+                    "line": "已连接路径到一线段。",
+                    "area": "已连接路径到一区域。"
                 }
             },
             "disconnect": {
                 "title": "断开连接",
-                "description": "断开这些线/面之间的连接。",
+                "description": "断开这些线/区域之间的连接。",
                 "key": "D",
-                "annotation": "断开线/面连接。",
+                "annotation": "断开线/区域连接。",
                 "not_connected": "没有足够的线/面来断开。",
                 "connected_to_hidden": "无法断开连接，因为其与一隐藏要素相连。",
                 "relation": "无法断开连接，因为其构成关系成员间的连接。"
@@ -174,9 +174,9 @@
                 "annotation": {
                     "point": "移动点。",
                     "vertex": "移动路径中节点。",
-                    "line": "移动线。",
-                    "area": "移动面状要素。",
-                    "multiple": "移动多个要素。"
+                    "line": "移动了一条线。",
+                    "area": "移动了一个区域",
+                    "multiple": "移动了多个要素。"
                 },
                 "incomplete_relation": {
                     "single": "因该要素未完全下载，所以无法被移动。",
@@ -242,7 +242,7 @@
                 "key": "R",
                 "annotation": {
                     "line": "旋转线。",
-                    "area": "旋转面状要素。",
+                    "area": "旋转了一个区域。",
                     "multiple": "旋转多个要素。"
                 },
                 "incomplete_relation": {
@@ -314,7 +314,7 @@
         "login": "登录",
         "logout": "退出",
         "loading_auth": "正在连接 OpenStreetMap...",
-        "report_a_bug": "报告漏洞",
+        "report_a_bug": "反馈 BUG",
         "help_translate": "帮助改进翻译",
         "feature_info": {
             "hidden_warning": "{count}个隐藏要素",
@@ -330,7 +330,7 @@
             "title": "上传至 OpenStreetMap",
             "upload_explanation": "您上传的修改将会在所有使用 OpenStreetMap 数据的地图上可见。",
             "upload_explanation_with_user": "{user}，您上传的修改将会在所有使用 OpenStreetMap 数据的地图上可见。",
-            "request_review": "我想要让他人检查我的编辑。",
+            "request_review": "我想要让其他人复核我的编辑。",
             "save": "上传",
             "cancel": "取消",
             "changes": "{count}个变更",
@@ -339,14 +339,14 @@
             "modified": "已更改",
             "deleted": "已删除",
             "created": "已创建",
-            "about_changeset_comments": "关于修改集合说明",
+            "about_changeset_comments": "关于编辑变动",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
-            "google_warning": "您在该评论中提及 Google : 记住复制 Google Maps 中信息是严格禁止的。",
+            "google_warning": "您在该评论中提及 Google : 请注意从 Google Maps 中复制信息是被严格禁止的。",
             "google_warning_link": "http://www.openstreetmap.org/copyright"
         },
         "contributors": {
-            "list": "{users} 编辑",
-            "truncated_list": "{users}及另外{count}人编辑"
+            "list": "由 {users} 编辑",
+            "truncated_list": "由 {users} 及另外{count}人编辑"
         },
         "info_panels": {
             "key": "I",
@@ -361,7 +361,9 @@
                 "accuracy": "精度",
                 "unknown": "未知",
                 "show_tiles": "显示瓦片",
-                "hide_tiles": "隐藏瓦片"
+                "hide_tiles": "隐藏瓦片",
+                "show_vintage": "显示影像日期",
+                "hide_vintage": "隐藏影像日期"
             },
             "history": {
                 "key": "H",
@@ -370,7 +372,7 @@
                 "version": "版本",
                 "last_edit": "最近编辑",
                 "edited_by": "编辑者",
-                "changeset": "修改集合",
+                "changeset": "变更集合",
                 "unknown": "未知",
                 "link_text": "在 openstreetmap.org 上的历史记录"
             },
@@ -399,7 +401,7 @@
             "point": "点",
             "vertex": "顶点",
             "line": "线",
-            "area": "面",
+            "area": "区域",
             "relation": "关系"
         },
         "geocoder": {
@@ -429,7 +431,7 @@
             "back_tooltip": "变更要素",
             "remove": "删除",
             "search": "搜索",
-            "multiselect": "选择要素",
+            "multiselect": "已选择的要素",
             "unknown": "未知",
             "incomplete": "<未下载>",
             "feature_list": "搜索要素",
@@ -466,7 +468,7 @@
             "custom_button": "编辑自定义背景",
             "custom_prompt": "输入地图瓦片URL地址。有效的参数有：\n   - {zoom}/{z}, {x}, {y} 作为 Z/X/Y 坐标系\n   - {ty} 作为翻转的 TMS 算法 Y 坐标\n   - {u} 作为四叉树坐标编码\n   - {switch:a,b,c} 作为 DNS 服务器解析的并行连接子域\n\n示例：\n{example}",
             "fix_misalignment": "调整影像偏移",
-            "imagery_source_faq": "该影像的来源是？",
+            "imagery_source_faq": "该影像是从哪里来的呢？",
             "reset": "重置",
             "offset": "在下面的灰色区域拖动来调整影像偏移，或输入以米为单位的偏移量。",
             "minimap": {
@@ -486,7 +488,7 @@
                     "title": "OpenStreetMap 数据"
                 }
             },
-            "fill_area": "填充面状要素",
+            "fill_area": "填充区域",
             "map_features": "地图要素",
             "autohidden": "这些要素已被自动隐藏，因为屏幕中的要素过多。请放大再编辑。",
             "osmhidden": "由于禁用的 OpenStreetMap 数据图层，这些要素已被自动隐藏。"
@@ -501,8 +503,8 @@
                 "tooltip": "公路、街道等"
             },
             "service_roads": {
-                "description": "专用道路",
-                "tooltip": "专用道路、停车场通道、轮迹路等"
+                "description": "服务性道路",
+                "tooltip": "服务性道路、停车场通道、赛道等"
             },
             "paths": {
                 "description": "小路",
@@ -553,7 +555,7 @@
             },
             "full": {
                 "description": "全部填充",
-                "tooltip": "面状要素以全部填充绘制。"
+                "tooltip": "区域全部填充绘制。"
             }
         },
         "restore": {
@@ -613,7 +615,7 @@
             "welcome": "欢迎使用 OpenStreetMap iD 编辑器",
             "text": "iD 编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是 {version} 版本。欲知详情，请浏览 {website} 及在 {github} 报告程序错误。",
             "walkthrough": "开始演练",
-            "start": "现在编辑"
+            "start": "现在就编辑"
         },
         "source_switch": {
             "live": "实况模式",
@@ -637,12 +639,12 @@
             "untagged_point_tooltip": "选择该点的要素类型。",
             "untagged_line": "未标记的线",
             "untagged_line_tooltip": "选择描述这条线的要素类型。",
-            "untagged_area": "未标记的面",
-            "untagged_area_tooltip": "选择描述这个面的要素类型。",
+            "untagged_area": "未标记的区域",
+            "untagged_area_tooltip": "选择描述这块区域的要素类型。",
             "untagged_relation": "未标记的关系",
             "untagged_relation_tooltip": "选择描述这个关系的要素类型。",
             "many_deletions": "您正在删除 {n} 个要素。您确定要这么做吗？这些要素将会在任何人所见的 openstreetmap.org 地图上被删除。",
-            "tag_suggests_area": "标签{tag}表明线应该为面要素，但它不是面",
+            "tag_suggests_area": "{tag}的标签所建议的线段应为区域，但这个不是一区域",
             "deprecated_tags": "弃用标签：{tags}"
         },
         "zoom": {
@@ -671,14 +673,14 @@
         "help": {
             "title": "帮助",
             "key": "H",
-            "help": "#帮助\n\n这是一个免费且可编辑的世界地图 [OpenStreetMap](http://www.openstreetmap.org/)\n的编辑器，你可以用它来增加和更新你所在地区的数据，为全世界将这个开源、开放数据的世界地图变得更好。\n\n你在这张地图上的编辑将会被所有使用 OpenStreetMap 的人看到。\n你需要 [登录](https://www.openstreetmap.org/login) 才能编辑。\n\n本编辑器名为 [iD](http://ideditor.com/) ，是一个 [源码在GitHub上共享](https://github.com/openstreetmap/iD) 的协作项目。\n",
-            "editing_saving": "# 编辑和保存\n\n本编辑器为在线编辑设计，您正在经由本网站使用它。\n\n### 选择要素\n\n您可以在地图上单击以选中一个要素，如道路或一个兴趣点。\n被选中的要素将被高亮显示，同时加载出显示其详细信息的侧边面板，\n如果您右键点击它，它将会显示可对该要素进行之操作的菜单。\n\n如需同时选中多个要素，您需要先按住 Shift 键。然后请多次点击选择全部的要素，\n或者在地图上画出一个长方形以圈出并选中长方形中所有的点。\n\n### 保存编辑内容\n\n当您做了比如编辑道路、建筑物或地点的更改后，\n这些更改在您将它们保存到服务器之前都只会保存在本地。\n无需担心犯错：您随时可以点击撤销按钮或重做按钮以撤销或重做更改。\n\n请点击“保存”按钮以结束一组编辑内容。例如，如果您刚完成了城镇的一个区域，\n正打算开始下一个区域的工作，这时您有机会重新检查之前完成的工作，\n同时编辑器会自动给出有用的建议。如果您的更改有一些问题，编辑器也会给出警告。\n\n如果一切正常，您可以在保存时写入一小段注释以说明上一阶段的工作内容，\n然后点击“上传”按钮以向\n[OpenStreetMap.org](http://www.openstreetmap.org/) 提交更改。\n在此之后，您的更改将对所有其它用户可见，其它用户也将以此为基础继续改进地图。\n\n如果您一时无法完成编辑内容，您可以关闭编辑器窗口。\n待稍后您返回 (至同一台计算机的同一个浏览器) 时，\n重新打开编辑器将会恢复您的工作进度。\n\n## 使用编辑器\n\n您可以按下 `?` 键来查看键盘快捷键列表。\n",
+            "help": "#帮助\n\n这是 [OpenStreetMap](http://www.openstreetmap.org/) 的编辑器，OpenStreetMap 是一个免费且可编辑的世界地图。你可以用这个编辑器来增加和更新你所在地区的地图资料，令这个开源和开放数据的世界地图变得更好。\n\n你在这张地图上的编辑将会被所有使用 OpenStreetMap 的人看到。\n你需要 [登录](https://www.openstreetmap.org/login) 才能编辑。\n\n本编辑器名为 [iD](http://ideditor.com/) ，是一个 [源码在GitHub上共享](https://github.com/openstreetmap/iD) 的协作项目。\n",
+            "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/)。在此之后，您的更改将被所有其它用户可见，其它用户也会以此为基础继续改进地图。\n\n如果您一时无法完成编辑内容，您可以关闭编辑器窗口。待稍后您返回 (至同一台计算机的同一个浏览器) 时，重新打开编辑器将会恢复您的工作进度。\n\n## 使用编辑器\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要删除道路，您可以点击它以选中，然后按下 '删除' 快捷键，或者右键点击后再点击垃圾桶图标。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n",
             "gps": "# GPS\n\n户外采集的GPS轨迹是OpenStreetMap的重要数据源之一。本编辑器\n支持本地轨迹——即你的电脑上的.gpx文件。你可以用众多智能手机\n应用或者个人GPS硬件采集这种GPS轨迹。\n\n有关如何使用GPS测量的信息，请参见\n[用智能手机、GPS或纸质图测图](http://learnosm.org/en/mobile-mapping/)。\n\n要使用GPX轨迹制图，将GPX文件拖曳到编辑器上即可。\n如果可以识别，将以亮紫色线条在地图上显示。\n点击右侧“地图数据”菜单可以打开、关闭或者\n缩放到新添加的GPX图层。\n\nGPX轨迹不会被直接上传到OpenStreetMap——最佳的使用方法是\n将其展绘到地图上作为辅助来绘制新增的地图要素，\n或者将其[上传到OpenStreetMap](http://www.openstreetmap.org/trace/create)\n供他人使用。\n",
-            "imagery": "# 影像\n\n航拍影像是绘制地图的一个重要资源。编辑器右侧「背景设置」菜单里提供了一组飞机航拍、卫星影像及自由编译的来源。\n\n默认情况下编辑器显示的是[必应地图](http://www.bing.com/maps/)的卫星图层，但当您移动或缩放地图到一个新的地理区域会得到新的来源。一些国家，比如美国、法国和丹麦，会在一些区域提供非常高质量的影像。\n\n影像有时会因为影像提供商的错误和地图数据存在偏移。如果您看到许多道路偏离背景，请不要立刻移动它们来匹配背景，您可以点击背景设置界面底部的「修复对齐」来调整影像以使它和已有数据吻合。\n",
+            "imagery": "# 影像\n\n航拍影像是绘制地图的一个重要资源。编辑器右侧「背景设置」菜单里有一组飞机航拍、卫星影像及自定义的来源可供选择。\n\n默认情况下编辑器显示的是[必应地图](http://www.bing.com/maps/)的卫星图层，但当您移动或缩放地图到一个新的地理区域，可能会有新的图源。一些国家，比如美国、法国和丹麦，会在一些区域提供非常高质量的影像。\n\n有时候由于影像提供商的错误，影像可能会与地图数据存在偏移。如果您看到许多道路偏离背景，请不要立刻移动它们来匹配背景，您可以点击背景设置界面底部的「修复对齐」来调整影像位置，以使它和已有数据吻合。\n",
             "addresses": "# 地址\n\n地址是地图上的最有用的一些信息。\n\nOpenStreetMap通过沿街位置记录建筑和场所的地址，地址通常表示为街道的一部分。\n\n您可以添加地址信息映射为建筑轮廓的地方以及那些映射为单个点。地址的最佳来源数据是来自于实地调查或个人的知识与任何其他功能，从谷歌地图商业来源的复制是严格禁止的。\n",
-            "inspector": "# 使用查看器\n\n查看器是页面左侧窗格中供你\n查看所选要素详细信息栏目。\n\n### 选择要素类型\n\n你添加完一个点、线或面之后，要选择它是什么类型，\n比如高速公路还是居民区街道、超市还是咖啡厅。\n查看器会显示一些常见要素类型的按钮，你也可以通过\n搜索框查找其他标签。\n\n点击要素类型按钮右下角的“i”可以深入了解该类型。\n点击类型按钮即可选择该类型。\n\n### 使用表格编辑标签\n\n选择要素类型后，或者某要素本来已有类型时，\n查看器会显示要素的字段详情，比如名称和地\n址。\n\n在已有的字段下方，你可以点击“添加字段”下拉菜单\n来添加其他详情，比如维基百科链接、轮椅通行情况\n等。\n\n在查看器底部，可以点击“附加标签”按钮来给要素添加\n任意其他标签。[Taginfo](http://taginfo.openstreetmap.org/)\n是了解更多常见标签组合的好资源。\n\n你在查看器里所做的变更会自动应用到地图。\n你可以随时点击“撤销”按钮撤销这些变更。\n",
-            "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮显示，同时加载出有关建筑物更多资料的侧边面板。如果您右键点击它，它将会显示可对该建筑物进行之操作的菜单。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后按 'M' 移动快捷键，或者右键点击后再选择 '移动' 工具。移动您的鼠标以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的回车键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一个建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除要素时务必要小心－ 像任何其他的编辑一样，结果会公之于众，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选中，然后按下 '删除' 快捷键，或者右键点击后再点击垃圾桶图标。\n",
+            "inspector": "# 使用查看器\n\n查看器是在页面左侧窗格的栏目，供你查看和编辑所选要素的详细信息。\n\n### 选择要素类型\n\n当添加完一个点、线或区域之后，你可以选择这个要素是什么类型，比如是高速公路还是居民区街道、超市还是咖啡厅。查看器会列出一些常见要素类型，你也可以通过搜索框查找其他类型。\n\n点击要素类型按钮右方的“i”可以显示该类型的介绍。点击类型按钮即可选择该类型。\n\n### 使用表格编辑标签\n\n选择要素类型后，或者某要素本来已有类型时，查看器会显示要素的字段详情，比如名称和地址。\n\n在已有的字段下方，你可以点击“添加字段”下拉菜单来添加其他详情，比如维基百科链接、轮椅通行情况等。\n\n在查看器底部，可以点击“附加标签”按钮来给要素添加任意其他标签。[Taginfo](http://taginfo.openstreetmap.org/) 是相当好用的工具，你可以了解常见的标签组合。\n\n你在查看器里所做的变更会自动应用到地图上。你可以随时点击“撤销”按钮撤销这些变更。\n",
+            "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界选择该建筑物。该建筑物将以高亮显示，同时在侧边面板中加载出此建筑物的更多信息。如果您右键点击它，它将会显示可对该建筑物进行之操作的菜单。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后按 'M' 移动快捷键，或者右键点击后再选择 '移动' 工具。移动您的鼠标以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n在 OpenStreetMap 上既可以用形状也可以用点来标记建筑，很多人常常困惑到底应该使用那种方式。一般来说，应_尽可能用区域来标记建筑物的轮廓_，用置于建筑轮廓内的点来标记建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后按键盘上的回车键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一个建筑物完全不正确：您看到它在卫星图像上不存在，并最好实地证实它根本不存在，您可以将建筑物删除，这会从地图中将之移除。删除要素时务必要小心：像任何其他的编辑一样，结果会公之于众。该建筑物或许是新建的，而卫星图像往往会过时。\n\n要删除建筑物，您可以点击它以选中，然后按下 '删除' 快捷键，或者右键点击后再点击垃圾桶图标。\n",
             "relations": "# 关系\n\n关系是 OpenStreetMap 中用于组合其它要素的特殊要素类型。比如，两个基本关系类型*路径关系*和*复合多边形*，它们分别用于组合同一条公路或高速公路的不同部分和一个复杂区域(分成多块或像油炸圈饼一样中间有个洞)的多条线条。\n\n关系中包含的要素称为*成员*。在侧边栏的底部，您可以看到成员所属的关系，并点击以选中它。选中某个关系后，您就能看到它的所有成员在侧边栏被全部列出并在地图上被高亮显示。\n\n在大多数时候，iD 会在您编辑的时候自动处理关系。您主要注意的是当您删除道路的某个部分并重绘它时，请确保新的部分还是原来的关系中的一员。\n\n## 编辑关系\n\n如果您想要编辑关系，这里是一些基本技巧。\n\n要向关系中添加要素，选择该要素，点击侧边栏「所有关系」中的「+」按钮，并选择或输入关系的名称。\n\n要创建一个新的关系，选中要作为成员的第一个要素，点击「所有关系」中的「+」按钮，并选择「新建关系...」。\n\n要从一个关系中移除要素，选择要素并点击您要从中移除的关系旁边的垃圾箱按钮。\n\n您可以使用「合并」工具创建有洞的复合多边形。绘制两个区域(内部和外部)，按住 Shift 键并点击各个多边形来选中它们，然后按 'C' 快捷键。另一种方法是同时选中它们，右键点击其中一个，然后点击「合并」(+) 按钮。\n"
         },
         "intro": {
@@ -824,8 +826,8 @@
                 "drag": "主地图区域在背景上显示了 OpenStreetMap 数据。{br}您可以在左键点击同时移动鼠标来拖动地图。您也可以使用键盘上的方向键。**拖动地图！**",
                 "zoom": "您可以滚动鼠标、触控板或点击 {plus} / {minus} 按钮来放大或缩小地图。 **缩放地图！**",
                 "features": "我们使用 *要素* 一词来描述在地图上出现的东西。现实世界上的任何东西都可以在 OpenStreetMap 中描绘成要素。",
-                "points_lines_areas": "地图要素以 *点、线、面* 的形式呈现。",
-                "nodes_ways": "在 OpenStreetMap 中，点有时被称为 *节点* ，线和面有时被称为 *路径* 。",
+                "points_lines_areas": "地图要素以 *点、线、区域* 的形式呈现。",
+                "nodes_ways": "在 OpenStreetMap 中，点有时被称为 *节点* ，线和区域有时被称为 *路径* 。",
                 "click_townhall": "所有地图上的要素都可以通过点击来选中。 **点击选中该点。**",
                 "selected_townhall": "很好！该点已经被选中了。选中的要素的周围会有光亮不停闪烁。",
                 "editor_townhall": "当一个要素被选中时， *要素编辑器* 将会在地图旁边显示。",
@@ -856,18 +858,18 @@
                 "play": "现在您知道了如何创建和编辑点，尝试练习创建更多的点！ **当您准备好进入下一章节时，点击 '{next}' 。**"
             },
             "areas": {
-                "title": "面",
-                "add_playground": "*面* 用来显示诸如湖泊、建筑物或居民区等要素的边界。{br}他们亦可作为一种更细致的绘制方式，以替代普通地用点来标记的方式。 **点击 {button} 面按钮来添加一个新的面。**",
-                "start_playground": "让我们通过描绘一个面来添加这个游乐场。面通过在要素的外部轮廓上放置若干 *节点* 来描绘。 **点击或按空格键，在游乐场的其中一角放置一个起始节点。**",
-                "continue_playground": "通过继续在游乐场的轮廓上放置更多的节点来绘制该面。若将面连接到已经存在的人行道上也是可以的。{br}提示：您可以按下{alt}键以防止节点连接到其他要素上。 **继续绘制游乐场的面。**",
-                "finish_playground": "按回车键、或再次点击起始/结束节点来结束绘制该面。 **完成勾画该游乐场的轮廓。**",
+                "title": "区域",
+                "add_playground": "*区域* 用来显示诸如湖泊、建筑物或居民区等要素的边界。{br}他们亦可作为一种更细致的绘制方式，以替代普通地用点来标记的方式。 **点击 {button} 区域按钮来添加一个新的区域。**",
+                "start_playground": "让我们用描绘一个区域的方式来添加这个游乐场吧。区域是通过在要素的外部轮廓上放置若干 *节点* 来描绘。 **点击或按空格键，在游乐场的其中一角放置一个起始节点。**",
+                "continue_playground": "继续在游乐场的轮廓上放置更多的节点来绘制该区域。如果遇到既有的人行道，你也可以将区域连接到人行道上。{br}提示：您可以按下{alt}键以防止节点连接到其他要素上。 **继续绘制游乐场区域。**",
+                "finish_playground": "按回车键、或再次点击起始/结束节点来结束绘制该区域。 **完成勾画该游乐场的轮廓。**",
                 "search_playground": "**搜索 '{preset}' 。**",
                 "choose_playground": "**在列表中选择 {preset} 。**",
                 "add_field": "这个游乐场还没有一个正式的名称，所以我们将不会在“名称”字段中填写任何东西。{br}但我们可以在“描述”字段中加入更多关于游乐场的的细节。 **打开“添加字段”列表。**",
                 "choose_field": "**在列表中选择 {field} 。**",
                 "retry_add_field": "您并未选择 {field} 字段。让我们重新试一次。",
                 "describe_playground": "**添加一条描述，然后点击 {button} 按钮来关闭要素编辑器。**",
-                "play": "干得不错！尝试绘制更多的面，来查看还有哪些面的要素可以被添加到 OpenStreetMap 。 **当您准备好进入下一章节时，点击 '{next}' 。**"
+                "play": "干得不错！再试试绘制更多的区域，然后看看还有哪些区域要素可以被添加到 OpenStreetMap 上。 **当您准备好进入下一章节时，点击 '{next}' 。**"
             },
             "lines": {
                 "title": "线",
@@ -901,7 +903,7 @@
             },
             "buildings": {
                 "title": "建筑物",
-                "add_building": "OpenStreetMap 是世界上最大的建筑物数据库。{br}您可以通过勾画未被标记的建筑物来帮助改进该数据库。 **点击 {button} 面按钮来添加一个新的面。**",
+                "add_building": "OpenStreetMap 是世界上最大的建筑物数据库。{br}您可以通过勾画未被标记的建筑物来帮助改进该数据库。 **点击 {button} 面按钮来添加一个新的区域。**",
                 "start_building": "让我们通过勾画这个房屋的轮廓来添加它。{br}建筑物应该尽可能准确地勾画在他们的底部周围。 **点击或按空格键，在建筑物的一处角落放置一个起始节点。**",
                 "continue_building": "继续在建筑物的轮廓上添加一些更多的节点。别忘您还可以放大地图来添加更多细节。{br}按回车键、或再次点击起始/结束节点来结束绘制建筑物。 **完成勾画建筑物的轮廓。**",
                 "retry_building": "看起来您在建筑物角落上放置节点时遇到了困难。请重试！",
@@ -912,9 +914,9 @@
                 "square_building": "如果能使您刚才创建的房屋拥有完美的直角那就更好了。 **点击 {button} 按钮使建筑物轮廓直角化。**",
                 "retry_square": "您并未点击直角化按钮。请重试。",
                 "done_square": "看见了建筑物的边角是如何规整的吗？让我们学习另一个有用的小技巧。",
-                "add_tank": "接下来我们将勾画这个圆形储罐的轮廓。 **点击 {button} 面按钮来添加一个新的面。**",
-                "start_tank": "不用担心，您不需要画出一个完美的圆。只需要在储罐上画一个面，使其节点接触到储罐的边缘。 **点击或按空格键，在储罐的边缘处放置一个起始节点。**",
-                "continue_tank": "在其边缘处添加一些更多的节点。之后圆将会创建在您勾画的节点外部。{br}按回车键、或再次点击起始/结束节点来结束绘制该面。 **完成勾画该储罐的轮廓。**",
+                "add_tank": "接下来我们将勾画这个圆形储罐的轮廓。 **点击 {button} 面按钮来添加一个新的区域。**",
+                "start_tank": "不用担心，您不需要画出一个完美的圆。只需要在储罐上画一个区域，使其节点接触到储罐的边缘。 **点击或按空格键，在储罐的边缘处放置一个起始节点。**",
+                "continue_tank": "在其边缘处添加一些更多的节点。之后圆将会创建在您勾画的节点外部。{br}按回车键、或再次点击起始/结束节点来结束绘制该区域。 **完成勾画该储罐的轮廓。**",
                 "search_tank": "**搜索 '{preset}' 。**",
                 "choose_tank": "**在列表中选择 {preset} 。**",
                 "rightclick_tank": "**右键点击选中您创建的储罐来显示编辑菜单。**",
@@ -1007,10 +1009,10 @@
                     "title": "绘制",
                     "add_point": "'增加 点' 模式",
                     "add_line": "'增加 线' 模式",
-                    "add_area": "'增加 面' 模式",
+                    "add_area": "'增加区域' 模式",
                     "place_point": "放置一个点",
                     "disable_snap": "按住以禁用节点吸附",
-                    "stop_line": "完成绘制线或面"
+                    "stop_line": "完成绘制线段或区域"
                 },
                 "operations": {
                     "title": "操作",
@@ -1021,8 +1023,8 @@
                     "reverse": "反转线的方向",
                     "move": "移动选中的要素",
                     "rotate": "旋转选中的要素",
-                    "orthogonalize": "将线拉直 / 直角化面",
-                    "circularize": "环状化闭合的线或面",
+                    "orthogonalize": "将线拉直 / 将区域变方",
+                    "circularize": "将闭合的线或区域变成圆形",
                     "reflect_long": "沿要素的长轴翻转",
                     "reflect_short": "沿要素的短轴翻转",
                     "delete": "删除选中的要素"
@@ -1051,51 +1053,51 @@
         "presets": {
             "categories": {
                 "category-barrier": {
-                    "name": "障碍要素"
+                    "name": "屏障"
                 },
                 "category-building": {
-                    "name": "建筑要素"
+                    "name": "建筑"
                 },
                 "category-golf": {
-                    "name": "高尔夫要素"
+                    "name": "高尔夫"
                 },
                 "category-landuse": {
-                    "name": "土地利用要素"
+                    "name": "土地用途"
                 },
                 "category-natural-area": {
-                    "name": "自然面要素"
+                    "name": "自然"
                 },
                 "category-natural-line": {
-                    "name": "自然线要素"
+                    "name": "自然"
                 },
                 "category-natural-point": {
-                    "name": "自然点要素"
+                    "name": "自然"
                 },
                 "category-path": {
-                    "name": "小路要素"
+                    "name": "小路"
                 },
                 "category-rail": {
-                    "name": "铁路要素"
+                    "name": "铁路"
                 },
                 "category-restriction": {
                     "name": "限制"
                 },
                 "category-road": {
-                    "name": "道路要素"
+                    "name": "道路"
                 },
                 "category-route": {
                     "name": "线路"
                 },
                 "category-water-area": {
-                    "name": "水体面要素"
+                    "name": "水体"
                 },
                 "category-water-line": {
-                    "name": "水体线要素"
+                    "name": "水体"
                 }
             },
             "fields": {
                 "access": {
-                    "label": "通行规则",
+                    "label": "允许通行",
                     "options": {
                         "designated": {
                             "description": "只限标志指定或特定本地法律容许的人士、车辆进入",
@@ -1136,14 +1138,14 @@
                     }
                 },
                 "access_simple": {
-                    "label": "通行规则"
+                    "label": "允许进入"
                 },
                 "address": {
                     "label": "地址",
                     "placeholders": {
                         "block_number": "街区编号",
                         "block_number!jp": "街区号",
-                        "city": "直辖市/地级市/自治州",
+                        "city": "地级市/自治州",
                         "city!jp": "市/镇/村/东京都特别区",
                         "city!vn": "市/镇",
                         "conscriptionnumber": "123号",
@@ -1166,7 +1168,7 @@
                         "quarter": "地方",
                         "quarter!jp": "大字/町",
                         "state": "行政州",
-                        "street": "道路",
+                        "street": "路",
                         "subdistrict": "街道",
                         "subdistrict!vn": "行政区/社区/小镇",
                         "suburb": "地区",
@@ -1192,7 +1194,7 @@
                     "label": "圆形顶"
                 },
                 "aerialway/capacity": {
-                    "label": "容量(每小时)",
+                    "label": "客流量(每小时)",
                     "placeholder": "500, 2500, 5000..."
                 },
                 "aerialway/duration": {
@@ -1233,7 +1235,7 @@
                     "label": "类型"
                 },
                 "artist": {
-                    "label": "艺人"
+                    "label": "艺术家"
                 },
                 "artwork_type": {
                     "label": "类型"
@@ -1258,7 +1260,7 @@
                     "options": {
                         "foot_bath": "足浴",
                         "hot_spring": "温泉",
-                        "onsen": "日本温泉"
+                        "onsen": "日式温泉"
                     }
                 },
                 "beauty": {
@@ -1285,6 +1287,9 @@
                 "board_type": {
                     "label": "类型"
                 },
+                "boules": {
+                    "label": "类型"
+                },
                 "boundary": {
                     "label": "类型"
                 },
@@ -1309,7 +1314,7 @@
                     "placeholder": "45, 90, 180, 270"
                 },
                 "camera/mount": {
-                    "label": "相机支架"
+                    "label": "相机架设"
                 },
                 "camera/type": {
                     "label": "相机类型",
@@ -1355,7 +1360,7 @@
                     }
                 },
                 "clothes": {
-                    "label": "服装"
+                    "label": "服饰"
                 },
                 "club": {
                     "label": "类型"
@@ -1384,7 +1389,7 @@
                     "label": "国家"
                 },
                 "covered": {
-                    "label": "覆盖"
+                    "label": "有上盖"
                 },
                 "craft": {
                     "label": "种类"
@@ -1404,7 +1409,7 @@
                     "label": "类型"
                 },
                 "cuisine": {
-                    "label": "菜肴"
+                    "label": "菜系"
                 },
                 "currency_multi": {
                     "label": "货币类型"
@@ -1420,7 +1425,7 @@
                     "label": "自行车道",
                     "options": {
                         "lane": {
-                            "description": "交通标线与机动车隔开的自行车道",
+                            "description": "通过交通标线与机动车隔开的自行车道",
                             "title": "标准自行车道"
                         },
                         "none": {
@@ -1428,7 +1433,7 @@
                             "title": "无"
                         },
                         "opposite": {
-                            "description": "单行街道上双向行驶的自行车道",
+                            "description": "单行路上可双向通行的自行车道",
                             "title": "逆向自行车道"
                         },
                         "opposite_lane": {
@@ -1464,7 +1469,7 @@
                     "label": "教派"
                 },
                 "denotation": {
-                    "label": "意思"
+                    "label": "树木指示性"
                 },
                 "description": {
                     "label": "描述"
@@ -1490,10 +1495,10 @@
                     "options": {
                         "contact_line": "接触线",
                         "no": "否",
-                        "rail": "电气化铁路",
+                        "rail": "第三轨供电",
                         "yes": "是(未指明)"
                     },
-                    "placeholder": "接触线、电气化铁路…"
+                    "placeholder": "架空接触线、第三轨供电…"
                 },
                 "elevation": {
                     "label": "海拔"
@@ -1529,9 +1534,9 @@
                     "label": "位置",
                     "options": {
                         "green": "绿地",
-                        "lane": "小巷",
+                        "lane": "车道",
                         "parking_lot": "停车场",
-                        "sidewalk": "路边人行道"
+                        "sidewalk": "人行道"
                     }
                 },
                 "fire_hydrant/type": {
@@ -1539,12 +1544,15 @@
                     "options": {
                         "pillar": "支柱/地上",
                         "pond": "池塘",
-                        "underground": "地铁",
+                        "underground": "地下",
                         "wall": "墙"
                     }
                 },
+                "fitness_station": {
+                    "label": "器械种类"
+                },
                 "fixme": {
-                    "label": "修复我"
+                    "label": "Fix Me"
                 },
                 "ford": {
                     "label": "类型",
@@ -1564,7 +1572,7 @@
                     "options": {
                         "female": "女",
                         "male": "男",
-                        "unisex": "无性别"
+                        "unisex": "男女通用"
                     },
                     "placeholder": "未知"
                 },
@@ -1572,7 +1580,7 @@
                     "label": "模式"
                 },
                 "generator/output/electricity": {
-                    "label": "输出功率",
+                    "label": "电力输出",
                     "placeholder": "50 MW, 100 MW, 200 MW..."
                 },
                 "generator/source": {
@@ -1627,7 +1635,7 @@
                     "label": "斜度"
                 },
                 "incline_steps": {
-                    "label": "坡度",
+                    "label": "斜坡",
                     "options": {
                         "down": "下",
                         "up": "上"
@@ -1674,7 +1682,7 @@
                     "label": "类型"
                 },
                 "lanes": {
-                    "label": "车道",
+                    "label": "车道数目",
                     "placeholder": "1, 2, 3..."
                 },
                 "layer": {
@@ -1727,7 +1735,7 @@
                     "label": "楼层"
                 },
                 "levels": {
-                    "label": "层数",
+                    "label": "楼层数",
                     "placeholder": "2, 4, 6..."
                 },
                 "lit": {
@@ -1767,18 +1775,18 @@
                 },
                 "milestone_position": {
                     "label": "里程碑位置",
-                    "placeholder": "距离精确到一位小数 (123.4)"
+                    "placeholder": "距离，精确到一位小数 (123.4)"
                 },
                 "mtb/scale": {
                     "label": "山地自行车骑行难度",
                     "options": {
-                        "0": "0：坚实的硕石土路，没有障碍物，大湾曲",
-                        "1": "1：铺面部分松散，有小的障碍物，大弯曲",
-                        "2": "2：大都是松散的铺面，有的障碍物，容易通过的发夹弯",
-                        "3": "3：铺面光滑，有大的障碍物",
+                        "0": "0：坚实的硕石土路，没有障碍物，路线较直",
+                        "1": "1：路面部分松散，有小的障碍物，路线较直",
+                        "2": "2：大都是松散的路面，有大的障碍物，容易通过的发夹弯",
+                        "3": "3：路面容易打滑，有大的障碍物，有发夹弯",
                         "4": "4：路面松散或是充满石头，有危险的发夹弯",
                         "5": "5：骑乘等级最困难，路面充满石头，或者是路面坍方",
-                        "6": "6：除非是技巧极好的越野车手，否则并不适合骑乘"
+                        "6": "6：无法骑行，除非是技巧极好的越野车手"
                     },
                     "placeholder": "0, 1, 2, 3..."
                 },
@@ -1826,7 +1834,7 @@
                     "placeholder": "本地的，地区的，国家的，国际的"
                 },
                 "network_foot": {
-                    "label": "网络类型",
+                    "label": "徒步网络类型",
                     "options": {
                         "iwn": "国际的",
                         "lwn": "本地的",
@@ -1900,7 +1908,7 @@
                         "garage_boxes": "车库盒",
                         "lane": "路边",
                         "multi-storey": "多层",
-                        "sheds": "单独车库",
+                        "sheds": "车棚",
                         "surface": "地面",
                         "underground": "地下"
                     }
@@ -1940,7 +1948,7 @@
                     "label": "类型",
                     "options": {
                         "downhill": "下坡",
-                        "hike": "徒步旅行",
+                        "hike": "徒步",
                         "ice_skate": "冰刀",
                         "nordic": "北欧人",
                         "playground": "练习场",
@@ -1991,7 +1999,7 @@
                     "label": "接受"
                 },
                 "recycling_type": {
-                    "label": "回收场所",
+                    "label": "回收类型",
                     "options": {
                         "centre": "回收站",
                         "container": "回收容器"
@@ -2054,14 +2062,14 @@
                 "sac_scale": {
                     "label": "远足难度",
                     "options": {
-                        "alpine_hiking": "T4：高山旅行",
-                        "demanding_alpine_hiking": "T5：进阶高山旅行",
-                        "demanding_mountain_hiking": "T3：进阶登山旅行",
-                        "difficult_alpine_hiking": "T6：艰困高山旅行",
-                        "hiking": "T1：徒步旅行",
-                        "mountain_hiking": "T2：登山旅行"
+                        "alpine_hiking": "T4：高山徒步",
+                        "demanding_alpine_hiking": "T5：进阶高山徒步",
+                        "demanding_mountain_hiking": "T3：进阶山地徒步",
+                        "difficult_alpine_hiking": "T6：艰困高山徒步",
+                        "hiking": "T1：徒步",
+                        "mountain_hiking": "T2：山地徒步"
                     },
-                    "placeholder": "登山旅行，越岭行走..."
+                    "placeholder": "山地徒步，高山远足..."
                 },
                 "sanitary_dump_station": {
                     "label": "厕所废物"
@@ -2130,7 +2138,7 @@
                         "excellent": "轴承：溜冰，滑板",
                         "good": "细轮：竞速自行车",
                         "horrible": "越野：高负重越野车辆",
-                        "impassable": "禁止通行/禁止轮类交通工具",
+                        "impassable": "无法通行 / 有轮车辆无法通行",
                         "intermediate": "轮胎：通勤脚踏车，轮椅，滑板车",
                         "very_bad": "轻量化：低负重越野车辆",
                         "very_horrible": "越野专用：拖拉机，全地形越野车"
@@ -2188,13 +2196,16 @@
                 "structure_waterway": {
                     "label": "结构",
                     "options": {
-                        "tunnel": "地道"
+                        "tunnel": "隧道"
                     },
                     "placeholder": "未知"
                 },
                 "studio": {
                     "label": "类型"
                 },
+                "substance": {
+                    "label": "材质"
+                },
                 "substation": {
                     "label": "类型"
                 },
@@ -2205,7 +2216,7 @@
                     "label": "支持物"
                 },
                 "surface": {
-                    "label": "路面铺设"
+                    "label": "表面铺设"
                 },
                 "surveillance": {
                     "label": "监视"
@@ -2252,7 +2263,7 @@
                     "label": "类型"
                 },
                 "tourism_attraction": {
-                    "label": "旅游业"
+                    "label": "类型"
                 },
                 "tower/construction": {
                     "label": "结构",
@@ -2272,6 +2283,9 @@
                     },
                     "placeholder": "坚硬地面，硬物铺面，软铺面"
                 },
+                "trade": {
+                    "label": "类型"
+                },
                 "traffic_calming": {
                     "label": "类型"
                 },
@@ -2290,6 +2304,16 @@
                     },
                     "placeholder": "良好，尚可，稍差..."
                 },
+                "transformer": {
+                    "options": {
+                        "converter": "变流器",
+                        "distribution": "配电变压器",
+                        "generator": "发电机变压器",
+                        "phase_angle_regulator": "相角调节器",
+                        "traction": "牵引变压器",
+                        "yes": "未知"
+                    }
+                },
                 "trees": {
                     "label": "树林"
                 },
@@ -2324,6 +2348,15 @@
                         "stratovolcano": "复合锥"
                     }
                 },
+                "voltage/primary": {
+                    "label": "一次电压"
+                },
+                "voltage/secondary": {
+                    "label": "二次电压"
+                },
+                "voltage/tertiary": {
+                    "label": "三次电压"
+                },
                 "wall": {
                     "label": "类型"
                 },
@@ -2351,6 +2384,18 @@
                 },
                 "wikipedia": {
                     "label": "维基百科"
+                },
+                "windings/configuration": {
+                    "label": "绕组配置",
+                    "options": {
+                        "delta": "三角形",
+                        "leblanc": "勒布朗",
+                        "open": "开放",
+                        "open-delta": "开放三角形",
+                        "scott": "斯科特",
+                        "star": "星型（Y型）",
+                        "zigzag": "曲折连接"
+                    }
                 }
             },
             "presets": {
@@ -2686,12 +2731,12 @@
                     "terms": "停车"
                 },
                 "amenity/parking_entrance": {
-                    "name": "停车场入口/出口",
-                    "terms": "停车场出入口"
+                    "name": "车库出入口",
+                    "terms": "停车场出入口,地下车库出入口,多层车库出入口"
                 },
                 "amenity/parking_space": {
-                    "name": "停车空间",
-                    "terms": "停车空间,停车场地"
+                    "name": "停车位",
+                    "terms": "停车空间,停车场地,停车位"
                 },
                 "amenity/pavilion": {
                     "name": "休息亭",
@@ -2797,8 +2842,7 @@
                     "terms": "学校,高中,初中,中学,小学,校园,中专,学习"
                 },
                 "amenity/scrapyard": {
-                    "name": "废品堆放场",
-                    "terms": "废品堆放场,废料场,垃圾,垃圾场,废物,废品,回收,填埋,堆放,废弃,报废,废料,废弃,残余物,碎片,清理,废置,坏,汽车,金属,打捞,沉船,场地"
+                    "name": "废品堆放场"
                 },
                 "amenity/shelter": {
                     "name": "亭",
@@ -3023,8 +3067,8 @@
                     "terms": "自行车,单车,路障"
                 },
                 "barrier/ditch": {
-                    "name": "沟",
-                    "terms": "沟"
+                    "name": "堑壕",
+                    "terms": "沟,壕沟,堑壕"
                 },
                 "barrier/entrance": {
                     "name": "入口"
@@ -3074,8 +3118,8 @@
                     "terms": "建筑物，屋宇"
                 },
                 "building/apartments": {
-                    "name": "公寓",
-                    "terms": "公寓"
+                    "name": "住宅楼",
+                    "terms": "公寓,住宅楼"
                 },
                 "building/barn": {
                     "name": "谷仓",
@@ -3113,7 +3157,7 @@
                     "terms": "在建建筑"
                 },
                 "building/detached": {
-                    "name": "独立式房屋",
+                    "name": "独栋住宅",
                     "terms": "独立式房屋"
                 },
                 "building/dormitory": {
@@ -3144,7 +3188,7 @@
                     "terms": "宾馆建筑"
                 },
                 "building/house": {
-                    "name": "房屋",
+                    "name": "洋房",
                     "terms": "房屋"
                 },
                 "building/hut": {
@@ -3172,8 +3216,8 @@
                     "terms": "商业建筑"
                 },
                 "building/roof": {
-                    "name": "楼顶",
-                    "terms": "楼顶,房顶,屋顶"
+                    "name": "开放式建筑",
+                    "terms": "大棚,屋顶,上盖,开放式建筑"
                 },
                 "building/school": {
                     "name": "学校建筑",
@@ -3196,7 +3240,7 @@
                     "terms": "固定房车,房车"
                 },
                 "building/terrace": {
-                    "name": "屋列",
+                    "name": "联排式住宅",
                     "terms": "屋列,房列,一列房,一列屋"
                 },
                 "building/train_station": {
@@ -3367,10 +3411,6 @@
                     "name": "脚手架搭建工",
                     "terms": "脚手架搭建工,搭脚手架的人"
                 },
-                "craft/sculpter": {
-                    "name": "雕刻师",
-                    "terms": "雕刻师"
-                },
                 "craft/shoemaker": {
                     "name": "鞋匠",
                     "terms": "鞋匠,制鞋店"
@@ -3379,10 +3419,6 @@
                     "name": "石匠",
                     "terms": "石匠"
                 },
-                "craft/sweep": {
-                    "name": "烟囱清理工",
-                    "terms": "烟囱清理工,扫烟囱的人"
-                },
                 "craft/tailor": {
                     "name": "裁缝"
                 },
@@ -3457,11 +3493,11 @@
                     "terms": "入口/出口,出入口"
                 },
                 "footway/crossing": {
-                    "name": "路口",
+                    "name": "人行横道",
                     "terms": "路口"
                 },
                 "footway/crossing-raised": {
-                    "name": "抬高的街道十字路口",
+                    "name": "抬高的人行横道",
                     "terms": "人行横道,速度,减速,交通稳静化"
                 },
                 "footway/crosswalk": {
@@ -3497,7 +3533,7 @@
                     "terms": "高尔夫球洞"
                 },
                 "golf/lateral_water_hazard_area": {
-                    "name": "高尔夫侧面水障碍水体",
+                    "name": "高尔夫侧面水障碍区",
                     "terms": "高尔夫侧面水障碍水体,水障碍,侧面水障碍,水障碍区"
                 },
                 "golf/lateral_water_hazard_line": {
@@ -3513,7 +3549,7 @@
                     "terms": "高尔夫开球区,开球区,发球台"
                 },
                 "golf/water_hazard_area": {
-                    "name": "高尔夫水障碍水体",
+                    "name": "高尔夫水障碍区",
                     "terms": "高尔夫水障碍水体,水障碍,正面水障碍,水障碍区"
                 },
                 "golf/water_hazard_line": {
@@ -3620,15 +3656,15 @@
                     "terms": "电梯,直梯"
                 },
                 "highway/footway": {
-                    "name": "独立人行道",
-                    "terms": "独立人行道,人行道,步行径"
+                    "name": "步行道路",
+                    "terms": "步行径"
                 },
                 "highway/give_way": {
                     "name": "让行标志",
                     "terms": "让行标志,减速让行标志"
                 },
                 "highway/living_street": {
-                    "name": "生活街",
+                    "name": "生活性街道",
                     "terms": "居住街道"
                 },
                 "highway/mini_roundabout": {
@@ -3651,9 +3687,11 @@
                     "name": "小道",
                     "terms": "路径"
                 },
-                "highway/pedestrian": {
-                    "name": "步行街",
-                    "terms": "步行街"
+                "highway/pedestrian_area": {
+                    "name": "行人区域（广场）"
+                },
+                "highway/pedestrian_line": {
+                    "name": "步行街"
                 },
                 "highway/primary": {
                     "name": "主要道路",
@@ -3693,7 +3731,7 @@
                 },
                 "highway/service/alley": {
                     "name": "胡同/弄堂",
-                    "terms": "胡同,巷,弄堂,里弄,小巷,巷,弄,巷弄"
+                    "terms": "胡同,巷,弄堂,里弄,小巷,巷,弄,巷弄（可通行机动车）"
                 },
                 "highway/service/drive-through": {
                     "name": "免下车",
@@ -3720,7 +3758,7 @@
                     "terms": "超速摄像头,电子警察,电子眼"
                 },
                 "highway/steps": {
-                    "name": "楼梯",
+                    "name": "阶梯",
                     "terms": "楼梯,台阶"
                 },
                 "highway/stop": {
@@ -3772,12 +3810,12 @@
                     "terms": "小型/未分级道路"
                 },
                 "historic": {
-                    "name": "历史遗迹",
+                    "name": "历史地点",
                     "terms": "历史遗迹,史迹"
                 },
                 "historic/archaeological_site": {
-                    "name": "遗址",
-                    "terms": "考古遗址"
+                    "name": "考古地点",
+                    "terms": "考古,遗址"
                 },
                 "historic/boundary_stone": {
                     "name": "界碑",
@@ -3831,6 +3869,10 @@
                     "name": "水池",
                     "terms": "水池"
                 },
+                "landuse/brownfield": {
+                    "name": "棕土",
+                    "terms": "工商业使用过但被弃置的土地"
+                },
                 "landuse/cemetery": {
                     "name": "墓地",
                     "terms": "墓地"
@@ -3870,6 +3912,10 @@
                     "name": "草坪",
                     "terms": "草地"
                 },
+                "landuse/greenfield": {
+                    "name": "待开发荒地",
+                    "terms": "未开发过的土地"
+                },
                 "landuse/harbour": {
                     "name": "港口",
                     "terms": "港口,港,岸,海"
@@ -3878,6 +3924,13 @@
                     "name": "工业区",
                     "terms": "工业区"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "废料场",
+                    "terms": "废料场"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "屠宰场"
+                },
                 "landuse/landfill": {
                     "name": "垃圾填埋区",
                     "terms": "垃圾,填埋,填埋场,填埋区,焚烧,填埋坑,废物"
@@ -3947,13 +4000,16 @@
                     "terms": "矿场"
                 },
                 "landuse/railway": {
-                    "name": "铁路用地",
+                    "name": "铁路走廊",
                     "terms": "铁路用地"
                 },
                 "landuse/recreation_ground": {
                     "name": "绿地",
                     "terms": "绿地"
                 },
+                "landuse/religious": {
+                    "name": "宗教场所"
+                },
                 "landuse/residential": {
                     "name": "居民区",
                     "terms": "住宅小区"
@@ -4031,8 +4087,8 @@
                     "terms": "滑冰,滑冰场"
                 },
                 "leisure/marina": {
-                    "name": "船坞",
-                    "terms": "船坞,码头"
+                    "name": "游艇码头",
+                    "terms": "码头,游艇码头"
                 },
                 "leisure/miniature_golf": {
                     "name": "迷你高尔夫",
@@ -4051,7 +4107,7 @@
                     "terms": "Picnic Table"
                 },
                 "leisure/pitch": {
-                    "name": "运动场",
+                    "name": "运动场地",
                     "terms": "体育场,操场,运动,田径,跑道"
                 },
                 "leisure/pitch/american_football": {
@@ -4099,7 +4155,7 @@
                     "terms": "足球场"
                 },
                 "leisure/pitch/table_tennis": {
-                    "name": "乒乓球桌",
+                    "name": "乒乓球场地",
                     "terms": "乒乓桌,乒乓球桌,乒乓球"
                 },
                 "leisure/pitch/tennis": {
@@ -4122,6 +4178,9 @@
                     "name": "跑道(跑步)",
                     "terms": "跑步,跑道,操场,跑"
                 },
+                "leisure/sauna": {
+                    "name": "桑拿"
+                },
                 "leisure/slipway": {
                     "name": "船台",
                     "terms": "船台"
@@ -4163,7 +4222,7 @@
                     "terms": "坑道入口,矿道入口"
                 },
                 "man_made/breakwater": {
-                    "name": "避风塘",
+                    "name": "防波堤",
                     "terms": "避风塘,避风港"
                 },
                 "man_made/bridge": {
@@ -4194,8 +4253,8 @@
                     "terms": "大型燃气罐,大型储气罐,煤气包"
                 },
                 "man_made/groyne": {
-                    "name": "防波堤",
-                    "terms": "防波堤"
+                    "name": "拦沙坝",
+                    "terms": "防波堤,拦沙坝"
                 },
                 "man_made/lighthouse": {
                     "name": "灯塔",
@@ -4342,8 +4401,8 @@
                     "terms": "山脊,山高,凸,坡,斜坡,山峰,山冈,山"
                 },
                 "natural/saddle": {
-                    "name": "山脊",
-                    "terms": "山脊,山鞍,鞍部"
+                    "name": "垭口",
+                    "terms": "垭口,山口,山鞍,鞍部"
                 },
                 "natural/sand": {
                     "name": "沙漠",
@@ -4374,7 +4433,7 @@
                     "terms": "火山"
                 },
                 "natural/water": {
-                    "name": "水",
+                    "name": "水体",
                     "terms": "水"
                 },
                 "natural/water/lake": {
@@ -4402,20 +4461,32 @@
                     "terms": "死胡同"
                 },
                 "office": {
-                    "name": "写字楼",
+                    "name": "办公地点",
                     "terms": "办公室,写字楼"
                 },
                 "office/accountant": {
-                    "name": "会计师楼",
-                    "terms": "会计师楼"
+                    "name": "会计师事务所"
                 },
                 "office/administrative": {
                     "name": "行政楼",
                     "terms": "行政楼"
                 },
+                "office/adoption_agency": {
+                    "name": "领养中介"
+                },
+                "office/advertising_agency": {
+                    "name": "广告中介"
+                },
                 "office/architect": {
-                    "name": "建筑师楼",
-                    "terms": "建筑师楼"
+                    "name": "建筑事务所",
+                    "terms": "建筑事务所"
+                },
+                "office/association": {
+                    "name": "非盈利机构办公室",
+                    "terms": "非盈利机构办公室"
+                },
+                "office/charity": {
+                    "name": "慈善机构"
                 },
                 "office/company": {
                     "name": "公司",
@@ -4433,29 +4504,45 @@
                     "name": "就业机构",
                     "terms": "就业机构"
                 },
+                "office/energy_supplier": {
+                    "name": "电力公司"
+                },
                 "office/estate_agent": {
                     "name": "地产代理",
                     "terms": "地产代理"
                 },
                 "office/financial": {
-                    "name": "财务部写字楼",
-                    "terms": "财务部写字楼"
+                    "name": "金融机构",
+                    "terms": "金融机构"
+                },
+                "office/forestry": {
+                    "name": "林务管理"
+                },
+                "office/foundation": {
+                    "name": "基金办公室",
+                    "terms": "基金办公室"
                 },
                 "office/government": {
-                    "name": "政府楼",
-                    "terms": "政府楼"
+                    "name": "政府办公点",
+                    "terms": "政府办公点"
                 },
                 "office/government/register_office": {
                     "name": "登记处",
                     "terms": "登记处,出生登记处,结婚登记处,死亡登记处"
                 },
+                "office/government/tax": {
+                    "name": "税局",
+                    "terms": "税局"
+                },
+                "office/guide": {
+                    "name": "导游机构"
+                },
                 "office/insurance": {
                     "name": "保险公司",
                     "terms": "保险公司"
                 },
                 "office/it": {
-                    "name": "IT公司",
-                    "terms": "IT公司"
+                    "name": "IT公司"
                 },
                 "office/lawyer": {
                     "name": "律师事务所",
@@ -4465,14 +4552,19 @@
                     "name": "公证处",
                     "terms": "公证处,Notary Office"
                 },
+                "office/moving_company": {
+                    "name": "搬家公司"
+                },
                 "office/newspaper": {
-                    "name": "报社",
-                    "terms": "报社,通讯社"
+                    "name": "报社"
                 },
                 "office/ngo": {
                     "name": "非政府组织",
                     "terms": "非政府组织"
                 },
+                "office/notary": {
+                    "name": "公证处"
+                },
                 "office/physician": {
                     "name": "医生"
                 },
@@ -4480,21 +4572,32 @@
                     "name": "政党",
                     "terms": "政党"
                 },
+                "office/private_investigator": {
+                    "name": "私家侦探事务所"
+                },
+                "office/quango": {
+                    "name": "准非政府组织"
+                },
                 "office/research": {
                     "name": "研究所",
                     "terms": "研究所"
                 },
+                "office/tax_advisor": {
+                    "name": "税务顾问机构"
+                },
                 "office/telecommunication": {
                     "name": "电信办公室",
                     "terms": "电信公司"
                 },
                 "office/therapist": {
-                    "name": "医疗师",
-                    "terms": "理疗,医生,中医,推拿,整骨,医疗,治疗,医疗,医师,护士,医护,办公室,技师,医院"
+                    "name": "治疗师工作室"
                 },
                 "office/travel_agent": {
                     "name": "旅行社"
                 },
+                "office/water_utility": {
+                    "name": "水务设施机构"
+                },
                 "piste": {
                     "name": "滑雪道",
                     "terms": "滑雪道"
@@ -4517,6 +4620,10 @@
                     "name": "岛屿",
                     "terms": "岛屿"
                 },
+                "place/islet": {
+                    "name": "小岛",
+                    "terms": "小岛"
+                },
                 "place/isolated_dwelling": {
                     "name": "孤立居所",
                     "terms": "孤立居所"
@@ -4526,7 +4633,7 @@
                     "terms": "地方,地点"
                 },
                 "place/neighbourhood": {
-                    "name": "街坊",
+                    "name": "街坊社区 / 小区",
                     "terms": "社区,街坊"
                 },
                 "place/quarter": {
@@ -4550,8 +4657,7 @@
                     "terms": "村庄"
                 },
                 "playground/balance_beam": {
-                    "name": "平衡木",
-                    "terms": "平衡木,独木桥,木桩,勇敢者道路,儿童,小孩,游乐,游乐设施,游乐园,游乐场,乐园,儿童乐园"
+                    "name": "跷跷板"
                 },
                 "playground/basket_spinner": {
                     "name": "网兜旋转器 (儿童游乐)",
@@ -4570,8 +4676,7 @@
                     "terms": "气垫,弹簧垫,弹簧,弹力,弹性,垫子,弹跳,蹦跳,跳,充气,充气城堡"
                 },
                 "playground/horizontal_bar": {
-                    "name": "单杠",
-                    "terms": "单杠,高低杠,杠子,横杠,铁棒,竞技,运动,体操,操场,回环,转体,摆荡,儿童,小孩,游乐,游乐设施,游乐园,游乐场,乐园,儿童乐园"
+                    "name": "平衡木"
                 },
                 "playground/rocker": {
                     "name": "弹簧木马 (儿童游乐)",
@@ -4625,12 +4730,12 @@
                     "terms": "风能,风轮机,涡轮,发电机,发电器,风力,风车,风,发电"
                 },
                 "power/line": {
-                    "name": "供电线",
-                    "terms": "供电线"
+                    "name": "输电线",
+                    "terms": "输电线"
                 },
                 "power/minor_line": {
-                    "name": "小供电线",
-                    "terms": "小供电线"
+                    "name": "次要输电线",
+                    "terms": "次要输电线"
                 },
                 "power/plant": {
                     "name": "发电厂",
@@ -4667,7 +4772,7 @@
                     "name": "铁路"
                 },
                 "railway/abandoned": {
-                    "name": "已拆除铁路",
+                    "name": "已拆除铁路遗迹",
                     "terms": "废弃的铁路"
                 },
                 "railway/buffer_stop": {
@@ -4711,11 +4816,11 @@
                     "terms": "窄轨铁路,铁路"
                 },
                 "railway/platform": {
-                    "name": "铁路站台",
-                    "terms": "站台"
+                    "name": "月台",
+                    "terms": "站台,月台"
                 },
                 "railway/rail": {
-                    "name": "铁轨",
+                    "name": "标准铁路",
                     "terms": "铁轨"
                 },
                 "railway/signal": {
@@ -5016,7 +5121,7 @@
                     "terms": "音响店"
                 },
                 "shop/houseware": {
-                    "name": "小型家饰店",
+                    "name": "家居用品店",
                     "terms": "小型家饰店"
                 },
                 "shop/interior_decoration": {
@@ -5187,6 +5292,10 @@
                     "name": "售票处",
                     "terms": "售票处,售票亭"
                 },
+                "shop/tiles": {
+                    "name": "瓷砖商店",
+                    "terms": "磁磚商店"
+                },
                 "shop/tobacco": {
                     "name": "烟草店",
                     "terms": "烟草店"
@@ -5195,6 +5304,10 @@
                     "name": "玩具店",
                     "terms": "玩具店"
                 },
+                "shop/trade": {
+                    "name": "材料商店",
+                    "terms": "建材商店,材料行"
+                },
                 "shop/travel_agency": {
                     "name": "旅行社",
                     "terms": "旅行社"
@@ -5227,7 +5340,7 @@
                     "terms": "手表店,钟表店,Watches Shop"
                 },
                 "shop/water_sports": {
-                    "name": "水上运动/泳装店",
+                    "name": "水上运动/泳具店",
                     "terms": "水上运动/泳装店"
                 },
                 "shop/weapons": {
@@ -5243,16 +5356,16 @@
                     "terms": "酒品商店,酒店,酒楼,酒坊"
                 },
                 "tourism": {
-                    "name": "旅行",
-                    "terms": "旅行"
+                    "name": "旅游设施",
+                    "terms": "旅行,旅游设施"
                 },
                 "tourism/alpine_hut": {
                     "name": "高山小屋",
                     "terms": "高山小屋"
                 },
                 "tourism/apartment": {
-                    "name": "公寓",
-                    "terms": "公寓,客人公寓"
+                    "name": "出租公寓",
+                    "terms": "公寓,客人公寓,出租公寓"
                 },
                 "tourism/aquarium": {
                     "name": "水族馆",
@@ -5275,8 +5388,8 @@
                     "terms": "房车营地"
                 },
                 "tourism/chalet": {
-                    "name": "木屋",
-                    "terms": "木屋"
+                    "name": "度假屋",
+                    "terms": "度假屋"
                 },
                 "tourism/gallery": {
                     "name": "美术馆",
@@ -5334,20 +5447,23 @@
                     "name": "观景点",
                     "terms": "景点"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "野外住宿小屋"
+                },
                 "tourism/zoo": {
                     "name": "动物园",
                     "terms": "动物园"
                 },
                 "traffic_calming": {
-                    "name": "交通稳静化",
-                    "terms": "交通稳静化,交通静稳化,车辆减速措施"
+                    "name": "交通减速设置",
+                    "terms": "车辆减速措施"
                 },
                 "traffic_calming/bump": {
                     "name": "减速带",
                     "terms": "减速,减速带,交通稳静化"
                 },
                 "traffic_calming/chicane": {
-                    "name": "曲折车行道",
+                    "name": "减速弯道",
                     "terms": "曲折车行道,减速弯道"
                 },
                 "traffic_calming/choker": {
@@ -5359,7 +5475,7 @@
                     "terms": "减速,减速垫,减速板,减速带,减速胶,交通稳静化"
                 },
                 "traffic_calming/dip": {
-                    "name": "路凹",
+                    "name": "减速路凹",
                     "terms": "路凹,减速路凹,减速坑"
                 },
                 "traffic_calming/hump": {
@@ -5367,8 +5483,8 @@
                     "terms": "减速,减速丘,交通稳静化"
                 },
                 "traffic_calming/island": {
-                    "name": "交通岛",
-                    "terms": "交通岛,导流岛,安全岛,中心岛,交通稳静化"
+                    "name": "交通分隔岛",
+                    "terms": "交通岛,导流岛,安全岛,中心岛,分隔岛"
                 },
                 "traffic_calming/rumble_strip": {
                     "name": "路肩警示带",
@@ -5566,6 +5682,13 @@
                 "description": "DigitalGlobe 优质卫星影像",
                 "name": "DigitalGlobe 优质影像"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "使用条款与意见反馈"
+                },
+                "description": "影像边界和拍摄日期。标签会在缩放到14层级或更高时显示。",
+                "name": "DigitalGlobe 优质影像年份"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "条款与反馈"
@@ -5573,6 +5696,13 @@
                 "description": "DigitalGlobe 标准卫星影像",
                 "name": "DigitalGlobe 标准影像"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "使用条款与意见反馈"
+                },
+                "description": "影像边界和拍摄日期。标签会在缩放到14层级或更高时显示。",
+                "name": "DigitalGlobe 标准影像年份"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "条款和反馈"
@@ -5644,6 +5774,7 @@
                 "name": "TIGER 道路 2014"
             },
             "US-TIGER-Roads-2017": {
+                "description": "黄色 = 来自美国人口调查局的公共领域地图数据。红色 = 在 OpenStreetMap 中找不到数据。",
                 "name": "TIGER 道路 2017"
             },
             "Waymarked_Trails-Cycling": {
@@ -5700,7 +5831,7 @@
                 "attribution": {
                     "text": "条款与反馈"
                 },
-                "description": "显示主要要素辅助定向",
+                "description": "叠加显示主要要素，以辅助定位",
                 "name": "定位辅助叠加层"
             },
             "openpt_map": {
diff --git a/dist/locales/zh-HK.json b/dist/locales/zh-HK.json
index 9c5464a58..1814d6120 100644
--- a/dist/locales/zh-HK.json
+++ b/dist/locales/zh-HK.json
@@ -310,7 +310,6 @@
             "localized_translation_language": "選擇語言",
             "localized_translation_name": "名稱"
         },
-        "zoom_in_edit": "放大以編輯",
         "login": "登入",
         "logout": "登出",
         "loading_auth": "正在連接 OpenStreetMap...",
@@ -603,8 +602,7 @@
         "splash": {
             "welcome": "歡迎使用iD OpenStreetMap編輯器",
             "text": "iD是一個易用但功能強大的工具以便你可在世界上最好的免費地圖中作出貢獻。這個是版本{version}。你可在{website}得到更多資料和在{github}報告錯誤。",
-            "walkthrough": "開始新手教學",
-            "start": "立即編輯"
+            "walkthrough": "開始新手教學"
         },
         "source_switch": {
             "live": "實況模式",
@@ -636,10 +634,6 @@
             "tag_suggests_area": "{tag}標籤建議綫應為範圍，但這不是一個範圍。",
             "deprecated_tags": "已棄用的標籤: {tags}"
         },
-        "zoom": {
-            "in": "放大",
-            "out": "縮細"
-        },
         "cannot_zoom": "在這個模式下不能再縮小。",
         "full_screen": "切換全螢幕",
         "gpx": {
@@ -2737,8 +2731,7 @@
                     "terms": "學校,中學,小學,學校用地,學校範圍,國際學校"
                 },
                 "amenity/scrapyard": {
-                    "name": "廢料場",
-                    "terms": "Scrap Yard, 廢車場, 廢物場"
+                    "name": "廢料場"
                 },
                 "amenity/shelter": {
                     "name": "涼亭",
@@ -3303,10 +3296,6 @@
                     "name": "棚架工程",
                     "terms": "搭棚"
                 },
-                "craft/sculpter": {
-                    "name": "雕塑工程",
-                    "terms": "雕刻工程"
-                },
                 "craft/shoemaker": {
                     "name": "鞋匠",
                     "terms": "皮鞋匠"
@@ -3315,10 +3304,6 @@
                     "name": "石匠",
                     "terms": "石工"
                 },
-                "craft/sweep": {
-                    "name": "煙囱打掃",
-                    "terms": "煙囱清掃,煙囱清潔"
-                },
                 "craft/tailor": {
                     "name": "裁縫"
                 },
@@ -3547,10 +3532,6 @@
                     "name": "路徑",
                     "terms": "Path,徑,路徑"
                 },
-                "highway/pedestrian": {
-                    "name": "行人專用區",
-                    "terms": "行人區, 行人專用"
-                },
                 "highway/primary": {
                     "name": "市區幹道",
                     "terms": "Primary Road,主要道路,大路"
@@ -4293,18 +4274,10 @@
                     "name": "辦公室",
                     "terms": "Office,寫字樓,辦公室"
                 },
-                "office/accountant": {
-                    "name": "會計師樓",
-                    "terms": "Accountant,會計師樓"
-                },
                 "office/administrative": {
                     "name": "行政樓",
                     "terms": "Administrative Office,行政樓"
                 },
-                "office/architect": {
-                    "name": "建築師樓",
-                    "terms": "Architect,則師樓,則樓,建築師樓"
-                },
                 "office/company": {
                     "name": "公司辦事處",
                     "terms": "Company Office,公司,公司寫字樓"
@@ -4341,10 +4314,6 @@
                     "name": "保險公司辦公室",
                     "terms": "Insurance Office,保險公司,保險公司寫字樓"
                 },
-                "office/it": {
-                    "name": "資訊科技公司辦公室",
-                    "terms": "IT Office,IT公司,資訊科技寫字樓,電腦公司寫字樓"
-                },
                 "office/lawyer": {
                     "name": "律師事務所",
                     "terms": "Law Office,律師事務所"
@@ -4353,10 +4322,6 @@
                     "name": "公證行",
                     "terms": "Notary Office,公證人"
                 },
-                "office/newspaper": {
-                    "name": "報社",
-                    "terms": "Newspaper,報社,新聞社,通訊社"
-                },
                 "office/ngo": {
                     "name": "非政府機構辦公室",
                     "terms": "NGO Office,志願機構寫字樓,非政府組織,志願組織"
@@ -4376,10 +4341,6 @@
                     "name": "電訊公司辦公室",
                     "terms": "Telecom Office,電信公司,電話公司寫字樓"
                 },
-                "office/therapist": {
-                    "name": "治療師",
-                    "terms": "Therapist,治療師,醫療師"
-                },
                 "office/travel_agent": {
                     "name": "旅行社"
                 },
@@ -5106,10 +5067,6 @@
                     "name": "露營車營地",
                     "terms": "RV Park,房車營地,露營車停車場,露營車營地"
                 },
-                "tourism/chalet": {
-                    "name": "木屋",
-                    "terms": "Chalet,木屋"
-                },
                 "tourism/gallery": {
                     "name": "畫廊",
                     "terms": "藝廊,藝術廊"
diff --git a/dist/locales/zh-TW.json b/dist/locales/zh-TW.json
index 437006c0d..144fb3900 100644
--- a/dist/locales/zh-TW.json
+++ b/dist/locales/zh-TW.json
@@ -310,7 +310,7 @@
             "localized_translation_language": "選擇語言",
             "localized_translation_name": "名稱"
         },
-        "zoom_in_edit": "放大以開始編輯",
+        "zoom_in_edit": "拉近以編輯",
         "login": "登入",
         "logout": "登出",
         "loading_auth": "正在連接 OpenStreetMap...",
@@ -361,7 +361,9 @@
                 "accuracy": "準確度",
                 "unknown": "未知",
                 "show_tiles": "顯示圖磚",
-                "hide_tiles": "隱藏圖磚"
+                "hide_tiles": "隱藏圖磚",
+                "show_vintage": "顯示年份",
+                "hide_vintage": "隱藏年份"
             },
             "history": {
                 "key": "H",
@@ -613,7 +615,7 @@
             "welcome": "歡迎使用iD OpenStreetMap編輯器",
             "text": "iD編輯器是一個既易用而又功能強大的工具，以助您編輯世界上最好的自由世界地圖。這是版本{version}。欲知詳情，請瀏覽 {website} 及於{github}報告臭蟲。",
             "walkthrough": "開始新手教學",
-            "start": "現在就開始編輯"
+            "start": "現在就編輯"
         },
         "source_switch": {
             "live": "實況模式",
@@ -646,8 +648,8 @@
             "deprecated_tags": "已棄用的標籤︰{tags}"
         },
         "zoom": {
-            "in": "放大",
-            "out": "縮小"
+            "in": "拉近",
+            "out": "拉遠"
         },
         "cannot_zoom": "在此模式下不能再縮小。",
         "full_screen": "啟動全螢幕",
@@ -658,15 +660,22 @@
             "browse": "瀏覽檔案"
         },
         "mapillary_images": {
-            "tooltip": "從 Mapillary 來的街道照片",
-            "title": "照片重疊 (Mapillary)"
+            "tooltip": "從 Mapillary 來的街道級照片",
+            "title": "照片覆蓋層 (Mapillary)"
         },
         "mapillary_signs": {
             "tooltip": "從 Mapillary 而來的交通號誌（必須啟用照片重疊）",
-            "title": "紅綠燈重疊 (Mapillary)"
+            "title": "紅綠燈覆蓋層 (Mapillary)"
         },
         "mapillary": {
-            "view_on_mapillary": "在 Mapillary 看這張照片"
+            "view_on_mapillary": "在 Mapillary 檢視這張照片"
+        },
+        "openstreetcam_images": {
+            "tooltip": "從 OpenStreetCam 而來的街道級照片",
+            "title": "照片覆蓋層 (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "在 OpenStreetCam 檢視這張圖片"
         },
         "help": {
             "title": "說明文件",
@@ -1217,6 +1226,9 @@
                 "aeroway": {
                     "label": "種類"
                 },
+                "agrarian": {
+                    "label": "產品"
+                },
                 "amenity": {
                     "label": "種類"
                 },
@@ -1285,6 +1297,9 @@
                 "board_type": {
                     "label": "種類"
                 },
+                "boules": {
+                    "label": "類型"
+                },
                 "boundary": {
                     "label": "種類"
                 },
@@ -1304,6 +1319,10 @@
                 "bunker_type": {
                     "label": "類型"
                 },
+                "cables": {
+                    "label": "電纜",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "方向（順時針）",
                     "placeholder": "45, 90, 180, 270"
@@ -1469,6 +1488,10 @@
                 "description": {
                     "label": "描述"
                 },
+                "devices": {
+                    "label": "裝置",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "有尿布台"
                 },
@@ -1543,6 +1566,9 @@
                         "wall": "牆"
                     }
                 },
+                "fitness_station": {
+                    "label": "設備類型"
+                },
                 "fixme": {
                     "label": "修復我"
                 },
@@ -1550,6 +1576,9 @@
                     "label": "類型",
                     "placeholder": "預設"
                 },
+                "frequency": {
+                    "label": "運作頻率"
+                },
                 "fuel": {
                     "label": "燃料"
                 },
@@ -1581,6 +1610,9 @@
                 "generator/type": {
                     "label": "種類"
                 },
+                "government": {
+                    "label": "類型"
+                },
                 "grape_variety": {
                     "label": "葡萄品種"
                 },
@@ -1908,6 +1940,10 @@
                 "payment_multi": {
                     "label": "付款種類"
                 },
+                "phases": {
+                    "label": "相位數",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "電話",
                     "placeholder": "+31 42 123 4567"
@@ -1987,6 +2023,9 @@
                 "railway": {
                     "label": "種類"
                 },
+                "rating": {
+                    "label": "電力頻率"
+                },
                 "recycling_accepts": {
                     "label": "接受"
                 },
@@ -2195,6 +2234,9 @@
                 "studio": {
                     "label": "種類"
                 },
+                "substance": {
+                    "label": "材質"
+                },
                 "substation": {
                     "label": "種類"
                 },
@@ -2221,6 +2263,15 @@
                 "surveillance/zone": {
                     "label": "監視區域"
                 },
+                "switch": {
+                    "label": "類型",
+                    "options": {
+                        "circuit_breaker": "斷路器",
+                        "disconnector": "分段開關",
+                        "earthing": "接地開關",
+                        "mechanical": "機械開關"
+                    }
+                },
                 "tactile_paving": {
                     "label": "人行道視障引導設施"
                 },
@@ -2293,6 +2344,19 @@
                     },
                     "placeholder": "良好、尚可、稍差..."
                 },
+                "transformer": {
+                    "label": "類型",
+                    "options": {
+                        "auto": "自動變壓",
+                        "auxiliary": "輔助",
+                        "converter": "變流器",
+                        "distribution": "分配",
+                        "generator": "發電機",
+                        "phase_angle_regulator": "相角調節器",
+                        "traction": "牽引",
+                        "yes": "未知"
+                    }
+                },
                 "trees": {
                     "label": "樹"
                 },
@@ -2327,6 +2391,18 @@
                         "stratovolcano": "複式火山"
                     }
                 },
+                "voltage": {
+                    "label": "伏特"
+                },
+                "voltage/primary": {
+                    "label": "主要電壓"
+                },
+                "voltage/secondary": {
+                    "label": "次要電壓"
+                },
+                "voltage/tertiary": {
+                    "label": "三次電壓"
+                },
                 "wall": {
                     "label": "種類"
                 },
@@ -2354,6 +2430,22 @@
                 },
                 "wikipedia": {
                     "label": "維基百科"
+                },
+                "windings": {
+                    "label": "線圈",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "繞組設定",
+                    "options": {
+                        "delta": "Delta",
+                        "leblanc": "勒布朗",
+                        "open": "開放",
+                        "open-delta": "Open Delta",
+                        "scott": "Scott",
+                        "star": "Star / Wye",
+                        "zigzag": "Zig Zag"
+                    }
                 }
             },
             "presets": {
@@ -2677,6 +2769,10 @@
                     "name": "機車停車場",
                     "terms": "機車停車場,速克達停車場,摩托車停車場"
                 },
+                "amenity/music_school": {
+                    "name": "音樂學校",
+                    "terms": "<translate with synonyms or related terms for 'Music School', separated by commas>"
+                },
                 "amenity/nightclub": {
                     "name": "夜總會",
                     "terms": "夜店"
@@ -2800,8 +2896,7 @@
                     "terms": "學校,中學,小學,國中,國小,高中,學校用地,學校範圍,School Grounds,School"
                 },
                 "amenity/scrapyard": {
-                    "name": "汽車廢料場",
-                    "terms": "汽車廢料場,廢料場,回收場"
+                    "name": "汽車廢料場"
                 },
                 "amenity/shelter": {
                     "name": "涼亭",
@@ -3261,6 +3356,10 @@
                     "name": "辦桌",
                     "terms": "辦桌,包辦伙食者,備辦宴會者"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "煙囪清掃工 ",
+                    "terms": "<translate with synonyms or related terms for 'Chimney Sweeper', separated by commas>"
+                },
                 "craft/clockmaker": {
                     "name": "製鐘廠",
                     "terms": "製鐘店"
@@ -3370,9 +3469,9 @@
                     "name": "棚架工程",
                     "terms": "棚架工程"
                 },
-                "craft/sculpter": {
-                    "name": "雕塑工程",
-                    "terms": "雕塑工程"
+                "craft/sculptor": {
+                    "name": "雕塑家",
+                    "terms": "<translate with synonyms or related terms for 'Sculptor', separated by commas>"
                 },
                 "craft/shoemaker": {
                     "name": "鞋匠",
@@ -3382,10 +3481,6 @@
                     "name": "切石廠",
                     "terms": "切石廠"
                 },
-                "craft/sweep": {
-                    "name": "煙囪清掃工",
-                    "terms": "煙囪清掃工"
-                },
                 "craft/tailor": {
                     "name": "裁縫"
                 },
@@ -3654,9 +3749,13 @@
                     "name": "路徑",
                     "terms": "路徑"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
                     "name": "徒步區",
-                    "terms": "行人徒步區"
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Area', separated by commas>"
+                },
+                "highway/pedestrian_line": {
+                    "name": "人行徒步街道",
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
                 },
                 "highway/primary": {
                     "name": "主要道路",
@@ -3834,6 +3933,10 @@
                     "name": "水池",
                     "terms": "水池"
                 },
+                "landuse/brownfield": {
+                    "name": "棕色地帶",
+                    "terms": "棕色地帶"
+                },
                 "landuse/cemetery": {
                     "name": "墓園",
                     "terms": "墓園"
@@ -3873,6 +3976,10 @@
                     "name": "草地",
                     "terms": "草地"
                 },
+                "landuse/greenfield": {
+                    "name": "未開發地帶",
+                    "terms": "未開發地帶,未開發地區"
+                },
                 "landuse/harbour": {
                     "name": "港灣",
                     "terms": "港灣,海港"
@@ -3881,6 +3988,14 @@
                     "name": "工業區",
                     "terms": "工業區"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "廢料場",
+                    "terms": "<translate with synonyms or related terms for 'Scrap Yard', separated by commas>"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "屠宰場",
+                    "terms": "<translate with synonyms or related terms for 'Slaughterhouse', separated by commas>"
+                },
                 "landuse/landfill": {
                     "name": "埯埋場",
                     "terms": "堆填區"
@@ -3957,6 +4072,10 @@
                     "name": "遊憩區",
                     "terms": "休憩區,遊樂場,遊樂園"
                 },
+                "landuse/religious": {
+                    "name": "宗教設施用地",
+                    "terms": "<translate with synonyms or related terms for 'Religious Area', separated by commas>"
+                },
                 "landuse/residential": {
                     "name": "住宅區",
                     "terms": "住宅用地"
@@ -4013,6 +4132,50 @@
                     "name": "戶外健身站",
                     "terms": "戶外健身站,健身站"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "運動平衡梁",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Balance Beam', separated by commas>"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "運動箱",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Box', separated by commas>"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "運動平衡單槓",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Horizontal Bar', separated by commas>"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "橫爬架",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Monkey Bars', separated by commas>"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "羅馬凳站",
+                    "terms": "<translate with synonyms or related terms for 'Hyperextension Station', separated by commas>"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "雙槓",
+                    "terms": "<translate with synonyms or related terms for 'Parallel Bars', separated by commas>"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "伏地挺身站",
+                    "terms": "<translate with synonyms or related terms for 'Push-Up Station', separated by commas>"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "運動吊環",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Rings', separated by commas>"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "運動指示標誌",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Instruction Sign', separated by commas>"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "仰臥起坐台",
+                    "terms": "<translate with synonyms or related terms for 'Sit-Up Station', separated by commas>"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "運動椅",
+                    "terms": "<translate with synonyms or related terms for 'Exercise Stairs', separated by commas>"
+                },
                 "leisure/garden": {
                     "name": "花園",
                     "terms": "花園,果園,菜園,植物園,公園"
@@ -4073,6 +4236,10 @@
                     "name": "沙灘排球場",
                     "terms": "沙灘排球場,沙灘排球"
                 },
+                "leisure/pitch/boules": {
+                    "name": "法式滾球場",
+                    "terms": "法式滾球場"
+                },
                 "leisure/pitch/bowls": {
                     "name": "保齡球綠地",
                     "terms": "保齡球綠地"
@@ -4125,6 +4292,10 @@
                     "name": "操場(跑步)",
                     "terms": "操場"
                 },
+                "leisure/sauna": {
+                    "name": "桑拿",
+                    "terms": "桑拿,芬蘭浴,三溫暖"
+                },
                 "leisure/slipway": {
                     "name": "船架滑道",
                     "terms": "船架滑道"
@@ -4410,15 +4581,31 @@
                 },
                 "office/accountant": {
                     "name": "會計師事務所",
-                    "terms": "會計師樓,會計師辦公室"
+                    "terms": "<translate with synonyms or related terms for 'Accountant Office', separated by commas>"
                 },
                 "office/administrative": {
                     "name": "行政辦公室",
                     "terms": "行政辦公室"
                 },
+                "office/adoption_agency": {
+                    "name": "領養代理",
+                    "terms": "<translate with synonyms or related terms for 'Adoption Agency', separated by commas>"
+                },
+                "office/advertising_agency": {
+                    "name": "廣告代理公司",
+                    "terms": "<translate with synonyms or related terms for 'Advertising Agency', separated by commas>"
+                },
                 "office/architect": {
                     "name": "建築師事務所",
-                    "terms": "建築師樓,建築師辦公室"
+                    "terms": "<translate with synonyms or related terms for 'Architect Office', separated by commas>"
+                },
+                "office/association": {
+                    "name": "非營利組織辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Nonprofit Organization Office', separated by commas>"
+                },
+                "office/charity": {
+                    "name": "慈善事業辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Charity Office', separated by commas>"
                 },
                 "office/company": {
                     "name": "公司辦事處",
@@ -4436,6 +4623,10 @@
                     "name": "就業服務站",
                     "terms": "職業介紹所"
                 },
+                "office/energy_supplier": {
+                    "name": "電力供應辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Energy Supplier Office', separated by commas>"
+                },
                 "office/estate_agent": {
                     "name": "房地產仲介",
                     "terms": "地產代理,房仲,不動產仲介"
@@ -4444,6 +4635,14 @@
                     "name": "金融機構辦公室",
                     "terms": "金融機構,金融單位"
                 },
+                "office/forestry": {
+                    "name": "林務辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Forestry Office', separated by commas>"
+                },
+                "office/foundation": {
+                    "name": "基金會辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Foundation Office', separated by commas>"
+                },
                 "office/government": {
                     "name": "政府辦公室",
                     "terms": "政府辦公室"
@@ -4452,13 +4651,21 @@
                     "name": "戶政事務所",
                     "terms": "戶政事務所,戶政機關"
                 },
+                "office/government/tax": {
+                    "name": "稅務辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Tax and Revenue Office', separated by commas>"
+                },
+                "office/guide": {
+                    "name": "導遊辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Tour Guide Office', separated by commas>"
+                },
                 "office/insurance": {
                     "name": "保險公司辦公室",
                     "terms": "保險公司,人壽公司"
                 },
                 "office/it": {
-                    "name": "資訊科技公司辦公室",
-                    "terms": "資訊公司,IT公司"
+                    "name": "資訊公司辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Information Technology Office', separated by commas>"
                 },
                 "office/lawyer": {
                     "name": "律師事務所",
@@ -4468,14 +4675,22 @@
                     "name": "公證處",
                     "terms": "公證人,民間公證人,民間公證處,Notary Office"
                 },
+                "office/moving_company": {
+                    "name": "搬家公司辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Moving Company Office', separated by commas>"
+                },
                 "office/newspaper": {
-                    "name": "報社",
-                    "terms": "報社,報館"
+                    "name": "報社辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Newspaper Office', separated by commas>"
                 },
                 "office/ngo": {
                     "name": "非政府機構辦公室",
                     "terms": "NGO辦公室"
                 },
+                "office/notary": {
+                    "name": "公證處",
+                    "terms": "<translate with synonyms or related terms for 'Notary Office', separated by commas>"
+                },
                 "office/physician": {
                     "name": "醫務所"
                 },
@@ -4483,21 +4698,41 @@
                     "name": "政黨辦公室",
                     "terms": "黨部,競選總部,服務處"
                 },
+                "office/private_investigator": {
+                    "name": "私家偵探辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Private Investigator Office', separated by commas>"
+                },
+                "office/quango": {
+                    "name": "準非政府組織辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Quasi-NGO Office', separated by commas>"
+                },
                 "office/research": {
                     "name": "研究機構",
                     "terms": "研究辦公室"
                 },
+                "office/surveyor": {
+                    "name": "測量員辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Surveyor Office', separated by commas>"
+                },
+                "office/tax_advisor": {
+                    "name": "稅務顧問辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Tax Advisor Office', separated by commas>"
+                },
                 "office/telecommunication": {
                     "name": "電信公司辦事處",
                     "terms": "電訊公司辦事處"
                 },
                 "office/therapist": {
-                    "name": "治療師診所",
-                    "terms": "治療師,物理治療師"
+                    "name": "治療師辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Therapist Office', separated by commas>"
                 },
                 "office/travel_agent": {
                     "name": "旅行社"
                 },
+                "office/water_utility": {
+                    "name": "自來水設施辦公室",
+                    "terms": "<translate with synonyms or related terms for 'Water Utility Office', separated by commas>"
+                },
                 "piste": {
                     "name": "滑雪場",
                     "terms": "滑雪場"
@@ -4520,6 +4755,10 @@
                     "name": "島嶼",
                     "terms": "島,island"
                 },
+                "place/islet": {
+                    "name": "小島",
+                    "terms": "小島"
+                },
                 "place/isolated_dwelling": {
                     "name": "獨立聚落",
                     "terms": "孤立民居"
@@ -4532,6 +4771,10 @@
                     "name": "鄰里",
                     "terms": "四鄰,Neighborhood"
                 },
+                "place/plot": {
+                    "name": "地籍",
+                    "terms": "<translate with synonyms or related terms for 'Plot', separated by commas>"
+                },
                 "place/quarter": {
                     "name": "自治市區",
                     "terms": "自治市區"
@@ -4553,8 +4796,8 @@
                     "terms": "村落,village"
                 },
                 "playground/balance_beam": {
-                    "name": "平衡木",
-                    "terms": "平衡木"
+                    "name": "平衡梁",
+                    "terms": "<translate with synonyms or related terms for 'Play Balance Beam', separated by commas>"
                 },
                 "playground/basket_spinner": {
                     "name": "籃子旋轉器",
@@ -4574,7 +4817,11 @@
                 },
                 "playground/horizontal_bar": {
                     "name": "單槓",
-                    "terms": "<translate with synonyms or related terms for 'Horizontal Bar', separated by commas>"
+                    "terms": "<translate with synonyms or related terms for 'Play Horizontal Bar', separated by commas>"
+                },
+                "playground/rocker": {
+                    "name": "彈簧椅",
+                    "terms": "<translate with synonyms or related terms for 'Spring Rider', separated by commas>"
                 },
                 "playground/roundabout": {
                     "name": "旋轉輪",
@@ -4646,6 +4893,10 @@
                     "name": "變電所",
                     "terms": "變電站"
                 },
+                "power/switch": {
+                    "name": "電力開關",
+                    "terms": "電力開關"
+                },
                 "power/tower": {
                     "name": "高壓電塔",
                     "terms": "高壓輸電塔"
@@ -4764,6 +5015,10 @@
                     "name": "商店",
                     "terms": "商店,商行"
                 },
+                "shop/agrarian": {
+                    "name": "農用品店",
+                    "terms": "<translate with synonyms or related terms for 'Agriculture Shop', separated by commas>"
+                },
                 "shop/alcohol": {
                     "name": "酒類專賣店",
                     "terms": "酒類商店,酒品專賣店,酒莊"
@@ -5282,8 +5537,8 @@
                     "terms": "房車營地"
                 },
                 "tourism/chalet": {
-                    "name": "木屋",
-                    "terms": "木屋"
+                    "name": "假日小屋",
+                    "terms": "<translate with synonyms or related terms for 'Holiday Cottage', separated by commas>"
                 },
                 "tourism/gallery": {
                     "name": "藝廊",
@@ -5341,6 +5596,10 @@
                     "name": "觀景點",
                     "terms": "風景點"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "野外小屋",
+                    "terms": "<translate with synonyms or related terms for 'Wilderness Hut', separated by commas>"
+                },
                 "tourism/zoo": {
                     "name": "動物園",
                     "terms": "動物園"
@@ -5573,6 +5832,13 @@
                 "description": "Premium DigitalGlobe 衛星圖",
                 "name": "DigitalGlobe Premium 空照圖"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "使用條款與意見回饋"
+                },
+                "description": "影像邊界與取得時間。標籤會在縮放14層級或更高時顯示。",
+                "name": "DigitalGlobe Premium 空照圖年份"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "使用條款與意見回饋"
@@ -5580,6 +5846,13 @@
                 "description": "Standard DigitalGlobe 衛星圖",
                 "name": "DigitalGlobe Standard 空照圖"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "使用條款與意見回饋"
+                },
+                "description": "影像邊界與取得時間。標籤會在縮放14層級或更高時顯示。",
+                "name": "DigitalGlobe Standard 空照圖年份"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "使用條款與回饋"
diff --git a/dist/locales/zh.json b/dist/locales/zh.json
index 4177a673c..d4c281873 100644
--- a/dist/locales/zh.json
+++ b/dist/locales/zh.json
@@ -164,7 +164,6 @@
             "localized_translation_language": "选择语言",
             "localized_translation_name": "名称"
         },
-        "zoom_in_edit": "放大编辑",
         "logout": "退出",
         "loading_auth": "连接OpenStreetMap...",
         "status": {
@@ -231,8 +230,7 @@
         "splash": {
             "welcome": "欢迎使用OpenStreetMap编辑器iD",
             "text": "iD编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是版本{version}。欲知详情，请浏览{website} 及在{github}上报告程序错误。",
-            "walkthrough": "开始练习",
-            "start": "现在编辑"
+            "walkthrough": "开始练习"
         },
         "source_switch": {
             "live": "运行模式",
@@ -251,10 +249,6 @@
             "tag_suggests_area": "{tag}这个标签建议使用在面上，但是他不是一个面",
             "deprecated_tags": "已过时标签：{tags}"
         },
-        "zoom": {
-            "in": "放大",
-            "out": "缩小"
-        },
         "cannot_zoom": "在当前模式下无法进一步缩小。",
         "help": {
             "title": "帮助"
@@ -1281,9 +1275,6 @@
                 "tourism/caravan_site": {
                     "name": "房车营地"
                 },
-                "tourism/chalet": {
-                    "name": "木屋"
-                },
                 "tourism/guest_house": {
                     "name": "宾馆"
                 },
diff --git a/modules/actions/reverse.js b/modules/actions/reverse.js
index ef1c63c29..051f3e64b 100644
--- a/modules/actions/reverse.js
+++ b/modules/actions/reverse.js
@@ -29,8 +29,8 @@ import _transform from 'lodash-es/transform';
    in order to ensure associated nodes (eg a Stop Sign) is also reversed
 
     Node Keys:
-        direction=forward ⟺ direction=backward
-        direction=left ⟺ direction=right
+        *direction=forward ⟺ *direction=backward
+        *direction=left ⟺ *direction=right
         *:forward=* ⟺ *:backward=*
         *:left=* ⟺ *:right=*
 
@@ -87,7 +87,7 @@ export function actionReverse(wayId, options) {
         // Update the direction based tags as appropriate then return an updated node
         return node.update({tags: _transform(node.tags, function(acc, tagValue, tagKey) {
             // See if this is a direction tag and reverse (or use existing value if not recognised)
-            if (tagKey === 'direction') {
+            if (tagKey.match(/direction$/) !== null) {
                 acc[tagKey] = {forward: 'backward', backward: 'forward', left: 'right', right: 'left'}[tagValue] || tagValue;
             } else {
                 // Use the reverseKey method to cater for situations such as traffic_sign:forward=stop
diff --git a/modules/behavior/operation.js b/modules/behavior/operation.js
index 9dfb8502d..88bc96e8b 100644
--- a/modules/behavior/operation.js
+++ b/modules/behavior/operation.js
@@ -9,61 +9,40 @@ import { uiFlash } from '../ui';
 
 /* Creates a keybinding behavior for an operation */
 export function behaviorOperation() {
-    var which, keybinding;
-
-
-    function drawIcon(selection) {
-        var button = selection
-            .append('svg')
-            .attr('class', 'operation-icon')
-            .append('g')
-            .attr('class', 'radial-menu-item radial-menu-item-' + which.id)
-            .attr('transform', 'translate(10,10)')
-            .classed('disabled', which.disabled());
-
-        button
-            .append('circle')
-            .attr('r', 9);
-
-        button
-            .append('use')
-            .attr('transform', 'translate(-7,-7)')
-            .attr('width', '14')
-            .attr('height', '14')
-            .attr('xlink:href', '#operation-' + which.id);
-
-        return selection;
-    }
-
+    var _operation, keybinding;
 
     var behavior = function () {
-        if (which && which.available()) {
-            keybinding = d3_keybinding('behavior.key.' + which.id);
-            keybinding.on(which.keys, function() {
+        if (_operation && _operation.available()) {
+            keybinding = d3_keybinding('behavior.key.' + _operation.id);
+            keybinding.on(_operation.keys, function() {
                 d3_event.preventDefault();
-                var disabled = which.disabled();
+                var disabled = _operation.disabled();
+                var flash;
 
                 if (disabled) {
-                    uiFlash(3000)
-                        .html('')
-                        .call(drawIcon)
-                        .append('div')
-                        .attr('class', 'operation-tip')
-                        .text(which.tooltip);
+                    flash = uiFlash()
+                        .duration(4000)
+                        .iconName('#operation-' + _operation.id)
+                        .iconClass('operation disabled')
+                        .text(_operation.tooltip);
+
+                    flash();
 
                 } else {
-                    uiFlash(1500)
-                        .html('')
-                        .call(drawIcon)
-                        .append('div')
-                        .attr('class', 'operation-tip')
-                        .text(which.annotation() || which.title);
+                    flash = uiFlash()
+                        .duration(2000)
+                        .iconName('#operation-' + _operation.id)
+                        .iconClass('operation')
+                        .text(_operation.annotation() || _operation.title);
 
-                    which();
+                    flash();
+                    _operation();
                 }
             });
+
             d3_select(document).call(keybinding);
         }
+
         return behavior;
     };
 
@@ -76,8 +55,8 @@ export function behaviorOperation() {
 
 
     behavior.which = function (_) {
-        if (!arguments.length) return which;
-        which = _;
+        if (!arguments.length) return _operation;
+        _operation = _;
         return behavior;
     };
 
diff --git a/modules/core/context.js b/modules/core/context.js
index 28ec30f60..ce0cf5787 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -53,7 +53,7 @@ export function setAreaKeys(value) {
 
 export function coreContext() {
     var context = {};
-    context.version = '2.4.3';
+    context.version = '2.5.1';
 
     // create a special translation that contains the keys in place of the strings
     var tkeys = _cloneDeep(dataEn);
@@ -112,10 +112,6 @@ export function coreContext() {
 
 
     /* Connection */
-    var entitiesLoaded = utilCallWhenIdle(function entitiesLoaded(err, result) {
-        if (!err) history.merge(result.data, result.extent);
-    });
-
     context.preauth = function(options) {
         if (connection) {
             connection.switch(options);
@@ -124,39 +120,51 @@ export function coreContext() {
     };
 
     context.loadTiles = utilCallWhenIdle(function(projection, dimensions, callback) {
+        var cid;
         function done(err, result) {
-            entitiesLoaded(err, result);
+            if (connection.getConnectionId() !== cid) {
+                if (callback) callback({ message: 'Connection Switched', status: -1 });
+                return;
+            }
+            if (!err) history.merge(result.data, result.extent);
             if (callback) callback(err, result);
         }
-        if (connection) {
+        if (connection && context.editable()) {
+            cid = connection.getConnectionId();
             connection.loadTiles(projection, dimensions, done);
         }
     });
 
-    context.loadEntity = function(id, callback) {
+    context.loadEntity = function(entityId, callback) {
+        var cid;
         function done(err, result) {
-            entitiesLoaded(err, result);
+            if (connection.getConnectionId() !== cid) {
+                if (callback) callback({ message: 'Connection Switched', status: -1 });
+                return;
+            }
+            if (!err) history.merge(result.data, result.extent);
             if (callback) callback(err, result);
         }
         if (connection) {
-            connection.loadEntity(id, done);
+            cid = connection.getConnectionId();
+            connection.loadEntity(entityId, done);
         }
     };
 
-    context.zoomToEntity = function(id, zoomTo) {
+    context.zoomToEntity = function(entityId, zoomTo) {
         if (zoomTo !== false) {
-            this.loadEntity(id, function(err, result) {
+            this.loadEntity(entityId, function(err, result) {
                 if (err) return;
-                var entity = _find(result.data, function(e) { return e.id === id; });
+                var entity = _find(result.data, function(e) { return e.id === entityId; });
                 if (entity) { map.zoomTo(entity); }
             });
         }
 
         map.on('drawn.zoomToEntity', function() {
-            if (!context.hasEntity(id)) return;
+            if (!context.hasEntity(entityId)) return;
             map.on('drawn.zoomToEntity', null);
             context.on('enter.zoomToEntity', null);
-            context.enter(modeSelect(context, [id]));
+            context.enter(modeSelect(context, [entityId]));
         });
 
         context.on('enter.zoomToEntity', function() {
diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js
index 4e4fd22a5..baed024ae 100644
--- a/modules/modes/drag_node.js
+++ b/modules/modes/drag_node.js
@@ -28,6 +28,7 @@ import {
 import { geoChooseEdge } from '../geo';
 import { osmNode } from '../osm';
 import { utilEntitySelector } from '../util';
+import { uiFlash } from '../ui';
 
 
 export function modeDragNode(context) {
@@ -106,11 +107,14 @@ export function modeDragNode(context) {
 
     function start(entity) {
         wasMidpoint = entity.type === 'midpoint';
+        var hasHidden = context.features().hasHiddenConnections(entity, context.graph());
+        isCancelled = d3_event.sourceEvent.shiftKey || hasHidden;
 
-        isCancelled = d3_event.sourceEvent.shiftKey ||
-            context.features().hasHiddenConnections(entity, context.graph());
 
         if (isCancelled) {
+            if (hasHidden) {
+                uiFlash().text(t('modes.drag_node.connected_to_hidden'))();
+            }
             return behavior.cancel();
         }
 
diff --git a/modules/modes/save.js b/modules/modes/save.js
index 18a01ea9b..4fb3908a0 100644
--- a/modules/modes/save.js
+++ b/modules/modes/save.js
@@ -24,7 +24,11 @@ import {
 } from '../actions';
 
 import { coreGraph } from '../core';
-import { modeBrowse } from './index';
+
+import {
+    modeBrowse,
+    modeSelect
+} from './index';
 
 import {
     uiConflicts,
@@ -53,8 +57,12 @@ export function modeSave(context) {
         .on('save', save);
 
 
-    function cancel() {
-        context.enter(modeBrowse(context));
+    function cancel(selectedID) {
+        if (selectedID) {
+            context.enter(modeSelect(context, [selectedID]));
+        } else {
+            context.enter(modeBrowse(context));
+        }
     }
 
 
diff --git a/modules/operations/delete.js b/modules/operations/delete.js
index 4eb4e2d47..820d3cbba 100644
--- a/modules/operations/delete.js
+++ b/modules/operations/delete.js
@@ -18,6 +18,7 @@ export function operationDelete(selectedIDs, context) {
 
     var operation = function() {
         var nextSelectedID;
+        var nextSelectedLoc;
 
         if (selectedIDs.length === 1) {
             var id = selectedIDs[0],
@@ -27,7 +28,7 @@ export function operationDelete(selectedIDs, context) {
                 parent = parents[0];
 
             // Select the next closest node in the way.
-            if (geometry === 'vertex' && parent.nodes.length > 2) {
+            if (geometry === 'vertex') {
                 var nodes = parent.nodes,
                     i = nodes.indexOf(id);
 
@@ -42,13 +43,19 @@ export function operationDelete(selectedIDs, context) {
                 }
 
                 nextSelectedID = nodes[i];
+                nextSelectedLoc = context.entity(nextSelectedID).loc;
             }
         }
 
         context.perform(action, operation.annotation());
 
-        if (nextSelectedID && context.hasEntity(nextSelectedID)) {
-            context.enter(modeSelect(context, [nextSelectedID]).follow(true));
+        if (nextSelectedID && nextSelectedLoc) {
+            if (context.hasEntity(nextSelectedID)) {
+                context.enter(modeSelect(context, [nextSelectedID]).follow(true));
+            } else {
+                context.map().centerEase(nextSelectedLoc);
+                context.enter(modeBrowse(context));
+            }
         } else {
             context.enter(modeBrowse(context));
         }
diff --git a/modules/renderer/background.js b/modules/renderer/background.js
index bc14298e1..d1d59042e 100644
--- a/modules/renderer/background.js
+++ b/modules/renderer/background.js
@@ -47,7 +47,7 @@ export function rendererBackground(context) {
 
         var b = background.baseLayerSource(),
             o = overlayLayers
-                .filter(function (d) { return !d.source().isLocatorOverlay(); })
+                .filter(function (d) { return !d.source().isLocatorOverlay() && !d.source().isHidden(); })
                 .map(function (d) { return d.source().id; })
                 .join(','),
             meters = geoOffsetToMeters(b.offset()),
@@ -86,12 +86,15 @@ export function rendererBackground(context) {
         var imageryUsed = [b.imageryUsed()];
 
         overlayLayers
-            .filter(function (d) { return !d.source().isLocatorOverlay(); })
+            .filter(function (d) { return !d.source().isLocatorOverlay() && !d.source().isHidden(); })
             .forEach(function (d) { imageryUsed.push(d.source().imageryUsed()); });
 
         var gpx = context.layers().layer('gpx');
         if (gpx && gpx.enabled() && gpx.hasGpx()) {
-            imageryUsed.push(gpx.getSrc());
+            // Include a string like '.gpx data file' or '.geojson data file'
+            var match = gpx.getSrc().match(/(kml|gpx|(?:geo)?json)$/i);
+            var extension = match ? ('.' + match[0].toLowerCase() + ' ') : '';
+            imageryUsed.push(extension + 'data file');
         }
 
         var mapillary_images = context.layers().layer('mapillary-images');
@@ -104,6 +107,11 @@ export function rendererBackground(context) {
             imageryUsed.push('Mapillary Signs');
         }
 
+        var openstreetcam_images = context.layers().layer('openstreetcam-images');
+        if (openstreetcam_images && openstreetcam_images.enabled()) {
+            imageryUsed.push('OpenStreetCam Images');
+        }
+
         context.history().imageryUsed(imageryUsed);
     };
 
diff --git a/modules/renderer/background_source.js b/modules/renderer/background_source.js
index 5407f1050..3fd2951e1 100644
--- a/modules/renderer/background_source.js
+++ b/modules/renderer/background_source.js
@@ -6,13 +6,16 @@ import { geoArea as d3_geoArea } from 'd3-geo';
 import { t } from '../util/locale';
 import { geoExtent, geoPolygonIntersectsPolygon } from '../geo';
 import { jsonpRequest } from '../util/jsonp_request';
+import { utilDetect } from '../util/detect';
 
 
 function localeDateString(s) {
     if (!s) return null;
+    var detected = utilDetect();
+    var options = { day: 'numeric', month: 'short', year: 'numeric' };
     var d = new Date(s);
     if (isNaN(d.getTime())) return null;
-    return d.toLocaleDateString();
+    return d.toLocaleDateString(detected.locale, options);
 }
 
 function vintageRange(vintage) {
@@ -28,14 +31,14 @@ function vintageRange(vintage) {
 
 
 export function rendererBackgroundSource(data) {
-    var source = _clone(data),
-        offset = [0, 0],
-        name = source.name,
-        description = source.description,
-        best = !!source.best,
-        template = source.template;
+    var source = _clone(data);
+    var offset = [0, 0];
+    var name = source.name;
+    var description = source.description;
+    var best = !!source.best;
+    var template = source.template;
 
-    source.scaleExtent = data.scaleExtent || [0, 20];
+    source.scaleExtent = data.scaleExtent || [0, 22];
     source.overzoom = data.overzoom !== false;
 
 
@@ -133,6 +136,13 @@ export function rendererBackgroundSource(data) {
     };
 
 
+    /* hides a source from the list, but leaves it available for use */
+    source.isHidden = function() {
+        return source.id === 'DigitalGlobe-Premium-vintage' ||
+            source.id === 'DigitalGlobe-Standard-vintage';
+    };
+
+
     source.copyrightNotices = function() {};
 
 
diff --git a/modules/renderer/map.js b/modules/renderer/map.js
index 56dbbf8d1..e53297ff4 100644
--- a/modules/renderer/map.js
+++ b/modules/renderer/map.js
@@ -1,5 +1,6 @@
 import _compact from 'lodash-es/compact';
 import _map from 'lodash-es/map';
+import _throttle from 'lodash-es/throttle';
 import _values from 'lodash-es/values';
 
 import { set as d3_set } from 'd3-collection';
@@ -74,31 +75,33 @@ export function rendererMap(context) {
         mousemove;
 
     var zoom = d3_zoom()
-            .scaleExtent([ztok(2), ztok(24)])
-            .interpolate(d3_interpolate)
-            .filter(zoomEventFilter)
-            .on('zoom', zoomPan);
+        .scaleExtent([ztok(2), ztok(24)])
+        .interpolate(d3_interpolate)
+        .filter(zoomEventFilter)
+        .on('zoom', zoomPan);
 
     var _selection = d3_select(null);
-    var isRedrawScheduled = false;
-    var pendingRedrawCall;
 
-    function scheduleRedraw() {
-        // Only schedule the redraw if one has not already been set.
-        if (isRedrawScheduled) return;
-        isRedrawScheduled = true;
-        var that = this;
-        var args = arguments;
-        pendingRedrawCall = requestIdleCallback(function () {
-            // Reset the boolean so future redraws can be set.
-            isRedrawScheduled = false;
-            redraw.apply(that, args);
-        }, { timeout: 1400 });
-    }
+    var scheduleRedraw = _throttle(redraw, 750);
+    // var isRedrawScheduled = false;
+    // var pendingRedrawCall;
+    // function scheduleRedraw() {
+    //     // Only schedule the redraw if one has not already been set.
+    //     if (isRedrawScheduled) return;
+    //     isRedrawScheduled = true;
+    //     var that = this;
+    //     var args = arguments;
+    //     pendingRedrawCall = window.requestIdleCallback(function () {
+    //         // Reset the boolean so future redraws can be set.
+    //         isRedrawScheduled = false;
+    //         redraw.apply(that, args);
+    //     }, { timeout: 1400 });
+    // }
 
     function cancelPendingRedraw() {
-        isRedrawScheduled = false;
-        window.cancelIdleCallback(pendingRedrawCall);
+        scheduleRedraw.cancel();
+        // isRedrawScheduled = false;
+        // window.cancelIdleCallback(pendingRedrawCall);
     }
 
     function map(selection) {
@@ -356,7 +359,7 @@ export function rendererMap(context) {
 
         if (ktoz(eventTransform.k * 2 * Math.PI) < minzoom) {
             surface.interrupt();
-            uiFlash().text(t('cannot_zoom'));
+            uiFlash().text(t('cannot_zoom'))();
             setZoom(context.minEditableZoom(), true);
             scheduleRedraw();
             dispatch.call('move', this, map);
@@ -650,7 +653,7 @@ export function rendererMap(context) {
 
         if (z2 < minzoom) {
             surface.interrupt();
-            uiFlash().text(t('cannot_zoom'));
+            uiFlash().text(t('cannot_zoom'))();
             z2 = context.minEditableZoom();
         }
 
diff --git a/modules/services/index.js b/modules/services/index.js
index f893714ab..aa5055b5c 100644
--- a/modules/services/index.js
+++ b/modules/services/index.js
@@ -1,13 +1,15 @@
 import serviceMapillary from './mapillary';
 import serviceNominatim from './nominatim';
+import serviceOpenstreetcam from './openstreetcam';
 import serviceOsm from './osm';
 import serviceTaginfo from './taginfo';
 import serviceWikidata from './wikidata';
 import serviceWikipedia from './wikipedia';
 
 export var services = {
-    mapillary: serviceMapillary,
     geocoder: serviceNominatim,
+    mapillary: serviceMapillary,
+    openstreetcam: serviceOpenstreetcam,
     osm: serviceOsm,
     taginfo: serviceTaginfo,
     wikidata: serviceWikidata,
@@ -17,6 +19,7 @@ export var services = {
 export {
     serviceMapillary,
     serviceNominatim,
+    serviceOpenstreetcam,
     serviceOsm,
     serviceTaginfo,
     serviceWikidata,
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
index bc0c5d425..23efc1573 100644
--- a/modules/services/mapillary.js
+++ b/modules/services/mapillary.js
@@ -6,6 +6,7 @@ import _forEach from 'lodash-es/forEach';
 import _isEmpty from 'lodash-es/isEmpty';
 import _map from 'lodash-es/map';
 import _some from 'lodash-es/some';
+import _union from 'lodash-es/union';
 
 import { range as d3_range } from 'd3-array';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -24,7 +25,6 @@ import rbush from 'rbush';
 
 import { d3geoTile as d3_geoTile } from '../lib/d3.geo.tile';
 import { geoExtent } from '../geo';
-import { svgIcon } from '../svg';
 import { utilDetect } from '../util/detect';
 import { utilQsString, utilRebind } from '../util';
 
@@ -36,12 +36,12 @@ var apibase = 'https://a.mapillary.com/v3/',
     maxResults = 1000,
     tileZoom = 14,
     dispatch = d3_dispatch('loadedImages', 'loadedSigns'),
-    mapillaryCache,
-    mapillaryClicks,
-    mapillaryImage,
-    mapillarySignDefs,
-    mapillarySignSprite,
-    mapillaryViewer;
+    _mlyCache,
+    _mlyClicks,
+    _mlySelectedImage,
+    _mlySignDefs,
+    _mlySignSprite,
+    _mlyViewer;
 
 
 function abortRequest(i) {
@@ -71,6 +71,20 @@ function maxPageAtZoom(z) {
 }
 
 
+function localeTimestamp(s) {
+    if (!s) return null;
+    var detected = utilDetect();
+    var options = {
+        day: 'numeric', month: 'short', year: 'numeric',
+        hour: 'numeric', minute: 'numeric', second: 'numeric',
+        timeZone: 'UTC'
+    };
+    var d = new Date(s);
+    if (isNaN(d.getTime())) return null;
+    return d.toLocaleString(detected.locale, options);
+}
+
+
 function getTiles(projection) {
     var s = projection.scale() * 2 * Math.PI,
         z = Math.max(Math.log(s) / Math.log(2) - 8, 0),
@@ -121,7 +135,7 @@ function loadTiles(which, url, projection) {
 
 
 function loadNextTilePage(which, currZoom, url, tile) {
-    var cache = mapillaryCache[which],
+    var cache = _mlyCache[which],
         rect = tile.extent.rectangle(),
         maxPages = maxPageAtZoom(currZoom),
         nextPage = cache.nextPage[tile.id] || 0,
@@ -164,8 +178,19 @@ function loadNextTilePage(which, currZoom, url, tile) {
                         key: feature.properties.key,
                         ca: feature.properties.ca,
                         captured_at: feature.properties.captured_at,
+                        captured_by: feature.properties.username,
                         pano: feature.properties.pano
                     };
+                    cache.forImageKey[d.key] = d;     // cache imageKey -> image
+
+                } else if (which === 'sequences') {
+                    var sequenceKey = feature.properties.key;
+                    cache.lineString[sequenceKey] = feature;           // cache sequenceKey -> lineString
+                    feature.properties.coordinateProperties.image_keys.forEach(function(imageKey) {
+                        cache.forImageKey[imageKey] = sequenceKey;     // cache imageKey -> sequenceKey
+                    });
+                    return false;  // because no `d` data worth loading into an rbush
+
                 } else if (which === 'objects') {
                     d = {
                         loc: loc,
@@ -175,15 +200,15 @@ function loadNextTilePage(which, currZoom, url, tile) {
                         detections: feature.properties.detections
                     };
 
-                    // cache image_key -> detection_key
+                    // cache imageKey -> detectionKey
                     feature.properties.detections.forEach(function(detection) {
-                        var ik = detection.image_key;
-                        var dk = detection.detection_key;
-                        if (!mapillaryCache.detections[ik]) {
-                            mapillaryCache.detections[ik] = {};
+                        var imageKey = detection.image_key;
+                        var detectionKey = detection.detection_key;
+                        if (!_mlyCache.detections[imageKey]) {
+                            _mlyCache.detections[imageKey] = {};
                         }
-                        if (!mapillaryCache.detections[ik][dk]) {
-                            mapillaryCache.detections[ik][dk] = {};
+                        if (!_mlyCache.detections[imageKey][detectionKey]) {
+                            _mlyCache.detections[imageKey][detectionKey] = {};
                         }
                     });
                 }
@@ -191,11 +216,12 @@ function loadNextTilePage(which, currZoom, url, tile) {
                 return {
                     minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d
                 };
-            });
+
+            }).filter(Boolean);
 
             cache.rtree.load(features);
 
-            if (which === 'images') {
+            if (which === 'images' || which === 'sequences') {
                 dispatch.call('loadedImages');
             } else if (which === 'objects') {
                 dispatch.call('loadedSigns');
@@ -287,7 +313,7 @@ function searchLimited(psize, limit, projection, rtree) {
 export default {
 
     init: function() {
-        if (!mapillaryCache) {
+        if (!_mlyCache) {
             this.reset();
         }
 
@@ -295,7 +321,7 @@ export default {
     },
 
     reset: function() {
-        var cache = mapillaryCache;
+        var cache = _mlyCache;
 
         if (cache) {
             if (cache.images && cache.images.inflight) {
@@ -304,28 +330,55 @@ export default {
             if (cache.objects && cache.objects.inflight) {
                 _forEach(cache.objects.inflight, abortRequest);
             }
+            if (cache.sequences && cache.sequences.inflight) {
+                _forEach(cache.sequences.inflight, abortRequest);
+            }
         }
 
-        mapillaryCache = {
-            images: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush() },
-            objects:  { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush() },
+        _mlyCache = {
+            images: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush(), forImageKey: {} },
+            objects: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush() },
+            sequences: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush(), forImageKey: {}, lineString: {} },
             detections: {}
         };
 
-        mapillaryImage = null;
-        mapillaryClicks = [];
+        _mlySelectedImage = null;
+        _mlyClicks = [];
     },
 
 
     images: function(projection) {
         var psize = 16, limit = 3;
-        return searchLimited(psize, limit, projection, mapillaryCache.images.rtree);
+        return searchLimited(psize, limit, projection, _mlyCache.images.rtree);
     },
 
 
     signs: function(projection) {
         var psize = 32, limit = 3;
-        return searchLimited(psize, limit, projection, mapillaryCache.objects.rtree);
+        return searchLimited(psize, limit, projection, _mlyCache.objects.rtree);
+    },
+
+
+    sequences: function(projection) {
+        var viewport = projection.clipExtent();
+        var min = [viewport[0][0], viewport[1][1]];
+        var max = [viewport[1][0], viewport[0][1]];
+        var bbox = geoExtent(projection.invert(min), projection.invert(max)).bbox();
+        var sequenceKeys = {};
+
+        // all sequences for images in viewport
+        _mlyCache.images.rtree.search(bbox)
+            .forEach(function(d) {
+                var sequenceKey = _mlyCache.sequences.forImageKey[d.data.key];
+                if (sequenceKey) {
+                    sequenceKeys[sequenceKey] = true;
+                }
+            });
+
+        // Return lineStrings for the sequences
+        return Object.keys(sequenceKeys).map(function(sequenceKey) {
+            return _mlyCache.sequences.lineString[sequenceKey];
+        });
     },
 
 
@@ -338,11 +391,11 @@ export default {
 
 
     signHTML: function(d) {
-        if (!mapillarySignDefs || !mapillarySignSprite) return;
-        var position = mapillarySignDefs[d.value];
+        if (!_mlySignDefs || !_mlySignSprite) return;
+        var position = _mlySignDefs[d.value];
         if (!position) return '<div></div>';
         var iconStyle = [
-            'background-image:url(' + mapillarySignSprite + ')',
+            'background-image:url(' + _mlySignSprite + ')',
             'background-repeat:no-repeat',
             'height:' + position.height + 'px',
             'width:' + position.width + 'px',
@@ -355,50 +408,43 @@ export default {
 
 
     loadImages: function(projection) {
-        var url = apibase + 'images?';
-        loadTiles('images', url, projection);
+        loadTiles('images', apibase + 'images?', projection);
+        loadTiles('sequences', apibase + 'sequences?', projection);
     },
 
 
     loadSigns: function(context, projection) {
-        var url = apibase + 'objects?';
-        loadTiles('objects', url, projection);
+        // if we are looking at signs, we'll actually need to fetch images too
+        loadTiles('images', apibase + 'images?', projection);
+        loadTiles('objects', apibase + 'objects?', projection);
 
         // load traffic sign defs
-        if (!mapillarySignDefs) {
-            mapillarySignSprite = context.asset('img/traffic-signs/traffic-signs.png');
-            mapillarySignDefs = {};
+        if (!_mlySignDefs) {
+            _mlySignSprite = context.asset('img/traffic-signs/traffic-signs.png');
+            _mlySignDefs = {};
             d3_json(context.asset('img/traffic-signs/traffic-signs.json'), function(err, data) {
                 if (err) return;
-                mapillarySignDefs = data;
+                _mlySignDefs = data;
             });
         }
     },
 
 
     loadViewer: function(context) {
-        var that = this;
-        var wrap = d3_select('#content').selectAll('.mapillary-wrap')
+        // add mly-wrapper
+        var wrap = d3_select('#photoviewer').selectAll('.mly-wrapper')
             .data([0]);
 
-        var enter = wrap.enter()
-            .append('div')
-            .attr('class', 'mapillary-wrap')
-            .classed('al', true)       // 'al'=left,  'ar'=right
-            .classed('hidden', true);
-
-        enter
-            .append('button')
-            .attr('class', 'thumb-hide')
-            .on('click', function () { that.hideViewer(); })
-            .append('div')
-            .call(svgIcon('#icon-close'));
-
-        enter
+        var wrapEnter = wrap.enter()
             .append('div')
             .attr('id', 'mly')
-            .attr('class', 'mly-wrapper')
-            .classed('active', false);
+            .attr('class', 'photo-wrapper mly-wrapper')
+            .classed('hide', true);
+
+        wrapEnter
+            .append('div')
+            .attr('class', 'photo-attribution fillD');
+
 
         // load mapillary-viewercss
         d3_select('head').selectAll('#mapillary-viewercss')
@@ -420,28 +466,42 @@ export default {
 
 
     showViewer: function() {
-        d3_select('#content')
-            .selectAll('.mapillary-wrap')
-            .classed('hidden', false)
-            .selectAll('.mly-wrapper')
-            .classed('active', true);
+        var wrap = d3_select('#photoviewer')
+            .classed('hide', false);
+
+        var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size();
+
+        if (isHidden) {
+            wrap
+                .selectAll('.photo-wrapper:not(.mly-wrapper)')
+                .classed('hide', true);
+
+            wrap
+                .selectAll('.photo-wrapper.mly-wrapper')
+                .classed('hide', false);
+
+            _mlyViewer.resize();
+        }
 
         return this;
     },
 
 
     hideViewer: function() {
-        d3_select('#content')
-            .selectAll('.mapillary-wrap')
-            .classed('hidden', true)
-            .selectAll('.mly-wrapper')
-            .classed('active', false);
+        _mlySelectedImage = null;
 
-        d3_selectAll('.layer-mapillary-images .viewfield-group, .layer-mapillary-signs .icon-sign')
+        var viewer = d3_select('#photoviewer');
+        if (!viewer.empty()) viewer.datum(null);
+
+        viewer
+            .classed('hide', true)
+            .selectAll('.photo-wrapper')
+            .classed('hide', true);
+
+        d3_selectAll('.viewfield-group, .sequence, .icon-sign')
             .classed('selected', false);
 
-        mapillaryImage = null;
-        return this;
+        return this.setStyles(null, true);
     },
 
 
@@ -449,12 +509,12 @@ export default {
 
 
     updateViewer: function(imageKey, context) {
-        if (!imageKey) return;
+        if (!imageKey) return this;
 
-        if (!mapillaryViewer) {
+        if (!_mlyViewer) {
             this.initViewer(imageKey, context);
         } else {
-            mapillaryViewer.moveToKey(imageKey);
+            _mlyViewer.moveToKey(imageKey);
         }
 
         return this;
@@ -473,51 +533,64 @@ export default {
                 }
             };
 
-            mapillaryViewer = new Mapillary.Viewer('mly', clientId, imageKey, opts);
-            mapillaryViewer.on('nodechanged', nodeChanged);
+            _mlyViewer = new Mapillary.Viewer('mly', clientId, imageKey, opts);
+            _mlyViewer.on('nodechanged', nodeChanged);
         }
 
         // nodeChanged: called after the viewer has changed images and is ready.
         //
-        // There is some logic here to batch up clicks into a mapillaryClicks array
+        // There is some logic here to batch up clicks into a _mlyClicks array
         // because the user might click on a lot of markers quickly and nodechanged
         // may be called out of order asychronously.
         //
         // Clicks are added to the array in `selectedImage` and removed here.
         //
         function nodeChanged(node) {
-            mapillaryViewer.getComponent('tag').removeAll();  // remove previous detections
+            _mlyViewer.getComponent('tag').removeAll();  // remove previous detections
 
-            var clicks = mapillaryClicks;
+            var clicks = _mlyClicks;
             var index = clicks.indexOf(node.key);
-            if (index > -1) {    // `nodechanged` initiated from clicking on a marker..
-                clicks.splice(index, 1);
-                // If `node.key` matches the current mapillaryImage, call `selectedImage()`
+            var selectedKey = _mlySelectedImage && _mlySelectedImage.key;
+
+            if (index > -1) {              // `nodechanged` initiated from clicking on a marker..
+                clicks.splice(index, 1);   // remove the click
+                // If `node.key` matches the current _mlySelectedImage, call `selectImage()`
                 // one more time to update the detections and attribution..
-                if (node.key === mapillaryImage) {
-                    that.selectedImage(node.key, false);
+                if (node.key === selectedKey) {
+                    that.selectImage(_mlySelectedImage, node.key, true);
                 }
             } else {             // `nodechanged` initiated from the Mapillary viewer controls..
                 var loc = node.computedLatLon ? [node.computedLatLon.lon, node.computedLatLon.lat] : [node.latLon.lon, node.latLon.lat];
                 context.map().centerEase(loc);
-                that.selectedImage(node.key, false);
+                that.selectImage(undefined, node.key, true);
             }
         }
     },
 
 
-    selectedImage: function(imageKey, fromClick) {
-        if (!arguments.length) return mapillaryImage;
-        mapillaryImage = imageKey;
-
-        if (fromClick) {
-            mapillaryClicks.push(imageKey);
+    // Pass the image datum itself in `d` or the `imageKey` string.
+    // This allows images to be selected from places that dont have access
+    // to the full image datum (like the street signs layer or the js viewer)
+    selectImage: function(d, imageKey, fromViewer) {
+        if (!d && imageKey) {
+            // If the user clicked on something that's not an image marker, we
+            // might get in here.. Cache lookup can fail, e.g. if the user
+            // clicked a streetsign, but images are loading slowly asynchronously.
+            // We'll try to carry on anyway if there is no datum.  There just
+            // might be a delay before user sees detections, captured_at, etc.
+            d = _mlyCache.images.forImageKey[imageKey];
         }
 
-        d3_selectAll('.layer-mapillary-images .viewfield-group')
-            .classed('selected', function(d) {
-                return d.key === imageKey;
-            });
+        _mlySelectedImage = d;
+        var viewer = d3_select('#photoviewer');
+        if (!viewer.empty()) viewer.datum(d);
+
+        imageKey = (d && d.key) || imageKey;
+        if (!fromViewer && imageKey) {
+            _mlyClicks.push(imageKey);
+        }
+
+        this.setStyles(null, true);
 
         d3_selectAll('.layer-mapillary-signs .icon-sign')
             .classed('selected', function(d) {
@@ -526,51 +599,113 @@ export default {
                 });
             });
 
-        if (!imageKey)  return this;
+        var wrap = d3_select('#photoviewer .mly-wrapper');
+        var attribution = wrap.selectAll('.photo-attribution').html('');
 
+        if (d) {
+            if (d.captured_by) {
+                attribution
+                    .append('a')
+                    .attr('class', 'captured_by')
+                    .attr('target', '_blank')
+                    .attr('href', 'https://www.mapillary.com/app/user/' + encodeURIComponent(d.captured_by))
+                    .text('@' + d.captured_by);
 
-        function localeTimestamp(s) {
-            if (!s) return null;
-            var d = new Date(s);
-            if (isNaN(d.getTime())) return null;
-            return d.toLocaleString(undefined, { timeZone: 'UTC' });
-        }
+                attribution
+                    .append('span')
+                    .text('|');
+            }
 
-        var selected = d3_selectAll('.layer-mapillary-images .viewfield-group.selected');
-        if (selected.empty()) return this;
+            if (d.captured_at) {
+                attribution
+                    .append('span')
+                    .attr('class', 'captured_at')
+                    .text(localeTimestamp(d.captured_at));
+
+                attribution
+                    .append('span')
+                    .text('|');
+            }
 
-        var datum = selected.datum();
-        var timestamp = localeTimestamp(datum.captured_at);
-        var attribution = d3_select('.mapillary-js-dom .Attribution');
-        var capturedAt = attribution.selectAll('.captured-at');
-        if (capturedAt.empty()) {
             attribution
-                .append('span')
-                .text('|');
-            capturedAt = attribution
-                .append('span')
-                .attr('class', 'captured-at');
-        }
-        capturedAt
-            .text(timestamp);
+                .append('a')
+                .attr('class', 'image_link')
+                .attr('target', '_blank')
+                .attr('href', 'https://www.mapillary.com/app/?pKey=' + encodeURIComponent(d.key) +
+                    '&focus=photo&lat=' + d.loc[1] + '&lng=' + d.loc[0] + '&z=17')
+                .text('mapillary.com');
 
-        this.updateDetections();
+            this.updateDetections(d);
+        }
 
         return this;
     },
 
 
-    updateDetections: function() {
-        if (!mapillaryViewer) return;
+    getSelectedImage: function() {
+        return _mlySelectedImage;
+    },
+
+
+    getSequenceKeyForImage: function(d) {
+        var imageKey = d && d.key;
+        return imageKey && _mlyCache.sequences.forImageKey[imageKey];
+    },
+
+
+    setStyles: function(hovered, reset) {
+        if (reset) {  // reset all layers
+            d3_selectAll('.viewfield-group')
+                .classed('highlighted', false)
+                .classed('hovered', false)
+                .classed('selected', false);
+
+            d3_selectAll('.sequence')
+                .classed('highlighted', false)
+                .classed('selected', false);
+        }
+
+        var hoveredImageKey = hovered && hovered.key;
+        var hoveredSequenceKey = this.getSequenceKeyForImage(hovered);
+        var hoveredLineString = hoveredSequenceKey && _mlyCache.sequences.lineString[hoveredSequenceKey];
+        var hoveredImageKeys = (hoveredLineString && hoveredLineString.properties.coordinateProperties.image_keys) || [];
+
+        var viewer = d3_select('#photoviewer');
+        var selected = viewer.empty() ? undefined : viewer.datum();
+        var selectedImageKey = selected && selected.key;
+        var selectedSequenceKey = this.getSequenceKeyForImage(selected);
+        var selectedLineString = selectedSequenceKey && _mlyCache.sequences.lineString[selectedSequenceKey];
+        var selectedImageKeys = (selectedLineString && selectedLineString.properties.coordinateProperties.image_keys) || [];
+
+        // highlight sibling viewfields on either the selected or the hovered sequences
+        var highlightedImageKeys = _union(hoveredImageKeys, selectedImageKeys);
+
+        d3_selectAll('.layer-mapillary-images .viewfield-group')
+            .classed('highlighted', function(d) { return highlightedImageKeys.indexOf(d.key) !== -1; })
+            .classed('hovered', function(d) { return d.key === hoveredImageKey; })
+            .classed('selected', function(d) { return d.key === selectedImageKey; });
+
+        d3_selectAll('.layer-mapillary-images .sequence')
+            .classed('highlighted', function(d) { return d.properties.key === hoveredSequenceKey; })
+            .classed('selected', function(d) { return d.properties.key === selectedSequenceKey; });
+
+        return this;
+    },
+
+
+    updateDetections: function(d) {
+        if (!_mlyViewer) return;
+
+        var imageKey = d && d.key;
+        var detections = (imageKey && _mlyCache.detections[imageKey]) || [];
 
-        var detections = mapillaryCache.detections[mapillaryImage];
         _forEach(detections, function(data, k) {
             if (_isEmpty(data)) {
                 loadDetection(k);
             } else {
                 var tag = makeTag(data);
                 if (tag) {
-                    var tagComponent = mapillaryViewer.getComponent('tag');
+                    var tagComponent = _mlyViewer.getComponent('tag');
                     tagComponent.add([tag]);
                 }
             }
@@ -591,13 +726,14 @@ export default {
                 .get(function(err, data) {
                     if (!data || !data.properties) return;
 
-                    var ik = data.properties.image_key;
-                    mapillaryCache.detections[ik][detectionKey] = data;
+                    var imageKey = data.properties.image_key;
+                    _mlyCache.detections[imageKey][detectionKey] = data;
 
-                    if (mapillaryImage === ik) {
+                    var selectedKey = _mlySelectedImage && _mlySelectedImage.key;
+                    if (imageKey === selectedKey) {
                         var tag = makeTag(data);
                         if (tag) {
-                            var tagComponent = mapillaryViewer.getComponent('tag');
+                            var tagComponent = _mlyViewer.getComponent('tag');
                             tagComponent.add([tag]);
                         }
                     }
@@ -652,16 +788,14 @@ export default {
     },
 
 
-    cache: function(_) {
-        if (!arguments.length) return mapillaryCache;
-        mapillaryCache = _;
-        return this;
+    cache: function() {
+        return _mlyCache;
     },
 
 
     signDefs: function(_) {
-        if (!arguments.length) return mapillarySignDefs;
-        mapillarySignDefs = _;
+        if (!arguments.length) return _mlySignDefs;
+        _mlySignDefs = _;
         return this;
     }
 
diff --git a/modules/services/openstreetcam.js b/modules/services/openstreetcam.js
new file mode 100644
index 000000000..3579e658b
--- /dev/null
+++ b/modules/services/openstreetcam.js
@@ -0,0 +1,584 @@
+import _filter from 'lodash-es/filter';
+import _find from 'lodash-es/find';
+import _flatten from 'lodash-es/flatten';
+import _forEach from 'lodash-es/forEach';
+import _map from 'lodash-es/map';
+import _union from 'lodash-es/union';
+
+import { range as d3_range } from 'd3-array';
+import { dispatch as d3_dispatch } from 'd3-dispatch';
+import { request as d3_request } from 'd3-request';
+
+import {
+    event as d3_event,
+    select as d3_select,
+    selectAll as d3_selectAll
+} from 'd3-selection';
+
+import {
+    zoom as d3_zoom,
+    zoomIdentity as d3_zoomIdentity
+} from 'd3-zoom';
+
+import rbush from 'rbush';
+
+import { d3geoTile as d3_geoTile } from '../lib/d3.geo.tile';
+import { geoExtent } from '../geo';
+
+import { utilDetect } from '../util/detect';
+
+import {
+    utilQsString,
+    utilRebind,
+    utilSetTransform
+} from '../util';
+
+
+var apibase = 'https://openstreetcam.org',
+    maxResults = 1000,
+    tileZoom = 14,
+    dispatch = d3_dispatch('loadedImages'),
+    imgZoom = d3_zoom()
+        .extent([[0, 0], [320, 240]])
+        .translateExtent([[0, 0], [320, 240]])
+        .scaleExtent([1, 15])
+        .on('zoom', zoomPan),
+    _oscCache,
+    _oscSelectedImage;
+
+
+function abortRequest(i) {
+    i.abort();
+}
+
+
+function nearNullIsland(x, y, z) {
+    if (z >= 7) {
+        var center = Math.pow(2, z - 1),
+            width = Math.pow(2, z - 6),
+            min = center - (width / 2),
+            max = center + (width / 2) - 1;
+        return x >= min && x <= max && y >= min && y <= max;
+    }
+    return false;
+}
+
+
+function maxPageAtZoom(z) {
+    if (z < 15)   return 2;
+    if (z === 15) return 5;
+    if (z === 16) return 10;
+    if (z === 17) return 20;
+    if (z === 18) return 40;
+    if (z > 18)   return 80;
+}
+
+
+function getTiles(projection) {
+    var s = projection.scale() * 2 * Math.PI,
+        z = Math.max(Math.log(s) / Math.log(2) - 8, 0),
+        ts = 256 * Math.pow(2, z - tileZoom),
+        origin = [
+            s / 2 - projection.translate()[0],
+            s / 2 - projection.translate()[1]];
+
+    return d3_geoTile()
+        .scaleExtent([tileZoom, tileZoom])
+        .scale(s)
+        .size(projection.clipExtent()[1])
+        .translate(projection.translate())()
+        .map(function(tile) {
+            var x = tile[0] * ts - origin[0],
+                y = tile[1] * ts - origin[1];
+
+            return {
+                id: tile.toString(),
+                xyz: tile,
+                extent: geoExtent(
+                    projection.invert([x, y + ts]),
+                    projection.invert([x + ts, y])
+                )
+            };
+        });
+}
+
+
+function loadTiles(which, url, projection) {
+    var s = projection.scale() * 2 * Math.PI,
+        currZoom = Math.floor(Math.max(Math.log(s) / Math.log(2) - 8, 0));
+
+    var tiles = getTiles(projection).filter(function(t) {
+            return !nearNullIsland(t.xyz[0], t.xyz[1], t.xyz[2]);
+        });
+
+    _filter(which.inflight, function(v, k) {
+        var wanted = _find(tiles, function(tile) { return k === (tile.id + ',0'); });
+        if (!wanted) delete which.inflight[k];
+        return !wanted;
+    }).map(abortRequest);
+
+    tiles.forEach(function(tile) {
+        loadNextTilePage(which, currZoom, url, tile);
+    });
+}
+
+
+function loadNextTilePage(which, currZoom, url, tile) {
+    var cache = _oscCache[which];
+    var bbox = tile.extent.bbox();
+    var maxPages = maxPageAtZoom(currZoom);
+    var nextPage = cache.nextPage[tile.id] || 1;
+    var params = utilQsString({
+            ipp: maxResults,
+            page: nextPage,
+            // client_id: clientId,
+            bbTopLeft: [bbox.maxY, bbox.minX].join(','),
+            bbBottomRight: [bbox.minY, bbox.maxX].join(',')
+        }, true);
+
+    if (nextPage > maxPages) return;
+
+    var id = tile.id + ',' + String(nextPage);
+    if (cache.loaded[id] || cache.inflight[id]) return;
+
+    cache.inflight[id] = d3_request(url)
+        .mimeType('application/json')
+        .header('Content-type', 'application/x-www-form-urlencoded')
+        .response(function(xhr) { return JSON.parse(xhr.responseText); })
+        .post(params, function(err, data) {
+            cache.loaded[id] = true;
+            delete cache.inflight[id];
+            if (err || !data.currentPageItems || !data.currentPageItems.length) return;
+
+            function localeDateString(s) {
+                if (!s) return null;
+                var detected = utilDetect();
+                var options = { day: 'numeric', month: 'short', year: 'numeric' };
+                var d = new Date(s);
+                if (isNaN(d.getTime())) return null;
+                return d.toLocaleDateString(detected.locale, options);
+            }
+
+            var features = data.currentPageItems.map(function(item) {
+                var loc = [+item.lng, +item.lat],
+                    d;
+
+                if (which === 'images') {
+                    d = {
+                        loc: loc,
+                        key: item.id,
+                        ca: +item.heading,
+                        captured_at: localeDateString(item.shot_date || item.date_added),
+                        captured_by: item.username,
+                        imagePath: item.lth_name,
+                        sequence_id: item.sequence_id,
+                        sequence_index: +item.sequence_index
+                    };
+
+                    // cache sequence info
+                    var seq = _oscCache.sequences[d.sequence_id];
+                    if (!seq) {
+                        seq = { rotation: 0, images: [] };
+                        _oscCache.sequences[d.sequence_id] = seq;
+                    }
+                    seq.images[d.sequence_index] = d;
+                }
+
+                return {
+                    minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d
+                };
+            });
+
+            cache.rtree.load(features);
+
+            if (which === 'images') {
+                dispatch.call('loadedImages');
+            }
+
+            if (data.currentPageItems.length === maxResults) {  // more pages to load
+                cache.nextPage[tile.id] = nextPage + 1;
+                loadNextTilePage(which, currZoom, url, tile);
+            } else {
+                cache.nextPage[tile.id] = Infinity;     // no more pages to load
+            }
+        });
+}
+
+
+// partition viewport into `psize` x `psize` regions
+function partitionViewport(psize, projection) {
+    var dimensions = projection.clipExtent()[1];
+    psize = psize || 16;
+    var cols = d3_range(0, dimensions[0], psize),
+        rows = d3_range(0, dimensions[1], psize),
+        partitions = [];
+
+    rows.forEach(function(y) {
+        cols.forEach(function(x) {
+            var min = [x, y + psize],
+                max = [x + psize, y];
+            partitions.push(
+                geoExtent(projection.invert(min), projection.invert(max)));
+        });
+    });
+
+    return partitions;
+}
+
+
+// no more than `limit` results per partition.
+function searchLimited(psize, limit, projection, rtree) {
+    limit = limit || 3;
+
+    var partitions = partitionViewport(psize, projection);
+    var results;
+
+    results = _flatten(_map(partitions, function(extent) {
+        return rtree.search(extent.bbox())
+            .slice(0, limit)
+            .map(function(d) { return d.data; });
+    }));
+    return results;
+}
+
+
+function zoomPan() {
+    var t = d3_event.transform;
+    d3_select('#photoviewer .osc-image-wrap')
+        .call(utilSetTransform, t.x, t.y, t.k);
+}
+
+
+export default {
+
+    init: function() {
+        if (!_oscCache) {
+            this.reset();
+        }
+
+        this.event = utilRebind(this, dispatch, 'on');
+    },
+
+    reset: function() {
+        var cache = _oscCache;
+
+        if (cache) {
+            if (cache.images && cache.images.inflight) {
+                _forEach(cache.images.inflight, abortRequest);
+            }
+        }
+
+        _oscCache = {
+            images: { inflight: {}, loaded: {}, nextPage: {}, rtree: rbush() },
+            sequences: {}
+        };
+
+        _oscSelectedImage = null;
+    },
+
+
+    images: function(projection) {
+        var psize = 16, limit = 3;
+        return searchLimited(psize, limit, projection, _oscCache.images.rtree);
+    },
+
+
+    sequences: function(projection) {
+        var viewport = projection.clipExtent();
+        var min = [viewport[0][0], viewport[1][1]];
+        var max = [viewport[1][0], viewport[0][1]];
+        var bbox = geoExtent(projection.invert(min), projection.invert(max)).bbox();
+        var sequenceKeys = {};
+
+        // all sequences for images in viewport
+        _oscCache.images.rtree.search(bbox)
+            .forEach(function(d) { sequenceKeys[d.data.sequence_id] = true; });
+
+        // make linestrings from those sequences
+        var lineStrings = [];
+        Object.keys(sequenceKeys)
+            .forEach(function(sequenceKey) {
+                var seq = _oscCache.sequences[sequenceKey];
+                var images = seq && seq.images;
+                if (images) {
+                    lineStrings.push({
+                        type: 'LineString',
+                        coordinates: images.map(function (d) { return d.loc; }).filter(Boolean),
+                        properties: { key: sequenceKey }
+                    });
+                }
+            });
+        return lineStrings;
+    },
+
+
+    loadImages: function(projection) {
+        var url = apibase + '/1.0/list/nearby-photos/';
+        loadTiles('images', url, projection);
+    },
+
+
+    loadViewer: function(context) {
+        var that = this;
+
+        // add osc-wrapper
+        var wrap = d3_select('#photoviewer').selectAll('.osc-wrapper')
+            .data([0]);
+
+        var wrapEnter = wrap.enter()
+            .append('div')
+            .attr('class', 'photo-wrapper osc-wrapper')
+            .classed('hide', true)
+            .call(imgZoom)
+            .on('dblclick.zoom', null);
+
+        wrapEnter
+            .append('div')
+            .attr('class', 'photo-attribution fillD');
+
+        var controlsEnter = wrapEnter
+            .append('div')
+            .attr('class', 'osc-controls-wrap')
+            .append('div')
+            .attr('class', 'osc-controls');
+
+        controlsEnter
+            .append('button')
+            .on('click.back', step(-1))
+            .text('◄');
+
+        controlsEnter
+            .append('button')
+            .on('click.rotate-ccw', rotate(-90))
+            .text('⤿');
+
+        controlsEnter
+            .append('button')
+            .on('click.rotate-cw', rotate(90))
+            .text('⤾');
+
+        controlsEnter
+            .append('button')
+            .on('click.forward', step(1))
+            .text('►');
+
+        wrapEnter
+            .append('div')
+            .attr('class', 'osc-image-wrap');
+
+
+        function rotate(deg) {
+            return function() {
+                if (!_oscSelectedImage) return;
+                var sequenceKey = _oscSelectedImage.sequence_id;
+                var sequence = _oscCache.sequences[sequenceKey];
+                if (!sequence) return;
+
+                var r = sequence.rotation || 0;
+                r += deg;
+
+                if (r > 180) r -= 360;
+                if (r < -180) r += 360;
+                sequence.rotation = r;
+
+                var wrap = d3_select('#photoviewer .osc-wrapper');
+
+                wrap
+                    .transition()
+                    .duration(100)
+                    .call(imgZoom.transform, d3_zoomIdentity);
+
+                wrap.selectAll('.osc-image')
+                    .transition()
+                    .duration(100)
+                    .style('transform', 'rotate(' + r + 'deg)');
+            };
+        }
+
+        function step(stepBy) {
+            return function() {
+                if (!_oscSelectedImage) return;
+                var sequenceKey = _oscSelectedImage.sequence_id;
+                var sequence = _oscCache.sequences[sequenceKey];
+                if (!sequence) return;
+
+                var nextIndex = _oscSelectedImage.sequence_index + stepBy;
+                var nextImage = sequence.images[nextIndex];
+                if (!nextImage) return;
+
+                context.map().centerEase(nextImage.loc);
+
+                that
+                    .selectImage(nextImage)
+                    .updateViewer(nextImage);
+            };
+        }
+    },
+
+
+    showViewer: function() {
+        var viewer = d3_select('#photoviewer')
+            .classed('hide', false);
+
+        var isHidden = viewer.selectAll('.photo-wrapper.osc-wrapper.hide').size();
+
+        if (isHidden) {
+            viewer
+                .selectAll('.photo-wrapper:not(.osc-wrapper)')
+                .classed('hide', true);
+
+            viewer
+                .selectAll('.photo-wrapper.osc-wrapper')
+                .classed('hide', false);
+        }
+
+        return this;
+    },
+
+
+    hideViewer: function() {
+        _oscSelectedImage = null;
+
+        var viewer = d3_select('#photoviewer');
+        if (!viewer.empty()) viewer.datum(null);
+
+        viewer
+            .classed('hide', true)
+            .selectAll('.photo-wrapper')
+            .classed('hide', true);
+
+        d3_selectAll('.viewfield-group, .sequence, .icon-sign')
+            .classed('selected', false);
+
+        return this.setStyles(null, true);
+    },
+
+
+    updateViewer: function(d) {
+        var wrap = d3_select('#photoviewer .osc-wrapper');
+        var imageWrap = wrap.selectAll('.osc-image-wrap');
+        var attribution = wrap.selectAll('.photo-attribution').html('');
+
+        wrap
+            .transition()
+            .duration(100)
+            .call(imgZoom.transform, d3_zoomIdentity);
+
+        imageWrap
+            .selectAll('.osc-image')
+            .remove();
+
+        if (d) {
+            var sequence = _oscCache.sequences[d.sequence_id];
+            var r = (sequence && sequence.rotation) || 0;
+
+            imageWrap
+                .append('img')
+                .attr('class', 'osc-image')
+                .attr('src', apibase + '/' + d.imagePath)
+                .style('transform', 'rotate(' + r + 'deg)');
+
+            if (d.captured_by) {
+                attribution
+                    .append('a')
+                    .attr('class', 'captured_by')
+                    .attr('target', '_blank')
+                    .attr('href', 'https://openstreetcam.org/user/' + encodeURIComponent(d.captured_by))
+                    .text('@' + d.captured_by);
+
+                attribution
+                    .append('span')
+                    .text('|');
+            }
+
+            if (d.captured_at) {
+                attribution
+                    .append('span')
+                    .attr('class', 'captured_at')
+                    .text(d.captured_at);
+
+                attribution
+                    .append('span')
+                    .text('|');
+            }
+
+            attribution
+                .append('a')
+                .attr('class', 'image_link')
+                .attr('target', '_blank')
+                .attr('href', 'https://openstreetcam.org/details/' + d.sequence_id + '/' + d.sequence_index)
+                .text('openstreetcam.org');
+        }
+        return this;
+    },
+
+
+    selectImage: function(d) {
+        _oscSelectedImage = d;
+        var viewer = d3_select('#photoviewer');
+        if (!viewer.empty()) viewer.datum(d);
+
+        this.setStyles(null, true);
+
+        d3_selectAll('.icon-sign')
+            .classed('selected', false);
+
+        return this;
+    },
+
+
+    getSelectedImage: function() {
+        return _oscSelectedImage;
+    },
+
+
+    getSequenceKeyForImage: function(d) {
+        return d && d.sequence_id;
+    },
+
+
+    setStyles: function(hovered, reset) {
+        if (reset) {  // reset all layers
+            d3_selectAll('.viewfield-group')
+                .classed('highlighted', false)
+                .classed('hovered', false)
+                .classed('selected', false);
+
+            d3_selectAll('.sequence')
+                .classed('highlighted', false)
+                .classed('selected', false);
+        }
+
+        var hoveredImageKey = hovered && hovered.key;
+        var hoveredSequenceKey = this.getSequenceKeyForImage(hovered);
+        var hoveredSequence = hoveredSequenceKey && _oscCache.sequences[hoveredSequenceKey];
+        var hoveredImageKeys = (hoveredSequence && hoveredSequence.images.map(function (d) { return d.key; })) || [];
+
+        var viewer = d3_select('#photoviewer');
+        var selected = viewer.empty() ? undefined : viewer.datum();
+        var selectedImageKey = selected && selected.key;
+        var selectedSequenceKey = this.getSequenceKeyForImage(selected);
+        var selectedSequence = selectedSequenceKey && _oscCache.sequences[selectedSequenceKey];
+        var selectedImageKeys = (selectedSequence && selectedSequence.images.map(function (d) { return d.key; })) || [];
+
+        // highlight sibling viewfields on either the selected or the hovered sequences
+        var highlightedImageKeys = _union(hoveredImageKeys, selectedImageKeys);
+
+        d3_selectAll('.layer-openstreetcam-images .viewfield-group')
+            .classed('highlighted', function(d) { return highlightedImageKeys.indexOf(d.key) !== -1; })
+            .classed('hovered', function(d) { return d.key === hoveredImageKey; })
+            .classed('selected', function(d) { return d.key === selectedImageKey; });
+
+        d3_selectAll('.layer-openstreetcam-images .sequence')
+            .classed('highlighted', function(d) { return d.properties.key === hoveredSequenceKey; })
+            .classed('selected', function(d) { return d.properties.key === selectedSequenceKey; });
+
+        return this;
+    },
+
+
+    cache: function() {
+        return _oscCache;
+    }
+
+};
diff --git a/modules/services/osm.js b/modules/services/osm.js
index 94e59207b..cf33659a3 100644
--- a/modules/services/osm.js
+++ b/modules/services/osm.js
@@ -31,6 +31,7 @@ var dispatch = d3_dispatch('authLoading', 'authDone', 'change', 'loading', 'load
     inflight = {},
     loadedTiles = {},
     entityCache = {},
+    connectionId = 1,
     tileZoom = 16,
     oauth = osmAuth({
         url: urlroot,
@@ -189,6 +190,7 @@ export default {
 
 
     reset: function() {
+        connectionId++;
         userChangesets = undefined;
         userDetails = undefined;
         rateLimitError = undefined;
@@ -200,6 +202,11 @@ export default {
     },
 
 
+    getConnectionId: function() {
+        return connectionId;
+    },
+
+
     changesetURL: function(changesetId) {
         return urlroot + '/changeset/' + changesetId;
     },
@@ -232,8 +239,14 @@ export default {
     loadFromAPI: function(path, callback, options) {
         options = _extend({ cache: true }, options);
         var that = this;
+        var cid = connectionId;
 
         function done(err, xml) {
+            if (that.getConnectionId() !== cid) {
+                if (callback) callback({ message: 'Connection Switched', status: -1 });
+                return;
+            }
+
             var isAuthenticated = that.authenticated();
 
             // 400 Bad Request, 401 Unauthorized, 403 Forbidden
@@ -333,6 +346,8 @@ export default {
 
 
     putChangeset: function(changeset, changes, callback) {
+        var that = this;
+        var cid = connectionId;
 
         // Create the changeset..
         oauth.xhr({
@@ -344,7 +359,13 @@ export default {
 
 
         function createdChangeset(err, changeset_id) {
-            if (err) return callback(err);
+            if (err) {
+                return callback(err);
+            }
+            if (that.getConnectionId() !== cid) {
+                return callback({ message: 'Connection Switched', status: -1 });
+            }
+
             changeset = changeset.update({ id: changeset_id });
 
             // Upload the changeset..
@@ -366,12 +387,16 @@ export default {
                 callback(null, changeset);
             }, 2500);
 
-            // Still attempt to close changeset, but ignore response because #2667
-            oauth.xhr({
-                method: 'PUT',
-                path: '/api/0.6/changeset/' + changeset.id + '/close',
-                options: { header: { 'Content-Type': 'text/xml' } }
-            }, function() { return true; });
+            // At this point, we don't really care if the connection was switched..
+            // Only try to close the changeset if we're still talking to the same server.
+            if (that.getConnectionId() === cid) {
+                // Still attempt to close changeset, but ignore response because #2667
+                oauth.xhr({
+                    method: 'PUT',
+                    path: '/api/0.6/changeset/' + changeset.id + '/close',
+                    options: { header: { 'Content-Type': 'text/xml' } }
+                }, function() { return true; });
+            }
         }
     },
 
@@ -382,8 +407,16 @@ export default {
             return;
         }
 
+        var that = this;
+        var cid = connectionId;
+
         function done(err, user_details) {
-            if (err) return callback(err);
+            if (err) {
+                return callback(err);
+            }
+            if (that.getConnectionId() !== cid) {
+                return callback({ message: 'Connection Switched', status: -1 });
+            }
 
             var u = user_details.getElementsByTagName('user')[0],
                 img = u.getElementsByTagName('img'),
@@ -420,27 +453,36 @@ export default {
             return;
         }
 
+        var that = this;
+        var cid = connectionId;
+
         this.userDetails(function(err, user) {
             if (err) {
-                callback(err);
-                return;
+                return callback(err);
+            }
+            if (that.getConnectionId() !== cid) {
+                return callback({ message: 'Connection Switched', status: -1 });
             }
 
             function done(err, changesets) {
                 if (err) {
-                    callback(err);
-                } else {
-                    userChangesets = Array.prototype.map.call(
-                        changesets.getElementsByTagName('changeset'),
-                        function (changeset) {
-                            return { tags: getTags(changeset) };
-                        }
-                    ).filter(function (changeset) {
-                        var comment = changeset.tags.comment;
-                        return comment && comment !== '';
-                    });
-                    callback(undefined, userChangesets);
+                    return callback(err);
                 }
+                if (that.getConnectionId() !== cid) {
+                    return callback({ message: 'Connection Switched', status: -1 });
+                }
+
+                userChangesets = Array.prototype.map.call(
+                    changesets.getElementsByTagName('changeset'),
+                    function (changeset) {
+                        return { tags: getTags(changeset) };
+                    }
+                ).filter(function (changeset) {
+                    var comment = changeset.tags.comment;
+                    return comment && comment !== '';
+                });
+
+                callback(undefined, userChangesets);
             }
 
             oauth.xhr({ method: 'GET', path: '/api/0.6/changesets?user=' + user.id }, done);
@@ -449,7 +491,14 @@ export default {
 
 
     status: function(callback) {
+        var that = this;
+        var cid = connectionId;
+
         function done(xml) {
+            if (that.getConnectionId() !== cid) {
+                return callback({ message: 'Connection Switched', status: -1 }, 'connectionSwitched');
+            }
+
             // update blacklists
             var elements = xml.getElementsByTagName('blacklist'),
                 regexes = [];
@@ -568,9 +617,9 @@ export default {
             done: authDone
         }, options));
 
-        dispatch.call('change');
         this.reset();
         this.userChangesets(function() {});  // eagerly load user details/changesets
+        dispatch.call('change');
         return this;
     },
 
@@ -599,10 +648,19 @@ export default {
 
     authenticate: function(callback) {
         var that = this;
+        var cid = connectionId;
         userChangesets = undefined;
         userDetails = undefined;
 
         function done(err, res) {
+            if (err) {
+                if (callback) callback(err);
+                return;
+            }
+            if (that.getConnectionId() !== cid) {
+                if (callback) callback({ message: 'Connection Switched', status: -1 });
+                return;
+            }
             rateLimitError = undefined;
             dispatch.call('change');
             if (callback) callback(err, res);
diff --git a/modules/svg/index.js b/modules/svg/index.js
index 9b48ba93d..8f54f5a5e 100644
--- a/modules/svg/index.js
+++ b/modules/svg/index.js
@@ -10,6 +10,7 @@ export { svgMapillaryImages } from './mapillary_images.js';
 export { svgMapillarySigns } from './mapillary_signs.js';
 export { svgMidpoints } from './midpoints.js';
 export { svgOneWaySegments } from './one_way_segments.js';
+export { svgOpenstreetcamImages } from './openstreetcam_images.js';
 export { svgOsm } from './osm.js';
 export { svgPath } from './path.js';
 export { svgPointTransform } from './point_transform.js';
diff --git a/modules/svg/labels.js b/modules/svg/labels.js
index a14a02c54..a42022721 100644
--- a/modules/svg/labels.js
+++ b/modules/svg/labels.js
@@ -337,7 +337,7 @@ export function svgLabels(projection, context) {
                 var getName = (geometry === 'line') ? utilDisplayNameForPath : utilDisplayName,
                     name = getName(entity),
                     width = name && textWidth(name, fontSize),
-                    p;
+                    p = null;
 
                 if (geometry === 'point') {
                     p = getPointLabel(entity, width, fontSize, geometry);
@@ -512,47 +512,65 @@ export function svgLabels(projection, context) {
         function getAreaLabel(entity, width, height) {
             var centroid = path.centroid(entity.asGeoJSON(graph, true)),
                 extent = entity.extent(graph),
-                entitywidth = projection(extent[1])[0] - projection(extent[0])[0];
+                areaWidth = projection(extent[1])[0] - projection(extent[0])[0];
 
-            if (isNaN(centroid[0]) || entitywidth < 20) return;
+            if (isNaN(centroid[0]) || areaWidth < 20) return;
 
-            var iconSize = 20,
-                iconX = centroid[0] - (iconSize / 2),
-                iconY = centroid[1] - (iconSize / 2),
+            var preset = context.presets().match(entity, context.graph()),
+                picon = preset && preset.icon,
+                iconSize = 17,
                 margin = 2,
-                textOffset = iconSize + margin,
-                p = { transform: 'translate(' + iconX + ',' + iconY + ')' };
+                p = {};
 
-            var bbox = {
-                minX: iconX,
-                minY: iconY,
-                maxX: iconX + iconSize,
-                maxY: iconY + iconSize
-            };
+            if (picon) {  // icon and label..
+                if (addIcon()) {
+                    addLabel(iconSize + margin);
+                    return p;
+                }
+            } else {   // label only..
+                if (addLabel(0)) {
+                    return p;
+                }
+            }
 
-            // try to add icon
-            if (tryInsert([bbox], entity.id + 'I', true)) {
-                if (width && entitywidth >= width + 20) {
-                    var labelX = centroid[0],
-                        labelY = centroid[1] + textOffset;
 
-                    bbox = {
+            function addIcon() {
+                var iconX = centroid[0] - (iconSize / 2);
+                var iconY = centroid[1] - (iconSize / 2);
+                var bbox = {
+                    minX: iconX,
+                    minY: iconY,
+                    maxX: iconX + iconSize,
+                    maxY: iconY + iconSize
+                };
+
+                if (tryInsert([bbox], entity.id + 'I', true)) {
+                    p.transform = 'translate(' + iconX + ',' + iconY + ')';
+                    return true;
+                }
+                return false;
+            }
+
+            function addLabel(yOffset) {
+                if (width && areaWidth >= width + 20) {
+                    var labelX = centroid[0];
+                    var labelY = centroid[1] + yOffset;
+                    var bbox = {
                         minX: labelX - (width / 2) - margin,
                         minY: labelY - (height / 2) - margin,
                         maxX: labelX + (width / 2) + margin,
                         maxY: labelY + (height / 2) + margin
                     };
 
-                    // try to add label
                     if (tryInsert([bbox], entity.id, true)) {
                         p.x = labelX;
                         p.y = labelY;
                         p.textAnchor = 'middle';
                         p.height = height;
+                        return true;
                     }
                 }
-
-                return p;
+                return false;
             }
         }
 
diff --git a/modules/svg/layers.js b/modules/svg/layers.js
index b0f590410..08f92db18 100644
--- a/modules/svg/layers.js
+++ b/modules/svg/layers.js
@@ -10,6 +10,7 @@ import { svgDebug } from './debug';
 import { svgGpx } from './gpx';
 import { svgMapillaryImages } from './mapillary_images';
 import { svgMapillarySigns } from './mapillary_signs';
+import { svgOpenstreetcamImages } from './openstreetcam_images';
 import { svgOsm } from './osm';
 import { utilRebind } from '../util/rebind';
 import { utilGetDimensions, utilSetDimensions } from '../util/dimensions';
@@ -23,6 +24,7 @@ export function svgLayers(projection, context) {
             { id: 'gpx', layer: svgGpx(projection, context, dispatch) },
             { id: 'mapillary-images', layer: svgMapillaryImages(projection, context, dispatch) },
             { id: 'mapillary-signs',  layer: svgMapillarySigns(projection, context, dispatch) },
+            { id: 'openstreetcam-images', layer: svgOpenstreetcamImages(projection, context, dispatch) },
             { id: 'debug', layer: svgDebug(projection, context, dispatch) }
         ];
 
diff --git a/modules/svg/mapillary_images.js b/modules/svg/mapillary_images.js
index 9b537d616..1bae3436c 100644
--- a/modules/svg/mapillary_images.js
+++ b/modules/svg/mapillary_images.js
@@ -1,5 +1,12 @@
 import _throttle from 'lodash-es/throttle';
+
+import {
+    geoIdentity as d3_geoIdentity,
+    geoPath as d3_geoPath
+} from 'd3-geo';
+
 import { select as d3_select } from 'd3-selection';
+
 import { svgPointTransform } from './point_transform';
 import { services } from '../services';
 
@@ -7,7 +14,8 @@ import { services } from '../services';
 export function svgMapillaryImages(projection, context, dispatch) {
     var throttledRedraw = _throttle(function () { dispatch.call('change'); }, 1000),
         minZoom = 12,
-        minViewfieldZoom = 17,
+        minMarkerZoom = 16,
+        minViewfieldZoom = 18,
         layer = d3_select(null),
         _mapillary;
 
@@ -19,7 +27,7 @@ export function svgMapillaryImages(projection, context, dispatch) {
     }
 
 
-    function getMapillary() {
+    function getService() {
         if (services.mapillary && !_mapillary) {
             _mapillary = services.mapillary;
             _mapillary.event.on('loadedImages', throttledRedraw);
@@ -32,10 +40,10 @@ export function svgMapillaryImages(projection, context, dispatch) {
 
 
     function showLayer() {
-        var mapillary = getMapillary();
-        if (!mapillary) return;
+        var service = getService();
+        if (!service) return;
 
-        mapillary.loadViewer(context);
+        service.loadViewer(context);
         editOn();
 
         layer
@@ -48,9 +56,9 @@ export function svgMapillaryImages(projection, context, dispatch) {
 
 
     function hideLayer() {
-        var mapillary = getMapillary();
-        if (mapillary) {
-            mapillary.hideViewer();
+        var service = getService();
+        if (service) {
+            service.hideViewer();
         }
 
         throttledRedraw.cancel();
@@ -75,58 +83,102 @@ export function svgMapillaryImages(projection, context, dispatch) {
 
 
     function click(d) {
-        var mapillary = getMapillary();
-        if (!mapillary) return;
+        var service = getService();
+        if (!service) return;
 
-        context.map().centerEase(d.loc);
-
-        mapillary
-            .selectedImage(d.key, true)
+        service
+            .selectImage(d)
             .updateViewer(d.key, context)
             .showViewer();
+
+        context.map().centerEase(d.loc);
+    }
+
+
+    function mouseover(d) {
+        var service = getService();
+        if (service) service.setStyles(d);
+    }
+
+
+    function mouseout() {
+        var service = getService();
+        if (service) service.setStyles(null);
     }
 
 
     function transform(d) {
         var t = svgPointTransform(projection)(d);
-        if (d.ca) t += ' rotate(' + Math.floor(d.ca) + ',0,0)';
+        if (d.ca) {
+            t += ' rotate(' + Math.floor(d.ca) + ',0,0)';
+        }
         return t;
     }
 
 
     function update() {
-        var mapillary = getMapillary(),
-            data = (mapillary ? mapillary.images(projection) : []),
-            imageKey = mapillary ? mapillary.selectedImage() : null;
+        var viewer = d3_select('#photoviewer');
+        var selected = viewer.empty() ? undefined : viewer.datum();
 
-        var markers = layer.selectAll('.viewfield-group')
-            .data(data, function(d) { return d.key; });
+        var z = ~~context.map().zoom();
+        var showMarkers = (z >= minMarkerZoom);
+        var showViewfields = (z >= minViewfieldZoom);
 
-        markers.exit()
+        var service = getService();
+        var sequences = (service ? service.sequences(projection) : []);
+        var images = (service && showMarkers ? service.images(projection) : []);
+
+        var clip = d3_geoIdentity().clipExtent(projection.clipExtent()).stream;
+        var project = projection.stream;
+        var makePath = d3_geoPath().projection({ stream: function(output) {
+            return project(clip(output));
+        }});
+
+        var traces = layer.selectAll('.sequences').selectAll('.sequence')
+            .data(sequences, function(d) { return d.properties.key; });
+
+        traces.exit()
             .remove();
 
-        var enter = markers.enter()
+        traces = traces.enter()
+            .append('path')
+            .attr('class', 'sequence')
+            .merge(traces);
+
+        traces
+            .attr('d', makePath);
+
+
+        var groups = layer.selectAll('.markers').selectAll('.viewfield-group')
+            .data(images, function(d) { return d.key; });
+
+        // exit
+        groups.exit()
+            .remove();
+
+        // enter
+        var groupsEnter = groups.enter()
             .append('g')
             .attr('class', 'viewfield-group')
-            .classed('selected', function(d) { return d.key === imageKey; })
+            .on('mouseover', mouseover)
+            .on('mouseout', mouseout)
             .on('click', click);
 
-        markers = markers
-            .merge(enter)
-            .attr('transform', transform);
+        groupsEnter
+            .append('g')
+            .attr('class', 'viewfield-scale');
 
+        // update
+        var markers = groups
+            .merge(groupsEnter)
+            .sort(function(a, b) {
+                return (a === selected) ? 1
+                    : (b === selected) ? -1
+                    : b.loc[1] - a.loc[1];  // sort Y
+            })
+            .attr('transform', transform)
+            .select('.viewfield-scale');
 
-       var viewfields = markers.selectAll('.viewfield')
-            .data(~~context.map().zoom() >= minViewfieldZoom ? [0] : []);
-
-        viewfields.exit()
-            .remove();
-
-        viewfields.enter()
-            .append('path')
-            .attr('class', 'viewfield')
-            .attr('transform', 'scale(1.5,1.5),translate(-8, -13)')
-            .attr('d', 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z');
 
         markers.selectAll('circle')
             .data([0])
@@ -135,30 +187,61 @@ export function svgMapillaryImages(projection, context, dispatch) {
             .attr('dx', '0')
             .attr('dy', '0')
             .attr('r', '6');
+
+        var viewfields = markers.selectAll('.viewfield')
+            .data(showViewfields ? [0] : []);
+
+        viewfields.exit()
+            .remove();
+
+        viewfields.enter()               // viewfields may or may not be drawn...
+            .insert('path', 'circle')    // but if they are, draw below the circles
+            .attr('class', 'viewfield')
+            .attr('transform', 'scale(1.5,1.5),translate(-8, -13)')
+            .attr('d', viewfieldPath);
+
+        function viewfieldPath() {
+            var d = this.parentNode.__data__;
+            if (d.pano) {
+                return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
+            } else {
+                return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
+            }
+        }
     }
 
 
     function drawImages(selection) {
         var enabled = svgMapillaryImages.enabled,
-            mapillary = getMapillary();
+            service = getService();
 
         layer = selection.selectAll('.layer-mapillary-images')
-            .data(mapillary ? [0] : []);
+            .data(service ? [0] : []);
 
         layer.exit()
             .remove();
 
-        layer = layer.enter()
+        var layerEnter = layer.enter()
             .append('g')
             .attr('class', 'layer-mapillary-images')
-            .style('display', enabled ? 'block' : 'none')
+            .style('display', enabled ? 'block' : 'none');
+
+        layerEnter
+            .append('g')
+            .attr('class', 'sequences');
+
+        layerEnter
+            .append('g')
+            .attr('class', 'markers');
+
+        layer = layerEnter
             .merge(layer);
 
         if (enabled) {
-            if (mapillary && ~~context.map().zoom() >= minZoom) {
+            if (service && ~~context.map().zoom() >= minZoom) {
                 editOn();
                 update();
-                mapillary.loadImages(projection);
+                service.loadImages(projection);
             } else {
                 editOff();
             }
@@ -180,7 +263,7 @@ export function svgMapillaryImages(projection, context, dispatch) {
 
 
     drawImages.supported = function() {
-        return !!getMapillary();
+        return !!getService();
     };
 
 
diff --git a/modules/svg/mapillary_signs.js b/modules/svg/mapillary_signs.js
index 5137c5a8f..a327c108d 100644
--- a/modules/svg/mapillary_signs.js
+++ b/modules/svg/mapillary_signs.js
@@ -18,7 +18,7 @@ export function svgMapillarySigns(projection, context, dispatch) {
     }
 
 
-    function getMapillary() {
+    function getService() {
         if (services.mapillary && !_mapillary) {
             _mapillary = services.mapillary;
             _mapillary.event.on('loadedSigns', throttledRedraw);
@@ -30,6 +30,10 @@ export function svgMapillarySigns(projection, context, dispatch) {
 
 
     function showLayer() {
+        var service = getService();
+        if (!service) return;
+
+        service.loadViewer(context);
         editOn();
     }
 
@@ -52,33 +56,36 @@ export function svgMapillarySigns(projection, context, dispatch) {
 
 
     function click(d) {
-        var mapillary = getMapillary();
-        if (!mapillary) return;
+        var service = getService();
+        if (!service) return;
 
         context.map().centerEase(d.loc);
 
-        var selected = mapillary.selectedImage(),
-            imageKey;
+        var selected = service.getSelectedImage();
+        var selectedImageKey = selected && selected.key;
+        var imageKey;
 
         // Pick one of the images the sign was detected in,
         // preference given to an image already selected.
         d.detections.forEach(function(detection) {
-            if (!imageKey || selected === detection.image_key) {
+            if (!imageKey || selectedImageKey === detection.image_key) {
                 imageKey = detection.image_key;
             }
         });
 
-        mapillary
-            .selectedImage(imageKey, true)
+        service
+            .selectImage(null, imageKey)
             .updateViewer(imageKey, context)
             .showViewer();
     }
 
 
     function update() {
-        var mapillary = getMapillary(),
-            data = (mapillary ? mapillary.signs(projection) : []),
-            imageKey = mapillary ? mapillary.selectedImage() : null;
+        var service = getService();
+        var data = (service ? service.signs(projection) : []);
+        var viewer = d3_select('#photoviewer');
+        var selected = viewer.empty() ? undefined : viewer.datum();
+        var selectedImageKey = selected && selected.key;
 
         var signs = layer.selectAll('.icon-sign')
             .data(data, function(d) { return d.key; });
@@ -93,7 +100,7 @@ export function svgMapillarySigns(projection, context, dispatch) {
             .attr('height', '24px')     // for Firefox
             .classed('selected', function(d) {
                 return _some(d.detections, function(detection) {
-                    return detection.image_key === imageKey;
+                    return detection.image_key === selectedImageKey;
                 });
             })
             .on('click', click);
@@ -101,7 +108,7 @@ export function svgMapillarySigns(projection, context, dispatch) {
         enter
             .append('xhtml:body')
             .attr('class', 'icon-sign-body')
-            .html(mapillary.signHTML);
+            .html(service.signHTML);
 
         signs
             .merge(enter)
@@ -112,10 +119,10 @@ export function svgMapillarySigns(projection, context, dispatch) {
 
     function drawSigns(selection) {
         var enabled = svgMapillarySigns.enabled,
-            mapillary = getMapillary();
+            service = getService();
 
         layer = selection.selectAll('.layer-mapillary-signs')
-            .data(mapillary ? [0] : []);
+            .data(service ? [0] : []);
 
         layer.exit()
             .remove();
@@ -127,10 +134,10 @@ export function svgMapillarySigns(projection, context, dispatch) {
             .merge(layer);
 
         if (enabled) {
-            if (mapillary && ~~context.map().zoom() >= minZoom) {
+            if (service && ~~context.map().zoom() >= minZoom) {
                 editOn();
                 update();
-                mapillary.loadSigns(context, projection);
+                service.loadSigns(context, projection);
             } else {
                 editOff();
             }
@@ -152,8 +159,8 @@ export function svgMapillarySigns(projection, context, dispatch) {
 
 
     drawSigns.supported = function() {
-        var mapillary = getMapillary();
-        return (mapillary && mapillary.signsSupported());
+        var service = getService();
+        return (service && service.signsSupported());
     };
 
 
diff --git a/modules/svg/openstreetcam_images.js b/modules/svg/openstreetcam_images.js
new file mode 100644
index 000000000..3184a7bc2
--- /dev/null
+++ b/modules/svg/openstreetcam_images.js
@@ -0,0 +1,263 @@
+import _throttle from 'lodash-es/throttle';
+
+import {
+    geoIdentity as d3_geoIdentity,
+    geoPath as d3_geoPath
+} from 'd3-geo';
+
+import { select as d3_select } from 'd3-selection';
+
+import { svgPointTransform } from './point_transform';
+import { services } from '../services';
+
+
+export function svgOpenstreetcamImages(projection, context, dispatch) {
+    var throttledRedraw = _throttle(function () { dispatch.call('change'); }, 1000),
+        minZoom = 12,
+        minMarkerZoom = 16,
+        minViewfieldZoom = 18,
+        layer = d3_select(null),
+        _openstreetcam;
+
+
+    function init() {
+        if (svgOpenstreetcamImages.initialized) return;  // run once
+        svgOpenstreetcamImages.enabled = false;
+        svgOpenstreetcamImages.initialized = true;
+    }
+
+
+    function getService() {
+        if (services.openstreetcam && !_openstreetcam) {
+            _openstreetcam = services.openstreetcam;
+            _openstreetcam.event.on('loadedImages', throttledRedraw);
+        } else if (!services.openstreetcam && _openstreetcam) {
+            _openstreetcam = null;
+        }
+
+        return _openstreetcam;
+    }
+
+
+    function showLayer() {
+        var service = getService();
+        if (!service) return;
+
+        service.loadViewer(context);
+        editOn();
+
+        layer
+            .style('opacity', 0)
+            .transition()
+            .duration(250)
+            .style('opacity', 1)
+            .on('end', function () { dispatch.call('change'); });
+    }
+
+
+    function hideLayer() {
+        var service = getService();
+        if (service) {
+            service.hideViewer();
+        }
+
+        throttledRedraw.cancel();
+
+        layer
+            .transition()
+            .duration(250)
+            .style('opacity', 0)
+            .on('end', editOff);
+    }
+
+
+    function editOn() {
+        layer.style('display', 'block');
+    }
+
+
+    function editOff() {
+        layer.selectAll('.viewfield-group').remove();
+        layer.style('display', 'none');
+    }
+
+
+    function click(d) {
+        var service = getService();
+        if (!service) return;
+
+        service
+            .selectImage(d)
+            .updateViewer(d)
+            .showViewer();
+
+        context.map().centerEase(d.loc);
+    }
+
+
+    function mouseover(d) {
+        var service = getService();
+        if (service) service.setStyles(d);
+    }
+
+
+    function mouseout() {
+        var service = getService();
+        if (service) service.setStyles(null);
+    }
+
+
+    function transform(d) {
+        var t = svgPointTransform(projection)(d);
+        if (d.ca) {
+            t += ' rotate(' + Math.floor(d.ca) + ',0,0)';
+        }
+        return t;
+    }
+
+
+    function update() {
+        var viewer = d3_select('#photoviewer');
+        var selected = viewer.empty() ? undefined : viewer.datum();
+
+        var z = ~~context.map().zoom();
+        var showMarkers = (z >= minMarkerZoom);
+        var showViewfields = (z >= minViewfieldZoom);
+
+        var service = getService();
+        var sequences = (service ? service.sequences(projection) : []);
+        var images = (service && showMarkers ? service.images(projection) : []);
+
+        var clip = d3_geoIdentity().clipExtent(projection.clipExtent()).stream;
+        var project = projection.stream;
+        var makePath = d3_geoPath().projection({ stream: function(output) {
+            return project(clip(output));
+        }});
+
+        var traces = layer.selectAll('.sequences').selectAll('.sequence')
+            .data(sequences, function(d) { return d.properties.key; });
+
+        traces.exit()
+            .remove();
+
+        traces = traces.enter()
+            .append('path')
+            .attr('class', 'sequence')
+            .merge(traces);
+
+        traces
+            .attr('d', makePath);
+
+
+        var groups = layer.selectAll('.markers').selectAll('.viewfield-group')
+            .data(images, function(d) { return d.key; });
+
+        // exit
+        groups.exit()
+            .remove();
+
+        // enter
+        var groupsEnter = groups.enter()
+            .append('g')
+            .attr('class', 'viewfield-group')
+            .on('mouseover', mouseover)
+            .on('mouseout', mouseout)
+            .on('click', click);
+
+        groupsEnter
+            .append('g')
+            .attr('class', 'viewfield-scale');
+
+        // update
+        var markers = groups
+            .merge(groupsEnter)
+            .sort(function(a, b) {
+                return (a === selected) ? 1
+                    : (b === selected) ? -1
+                    : b.loc[1] - a.loc[1];  // sort Y
+            })
+            .attr('transform', transform)
+            .select('.viewfield-scale');
+
+
+        markers.selectAll('circle')
+            .data([0])
+            .enter()
+            .append('circle')
+            .attr('dx', '0')
+            .attr('dy', '0')
+            .attr('r', '6');
+
+        var viewfields = markers.selectAll('.viewfield')
+            .data(showViewfields ? [0] : []);
+
+        viewfields.exit()
+            .remove();
+
+        viewfields.enter()               // viewfields may or may not be drawn...
+            .insert('path', 'circle')    // but if they are, draw below the circles
+            .attr('class', 'viewfield')
+            .attr('transform', 'scale(1.5,1.5),translate(-8, -13)')
+            .attr('d', 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z');
+    }
+
+
+    function drawImages(selection) {
+        var enabled = svgOpenstreetcamImages.enabled,
+            service = getService();
+
+        layer = selection.selectAll('.layer-openstreetcam-images')
+            .data(service ? [0] : []);
+
+        layer.exit()
+            .remove();
+
+        var layerEnter = layer.enter()
+            .append('g')
+            .attr('class', 'layer-openstreetcam-images')
+            .style('display', enabled ? 'block' : 'none');
+
+        layerEnter
+            .append('g')
+            .attr('class', 'sequences');
+
+        layerEnter
+            .append('g')
+            .attr('class', 'markers');
+
+        layer = layerEnter
+            .merge(layer);
+
+        if (enabled) {
+            if (service && ~~context.map().zoom() >= minZoom) {
+                editOn();
+                update();
+                service.loadImages(projection);
+            } else {
+                editOff();
+            }
+        }
+    }
+
+
+    drawImages.enabled = function(_) {
+        if (!arguments.length) return svgOpenstreetcamImages.enabled;
+        svgOpenstreetcamImages.enabled = _;
+        if (svgOpenstreetcamImages.enabled) {
+            showLayer();
+        } else {
+            hideLayer();
+        }
+        dispatch.call('change');
+        return this;
+    };
+
+
+    drawImages.supported = function() {
+        return !!getService();
+    };
+
+
+    init();
+    return drawImages;
+}
diff --git a/modules/ui/background.js b/modules/ui/background.js
index c7ada03d9..9b58c79d5 100644
--- a/modules/ui/background.js
+++ b/modules/ui/background.js
@@ -206,8 +206,8 @@ export function uiBackground(context) {
 
 
         function update() {
-            backgroundList.call(drawList, 'radio', clickSetSource, function(d) { return !d.overlay; });
-            overlayList.call(drawList, 'checkbox', clickSetOverlay, function(d) { return d.overlay; });
+            backgroundList.call(drawList, 'radio', clickSetSource, function(d) { return !d.isHidden() && !d.overlay; });
+            overlayList.call(drawList, 'checkbox', clickSetOverlay, function(d) { return !d.isHidden() && d.overlay; });
 
             selectLayer();
             updateOffsetVal();
@@ -568,9 +568,6 @@ export function uiBackground(context) {
 
         d3_select(document)
             .call(keybinding);
-
-        context.surface().on('mousedown.background-outside', hide);
-        context.container().on('mousedown.background-outside', hide);
     }
 
     return background;
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 62ca53989..52696ca30 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -228,7 +228,8 @@ export function uiCommit(context) {
 
         buttonSection.selectAll('.cancel-button')
             .on('click.cancel', function() {
-                dispatch.call('cancel');
+                var selectedID = commitChanges.entityID();
+                dispatch.call('cancel', this, selectedID);
             });
 
         buttonSection.selectAll('.save-button')
diff --git a/modules/ui/commit_changes.js b/modules/ui/commit_changes.js
index 321d643bc..195a7fd6c 100644
--- a/modules/ui/commit_changes.js
+++ b/modules/ui/commit_changes.js
@@ -15,6 +15,7 @@ import {
 
 
 export function uiCommitChanges(context) {
+    var _entityID;
     var detected = utilDetect();
 
 
@@ -91,7 +92,7 @@ export function uiCommitChanges(context) {
         items
             .on('mouseover', mouseover)
             .on('mouseout', mouseout)
-            .on('click', zoomToEntity);
+            .on('click', click);
 
 
         // Download changeset link
@@ -144,17 +145,27 @@ export function uiCommitChanges(context) {
         }
 
 
-        function zoomToEntity(change) {
-            var entity = change.entity;
-            if (change.changeType !== 'deleted' &&
-                context.graph().entity(entity.id).geometry(context.graph()) !== 'vertex') {
+        function click(change) {
+            if (change.changeType === 'deleted') {
+                _entityID = null;
+            } else {
+                var entity = change.entity;
+                _entityID = change.entity.id;
                 context.map().zoomTo(entity);
-                context.surface().selectAll(utilEntityOrMemberSelector([entity.id], context.graph()))
+                context.surface().selectAll(utilEntityOrMemberSelector([_entityID], context.graph()))
                     .classed('hover', true);
             }
         }
     }
 
 
+    commitChanges.entityID = function(_) {
+        if (!arguments.length) return _entityID;
+        _entityID = _;
+        return commitChanges;
+    };
+
+
+
     return commitChanges;
 }
diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js
index 378e2f9e3..d5ed9330b 100644
--- a/modules/ui/feature_list.js
+++ b/modules/ui/feature_list.js
@@ -3,24 +3,28 @@ import {
     select as d3_select
 } from 'd3-selection';
 
+import { d3keybinding as d3_keybinding } from '../lib/d3.keybinding.js';
+
 import * as sexagesimal from '@mapbox/sexagesimal';
 import { t } from '../util/locale';
-import { geoExtent, geoChooseEdge } from '../geo/index';
-import { modeSelect } from '../modes/index';
-import { osmEntity } from '../osm/index';
-import { svgIcon } from '../svg/index';
-import { services } from '../services/index';
+import { geoExtent, geoChooseEdge } from '../geo';
+import { modeSelect } from '../modes';
+import { osmEntity } from '../osm';
+import { svgIcon } from '../svg';
+import { services } from '../services';
+import { uiCmd } from './cmd';
 
 import {
     utilDisplayName,
     utilDisplayType,
     utilEntityOrMemberSelector,
     utilNoAuto
-} from '../util/index';
+} from '../util';
 
 
 export function uiFeatureList(context) {
-    var geocodeResults;
+    var keybinding = d3_keybinding('feature-list');
+    var _geocodeResults;
 
 
     function featureList(selection) {
@@ -28,7 +32,8 @@ export function uiFeatureList(context) {
             .append('div')
             .attr('class', 'header fillL cf');
 
-        header.append('h3')
+        header
+            .append('h3')
             .text(t('inspector.feature_list'));
 
         var searchWrap = selection
@@ -41,6 +46,7 @@ export function uiFeatureList(context) {
             .attr('type', 'search')
             .call(utilNoAuto)
             .on('keypress', keypress)
+            .on('keydown', keydown)
             .on('input', inputevent);
 
         searchWrap
@@ -59,18 +65,40 @@ export function uiFeatureList(context) {
         context.map()
             .on('drawn.feature-list', mapDrawn);
 
+        keybinding
+            .on(uiCmd('⌘F'), focusSearch);
+
+        d3_select(document)
+            .call(keybinding);
+
+
+        function focusSearch() {
+            var mode = context.mode() && context.mode().id;
+            if (mode !== 'browse') return;
+
+            d3_event.preventDefault();
+            search.node().focus();
+        }
+
+
+        function keydown() {
+            if (d3_event.keyCode === 27) {  // escape
+                search.node().blur();
+            }
+        }
+
 
         function keypress() {
             var q = search.property('value'),
                 items = list.selectAll('.feature-list-item');
-            if (d3_event.keyCode === 13 && q.length && items.size()) {
+            if (d3_event.keyCode === 13 && q.length && items.size()) {  // return
                 click(items.datum());
             }
         }
 
 
         function inputevent() {
-            geocodeResults = undefined;
+            _geocodeResults = undefined;
             drawList();
         }
 
@@ -149,7 +177,7 @@ export function uiFeatureList(context) {
                 addEntity(visible[i].__data__);
             }
 
-            (geocodeResults || []).forEach(function(d) {
+            (_geocodeResults || []).forEach(function(d) {
                 // https://github.com/openstreetmap/iD/issues/1890
                 if (d.osm_type && d.osm_id) {
                     result.push({
@@ -175,11 +203,12 @@ export function uiFeatureList(context) {
 
             list.classed('filtered', value.length);
 
-            var noResultsWorldwide = geocodeResults && geocodeResults.length === 0;
+            var noResultsWorldwide = _geocodeResults && _geocodeResults.length === 0;
 
             var resultsIndicator = list.selectAll('.no-results-item')
                 .data([0])
-                .enter().append('button')
+                .enter()
+                .append('button')
                 .property('disabled', true)
                 .attr('class', 'no-results-item')
                 .call(svgIcon('#icon-alert', 'pre-text'));
@@ -193,7 +222,8 @@ export function uiFeatureList(context) {
             if (services.geocoder) {
               list.selectAll('.geocode-item')
                   .data([0])
-                  .enter().append('button')
+                  .enter()
+                  .append('button')
                   .attr('class', 'geocode-item')
                   .on('click', geocoderSearch)
                   .append('div')
@@ -207,7 +237,7 @@ export function uiFeatureList(context) {
                 .style('display', (value.length && !results.length) ? 'block' : 'none');
 
             list.selectAll('.geocode-item')
-                .style('display', (value && geocodeResults === undefined) ? 'block' : 'none');
+                .style('display', (value && _geocodeResults === undefined) ? 'block' : 'none');
 
             list.selectAll('.feature-list-item')
                 .data([-1])
@@ -227,20 +257,24 @@ export function uiFeatureList(context) {
                 .append('div')
                 .attr('class', 'label');
 
-            label.each(function(d) {
-                d3_select(this)
-                    .call(svgIcon('#icon-' + d.geometry, 'pre-text'));
-            });
+            label
+                .each(function(d) {
+                    d3_select(this)
+                        .call(svgIcon('#icon-' + d.geometry, 'pre-text'));
+                });
 
-            label.append('span')
+            label
+                .append('span')
                 .attr('class', 'entity-type')
                 .text(function(d) { return d.type; });
 
-            label.append('span')
+            label
+                .append('span')
                 .attr('class', 'entity-name')
                 .text(function(d) { return d.name; });
 
-            enter.style('opacity', 0)
+            enter
+                .style('opacity', 0)
                 .transition()
                 .style('opacity', 1);
 
@@ -287,7 +321,7 @@ export function uiFeatureList(context) {
 
         function geocoderSearch() {
             services.geocoder.search(search.property('value'), function (err, resp) {
-                geocodeResults = resp || [];
+                _geocodeResults = resp || [];
                 drawList();
             });
         }
diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index df1dc9dc4..875fc6393 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -37,8 +37,10 @@ export function uiFieldCombo(field, context) {
         optstrings = field.strings && field.strings.options,
         optarray = field.options,
         snake_case = (field.snake_case || (field.snake_case === undefined)),
+        caseSensitive = field.caseSensitive,
         combobox = d3_combobox()
             .container(context.container())
+            .caseSensitive(caseSensitive)
             .minItems(isMulti || isSemi ? 1 : 2),
         comboData = [],
         multiData = [],
diff --git a/modules/ui/fields/radio.js b/modules/ui/fields/radio.js
index aeb552b76..27c8175b3 100644
--- a/modules/ui/fields/radio.js
+++ b/modules/ui/fields/radio.js
@@ -203,10 +203,22 @@ export function uiFieldRadio(field, context) {
         }
 
         if (field.type === 'structureRadio') {
-            if (val === 'no' || (key !== 'bridge' && key !== 'tunnel')) {
+            // remove layer if it should not be set
+            if (val === 'no' ||
+                (key !== 'bridge' && key !== 'tunnel') ||
+                (key === 'tunnel' && val === 'building_passage')) {
                 t.layer = undefined;
             }
-        }
+            // add layer if it should be set
+            if (t.layer === undefined) {
+                if (key === 'bridge' && val !== 'no') {
+                    t.layer = '1';
+                }
+                if (key === 'tunnel' && val !== 'no' && val !== 'building_passage') {
+                    t.layer = '-1';
+                }
+            }
+         }
 
         dispatch.call('change', this, t, onInput);
     }
@@ -243,7 +255,7 @@ export function uiFieldRadio(field, context) {
         if (field.type === 'structureRadio') {
             if (activeKey === 'bridge') {
                 t.layer = '1';
-            } else if (activeKey === 'tunnel') {
+            } else if (activeKey === 'tunnel' && t.tunnel !== 'building_passage') {
                 t.layer = '-1';
             } else {
                 t.layer = undefined;
diff --git a/modules/ui/flash.js b/modules/ui/flash.js
index 27a5d759e..8540c706a 100644
--- a/modules/ui/flash.js
+++ b/modules/ui/flash.js
@@ -1,37 +1,115 @@
 import { select as d3_select } from 'd3-selection';
 import { timeout as d3_timeout } from 'd3-timer';
 
-var timer;
+var _flashTimer;
 
 
-export function uiFlash(showDuration) {
-    showDuration = showDuration || 1500;
+export function uiFlash() {
+    var _duration = 2000;
+    var _iconName = '#icon-no';
+    var _iconClass = 'disabled';
+    var _text = '';
+    var _textClass;
 
-    if (timer) {
-        timer.stop();
+
+    function flash() {
+        if (_flashTimer) {
+            _flashTimer.stop();
+        }
+
+        d3_select('#footer-wrap')
+            .attr('class', 'footer-hide');
+        d3_select('#flash-wrap')
+            .attr('class', 'footer-show');
+
+        var content = d3_select('#flash-wrap').selectAll('.flash-content')
+            .data([0]);
+
+        // Enter
+        var contentEnter = content.enter()
+            .append('div')
+            .attr('class', 'flash-content');
+
+        var iconEnter = contentEnter
+            .append('svg')
+            .attr('class', 'flash-icon')
+            .append('g')
+            .attr('transform', 'translate(10,10)');
+
+        iconEnter
+            .append('circle')
+            .attr('r', 9);
+
+        iconEnter
+            .append('use')
+            .attr('transform', 'translate(-7,-7)')
+            .attr('width', '14')
+            .attr('height', '14');
+
+        contentEnter
+            .append('div')
+            .attr('class', 'flash-text');
+
+
+        // Update
+        content = content
+            .merge(contentEnter);
+
+        content
+            .selectAll('.flash-icon')
+            .attr('class', 'flash-icon ' + (_iconClass || ''));
+
+        content
+            .selectAll('.flash-icon use')
+            .attr('xlink:href', _iconName);
+
+        content
+            .selectAll('.flash-text')
+            .attr('class', 'flash-text ' + (_textClass || ''))
+            .text(_text);
+
+
+        _flashTimer = d3_timeout(function() {
+            _flashTimer = null;
+            d3_select('#footer-wrap')
+                .attr('class', 'footer-show');
+            d3_select('#flash-wrap')
+                .attr('class', 'footer-hide');
+        }, _duration);
+
+        return content;
     }
 
-    d3_select('#footer-wrap')
-        .attr('class', 'footer-hide');
-    d3_select('#flash-wrap')
-        .attr('class', 'footer-show');
 
-    var content = d3_select('#flash-wrap').selectAll('.content')
-        .data([0]);
+    flash.duration = function(_) {
+        if (!arguments.length) return _duration;
+        _duration = _;
+        return flash;
+    };
 
-    content = content.enter()
-        .append('div')
-        .attr('class', 'content')
-        .merge(content);
+    flash.text = function(_) {
+        if (!arguments.length) return _text;
+        _text = _;
+        return flash;
+    };
 
-    timer = d3_timeout(function() {
-        timer = null;
-        d3_select('#footer-wrap')
-            .attr('class', 'footer-show');
-        d3_select('#flash-wrap')
-            .attr('class', 'footer-hide');
-    }, showDuration);
+    flash.textClass = function(_) {
+        if (!arguments.length) return _textClass;
+        _textClass = _;
+        return flash;
+    };
 
+    flash.iconName = function(_) {
+        if (!arguments.length) return _iconName;
+        _iconName = _;
+        return flash;
+    };
 
-    return content;
+    flash.iconClass = function(_) {
+        if (!arguments.length) return _iconClass;
+        _iconClass = _;
+        return flash;
+    };
+
+    return flash;
 }
diff --git a/modules/ui/help.js b/modules/ui/help.js
index aafe0c152..6b1e6b435 100644
--- a/modules/ui/help.js
+++ b/modules/ui/help.js
@@ -8,31 +8,252 @@ import { d3keybinding as d3_keybinding } from '../lib/d3.keybinding.js';
 import marked from 'marked';
 import { t, textDirection } from '../util/locale';
 import { svgIcon } from '../svg';
+import { uiCmd } from './cmd';
 import { uiIntro } from './intro';
 import { uiShortcuts } from './shortcuts';
 import { uiTooltipHtml } from './tooltipHtml';
 import { tooltip } from '../util/tooltip';
 
+import { icon } from 'intro/helper';
 
 export function uiHelp(context) {
     var key = t('help.key');
 
     var docKeys = [
-        'help.help',
-        'help.editing_saving',
-        'help.roads',
-        'help.gps',
-        'help.imagery',
-        'help.addresses',
-        'help.inspector',
-        'help.buildings',
-        'help.relations'];
+        ['help', [
+            'welcome',
+            'open_data_h',
+            'open_data',
+            'before_start_h',
+            'before_start',
+            'open_source_h',
+            'open_source',
+            'open_source_help'
+        ]],
+        ['overview', [
+            'navigation_h',
+            'navigation_drag',
+            'navigation_zoom',
+            'features_h',
+            'features',
+            'nodes_ways'
+        ]],
+        ['editing', [
+            'select_h',
+            'select_left_click',
+            'select_right_click',
+            'multiselect_h',
+            'multiselect_shift_click',
+            'multiselect_lasso',
+            'undo_redo_h',
+            'undo_redo',
+            'save_h',
+            'save',
+            'save_validation',
+            'upload_h',
+            'upload',
+            'backups_h',
+            'backups',
+            'keyboard_h',
+            'keyboard'
+        ]],
+        ['feature_editor', [
+            'intro',
+            'definitions',
+            'type_h',
+            'type',
+            'type_picker',
+            'fields_h',
+            'fields_all_fields',
+            'fields_example',
+            'fields_add_field',
+            'tags_h',
+            'tags_all_tags',
+            'tags_resources'
+        ]],
+        ['points', [
+            'intro',
+            'add_point_h',
+            'add_point',
+            'add_point_finish',
+            'move_point_h',
+            'move_point',
+            'delete_point_h',
+            'delete_point',
+            'delete_point_command'
+        ]],
+        ['lines', [
+            'intro',
+            'add_line_h',
+            'add_line',
+            'add_line_draw',
+            'add_line_finish',
+            'modify_line_h',
+            'modify_line_dragnode',
+            'modify_line_addnode',
+            'connect_line_h',
+            'connect_line',
+            'connect_line_display',
+            'connect_line_drag',
+            'connect_line_tag',
+            'disconnect_line_h',
+            'disconnect_line_command',
+            'move_line_h',
+            'move_line_command',
+            'move_line_connected',
+            'delete_line_h',
+            'delete_line',
+            'delete_line_command'
+        ]],
+        ['areas', [
+            'intro',
+            'point_or_area_h',
+            'point_or_area',
+            'add_area_h',
+            'add_area_command',
+            'add_area_draw',
+            'add_area_finish',
+            'square_area_h',
+            'square_area_command',
+            'modify_area_h',
+            'modify_area_dragnode',
+            'modify_area_addnode',
+            'delete_area_h',
+            'delete_area',
+            'delete_area_command'
+        ]],
+        ['relations', [
+            'intro',
+            'edit_relation_h',
+            'edit_relation',
+            'edit_relation_add',
+            'edit_relation_delete',
+            'maintain_relation_h',
+            'maintain_relation',
+            'relation_types_h',
+            'multipolygon_h',
+            'multipolygon',
+            'multipolygon_create',
+            'multipolygon_merge',
+            'turn_restriction_h',
+            'turn_restriction',
+            'turn_restriction_field',
+            'turn_restriction_editing',
+            'route_h',
+            'route',
+            'route_add',
+            'boundary_h',
+            'boundary',
+            'boundary_add'
+        ]],
+        ['imagery', [
+            'intro',
+            'sources_h',
+            'choosing',
+            'sources',
+            'offsets_h',
+            'offset',
+            'offset_change'
+        ]],
+        ['streetlevel', [
+            'intro',
+            'using_h',
+            'using',
+            'photos',
+            'viewer'
+        ]],
+        ['gps', [
+            'intro',
+            'survey',
+            'using_h',
+            'using',
+            'tracing',
+            'upload'
+        ]]
+    ];
 
+    var headings = {
+        'help.help.open_data_h': 3,
+        'help.help.before_start_h': 3,
+        'help.help.open_source_h': 3,
+        'help.overview.navigation_h': 3,
+        'help.overview.features_h': 3,
+        'help.editing.select_h': 3,
+        'help.editing.multiselect_h': 3,
+        'help.editing.undo_redo_h': 3,
+        'help.editing.save_h': 3,
+        'help.editing.upload_h': 3,
+        'help.editing.backups_h': 3,
+        'help.editing.keyboard_h': 3,
+        'help.feature_editor.type_h': 3,
+        'help.feature_editor.fields_h': 3,
+        'help.feature_editor.tags_h': 3,
+        'help.points.add_point_h': 3,
+        'help.points.move_point_h': 3,
+        'help.points.delete_point_h': 3,
+        'help.lines.add_line_h': 3,
+        'help.lines.modify_line_h': 3,
+        'help.lines.connect_line_h': 3,
+        'help.lines.disconnect_line_h': 3,
+        'help.lines.move_line_h': 3,
+        'help.lines.delete_line_h': 3,
+        'help.areas.point_or_area_h': 3,
+        'help.areas.add_area_h': 3,
+        'help.areas.square_area_h': 3,
+        'help.areas.modify_area_h': 3,
+        'help.areas.delete_area_h': 3,
+        'help.relations.edit_relation_h': 3,
+        'help.relations.maintain_relation_h': 3,
+        'help.relations.relation_types_h': 2,
+        'help.relations.multipolygon_h': 3,
+        'help.relations.turn_restriction_h': 3,
+        'help.relations.route_h': 3,
+        'help.relations.boundary_h': 3,
+        'help.imagery.sources_h': 3,
+        'help.imagery.offsets_h': 3,
+        'help.streetlevel.using_h': 3,
+        'help.gps.using_h': 3,
+    };
+
+    var replacements = {
+        point: icon('#icon-point', 'pre-text'),
+        line: icon('#icon-line', 'pre-text'),
+        area: icon('#icon-area', 'pre-text'),
+        plus: icon('#icon-plus', 'pre-text'),
+        minus: icon('#icon-minus', 'pre-text'),
+        orthogonalize: icon('#operation-orthogonalize', 'pre-text'),
+        disconnect: icon('#operation-disconnect', 'pre-text'),
+        layers: icon('#icon-layers', 'pre-text'),
+        data: icon('#icon-data', 'pre-text'),
+        inspect: icon('#icon-inspect', 'pre-text'),
+        move: icon('#operation-move', 'pre-text'),
+        merge: icon('#operation-merge', 'pre-text'),
+        delete: icon('#operation-delete', 'pre-text'),
+        close: icon('#icon-close', 'pre-text'),
+        undo: icon(textDirection === 'rtl' ? '#icon-redo' : '#icon-undo', 'pre-text'),
+        redo: icon(textDirection === 'rtl' ? '#icon-undo' : '#icon-redo', 'pre-text'),
+        save: icon('#icon-save', 'pre-text'),
+        leftclick: icon('#walkthrough-mouse', 'pre-text mouseclick', 'left'),
+        rightclick: icon('#walkthrough-mouse', 'pre-text mouseclick', 'right'),
+        shift: uiCmd.display('⇧'),
+        alt: uiCmd.display('⌥'),
+        return: uiCmd.display('↵'),
+        version: context.version
+    };
+
+    // For each section, squash all the texts into a single markdown document
     var docs = docKeys.map(function(key) {
-        var text = t(key);
+        var helpkey = 'help.' + key[0];
+        var text = key[1].reduce(function(all, part) {
+            var subkey = helpkey + '.' + part;
+            var depth = headings[subkey];                              // is this subkey a heading?
+            var hhh = depth ? Array(depth + 1).join('#') + ' ' : '';   // if so, prepend with some ##'s
+            return all + hhh + t(subkey, replacements) + '\n\n';
+        }, '');
+
         return {
-            title: text.split('\n')[0].replace('#', '').trim(),
-            html: marked(text.split('\n').slice(1).join('\n'))
+            title: t(helpkey + '.title'),
+            html: marked(text.trim())
         };
     });
 
@@ -223,9 +444,6 @@ export function uiHelp(context) {
 
         d3_select(document)
             .call(keybinding);
-
-        context.surface().on('mousedown.help-outside', hide);
-        context.container().on('mousedown.help-outside', hide);
     }
 
     return help;
diff --git a/modules/ui/init.js b/modules/ui/init.js
index 8519c6f88..adeb376fb 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -8,9 +8,10 @@ import { d3keybinding as d3_keybinding } from '../lib/d3.keybinding.js';
 import { t, textDirection } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 
-import { svgDefs, svgIcon } from '../svg/index';
-import { modeBrowse } from '../modes/index';
-import { behaviorHash } from '../behavior/index';
+import { behaviorHash } from '../behavior';
+import { modeBrowse } from '../modes';
+import { services } from '../services';
+import { svgDefs, svgIcon } from '../svg';
 import { utilGetDimensions } from '../util/dimensions';
 
 import { uiAccount } from './account';
@@ -238,6 +239,23 @@ export function uiInit(context) {
             .call(uiContributors(context));
 
 
+        var photoviewer = content
+            .append('div')
+            .attr('id', 'photoviewer')
+            .classed('al', true)       // 'al'=left,  'ar'=right
+            .classed('hide', true);
+
+        photoviewer
+            .append('button')
+            .attr('class', 'thumb-hide')
+            .on('click', function () {
+                if (services.mapillary) { services.mapillary.hideViewer(); }
+                if (services.openstreetcam) { services.openstreetcam.hideViewer(); }
+            })
+            .append('div')
+            .call(svgIcon('#icon-close'));
+
+
         window.onbeforeunload = function() {
             return context.save();
         };
diff --git a/modules/ui/intro/helper.js b/modules/ui/intro/helper.js
index 37e257fa8..4c8cdb361 100644
--- a/modules/ui/intro/helper.js
+++ b/modules/ui/intro/helper.js
@@ -38,9 +38,10 @@ export function pad(locOrBox, padding, context) {
 }
 
 
-export function icon(name, svgklass) {
+export function icon(name, svgklass, useklass) {
     return '<svg class="icon ' + (svgklass || '') + '">' +
-         '<use xlink:href="' + name + '"></use></svg>';
+         '<use xlink:href="' + name + '"' +
+         (useklass ? ' class="' + useklass + '"' : '') + '></use></svg>';
 }
 
 
diff --git a/modules/ui/intro/welcome.js b/modules/ui/intro/welcome.js
index f54c81bc4..8187998e7 100644
--- a/modules/ui/intro/welcome.js
+++ b/modules/ui/intro/welcome.js
@@ -137,7 +137,7 @@ export function uiIntroWelcome(context, reveal) {
         );
     }
 
-
+    
     chapter.enter = function() {
         welcome();
     };
@@ -145,6 +145,9 @@ export function uiIntroWelcome(context, reveal) {
 
     chapter.exit = function() {
         listener.off();
+        var tooltip = d3_select('.curtain-tooltip.intro-mouse')
+            .selectAll('.counter')
+            .remove();
     };
 
 
diff --git a/modules/ui/map_data.js b/modules/ui/map_data.js
index 12e676d0e..fb522c098 100644
--- a/modules/ui/map_data.js
+++ b/modules/ui/map_data.js
@@ -80,113 +80,65 @@ export function uiMapData(context) {
         }
 
 
-        function clickMapillaryImages() {
-            toggleLayer('mapillary-images');
-            if (!showsLayer('mapillary-images')) {
-                setLayer('mapillary-signs', false);
+        function drawPhotoItems(selection) {
+            var photoKeys = ['mapillary-images', 'mapillary-signs', 'openstreetcam-images'];
+            var photoLayers = layers.all().filter(function(obj) { return photoKeys.indexOf(obj.id) !== -1; });
+            var data = photoLayers.filter(function(obj) { return obj.layer.supported(); });
+
+            function layerSupported(d) {
+                return d.layer && d.layer.supported();
+            }
+            function layerEnabled(d) {
+                return layerSupported(d) && d.layer.enabled();
             }
-        }
 
-
-        function clickMapillarySigns() {
-            toggleLayer('mapillary-signs');
-        }
-
-
-        function drawMapillaryItems(selection) {
-            var mapillaryImages = layers.layer('mapillary-images'),
-                mapillarySigns = layers.layer('mapillary-signs'),
-                supportsMapillaryImages = mapillaryImages && mapillaryImages.supported(),
-                supportsMapillarySigns = mapillarySigns && mapillarySigns.supported(),
-                showsMapillaryImages = supportsMapillaryImages && mapillaryImages.enabled(),
-                showsMapillarySigns = supportsMapillarySigns && mapillarySigns.enabled();
-
-            var mapillaryList = selection
-                .selectAll('.layer-list-mapillary')
+            var ul = selection
+                .selectAll('.layer-list-photos')
                 .data([0]);
 
-            mapillaryList = mapillaryList.enter()
+            ul = ul.enter()
                 .append('ul')
-                .attr('class', 'layer-list layer-list-mapillary')
-                .merge(mapillaryList);
+                .attr('class', 'layer-list layer-list-photos')
+                .merge(ul);
 
+            var li = ul.selectAll('.list-item-photos')
+                .data(data);
 
-            var mapillaryImageLayerItem = mapillaryList
-                .selectAll('.list-item-mapillary-images')
-                .data(supportsMapillaryImages ? [0] : []);
-
-            mapillaryImageLayerItem.exit()
+            li.exit()
                 .remove();
 
-            var enterImages = mapillaryImageLayerItem.enter()
+            var liEnter = li.enter()
                 .append('li')
-                .attr('class', 'list-item-mapillary-images');
+                .attr('class', function(d) { return 'list-item-photos list-item-' + d.id; });
 
-            var labelImages = enterImages
+            var labelEnter = liEnter
                 .append('label')
-                .call(tooltip()
-                    .title(t('mapillary_images.tooltip'))
-                    .placement('top'));
+                .each(function(d) {
+                    d3_select(this)
+                        .call(tooltip()
+                            .title(t(d.id.replace('-', '_') + '.tooltip'))
+                            .placement('top')
+                        );
+                });
 
-            labelImages
+            labelEnter
                 .append('input')
                 .attr('type', 'checkbox')
-                .on('change', clickMapillaryImages);
+                .on('change', function(d) { toggleLayer(d.id); });
 
-            labelImages
+            labelEnter
                 .append('span')
-                .text(t('mapillary_images.title'));
+                .text(function(d) { return t(d.id.replace('-', '_') + '.title'); });
 
 
-            var mapillarySignLayerItem = mapillaryList
-                .selectAll('.list-item-mapillary-signs')
-                .data(supportsMapillarySigns ? [0] : []);
+            // Update
+            li = li
+                .merge(liEnter);
 
-            mapillarySignLayerItem.exit()
-                .remove();
-
-            var enterSigns = mapillarySignLayerItem.enter()
-                .append('li')
-                .attr('class', 'list-item-mapillary-signs');
-
-            var labelSigns = enterSigns
-                .append('label')
-                .call(tooltip()
-                    .title(t('mapillary_signs.tooltip'))
-                    .placement('top'));
-
-            labelSigns
-                .append('input')
-                .attr('type', 'checkbox')
-                .on('change', clickMapillarySigns);
-
-            labelSigns
-                .append('span')
-                .text(t('mapillary_signs.title'));
-
-
-            // Updates
-            mapillaryImageLayerItem = mapillaryImageLayerItem
-                .merge(enterImages);
-
-            mapillaryImageLayerItem
-                .classed('active', showsMapillaryImages)
+            li
+                .classed('active', layerEnabled)
                 .selectAll('input')
-                .property('checked', showsMapillaryImages);
-
-
-            mapillarySignLayerItem = mapillarySignLayerItem
-                .merge(enterSigns);
-
-            mapillarySignLayerItem
-                .classed('active', showsMapillarySigns)
-                .selectAll('input')
-                .property('disabled', !showsMapillaryImages)
-                .property('checked', showsMapillarySigns);
-
-            mapillarySignLayerItem
-                .selectAll('label')
-                .classed('deemphasize', !showsMapillaryImages);
+                .property('checked', layerEnabled);
         }
 
 
@@ -377,7 +329,7 @@ export function uiMapData(context) {
         function update() {
             dataLayerContainer
                 .call(drawOsmItem)
-                .call(drawMapillaryItems)
+                .call(drawPhotoItems)
                 .call(drawGpxItem);
 
             fillList
@@ -540,11 +492,7 @@ export function uiMapData(context) {
 
         d3_select(document)
             .call(keybinding);
-
-        context.surface().on('mousedown.map_data-outside', hidePanel);
-        context.container().on('mousedown.map_data-outside', hidePanel);
     }
 
-
     return map_data;
 }
diff --git a/modules/ui/notice.js b/modules/ui/notice.js
index 4f21c8090..9e35a610f 100644
--- a/modules/ui/notice.js
+++ b/modules/ui/notice.js
@@ -1,5 +1,7 @@
 import _debounce from 'lodash-es/debounce';
 
+import { event as d3_event } from 'd3-selection';
+
 import { t } from '../util/locale';
 import { svgIcon } from '../svg/index';
 
@@ -15,7 +17,11 @@ export function uiNotice(context) {
             .append('button')
             .attr('class', 'zoom-to notice fillD')
             .on('click', function() {
-                context.map().zoom(context.minEditableZoom());
+                context.map().zoomEase(context.minEditableZoom());
+            })
+            .on('wheel', function() {   // let wheel events pass through #4482
+                var e2 = new WheelEvent(d3_event.type, d3_event);
+                context.surface().node().dispatchEvent(e2);
             });
 
         button
diff --git a/modules/ui/panels/background.js b/modules/ui/panels/background.js
index 2b34e1096..5f869405a 100644
--- a/modules/ui/panels/background.js
+++ b/modules/ui/panels/background.js
@@ -20,8 +20,11 @@ export function uiPanelBackground(context) {
     var debouncedRedraw = _debounce(redraw, 250);
 
     function redraw(selection) {
-        if (currSourceName !== background.baseLayerSource().name()) {
-            currSourceName = background.baseLayerSource().name();
+        var source = background.baseLayerSource(),
+            isDG = (source.id.match(/^DigitalGlobe/i) !== null);
+
+        if (currSourceName !== source.name()) {
+            currSourceName = source.name();
             metadata = {};
         }
 
@@ -36,11 +39,14 @@ export function uiPanelBackground(context) {
             .text(currSourceName);
 
         metadataKeys.forEach(function(k) {
+            // DigitalGlobe vintage is available in raster layers for now.
+            if (isDG && k === 'vintage') return;
+
             list
                 .append('li')
                 .attr('class', 'background-info-list-' + k)
                 .classed('hide', !metadata[k])
-                .text(t('info_panels.background.' + k) + ': ')
+                .text(t('info_panels.background.' + k) + ':')
                 .append('span')
                 .attr('class', 'background-info-span-' + k)
                 .text(metadata[k]);
@@ -48,11 +54,11 @@ export function uiPanelBackground(context) {
 
         debouncedGetMetadata(selection);
 
-        var toggle = context.getDebug('tile') ? 'hide_tiles' : 'show_tiles';
+        var toggleTiles = context.getDebug('tile') ? 'hide_tiles' : 'show_tiles';
 
         selection
             .append('a')
-            .text(t('info_panels.background.' + toggle))
+            .text(t('info_panels.background.' + toggleTiles))
             .attr('href', '#')
             .attr('class', 'button button-toggle-tiles')
             .on('click', function() {
@@ -60,6 +66,34 @@ export function uiPanelBackground(context) {
                 context.setDebug('tile', !context.getDebug('tile'));
                 selection.call(redraw);
             });
+
+        if (isDG) {
+            var key = source.id + '-vintage';
+            var sourceVintage = context.background().findSource(key);
+            var showsVintage = context.background().showsLayer(sourceVintage);
+            var toggleVintage = showsVintage ? 'hide_vintage' : 'show_vintage';
+            selection
+                .append('a')
+                .text(t('info_panels.background.' + toggleVintage))
+                .attr('href', '#')
+                .attr('class', 'button button-toggle-vintage')
+                .on('click', function() {
+                    d3_event.preventDefault();
+                    context.background().toggleOverlayLayer(sourceVintage);
+                    selection.call(redraw);
+                });
+        }
+
+        // disable if necessary
+        ['DigitalGlobe-Premium', 'DigitalGlobe-Standard'].forEach(function(layerId) {
+            if (source.id !== layerId) {
+                var key = layerId + '-vintage';
+                var sourceVintage = context.background().findSource(key);
+                if (context.background().showsLayer(sourceVintage)) {
+                    context.background().toggleOverlayLayer(sourceVintage);
+                }
+            }
+        });
     }
 
 
diff --git a/modules/ui/panels/history.js b/modules/ui/panels/history.js
index 99196b42d..b665fe5f9 100644
--- a/modules/ui/panels/history.js
+++ b/modules/ui/panels/history.js
@@ -2,6 +2,7 @@ import _filter from 'lodash-es/filter';
 
 import { t } from '../../util/locale';
 import { svgIcon } from '../../svg';
+import { utilDetect } from '../../util/detect';
 
 
 export function uiPanelHistory(context) {
@@ -9,11 +10,14 @@ export function uiPanelHistory(context) {
 
     function displayTimestamp(entity) {
         if (!entity.timestamp) return t('info_panels.history.unknown');
-
+        var detected = utilDetect();
+        var options = {
+            day: 'numeric', month: 'short', year: 'numeric',
+            hour: 'numeric', minute: 'numeric', second: 'numeric'
+        };
         var d = new Date(entity.timestamp);
         if (isNaN(d.getTime())) return t('info_panels.history.unknown');
-
-        return d.toLocaleString();
+        return d.toLocaleString(detected.locale, options);
     }
 
 
@@ -113,20 +117,24 @@ export function uiPanelHistory(context) {
 
         list
             .append('li')
-            .text(t('info_panels.history.version') + ': ' + entity.version);
+            .text(t('info_panels.history.version') + ':')
+            .append('span')
+            .text(entity.version);
 
         list
             .append('li')
-            .text(t('info_panels.history.last_edit') + ': ' + displayTimestamp(entity));
+            .text(t('info_panels.history.last_edit') + ':')
+            .append('span')
+            .text(displayTimestamp(entity));
 
         list
             .append('li')
-            .text(t('info_panels.history.edited_by') + ': ')
+            .text(t('info_panels.history.edited_by') + ':')
             .call(displayUser, entity);
 
         list
             .append('li')
-            .text(t('info_panels.history.changeset') + ': ')
+            .text(t('info_panels.history.changeset') + ':')
             .call(displayChangeset, entity);
 
         if (osm) {
diff --git a/modules/ui/panels/measurement.js b/modules/ui/panels/measurement.js
index 36737f4d4..7de2a601d 100644
--- a/modules/ui/panels/measurement.js
+++ b/modules/ui/panels/measurement.js
@@ -113,11 +113,11 @@ export function uiPanelMeasurement(context) {
 
 
     function redraw(selection) {
-        var resolver = context.graph(),
-            selected = _filter(context.selectedIDs(), function(e) { return context.hasEntity(e); }),
-            singular = selected.length === 1 ? selected[0] : null,
-            extent = geoExtent(),
-            entity;
+        var resolver = context.graph();
+        var selected = _filter(context.selectedIDs(), function(e) { return context.hasEntity(e); });
+        var singular = selected.length === 1 ? selected[0] : null;
+        var extent = geoExtent();
+        var entity;
 
         selection.html('');
 
@@ -143,7 +143,9 @@ export function uiPanelMeasurement(context) {
         if (!singular) {
             list
                 .append('li')
-                .text(t('info_panels.measurement.center') + ': ' +
+                .text(t('info_panels.measurement.center') + ':')
+                .append('span')
+                .text(
                     center[1].toFixed(OSM_PRECISION) + ', ' + center[0].toFixed(OSM_PRECISION)
                 );
             return;
@@ -162,23 +164,32 @@ export function uiPanelMeasurement(context) {
 
             list
                 .append('li')
-                .text(t('info_panels.measurement.geometry') + ': ' +
-                    (closed ? t('info_panels.measurement.closed') + ' ' : '') + t('geometry.' + geometry) );
+                .text(t('info_panels.measurement.geometry') + ':')
+                .append('span')
+                .text(
+                    (closed ? t('info_panels.measurement.closed') + ' ' : '') + t('geometry.' + geometry)
+                );
 
             if (closed) {
                 var area = steradiansToSqmeters(entity.area(resolver));
                 list
                     .append('li')
-                    .text(t('info_panels.measurement.area') + ': ' + displayArea(area));
+                    .text(t('info_panels.measurement.area') + ':')
+                    .append('span')
+                    .text(displayArea(area));
             }
 
             list
                 .append('li')
-                .text(lengthLabel + ': ' + displayLength(length));
+                .text(lengthLabel + ':')
+                .append('span')
+                .text(displayLength(length));
 
             list
                 .append('li')
-                .text(t('info_panels.measurement.centroid') + ': ' +
+                .text(t('info_panels.measurement.centroid') + ':')
+                .append('span')
+                .text(
                     centroid[1].toFixed(OSM_PRECISION) + ', ' + centroid[0].toFixed(OSM_PRECISION)
                 );
 
@@ -201,11 +212,15 @@ export function uiPanelMeasurement(context) {
 
             list
                 .append('li')
-                .text(t('info_panels.measurement.geometry') + ': ' + t('geometry.' + geometry));
+                .text(t('info_panels.measurement.geometry') + ':')
+                .append('span')
+                .text(t('geometry.' + geometry));
 
             list
                 .append('li')
-                .text(centerLabel + ': ' +
+                .text(centerLabel + ':')
+                .append('span')
+                .text(
                     center[1].toFixed(OSM_PRECISION) + ', ' + center[0].toFixed(OSM_PRECISION)
                 );
         }
diff --git a/modules/ui/source_switch.js b/modules/ui/source_switch.js
index 475cd4801..fe54f5a67 100644
--- a/modules/ui/source_switch.js
+++ b/modules/ui/source_switch.js
@@ -13,22 +13,28 @@ export function uiSourceSwitch(context) {
 
     function click() {
         d3_event.preventDefault();
+
+        var osm = context.connection();
+        if (!osm) return;
+
         if (context.inIntro()) return;
 
         if (context.history().hasChanges() &&
             !window.confirm(t('source_switch.lose_changes'))) return;
 
-        var live = d3_select(this)
+        var isLive = d3_select(this)
             .classed('live');
 
-        context.history().clearSaved();
-        context.connection().switch(live ? keys[1] : keys[0]);
+        isLive = !isLive;
         context.enter(modeBrowse(context));
-        context.flush();
+        context.history().clearSaved();          // remove saved history
+        context.flush();                         // remove stored data
 
         d3_select(this)
-            .text(live ? t('source_switch.dev') : t('source_switch.live'))
-            .classed('live', !live);
+            .text(isLive ? t('source_switch.live') : t('source_switch.dev'))
+            .classed('live', isLive);
+
+        osm.switch(isLive ? keys[0] : keys[1]);  // switch connection (warning: dispatches 'change' event)
     }
 
     var sourceSwitch = function(selection) {
diff --git a/modules/ui/status.js b/modules/ui/status.js
index ec758011c..0dc62b4c2 100644
--- a/modules/ui/status.js
+++ b/modules/ui/status.js
@@ -16,7 +16,12 @@ export function uiStatus(context) {
                 selection.html('');
 
                 if (err) {
-                    if (apiStatus === 'rateLimited') {
+                    if (apiStatus === 'connectionSwitched') {
+                        // if the connection was just switched, we can't rely on
+                        // the status (we're getting the status of the previous api)
+                        return;
+
+                    } else if (apiStatus === 'rateLimited') {
                         selection
                             .text(t('status.rateLimit'))
                             .append('a')
diff --git a/modules/util/idle_worker.js b/modules/util/idle_worker.js
index 2a5cc5cfb..5e75ef324 100644
--- a/modules/util/idle_worker.js
+++ b/modules/util/idle_worker.js
@@ -1,27 +1,34 @@
 export function utilIdleWorker(tasks, processor, callback) {
-    var processed = [];
-    var currentPos = 0;
-    var totalTasks = tasks.length;
-
-    function worker(deadline) {
-        while (deadline.timeRemaining() > 0 && currentPos < totalTasks) {
-            var result = processor(tasks[currentPos]);
-
-            // if falsy dont add to the processed list
-            if (result) processed.push(result);
-            currentPos++;
-        }
-
-        // more tasks are left, we might need more idleCallbacks
-        if (currentPos < totalTasks) {
-            return window.requestIdleCallback(function(deadline) {worker(deadline);});
-        }
-
-        // tasks are completed
-        return callback(processed);
+    var results = [], result;
+    for (var i = 0; i < tasks.length; i++) {
+        result = processor(tasks[i]);
+        if (result) results.push(result);
     }
+    callback(results);
 
-    window.requestIdleCallback(function(deadline) {worker(deadline);});
+    // var processed = [];
+    // var currentPos = 0;
+    // var totalTasks = tasks.length;
+
+    // function worker(deadline) {
+    //     while (deadline.timeRemaining() > 0 && currentPos < totalTasks) {
+    //         var result = processor(tasks[currentPos]);
+
+    //         // if falsy dont add to the processed list
+    //         if (result) processed.push(result);
+    //         currentPos++;
+    //     }
+
+    //     // more tasks are left, we might need more idleCallbacks
+    //     if (currentPos < totalTasks) {
+    //         return window.requestIdleCallback(function(deadline) {worker(deadline);});
+    //     }
+
+    //     // tasks are completed
+    //     return callback(processed);
+    // }
+
+    // window.requestIdleCallback(function(deadline) {worker(deadline);});
 }
 
 // shim
diff --git a/modules/util/util.js b/modules/util/util.js
index c9a22fa43..5c93b5c9c 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -255,9 +255,11 @@ export function utilFunctor(value) {
 
 
 export function utilNoAuto(selection) {
+    var isText = (selection.size() && selection.node().tagName.toLowerCase() === 'textarea');
+
     return selection
         .attr('autocomplete', 'off')
         .attr('autocorrect', 'off')
         .attr('autocapitalize', 'off')
-        .attr('spellcheck', 'false');
+        .attr('spellcheck', isText ? 'true' : 'false');
 }
diff --git a/package.json b/package.json
index 186d3feaf..7fbecbb29 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "2.4.3",
+  "version": "2.5.1",
   "description": "A friendly editor for OpenStreetMap",
   "main": "iD.js",
   "repository": "openstreetmap/iD",
@@ -30,20 +30,20 @@
     "@mapbox/togeojson": "0.16.0",
     "diacritics": "1.3.0",
     "lodash-es": "4.17.4",
-    "marked": "0.3.6",
+    "marked": "0.3.9",
     "node-diff3": "bhousel/node-diff3.git#v0.1.0",
     "osm-auth": "1.0.2",
-    "rbush": "2.0.1",
+    "rbush": "2.0.2",
     "wmf-sitematrix": "0.1.4"
   },
   "devDependencies": {
     "@mapbox/maki": "^4.0.0",
-    "@std/esm": "^0.12.0",
+    "@std/esm": "^0.18.0",
     "brfs": "1.4.3",
     "chai": "^4.1.0",
     "colors": "^1.1.2",
     "concat-files": "^0.1.1",
-    "d3": "4.11.0",
+    "d3": "4.12.2",
     "ecstatic": "^3.0.0",
     "editor-layer-index": "osmlab/editor-layer-index.git#gh-pages",
     "eslint": "^4.3.0",
@@ -53,7 +53,7 @@
     "js-yaml": "^3.9.0",
     "json-stable-stringify": "^1.0.1",
     "jsonschema": "^1.1.0",
-    "mapillary-js": "2.9.0",
+    "mapillary-js": "2.10.1",
     "minimist": "^1.2.0",
     "mocha": "^4.0.0",
     "mocha-phantomjs-core": "^2.1.0",
@@ -61,8 +61,8 @@
     "npm-run-all": "^4.0.0",
     "phantomjs-prebuilt": "~2.1.11",
     "request": "^2.81.0",
-    "rollup": "0.45.2",
-    "rollup-plugin-commonjs": "8.2.5",
+    "rollup": "0.53.0",
+    "rollup-plugin-commonjs": "8.2.6",
     "rollup-plugin-includepaths": "0.2.2",
     "rollup-plugin-json": "2.2.0",
     "rollup-plugin-node-resolve": "3.0.0",
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index f49b6df5f..e7a182af0 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -31,6 +31,7 @@
     "icon-up":                  { "viewBox": "580 0 20 20" },
     "icon-down":                { "viewBox": "600 0 20 20" },
     "icon-more":                { "viewBox": "620 0 20 20" },
+    "icon-no":                  { "viewBox": "640 0 20 20" },
 
     "icon-alert-shape":               { "fill": "currentColor" },
     "icon-point-shape":               { "fill": "currentColor" },
@@ -68,6 +69,7 @@
     "icon-up-shape":                  { "fill": "currentColor" },
     "icon-down-shape":                { "fill": "currentColor" },
     "icon-more-shape":                { "fill": "currentColor" },
+    "icon-no-shape":                  { "fill": "currentColor" },
 
     "highway-motorway":         { "viewBox": "0 20 60 60" },
     "highway-trunk":            { "viewBox": "60 20 60 60" },
@@ -218,11 +220,15 @@
 
     "ferry-line":            { "viewBox": "660 140 60 60" },
     "pipeline-line":         { "viewBox": "720 140 60 60" },
+    "piste-line":            { "viewBox": "780 140 60 60" },
 
     "ferry-line-dashes":        { "fill": "inherit" },
     "ferry-line-stroke1":       { "fill": "currentColor" },
     "ferry-line-stroke2":       { "fill": "currentColor" },
     "pipeline-line-stroke":     { "fill": "currentColor" },
+    "piste-line-dashes":        { "fill": "inherit" },
+    "piste-line-stroke1":       { "fill": "currentColor" },
+    "piste-line-stroke2":       { "fill": "currentColor" },
 
     "relation":                 { "viewBox": "0 200 60 60" },
     "boundary":                 { "viewBox": "60 200 60 60" },
@@ -240,6 +246,10 @@
     "route-power":              { "viewBox": "780 200 60 60" },
     "route-water":              { "viewBox": "840 200 60 60" },
     "route-master":             { "viewBox": "0 260 60 60" },
+    "route-light-rail":         { "viewBox": "600 260 60 60" },
+    "route-piste":              { "viewBox": "660 260 60 60" },
+    "route-line":               { "viewBox": "720 260 60 60" },
+    "route-subway":             { "viewBox": "780 260 60 60" },
 
     "route-bicycle-stroke":      { "fill": "currentColor" },
     "route-foot-stroke":         { "fill": "currentColor" },
@@ -247,6 +257,7 @@
     "route-ferry-stroke":        { "fill": "currentColor" },
     "route-water-stroke1":       { "fill": "currentColor" },
     "route-water-stroke2":       { "fill": "currentColor" },
+    "route-piste-stroke":        { "fill": "currentColor" },
 
     "restriction-no-straight-on":   { "viewBox": "60 260 60 60" },
     "restriction-no-u-turn":        { "viewBox": "120 260 60 60" },
@@ -278,6 +289,11 @@
     "poi-shintoist":            { "viewBox": "640 320 15 15" },
     "poi-buffer-stop":          { "viewBox": "655 320 15 15" },
     "poi-railway-signals":      { "viewBox": "670 320 15 15" },
+    "poi-monorail":             { "viewBox": "685 320 15 15" },
+    "poi-tram":                 { "viewBox": "700 320 15 15" },
+    "poi-subway":               { "viewBox": "715 320 15 15" },
+    "poi-light-rail":           { "viewBox": "730 320 15 15" },
+    "poi-trolleybus":           { "viewBox": "745 320 15 15" },
 
     "poi-foot-shape":              { "fill": "currentColor" },
     "poi-traffic-signals-shape":   { "fill": "currentColor" },
@@ -298,6 +314,11 @@
     "poi-shintoist-shape":         { "fill": "currentColor" },
     "poi-buffer-stop-shape":       { "fill": "currentColor" },
     "poi-railway-signals-shape":   { "fill": "currentColor" },
+    "poi-monorail-shape":          { "fill": "currentColor" },
+    "poi-tram-shape":              { "fill": "currentColor" },
+    "poi-subway-shape":            { "fill": "currentColor" },
+    "poi-light-rail-shape":        { "fill": "currentColor" },
+    "poi-trolleybus-shape":        { "fill": "currentColor" },
 
     "poi-vending-machine":      { "viewBox": "400 335 15 15" },
     "poi-dice":                 { "viewBox": "415 335 15 15" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index fbae92815..d51f02054 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index f28cbeec3..1fffde658 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -372,6 +372,21 @@
     <g id="poi-vending-machine">
       <path d="M412,335 C412.552,335 413,335.448 413,336 L413,349 C413,349.552 412.552,350 412,350 L403,350 C402.448,350 402,349.552 402,349 L402,336 C402,335.448 402.448,335 403,335 L412,335 z M409,346 L406,346 L406,347.5 L409,347.5 L409,346 z M409,341 L408,341 L408,342 L409,342 L409,341 z M405,341 L404,341 L404,342 L405,342 L405,341 z M407,341 L406,341 L406,342 L407,342 L407,341 z M411,341 L410,341 L410,342 L411,342 L411,341 z M411,339 L410,339 L410,340 L411,340 L411,339 z M407,339 L406,339 L406,340 L407,340 L407,339 z M405,339 L404,339 L404,340 L405,340 L405,339 z M409,339 L408,339 L408,340 L409,340 L409,339 z M409,337 L408,337 L408,338 L409,338 L409,337 z M405,337 L404,337 L404,338 L405,338 L405,337 z M407,337 L406,337 L406,338 L407,338 L407,337 z M411,337 L410,337 L410,338 L411,338 L411,337 z" fill="#000000" id="poi-vending-machine-shape"/>
     </g>
+    <g id="poi-trolleybus">
+      <path d="M749.538,322 C748.385,322 747,322.595 747,324.197 L747,328.559 L747,331.6 C747,331.6 747,332.4 747.846,332.4 L747.846,333.2 C747.846,333.2 747.846,334 748.692,334 C749.538,334 749.538,333.2 749.538,333.2 L749.538,332.4 L755.462,332.4 L755.462,333.2 C755.462,333.2 755.462,334 756.308,334 C757.154,334 757.154,333.2 757.154,333.2 L757.154,332.4 C757.154,332.4 758,332.4 758,331.6 L758,324.197 C758,322.56 756.954,322 755.8,322 L749.538,322 z M749.75,323.2 L755.25,323.2 C755.367,323.2 755.462,323.289 755.462,323.4 C755.462,323.511 755.367,323.6 755.25,323.6 L749.75,323.6 C749.633,323.6 749.538,323.511 749.538,323.4 C749.538,323.289 749.633,323.2 749.75,323.2 z M748.692,324.4 L756.308,324.4 C757.154,324.4 757.154,325.173 757.154,325.173 L757.154,327.6 C757.154,327.6 757.154,328.4 756.308,328.4 L748.692,328.4 C747.846,328.4 747.846,327.6 747.846,327.6 L747.846,325.2 C747.846,325.2 747.846,324.4 748.692,324.4 z M748.692,330 C749.16,330 749.538,330.358 749.538,330.8 C749.538,331.242 749.16,331.6 748.692,331.6 C748.225,331.6 747.846,331.242 747.846,330.8 C747.846,330.358 748.225,330 748.692,330 z M756.308,330 C756.775,330 757.154,330.358 757.154,330.8 C757.154,331.242 756.775,331.6 756.308,331.6 C755.84,331.6 755.462,331.242 755.462,330.8 C755.462,330.358 755.84,330 756.308,330 z M755,320 L755,320.5 L753,320.5 L753,321.5 L752,321.5 L752,320.5 L750,320.5 L750,320 z" fill="#000000" id="poi-trolleybus-shape"/>
+    </g>
+    <g id="poi-light-rail">
+      <path d="M734.091,332.449 L735.606,332.449 L735.227,333.132 L739.773,333.132 L739.394,332.449 L740.909,332.449 L742.045,334.5 L740.53,334.5 L740.151,333.816 L734.849,333.816 L734.47,334.5 L732.955,334.5 L734.091,332.449 z M739.722,329.357 L738.611,330.234 L738.611,330.673 L740.833,330.673 L741.389,330.234 L741.389,329.357 L739.722,329.357 z M733.611,329.357 L733.611,330.234 L734.167,330.673 L736.389,330.673 L736.389,330.234 L735.278,329.357 L733.611,329.357 z M734.167,324.97 L733.611,325.409 L733.611,327.164 L735.278,327.164 L739.722,327.164 L741.389,327.164 L741.389,325.409 L740.833,324.97 L739.722,324.97 L735.278,324.97 L734.167,324.97 z M735.278,322.777 L735.278,323.654 L739.722,323.654 L739.722,322.777 L735.278,322.777 z M735.278,322.338 L739.722,322.338 L742.5,324.97 L742.5,331.112 L741.389,331.989 L733.611,331.989 L732.5,331.112 L732.5,324.97 L735.278,322.338 z M739.773,320.5 L739.773,320.96 L737.955,320.96 L737.955,321.879 L737.045,321.879 L737.045,320.96 L735.227,320.96 L735.227,320.5 z" fill="#000000" id="poi-light-rail-shape"/>
+    </g>
+    <g id="poi-subway">
+      <path d="M719.389,332.212 L720.724,332.212 L720.391,332.808 L724.395,332.808 L724.061,332.212 L725.396,332.212 L726.397,334 L725.062,334 L724.729,333.404 L720.057,333.404 L719.723,334 L718.388,334 L719.389,332.212 z M724.795,329.514 L723.995,330.28 L723.995,330.663 L725.596,330.663 L725.997,330.28 L725.997,329.514 L724.795,329.514 z M718.789,329.514 L718.789,330.28 L719.189,330.663 L720.791,330.663 L720.791,330.28 L719.99,329.514 L718.789,329.514 z M719.189,325.3 L718.789,325.683 L718.789,327.216 L719.99,327.982 L724.795,327.982 L725.997,327.216 L725.997,325.683 L725.596,325.3 L724.795,325.3 L719.99,325.3 L719.189,325.3 z M720.791,323.768 L720.791,324.534 L723.995,324.534 L723.995,323.768 L720.791,323.768 z M720.391,323.002 L724.395,323.002 L726.798,325.3 L726.798,331.046 L725.997,331.812 L718.789,331.812 L717.988,331.046 L717.988,325.3 L720.391,323.002 z M721.992,321 L722.793,321 L725.196,321 C727.171,321.329 728.8,322.201 728.8,324.604 L728.8,332.613 L727.599,332.212 L727.599,324.604 C727.599,323.002 726.397,322.201 725.196,322.201 L722.793,322.201 L721.992,322.201 L719.59,322.201 C718.388,322.201 717.187,323.002 717.187,324.604 L717.187,332.212 L715.986,332.613 L715.986,324.604 C715.986,322.201 717.587,321 719.59,321 z" fill="#000000" id="poi-subway-shape"/>
+    </g>
+    <g id="poi-tram">
+      <path d="M709.561,333.065 L710.288,335 L711.5,335 L710.773,333.065 z M704.212,333.065 L703.5,335 L704.712,335 L705.424,333.065 z M709.345,329.677 L708.483,330.645 L708.483,331.129 L710.207,331.129 L710.638,330.645 L710.638,329.677 L709.345,329.677 z M704.604,329.677 L704.604,330.645 L705.035,331.129 L706.759,331.129 L706.759,330.645 L705.897,329.677 L704.604,329.677 z M705.035,324.839 L704.604,325.323 L704.604,327.258 L705.897,327.258 L709.345,327.258 L710.638,327.258 L710.638,325.323 L710.207,324.839 L709.345,324.839 L705.897,324.839 L705.035,324.839 z M705.897,322.419 L705.897,323.387 L709.345,323.387 L709.345,322.419 L705.897,322.419 z M705.897,321.935 L709.345,321.935 L711.5,324.839 L711.5,331.613 L710.638,332.581 L704.604,332.581 L703.742,331.613 L703.742,324.839 L705.897,321.935 z M710.045,320 L710.045,320.484 L708.106,320.484 L708.106,321.452 L707.136,321.452 L707.136,320.484 L705.197,320.484 L705.197,320 z" fill="#000000" id="poi-tram-shape"/>
+    </g>
+    <g id="poi-monorail">
+      <path d="M689,332.014 L688,330.965 L688,324.147 L690.5,321 L694.5,321 L697,324.147 L697,330.965 L696,332.014 L694.5,332.014 L694.5,333.587 L693.5,333.587 L693.5,332.539 L693,332.014 L692,332.014 L691.5,332.539 L691.5,333.587 L690.5,333.587 L690.5,332.014 L689,332.014 z M696,328.343 L694,328.343 L693.5,329.392 L693.5,329.916 L695.5,329.916 L696,329.392 L696,328.343 z M691,328.343 L689,328.343 L689,329.392 L689.5,329.916 L691.5,329.916 L691.5,329.392 L691,328.343 z M695.5,324.147 L689.5,324.147 L689,324.671 L689,326.769 L696,326.769 L696,324.671 L695.5,324.147 z M694.5,321.524 L690.5,321.524 L690.5,322.573 L694.5,322.573 L694.5,321.524 z M693,332.539 L692,332.539 L692,334.112 L691,334.112 L691,334.636 L694,334.636 L694,334.112 L693,334.112 L693,332.539 z" fill="#000000" id="poi-monorail-shape"/>
+    </g>
     <g id="poi-railway-signals">
       <path d="M679.214,321.5 C680.476,321.5 681.5,322.533 681.5,323.808 L681.5,331.192 C681.5,332.466 680.477,333.5 679.214,333.5 L675.786,333.499 C674.523,333.5 673.5,332.466 673.5,331.192 L673.5,323.808 C673.5,322.533 674.523,321.5 675.786,321.5 L679.214,321.5 z M677.5,328.5 C676.672,328.5 676,329.172 676,330 C676,330.828 676.672,331.5 677.5,331.5 C678.328,331.5 679,330.828 679,330 C679,329.172 678.328,328.5 677.5,328.5 z M677.5,323.5 C676.672,323.5 676,324.172 676,325 C676,325.829 676.672,326.5 677.5,326.5 C678.328,326.5 679,325.829 679,325 C679,324.172 678.328,323.5 677.5,323.5 z" fill="#000000" id="poi-railway-signals-shape"/>
     </g>
@@ -462,108 +477,160 @@
       <path d="M330,274 C321.163,274 314,281.163 314,290 C314,298.837 321.163,306 330,306 C338.836,306 346,298.837 346,290 C346,281.163 338.836,274 330,274 z M330,278 L339,288 L333,288 L333,300.531 C332.047,300.832 331.051,301 330,301 C328.96,301 327.953,300.863 327,300.594 L327,288 L321,288 L330,278 z" fill="#58A9ED" id="path5016"/>
     </g>
     <g id="restriction-no-right-turn">
-      <g id="g4552">
-        <path d="M279,277 L279,283 L269,283 L267.344,283.812 L272.531,289 L279,289 L279,295 L289,286 z M263.25,286.75 L263,287 L261,290 L261,296.312 C262.434,298.355 264.536,299.899 267,300.594 L267,291 L267.25,290.75 z" fill="#989898" id="path4620"/>
-        <path d="M270,275 C261.71,275 255,281.71 255,290 C255,298.29 261.71,305 270,305 C277.973,305 284.482,298.787 284.969,290.938 L281.156,294.375 C280.803,295.268 280.355,296.101 279.812,296.875 L279.469,297.344 L263.062,280.938 L262.625,280.5 L263.125,280.156 C265.072,278.791 267.439,278 270,278 C273.08,278 275.874,279.183 278,281.094 L278,277.344 C275.68,275.874 272.952,275 270,275 z M260.531,282.625 L260.937,283.031 L276.937,299.031 L277.375,299.469 L276.875,299.812 C274.928,301.178 272.561,302 270,302 C263.378,302 258,296.621 258,290 C258,287.439 258.822,285.041 260.187,283.094 z" fill="#E06D5F" id="path4564"/>
-      </g>
+      <path d="M279,277 L279,283 L269,283 L267.344,283.812 L272.531,289 L279,289 L279,295 L289,286 z M263.25,286.75 L263,287 L261,290 L261,296.312 C262.434,298.355 264.536,299.899 267,300.594 L267,291 L267.25,290.75 z" fill="#989898" id="path4620"/>
+      <path d="M270,275 C261.71,275 255,281.71 255,290 C255,298.29 261.71,305 270,305 C277.973,305 284.482,298.787 284.969,290.938 L281.156,294.375 C280.803,295.268 280.355,296.101 279.812,296.875 L279.469,297.344 L263.062,280.938 L262.625,280.5 L263.125,280.156 C265.072,278.791 267.439,278 270,278 C273.08,278 275.874,279.183 278,281.094 L278,277.344 C275.68,275.874 272.952,275 270,275 z M260.531,282.625 L260.937,283.031 L276.937,299.031 L277.375,299.469 L276.875,299.812 C274.928,301.178 272.561,302 270,302 C263.378,302 258,296.621 258,290 C258,287.439 258.822,285.041 260.187,283.094 z" fill="#E06D5F" id="path4564"/>
     </g>
     <g id="restriction-no-left-turn">
-      <g id="g4600">
-        <path d="M200,277 L190,286 L200,295 L200,289 L205.5,289 L200,283.5 L200,277 z M206.531,283 L218,294.469 L218,291 L216,287 L214,285 L210,283 L206.531,283 z M212,295.5 L212,300.812 C213.354,300.53 214.611,299.958 215.75,299.25 L212,295.5 z" fill="#989898" id="path4604"/>
-        <path d="M210,275 C206.612,275 203.51,276.14 201,278.031 L201,283.094 L217.375,299.469 L216.875,299.812 C214.928,301.178 212.561,302 210,302 C205.527,302 201.626,299.541 199.562,295.906 L195.125,291.938 C196.076,299.309 202.368,305 210,305 C218.29,305 225,298.29 225,290 C225,281.71 218.29,275 210,275 z M210,278 C216.621,278 222,283.379 222,290 C222,292.561 221.178,294.928 219.812,296.875 L219.469,297.344 L202.625,280.5 L203.125,280.156 C205.072,278.791 207.439,278 210,278 z" fill="#E06D5F" id="path4612"/>
-      </g>
+      <path d="M200,277 L190,286 L200,295 L200,289 L205.5,289 L200,283.5 L200,277 z M206.531,283 L218,294.469 L218,291 L216,287 L214,285 L210,283 L206.531,283 z M212,295.5 L212,300.812 C213.354,300.53 214.611,299.958 215.75,299.25 L212,295.5 z" fill="#989898" id="path4604"/>
+      <path d="M210,275 C206.612,275 203.51,276.14 201,278.031 L201,283.094 L217.375,299.469 L216.875,299.812 C214.928,301.178 212.561,302 210,302 C205.527,302 201.626,299.541 199.562,295.906 L195.125,291.938 C196.076,299.309 202.368,305 210,305 C218.29,305 225,298.29 225,290 C225,281.71 218.29,275 210,275 z M210,278 C216.621,278 222,283.379 222,290 C222,292.561 221.178,294.928 219.812,296.875 L219.469,297.344 L202.625,280.5 L203.125,280.156 C205.072,278.791 207.439,278 210,278 z" fill="#E06D5F" id="path4612"/>
     </g>
     <g id="restriction-no-u-turn">
       <path d="M149,282 L146.687,283.156 L151.531,288 L155,288 L157,290 L157,296 L151,296 L160,306 L169,296 L163,296 L163,290 L161.719,287.406 L161,286 L159,284 L155,282 z M142.844,286.344 L141,290 L141,296.312 C142.343,298.225 144.267,299.72 146.531,300.469 L147,300 L147,290.5 z" fill="#989898" id="path4860"/>
       <path d="M150,275 C141.71,275 135,281.71 135,290 C135,298.29 141.71,305 150,305 C152.307,305 154.486,304.46 156.437,303.531 L154.312,301.156 C152.974,301.679 151.522,302 150,302 C143.378,302 138,296.621 138,290 C138,287.439 138.822,285.041 140.187,283.094 L140.531,282.625 L140.937,283.031 L152.906,295 L156,295 L156,293.875 L143.062,280.938 L142.625,280.5 L143.125,280.156 C145.072,278.791 147.439,278 150,278 C154.385,278 158.219,280.359 160.312,283.875 L161.812,285.406 L164,289.75 L164,295 L164.125,295 C164.677,293.436 165,291.754 165,290 C165,281.71 158.29,275 150,275 z" fill="#E06D5F" id="path4852"/>
     </g>
     <g id="restriction-no-straight-on">
-      <g id="g4998">
-        <path d="M90,275 L81,285 L88.531,285 L93,289.469 L93,285 L99,285 L90,275 z M87,290.5 L87,300.594 C87.953,300.863 88.96,301 90,301 C91.051,301 92.047,300.832 93,300.531 L93,296.5 L87,290.5 z" fill="#989898" id="path4995"/>
-        <path d="M88.469,275.062 C80.901,275.83 75,282.228 75,290 C75,298.29 81.71,305 90,305 C98.29,305 105,298.29 105,290 C105,282.186 99.034,275.773 91.406,275.062 L95.094,279.156 C99.163,281.078 102,285.206 102,290 C102,292.561 101.178,294.928 99.812,296.875 L99.469,297.344 L99.062,296.938 L88.125,286 L87,286 L83.906,286 L96.938,299.031 L97.375,299.469 L96.875,299.812 C94.928,301.178 92.561,302 90,302 C83.379,302 78,296.621 78,290 C78,287.439 78.822,285.041 80.188,283.094 L80.531,282.625 L80.938,283.031 L81.188,283.281 L83.188,281.062 L83.062,280.938 L82.625,280.5 L83.125,280.156 C83.688,279.762 84.279,279.418 84.906,279.125 L88.594,275.062 C88.553,275.066 88.51,275.058 88.469,275.062 z" fill="#E06D5F" id="path4989"/>
+      <path d="M90,275 L81,285 L88.531,285 L93,289.469 L93,285 L99,285 L90,275 z M87,290.5 L87,300.594 C87.953,300.863 88.96,301 90,301 C91.051,301 92.047,300.832 93,300.531 L93,296.5 L87,290.5 z" fill="#989898" id="path4995"/>
+      <path d="M88.469,275.062 C80.901,275.83 75,282.228 75,290 C75,298.29 81.71,305 90,305 C98.29,305 105,298.29 105,290 C105,282.186 99.034,275.773 91.406,275.062 L95.094,279.156 C99.163,281.078 102,285.206 102,290 C102,292.561 101.178,294.928 99.812,296.875 L99.469,297.344 L99.062,296.938 L88.125,286 L87,286 L83.906,286 L96.938,299.031 L97.375,299.469 L96.875,299.812 C94.928,301.178 92.561,302 90,302 C83.379,302 78,296.621 78,290 C78,287.439 78.822,285.041 80.188,283.094 L80.531,282.625 L80.938,283.031 L81.188,283.281 L83.188,281.062 L83.062,280.938 L82.625,280.5 L83.125,280.156 C83.688,279.762 84.279,279.418 84.906,279.125 L88.594,275.062 C88.553,275.066 88.51,275.058 88.469,275.062 z" fill="#E06D5F" id="path4989"/>
+    </g>
+    <g id="route-subway">
+      <g>
+        <path d="M816.969,305.469 L814.031,309.531 L803.031,301.531 L805.969,297.469 z" fill="#46682F"/>
+        <path d="M814.125,305.406 L816.875,309.594 L828.875,301.594 L826.125,297.406 z" fill="#70372F"/>
+        <path d="M791.125,305.419 L793.875,309.575 L805.875,301.575 L803.125,297.419 z" fill="#2C5476"/>
+        <path d="M816.375,306.281 L814.625,308.719 L803.625,300.719 L805.375,298.281 z" fill="#8CD05F"/>
+        <path d="M814.656,306.25 L816.344,308.75 L828.344,300.75 L826.656,298.25 z" fill="#E06D5F"/>
+        <path d="M791.656,306.263 L793.344,308.763 L805.344,300.763 L803.656,298.263 z" fill="#58A9ED"/>
+        <path d="M830,299.5 C830,300.881 828.881,302 827.5,302 C826.119,302 825,300.881 825,299.5 C825,298.119 826.119,297 827.5,297 C828.881,297 830,298.119 830,299.5 z" fill="#70372F"/>
+        <path d="M795,307.5 C795,308.881 793.881,310 792.5,310 C791.119,310 790,308.881 790,307.5 C790,306.119 791.119,305 792.5,305 C793.881,305 795,306.119 795,307.5 z" fill="#2C5476"/>
+        <path d="M807,299.5 C807,300.881 805.881,302 804.5,302 C803.119,302 802,300.881 802,299.5 C802,298.119 803.119,297 804.5,297 C805.881,297 807,298.119 807,299.5 z" fill="#395E53"/>
+        <path d="M818,307.5 C818,308.881 816.881,310 815.5,310 C814.119,310 813,308.881 813,307.5 C813,306.119 814.119,305 815.5,305 C816.881,305 818,306.119 818,307.5 z" fill="#5B502F"/>
+        <path d="M829,299.5 C829,300.328 828.328,301 827.5,301 C826.672,301 826,300.328 826,299.5 C826,298.671 826.672,298 827.5,298 C828.328,298 829,298.671 829,299.5 z" fill="#FFFFFF"/>
+        <path d="M817,307.5 C817,308.328 816.328,309 815.5,309 C814.672,309 814,308.328 814,307.5 C814,306.671 814.672,306 815.5,306 C816.328,306 817,306.671 817,307.5 z" fill="#FFFFFF"/>
+        <path d="M806,299.5 C806,300.328 805.328,301 804.5,301 C803.672,301 803,300.328 803,299.5 C803,298.671 803.672,298 804.5,298 C805.328,298 806,298.671 806,299.5 z" fill="#FFFFFF"/>
+        <path d="M794,307.5 C794,308.328 793.328,309 792.5,309 C791.672,309 791,308.328 791,307.5 C791,306.671 791.672,306 792.5,306 C793.328,306 794,306.671 794,307.5 z" fill="#FFFFFF"/>
+      </g>
+      <g>
+        <path d="M802.5,291 L805.833,291 L805,292.488 L815,292.488 L814.167,291 L817.5,291 L820,295.464 L816.667,295.464 L815.833,293.976 L804.167,293.976 L803.333,295.464 L800,295.464 L802.5,291 z" fill="#989898"/>
+        <path d="M805,268 L799,273.739 L799,288.087 L801,290 L819,290 L821,288.087 L821,273.739 L815,268 L805,268 z M806,269.913 L814,269.913 L814,271.826 L806,271.826 L806,269.913 z M802,273.739 L804,273.739 L816,273.739 L818,273.739 L819,274.696 L819,278.522 L816,280.435 L804,280.435 L801,278.522 L801,274.696 L802,273.739 z M801,284.261 L804,284.261 L806,286.174 L806,287.13 L802,287.13 L801,286.174 L801,284.261 z M816,284.261 L819,284.261 L819,286.174 L818,287.13 L814,287.13 L814,286.174 L816,284.261 z" fill="#989898"/>
+        <path d="M803,263 C798,263 794,266 794,272 L794,292 L797,291 L797,272 C797,268 800,266 803,266 L809,266 L811,266 L817,266 C820,266 823,268 823,272 L823,291 L826,292 L826,272 C826,266 821.932,263.822 817,263 L811,263 L809,263 z" fill="#B5B5B5"/>
+      </g>
+    </g>
+    <g id="route-line">
+      <g>
+        <path d="M756.969,305.469 L754.031,309.531 L743.031,301.531 L745.969,297.469 z" fill="#46682F"/>
+        <path d="M754.125,305.406 L756.875,309.594 L768.875,301.594 L766.125,297.406 z" fill="#70372F"/>
+        <path d="M731.125,305.419 L733.875,309.575 L745.875,301.575 L743.125,297.419 z" fill="#2C5476"/>
+        <path d="M756.375,306.281 L754.625,308.719 L743.625,300.719 L745.375,298.281 z" fill="#8CD05F"/>
+        <path d="M754.656,306.25 L756.344,308.75 L768.344,300.75 L766.656,298.25 z" fill="#E06D5F"/>
+        <path d="M731.656,306.263 L733.344,308.763 L745.344,300.763 L743.656,298.263 z" fill="#58A9ED"/>
+        <path d="M770,299.5 C770,300.881 768.881,302 767.5,302 C766.119,302 765,300.881 765,299.5 C765,298.119 766.119,297 767.5,297 C768.881,297 770,298.119 770,299.5 z" fill="#70372F"/>
+        <path d="M735,307.5 C735,308.881 733.881,310 732.5,310 C731.119,310 730,308.881 730,307.5 C730,306.119 731.119,305 732.5,305 C733.881,305 735,306.119 735,307.5 z" fill="#2C5476"/>
+        <path d="M747,299.5 C747,300.881 745.881,302 744.5,302 C743.119,302 742,300.881 742,299.5 C742,298.119 743.119,297 744.5,297 C745.881,297 747,298.119 747,299.5 z" fill="#395E53"/>
+        <path d="M758,307.5 C758,308.881 756.881,310 755.5,310 C754.119,310 753,308.881 753,307.5 C753,306.119 754.119,305 755.5,305 C756.881,305 758,306.119 758,307.5 z" fill="#5B502F"/>
+        <path d="M769,299.5 C769,300.328 768.328,301 767.5,301 C766.672,301 766,300.328 766,299.5 C766,298.672 766.672,298 767.5,298 C768.328,298 769,298.672 769,299.5 z" fill="#FFFFFF"/>
+        <path d="M757,307.5 C757,308.328 756.328,309 755.5,309 C754.672,309 754,308.328 754,307.5 C754,306.672 754.672,306 755.5,306 C756.328,306 757,306.672 757,307.5 z" fill="#FFFFFF"/>
+        <path d="M746,299.5 C746,300.328 745.328,301 744.5,301 C743.672,301 743,300.328 743,299.5 C743,298.672 743.672,298 744.5,298 C745.328,298 746,298.672 746,299.5 z" fill="#FFFFFF"/>
+        <path d="M734,307.5 C734,308.328 733.328,309 732.5,309 C731.672,309 731,308.328 731,307.5 C731,306.672 731.672,306 732.5,306 C733.328,306 734,306.672 734,307.5 z" fill="#FFFFFF"/>
+      </g>
+      <path d="M742,291 L745,280 L748,269 L752,269 L755,280 L758,291 z" fill="#989898" id="route-line-stroke"/>
+    </g>
+    <g id="route-piste">
+      <g>
+        <path d="M696.969,305.469 L694.031,309.531 L683.031,301.531 L685.969,297.469 z" fill="#46682F"/>
+        <path d="M694.125,305.406 L696.875,309.594 L708.875,301.594 L706.125,297.406 z" fill="#70372F"/>
+        <path d="M671.125,305.419 L673.875,309.575 L685.875,301.575 L683.125,297.419 z" fill="#2C5476"/>
+        <path d="M696.375,306.281 L694.625,308.719 L683.625,300.719 L685.375,298.281 z" fill="#8CD05F"/>
+        <path d="M694.656,306.25 L696.344,308.75 L708.344,300.75 L706.656,298.25 z" fill="#E06D5F"/>
+        <path d="M671.656,306.263 L673.344,308.763 L685.344,300.763 L683.656,298.263 z" fill="#58A9ED"/>
+        <path d="M710,299.5 C710,300.881 708.881,302 707.5,302 C706.119,302 705,300.881 705,299.5 C705,298.119 706.119,297 707.5,297 C708.881,297 710,298.119 710,299.5 z" fill="#70372F"/>
+        <path d="M675,307.5 C675,308.881 673.881,310 672.5,310 C671.119,310 670,308.881 670,307.5 C670,306.119 671.119,305 672.5,305 C673.881,305 675,306.119 675,307.5 z" fill="#2C5476"/>
+        <path d="M687,299.5 C687,300.881 685.881,302 684.5,302 C683.119,302 682,300.881 682,299.5 C682,298.119 683.119,297 684.5,297 C685.881,297 687,298.119 687,299.5 z" fill="#395E53"/>
+        <path d="M698,307.5 C698,308.881 696.881,310 695.5,310 C694.119,310 693,308.881 693,307.5 C693,306.119 694.119,305 695.5,305 C696.881,305 698,306.119 698,307.5 z" fill="#5B502F"/>
+        <path d="M709,299.5 C709,300.328 708.328,301 707.5,301 C706.672,301 706,300.328 706,299.5 C706,298.671 706.672,298 707.5,298 C708.328,298 709,298.671 709,299.5 z" fill="#FFFFFF"/>
+        <path d="M697,307.5 C697,308.328 696.328,309 695.5,309 C694.672,309 694,308.328 694,307.5 C694,306.671 694.672,306 695.5,306 C696.328,306 697,306.671 697,307.5 z" fill="#FFFFFF"/>
+        <path d="M686,299.5 C686,300.328 685.328,301 684.5,301 C683.672,301 683,300.328 683,299.5 C683,298.671 683.672,298 684.5,298 C685.328,298 686,298.671 686,299.5 z" fill="#FFFFFF"/>
+        <path d="M674,307.5 C674,308.328 673.328,309 672.5,309 C671.672,309 671,308.328 671,307.5 C671,306.671 671.672,306 672.5,306 C673.328,306 674,306.671 674,307.5 z" fill="#FFFFFF"/>
+      </g>
+      <path d="M701.884,278.834 C701.884,280.169 700.802,281.251 699.467,281.251 C698.132,281.251 697.05,280.169 697.05,278.834 C697.05,277.499 698.132,276.417 699.467,276.417 C700.802,276.417 701.884,277.499 701.884,278.834 z M699.821,290.742 C699.721,290.549 699.486,290.47 699.29,290.564 C698.187,291.24 696.839,291.388 695.616,290.967 L685.416,285.859 L689.799,283.668 L689.799,278.834 L692.216,280.042 L692.216,284.876 L694.633,286.085 L697.05,284.876 L694.633,283.668 L694.633,276.417 L689.799,274 L687.382,275.208 L687.382,282.459 L682.999,284.651 L678.697,282.508 C678.497,282.41 678.255,282.493 678.157,282.693 C678.059,282.893 678.142,283.135 678.343,283.233 L695.261,291.692 C695.77,291.91 696.32,292.014 696.873,291.998 C697.839,291.982 698.788,291.739 699.644,291.289 C699.843,291.19 699.925,290.949 699.826,290.749 C699.824,290.747 699.823,290.744 699.821,290.742 z" fill="#000000" id="route-piste-stroke"/>
+    </g>
+    <g id="route-light-rail">
+      <g>
+        <path d="M636.969,305.469 L634.031,309.531 L623.031,301.531 L625.969,297.469 z" fill="#46682F"/>
+        <path d="M634.125,305.406 L636.875,309.594 L648.875,301.594 L646.125,297.406 z" fill="#70372F"/>
+        <path d="M611.125,305.419 L613.875,309.575 L625.875,301.575 L623.125,297.419 z" fill="#2C5476"/>
+        <path d="M636.375,306.281 L634.625,308.719 L623.625,300.719 L625.375,298.281 z" fill="#8CD05F"/>
+        <path d="M634.656,306.25 L636.344,308.75 L648.344,300.75 L646.656,298.25 z" fill="#E06D5F"/>
+        <path d="M611.656,306.263 L613.344,308.763 L625.344,300.763 L623.656,298.263 z" fill="#58A9ED"/>
+        <path d="M650,299.5 C650,300.881 648.881,302 647.5,302 C646.119,302 645,300.881 645,299.5 C645,298.119 646.119,297 647.5,297 C648.881,297 650,298.119 650,299.5 z" fill="#70372F"/>
+        <path d="M615,307.5 C615,308.881 613.881,310 612.5,310 C611.119,310 610,308.881 610,307.5 C610,306.119 611.119,305 612.5,305 C613.881,305 615,306.119 615,307.5 z" fill="#2C5476"/>
+        <path d="M627,299.5 C627,300.881 625.881,302 624.5,302 C623.119,302 622,300.881 622,299.5 C622,298.119 623.119,297 624.5,297 C625.881,297 627,298.119 627,299.5 z" fill="#395E53"/>
+        <path d="M638,307.5 C638,308.881 636.881,310 635.5,310 C634.119,310 633,308.881 633,307.5 C633,306.119 634.119,305 635.5,305 C636.881,305 638,306.119 638,307.5 z" fill="#5B502F"/>
+        <path d="M649,299.5 C649,300.328 648.328,301 647.5,301 C646.672,301 646,300.328 646,299.5 C646,298.672 646.672,298 647.5,298 C648.328,298 649,298.672 649,299.5 z" fill="#FFFFFF"/>
+        <path d="M637,307.5 C637,308.328 636.328,309 635.5,309 C634.672,309 634,308.328 634,307.5 C634,306.672 634.672,306 635.5,306 C636.328,306 637,306.672 637,307.5 z" fill="#FFFFFF"/>
+        <path d="M626,299.5 C626,300.328 625.328,301 624.5,301 C623.672,301 623,300.328 623,299.5 C623,298.672 623.672,298 624.5,298 C625.328,298 626,298.672 626,299.5 z" fill="#FFFFFF"/>
+        <path d="M614,307.5 C614,308.328 613.328,309 612.5,309 C611.672,309 611,308.328 611,307.5 C611,306.672 611.672,306 612.5,306 C613.328,306 614,306.672 614,307.5 z" fill="#FFFFFF"/>
+      </g>
+      <g>
+        <path d="M622.5,291 L625.833,291 L625,292.488 L635,292.488 L634.167,291 L637.5,291 L640,295.464 L636.667,295.464 L635.833,293.976 L624.167,293.976 L623.333,295.464 L620,295.464 L622.5,291 z" fill="#989898"/>
+        <path d="M625.111,269 L619,274.727 L619,288.091 L621.444,290 L638.556,290 L641,288.091 L641,274.727 L634.889,269 L625.111,269 z M625.111,269.955 L634.889,269.955 L634.889,271.864 L625.111,271.864 L625.111,269.955 z M622.667,274.727 L625.111,274.727 L634.889,274.727 L637.333,274.727 L638.556,275.682 L638.556,279.5 L634.889,279.5 L625.111,279.5 L621.444,279.5 L621.444,275.682 L622.667,274.727 z M621.444,284.273 L625.111,284.273 L627.556,286.182 L627.556,287.136 L622.667,287.136 L621.444,286.182 L621.444,284.273 z M634.889,284.273 L638.556,284.273 L638.556,286.182 L637.333,287.136 L632.444,287.136 L632.444,286.182 L634.889,284.273 z" fill="#989898"/>
+        <path d="M625,265 L625,266 L629,266 L629,268 L631,268 L631,266 L635,266 L635,265 z" fill="#989898"/>
       </g>
     </g>
     <g id="route-master">
-      <g id="g3425">
-        <g id="g3427">
-          <path d="M36.969,305.469 L34.031,309.531 L23.031,301.531 L25.969,297.469 z" fill="#46682F" id="path3429"/>
-          <path d="M34.125,305.406 L36.875,309.594 L48.875,301.594 L46.125,297.406 z" fill="#70372F" id="path3431"/>
-          <path d="M11.125,305.419 L13.875,309.575 L25.875,301.575 L23.125,297.419 z" fill="#2C5476" id="path3433"/>
-        </g>
-        <path d="M36.375,306.281 L34.625,308.719 L23.625,300.719 L25.375,298.281 z" fill="#8CD05F" id="path3437"/>
-        <path d="M34.656,306.25 L36.344,308.75 L48.344,300.75 L46.656,298.25 z" fill="#E06D5F" id="path3441"/>
-        <path d="M11.656,306.263 L13.344,308.763 L25.344,300.763 L23.656,298.263 z" fill="#58A9ED" id="path3443"/>
-        <path d="M50,299.5 C50,300.881 48.881,302 47.5,302 C46.119,302 45,300.881 45,299.5 C45,298.119 46.119,297 47.5,297 C48.881,297 50,298.119 50,299.5 z" fill="#70372F" id="path3445"/>
-        <path d="M15,307.5 C15,308.881 13.881,310 12.5,310 C11.119,310 10,308.881 10,307.5 C10,306.119 11.119,305 12.5,305 C13.881,305 15,306.119 15,307.5 z" fill="#2C5476" id="path3447"/>
-        <path d="M27,299.5 C27,300.881 25.881,302 24.5,302 C23.119,302 22,300.881 22,299.5 C22,298.119 23.119,297 24.5,297 C25.881,297 27,298.119 27,299.5 z" fill="#395E53" id="path3449"/>
-        <path d="M38,307.5 C38,308.881 36.881,310 35.5,310 C34.119,310 33,308.881 33,307.5 C33,306.119 34.119,305 35.5,305 C36.881,305 38,306.119 38,307.5 z" fill="#5B502F" id="path3451"/>
-        <path d="M49,299.5 C49,300.328 48.328,301 47.5,301 C46.672,301 46,300.328 46,299.5 C46,298.672 46.672,298 47.5,298 C48.328,298 49,298.672 49,299.5 z" fill="#FFFFFF" id="path3453"/>
-        <path d="M37,307.5 C37,308.328 36.328,309 35.5,309 C34.672,309 34,308.328 34,307.5 C34,306.672 34.672,306 35.5,306 C36.328,306 37,306.672 37,307.5 z" fill="#FFFFFF" id="path3455"/>
-        <path d="M26,299.5 C26,300.328 25.328,301 24.5,301 C23.672,301 23,300.328 23,299.5 C23,298.672 23.672,298 24.5,298 C25.328,298 26,298.672 26,299.5 z" fill="#FFFFFF" id="path3457"/>
-        <path d="M14,307.5 C14,308.328 13.328,309 12.5,309 C11.672,309 11,308.328 11,307.5 C11,306.672 11.672,306 12.5,306 C13.328,306 14,306.672 14,307.5 z" fill="#FFFFFF" id="path3459"/>
+      <g>
+        <path d="M36.969,305.469 L34.031,309.531 L23.031,301.531 L25.969,297.469 z" fill="#46682F"/>
+        <path d="M34.125,305.406 L36.875,309.594 L48.875,301.594 L46.125,297.406 z" fill="#70372F"/>
+        <path d="M11.125,305.419 L13.875,309.575 L25.875,301.575 L23.125,297.419 z" fill="#2C5476"/>
+        <path d="M36.375,306.281 L34.625,308.719 L23.625,300.719 L25.375,298.281 z" fill="#8CD05F"/>
+        <path d="M34.656,306.25 L36.344,308.75 L48.344,300.75 L46.656,298.25 z" fill="#E06D5F"/>
+        <path d="M11.656,306.263 L13.344,308.763 L25.344,300.763 L23.656,298.263 z" fill="#58A9ED"/>
+        <path d="M50,299.5 C50,300.881 48.881,302 47.5,302 C46.119,302 45,300.881 45,299.5 C45,298.119 46.119,297 47.5,297 C48.881,297 50,298.119 50,299.5 z" fill="#70372F"/>
+        <path d="M15,307.5 C15,308.881 13.881,310 12.5,310 C11.119,310 10,308.881 10,307.5 C10,306.119 11.119,305 12.5,305 C13.881,305 15,306.119 15,307.5 z" fill="#2C5476"/>
+        <path d="M27,299.5 C27,300.881 25.881,302 24.5,302 C23.119,302 22,300.881 22,299.5 C22,298.119 23.119,297 24.5,297 C25.881,297 27,298.119 27,299.5 z" fill="#395E53"/>
+        <path d="M38,307.5 C38,308.881 36.881,310 35.5,310 C34.119,310 33,308.881 33,307.5 C33,306.119 34.119,305 35.5,305 C36.881,305 38,306.119 38,307.5 z" fill="#5B502F"/>
+        <path d="M49,299.5 C49,300.328 48.328,301 47.5,301 C46.672,301 46,300.328 46,299.5 C46,298.672 46.672,298 47.5,298 C48.328,298 49,298.672 49,299.5 z" fill="#FFFFFF"/>
+        <path d="M37,307.5 C37,308.328 36.328,309 35.5,309 C34.672,309 34,308.328 34,307.5 C34,306.672 34.672,306 35.5,306 C36.328,306 37,306.672 37,307.5 z" fill="#FFFFFF"/>
+        <path d="M26,299.5 C26,300.328 25.328,301 24.5,301 C23.672,301 23,300.328 23,299.5 C23,298.672 23.672,298 24.5,298 C25.328,298 26,298.672 26,299.5 z" fill="#FFFFFF"/>
+        <path d="M14,307.5 C14,308.328 13.328,309 12.5,309 C11.672,309 11,308.328 11,307.5 C11,306.672 11.672,306 12.5,306 C13.328,306 14,306.672 14,307.5 z" fill="#FFFFFF"/>
       </g>
-      <g id="g3473">
-        <g id="g3475">
-          <path d="M36.969,305.469 L34.031,309.531 L23.031,301.531 L25.969,297.469 z" fill="#46682F" id="path3477"/>
-          <path d="M34.125,305.406 L36.875,309.594 L48.875,301.594 L46.125,297.406 z" fill="#70372F" id="path3479"/>
-          <path d="M11.125,305.419 L13.875,309.575 L25.875,301.575 L23.125,297.419 z" fill="#2C5476" id="path3481"/>
-        </g>
-        <path d="M36.375,306.281 L34.625,308.719 L23.625,300.719 L25.375,298.281 z" fill="#8CD05F" id="path3485"/>
-        <path d="M34.656,306.25 L36.344,308.75 L48.344,300.75 L46.656,298.25 z" fill="#E06D5F" id="path3489"/>
-        <path d="M11.656,306.263 L13.344,308.763 L25.344,300.763 L23.656,298.263 z" fill="#58A9ED" id="path3491"/>
-        <path d="M50,299.5 C50,300.881 48.881,302 47.5,302 C46.119,302 45,300.881 45,299.5 C45,298.119 46.119,297 47.5,297 C48.881,297 50,298.119 50,299.5 z" fill="#70372F" id="path3493"/>
-        <path d="M15,307.5 C15,308.881 13.881,310 12.5,310 C11.119,310 10,308.881 10,307.5 C10,306.119 11.119,305 12.5,305 C13.881,305 15,306.119 15,307.5 z" fill="#2C5476" id="path3495"/>
-        <path d="M27,299.5 C27,300.881 25.881,302 24.5,302 C23.119,302 22,300.881 22,299.5 C22,298.119 23.119,297 24.5,297 C25.881,297 27,298.119 27,299.5 z" fill="#395E53" id="path3497"/>
-        <path d="M38,307.5 C38,308.881 36.881,310 35.5,310 C34.119,310 33,308.881 33,307.5 C33,306.119 34.119,305 35.5,305 C36.881,305 38,306.119 38,307.5 z" fill="#5B502F" id="path3499"/>
-        <path d="M49,299.5 C49,300.328 48.328,301 47.5,301 C46.672,301 46,300.328 46,299.5 C46,298.672 46.672,298 47.5,298 C48.328,298 49,298.672 49,299.5 z" fill="#FFFFFF" id="path3501"/>
-        <path d="M37,307.5 C37,308.328 36.328,309 35.5,309 C34.672,309 34,308.328 34,307.5 C34,306.672 34.672,306 35.5,306 C36.328,306 37,306.672 37,307.5 z" fill="#FFFFFF" id="path3503"/>
-        <path d="M26,299.5 C26,300.328 25.328,301 24.5,301 C23.672,301 23,300.328 23,299.5 C23,298.672 23.672,298 24.5,298 C25.328,298 26,298.672 26,299.5 z" fill="#FFFFFF" id="path3505"/>
-        <path d="M14,307.5 C14,308.328 13.328,309 12.5,309 C11.672,309 11,308.328 11,307.5 C11,306.672 11.672,306 12.5,306 C13.328,306 14,306.672 14,307.5 z" fill="#FFFFFF" id="path3507"/>
+      <g>
+        <path d="M36.969,291.469 L34.031,295.531 L23.031,287.531 L25.969,283.469 z" fill="#46682F"/>
+        <path d="M34.125,291.406 L36.875,295.594 L48.875,287.594 L46.125,283.406 z" fill="#70372F"/>
+        <path d="M11.125,291.419 L13.875,295.575 L25.875,287.575 L23.125,283.419 z" fill="#2C5476"/>
+        <path d="M36.375,292.281 L34.625,294.719 L23.625,286.719 L25.375,284.281 z" fill="#8CD05F"/>
+        <path d="M34.656,292.25 L36.344,294.75 L48.344,286.75 L46.656,284.25 z" fill="#E06D5F"/>
+        <path d="M11.656,292.263 L13.344,294.763 L25.344,286.763 L23.656,284.263 z" fill="#58A9ED"/>
+        <path d="M50,285.5 C50,286.881 48.881,288 47.5,288 C46.119,288 45,286.881 45,285.5 C45,284.119 46.119,283 47.5,283 C48.881,283 50,284.119 50,285.5 z" fill="#70372F"/>
+        <path d="M15,293.5 C15,294.881 13.881,296 12.5,296 C11.119,296 10,294.881 10,293.5 C10,292.119 11.119,291 12.5,291 C13.881,291 15,292.119 15,293.5 z" fill="#2C5476"/>
+        <path d="M27,285.5 C27,286.881 25.881,288 24.5,288 C23.119,288 22,286.881 22,285.5 C22,284.119 23.119,283 24.5,283 C25.881,283 27,284.119 27,285.5 z" fill="#395E53"/>
+        <path d="M38,293.5 C38,294.881 36.881,296 35.5,296 C34.119,296 33,294.881 33,293.5 C33,292.119 34.119,291 35.5,291 C36.881,291 38,292.119 38,293.5 z" fill="#5B502F"/>
+        <path d="M49,285.5 C49,286.328 48.328,287 47.5,287 C46.672,287 46,286.328 46,285.5 C46,284.672 46.672,284 47.5,284 C48.328,284 49,284.672 49,285.5 z" fill="#FFFFFF"/>
+        <path d="M37,293.5 C37,294.328 36.328,295 35.5,295 C34.672,295 34,294.328 34,293.5 C34,292.672 34.672,292 35.5,292 C36.328,292 37,292.672 37,293.5 z" fill="#FFFFFF"/>
+        <path d="M26,285.5 C26,286.328 25.328,287 24.5,287 C23.672,287 23,286.328 23,285.5 C23,284.672 23.672,284 24.5,284 C25.328,284 26,284.672 26,285.5 z" fill="#FFFFFF"/>
+        <path d="M14,293.5 C14,294.328 13.328,295 12.5,295 C11.672,295 11,294.328 11,293.5 C11,292.672 11.672,292 12.5,292 C13.328,292 14,292.672 14,293.5 z" fill="#FFFFFF"/>
       </g>
-      <g id="g3545">
-        <g id="g3547">
-          <path d="M36.969,291.469 L34.031,295.531 L23.031,287.531 L25.969,283.469 z" fill="#46682F" id="path3549"/>
-          <path d="M34.125,291.406 L36.875,295.594 L48.875,287.594 L46.125,283.406 z" fill="#70372F" id="path3551"/>
-          <path d="M11.125,291.419 L13.875,295.575 L25.875,287.575 L23.125,283.419 z" fill="#2C5476" id="path3553"/>
-        </g>
-        <path d="M36.375,292.281 L34.625,294.719 L23.625,286.719 L25.375,284.281 z" fill="#8CD05F" id="path3557"/>
-        <path d="M34.656,292.25 L36.344,294.75 L48.344,286.75 L46.656,284.25 z" fill="#E06D5F" id="path3561"/>
-        <path d="M11.656,292.263 L13.344,294.763 L25.344,286.763 L23.656,284.263 z" fill="#58A9ED" id="path3563"/>
-        <path d="M50,285.5 C50,286.881 48.881,288 47.5,288 C46.119,288 45,286.881 45,285.5 C45,284.119 46.119,283 47.5,283 C48.881,283 50,284.119 50,285.5 z" fill="#70372F" id="path3565"/>
-        <path d="M15,293.5 C15,294.881 13.881,296 12.5,296 C11.119,296 10,294.881 10,293.5 C10,292.119 11.119,291 12.5,291 C13.881,291 15,292.119 15,293.5 z" fill="#2C5476" id="path3567"/>
-        <path d="M27,285.5 C27,286.881 25.881,288 24.5,288 C23.119,288 22,286.881 22,285.5 C22,284.119 23.119,283 24.5,283 C25.881,283 27,284.119 27,285.5 z" fill="#395E53" id="path3569"/>
-        <path d="M38,293.5 C38,294.881 36.881,296 35.5,296 C34.119,296 33,294.881 33,293.5 C33,292.119 34.119,291 35.5,291 C36.881,291 38,292.119 38,293.5 z" fill="#5B502F" id="path3571"/>
-        <path d="M49,285.5 C49,286.328 48.328,287 47.5,287 C46.672,287 46,286.328 46,285.5 C46,284.672 46.672,284 47.5,284 C48.328,284 49,284.672 49,285.5 z" fill="#FFFFFF" id="path3573"/>
-        <path d="M37,293.5 C37,294.328 36.328,295 35.5,295 C34.672,295 34,294.328 34,293.5 C34,292.672 34.672,292 35.5,292 C36.328,292 37,292.672 37,293.5 z" fill="#FFFFFF" id="path3575"/>
-        <path d="M26,285.5 C26,286.328 25.328,287 24.5,287 C23.672,287 23,286.328 23,285.5 C23,284.672 23.672,284 24.5,284 C25.328,284 26,284.672 26,285.5 z" fill="#FFFFFF" id="path3577"/>
-        <path d="M14,293.5 C14,294.328 13.328,295 12.5,295 C11.672,295 11,294.328 11,293.5 C11,292.672 11.672,292 12.5,292 C13.328,292 14,292.672 14,293.5 z" fill="#FFFFFF" id="path3579"/>
-      </g>
-      <g id="g3581">
-        <g id="g3583">
-          <path d="M36.969,277.469 L34.031,281.531 L23.031,273.531 L25.969,269.469 z" fill="#46682F" id="path3585"/>
-          <path d="M34.125,277.406 L36.875,281.594 L48.875,273.594 L46.125,269.406 z" fill="#70372F" id="path3587"/>
-          <path d="M11.125,277.419 L13.875,281.575 L25.875,273.575 L23.125,269.419 z" fill="#2C5476" id="path3589"/>
-        </g>
-        <path d="M36.375,278.281 L34.625,280.719 L23.625,272.719 L25.375,270.281 z" fill="#8CD05F" id="path3593"/>
-        <path d="M34.656,278.25 L36.344,280.75 L48.344,272.75 L46.656,270.25 z" fill="#E06D5F" id="path3597"/>
-        <path d="M11.656,278.263 L13.344,280.763 L25.344,272.763 L23.656,270.263 z" fill="#58A9ED" id="path3599"/>
-        <path d="M50,271.5 C50,272.881 48.881,274 47.5,274 C46.119,274 45,272.881 45,271.5 C45,270.119 46.119,269 47.5,269 C48.881,269 50,270.119 50,271.5 z" fill="#70372F" id="path3601"/>
-        <path d="M15,279.5 C15,280.881 13.881,282 12.5,282 C11.119,282 10,280.881 10,279.5 C10,278.119 11.119,277 12.5,277 C13.881,277 15,278.119 15,279.5 z" fill="#2C5476" id="path3603"/>
-        <path d="M27,271.5 C27,272.881 25.881,274 24.5,274 C23.119,274 22,272.881 22,271.5 C22,270.119 23.119,269 24.5,269 C25.881,269 27,270.119 27,271.5 z" fill="#395E53" id="path3605"/>
-        <path d="M38,279.5 C38,280.881 36.881,282 35.5,282 C34.119,282 33,280.881 33,279.5 C33,278.119 34.119,277 35.5,277 C36.881,277 38,278.119 38,279.5 z" fill="#5B502F" id="path3607"/>
-        <path d="M49,271.5 C49,272.328 48.328,273 47.5,273 C46.672,273 46,272.328 46,271.5 C46,270.672 46.672,270 47.5,270 C48.328,270 49,270.672 49,271.5 z" fill="#FFFFFF" id="path3609"/>
-        <path d="M37,279.5 C37,280.328 36.328,281 35.5,281 C34.672,281 34,280.328 34,279.5 C34,278.672 34.672,278 35.5,278 C36.328,278 37,278.672 37,279.5 z" fill="#FFFFFF" id="path3611"/>
-        <path d="M26,271.5 C26,272.328 25.328,273 24.5,273 C23.672,273 23,272.328 23,271.5 C23,270.672 23.672,270 24.5,270 C25.328,270 26,270.672 26,271.5 z" fill="#FFFFFF" id="path3613"/>
-        <path d="M14,279.5 C14,280.328 13.328,281 12.5,281 C11.672,281 11,280.328 11,279.5 C11,278.672 11.672,278 12.5,278 C13.328,278 14,278.672 14,279.5 z" fill="#FFFFFF" id="path3615"/>
+      <g>
+        <path d="M36.969,277.469 L34.031,281.531 L23.031,273.531 L25.969,269.469 z" fill="#46682F"/>
+        <path d="M34.125,277.406 L36.875,281.594 L48.875,273.594 L46.125,269.406 z" fill="#70372F"/>
+        <path d="M11.125,277.419 L13.875,281.575 L25.875,273.575 L23.125,269.419 z" fill="#2C5476"/>
+        <path d="M36.375,278.281 L34.625,280.719 L23.625,272.719 L25.375,270.281 z" fill="#8CD05F"/>
+        <path d="M34.656,278.25 L36.344,280.75 L48.344,272.75 L46.656,270.25 z" fill="#E06D5F"/>
+        <path d="M11.656,278.263 L13.344,280.763 L25.344,272.763 L23.656,270.263 z" fill="#58A9ED"/>
+        <path d="M50,271.5 C50,272.881 48.881,274 47.5,274 C46.119,274 45,272.881 45,271.5 C45,270.119 46.119,269 47.5,269 C48.881,269 50,270.119 50,271.5 z" fill="#70372F"/>
+        <path d="M15,279.5 C15,280.881 13.881,282 12.5,282 C11.119,282 10,280.881 10,279.5 C10,278.119 11.119,277 12.5,277 C13.881,277 15,278.119 15,279.5 z" fill="#2C5476"/>
+        <path d="M27,271.5 C27,272.881 25.881,274 24.5,274 C23.119,274 22,272.881 22,271.5 C22,270.119 23.119,269 24.5,269 C25.881,269 27,270.119 27,271.5 z" fill="#395E53"/>
+        <path d="M38,279.5 C38,280.881 36.881,282 35.5,282 C34.119,282 33,280.881 33,279.5 C33,278.119 34.119,277 35.5,277 C36.881,277 38,278.119 38,279.5 z" fill="#5B502F"/>
+        <path d="M49,271.5 C49,272.328 48.328,273 47.5,273 C46.672,273 46,272.328 46,271.5 C46,270.672 46.672,270 47.5,270 C48.328,270 49,270.672 49,271.5 z" fill="#FFFFFF"/>
+        <path d="M37,279.5 C37,280.328 36.328,281 35.5,281 C34.672,281 34,280.328 34,279.5 C34,278.672 34.672,278 35.5,278 C36.328,278 37,278.672 37,279.5 z" fill="#FFFFFF"/>
+        <path d="M26,271.5 C26,272.328 25.328,273 24.5,273 C23.672,273 23,272.328 23,271.5 C23,270.672 23.672,270 24.5,270 C25.328,270 26,270.672 26,271.5 z" fill="#FFFFFF"/>
+        <path d="M14,279.5 C14,280.328 13.328,281 12.5,281 C11.672,281 11,280.328 11,279.5 C11,278.672 11.672,278 12.5,278 C13.328,278 14,278.672 14,279.5 z" fill="#FFFFFF"/>
       </g>
     </g>
     <g id="route-water">
       <g>
-        <g>
-          <path d="M876.969,245.469 L874.031,249.531 L863.031,241.531 L865.969,237.469 z" fill="#46682F"/>
-          <path d="M874.125,245.406 L876.875,249.594 L888.875,241.594 L886.125,237.406 z" fill="#70372F"/>
-          <path d="M851.125,245.419 L853.875,249.575 L865.875,241.575 L863.125,237.419 z" fill="#2C5476"/>
-        </g>
+        <path d="M876.969,245.469 L874.031,249.531 L863.031,241.531 L865.969,237.469 z" fill="#46682F"/>
+        <path d="M874.125,245.406 L876.875,249.594 L888.875,241.594 L886.125,237.406 z" fill="#70372F"/>
+        <path d="M851.125,245.419 L853.875,249.575 L865.875,241.575 L863.125,237.419 z" fill="#2C5476"/>
         <path d="M876.375,246.281 L874.625,248.719 L863.625,240.719 L865.375,238.281 z" fill="#8CD05F"/>
         <path d="M874.656,246.25 L876.344,248.75 L888.344,240.75 L886.656,238.25 z" fill="#E06D5F"/>
         <path d="M851.656,246.263 L853.344,248.763 L865.344,240.763 L863.656,238.263 z" fill="#58A9ED"/>
@@ -580,310 +647,282 @@
       <path d="M856.803,232 C856.803,232 856.267,230.154 856.458,229.25 C856.679,228.203 858.113,226.5 858.113,226.5 C858.113,226.5 859.546,224.797 859.767,223.75 C859.959,222.846 859.422,221 859.422,221 C859.422,221 858.886,219.154 859.077,218.25 C859.298,217.203 860.732,215.5 860.732,215.5 C860.732,215.5 862.165,213.797 862.386,212.75 C862.578,211.846 862.041,210 862.041,210 L878.541,210 C878.541,210 879.975,211.703 880.196,212.75 C880.387,213.654 879.851,215.5 879.851,215.5 C879.851,215.5 879.314,217.346 879.506,218.25 C879.727,219.297 881.16,221 881.16,221 C881.16,221 882.594,222.703 882.815,223.75 C883.006,224.654 882.47,226.5 882.47,226.5 C882.47,226.5 881.933,228.346 882.125,229.25 C882.346,230.297 883.779,232 883.779,232 z" fill="#000000" id="route-water-stroke1"/>
     </g>
     <g id="route-power">
-      <g id="#g3890">
-        <path d="M800,208 L800,209 L802,209 L802,208 L800,208 z M804,208 L804,209 L806,209 L806,208 L804,208 z M814,208 L814,209 L816,209 L816,208 L814,208 z M818,208 L818,209 L820,209 L820,208 L818,208 z M800.313,213 C799.647,216.533 797.267,218.5 795,218.5 L794,218.5 L794,219.5 L795,219.5 C796.042,219.5 797.082,219.196 798,218.594 L798,219.5 L799,219.5 C801.879,219.5 804.615,217.022 805.313,213 L804.313,213 C803.647,216.533 801.267,218.5 799,218.5 L798.125,218.5 C799.686,217.42 800.885,215.509 801.313,213 L800.313,213 z M814.688,213 C815.385,217.022 818.121,219.5 821,219.5 L822,219.5 L822,218.594 C822.918,219.196 823.958,219.5 825,219.5 L826,219.5 L826,218.5 L825,218.5 C822.733,218.5 820.353,216.533 819.688,213 L818.688,213 C819.115,215.509 820.314,217.42 821.875,218.5 L821,218.5 C818.733,218.5 816.353,216.533 815.688,213 L814.688,213 z" fill="#989898" id="rect4103-5"/>
-        <path d="M808,208 L808,210 L799,210 L799,212 L808,212 L808,234 L812,234 L812,212 L821,212 L821,210 L812,210 L812,208 L808,208 z" fill="#B5B5B5" id="rect4101-1"/>
-      </g>
-      <g id="g22802">
-        <g id="g22804">
-          <path d="M816.969,245.469 L814.031,249.531 L803.031,241.531 L805.969,237.469 z" fill="#46682F" id="path22806"/>
-          <path d="M814.125,245.406 L816.875,249.594 L828.875,241.594 L826.125,237.406 z" fill="#70372F" id="path22808"/>
-          <path d="M791.125,245.419 L793.875,249.575 L805.875,241.575 L803.125,237.419 z" fill="#2C5476" id="path22810"/>
-        </g>
-        <path d="M816.375,246.281 L814.625,248.719 L803.625,240.719 L805.375,238.281 z" fill="#8CD05F" id="path22814"/>
-        <path d="M814.656,246.25 L816.344,248.75 L828.344,240.75 L826.656,238.25 z" fill="#E06D5F" id="path22818"/>
-        <path d="M791.656,246.263 L793.344,248.763 L805.344,240.763 L803.656,238.263 z" fill="#58A9ED" id="path22820"/>
-        <path d="M830,239.5 C830,240.881 828.881,242 827.5,242 C826.119,242 825,240.881 825,239.5 C825,238.119 826.119,237 827.5,237 C828.881,237 830,238.119 830,239.5 z" fill="#70372F" id="path22822"/>
-        <path d="M795,247.5 C795,248.881 793.881,250 792.5,250 C791.119,250 790,248.881 790,247.5 C790,246.119 791.119,245 792.5,245 C793.881,245 795,246.119 795,247.5 z" fill="#2C5476" id="path22824"/>
-        <path d="M807,239.5 C807,240.881 805.881,242 804.5,242 C803.119,242 802,240.881 802,239.5 C802,238.119 803.119,237 804.5,237 C805.881,237 807,238.119 807,239.5 z" fill="#395E53" id="path22826"/>
-        <path d="M818,247.5 C818,248.881 816.881,250 815.5,250 C814.119,250 813,248.881 813,247.5 C813,246.119 814.119,245 815.5,245 C816.881,245 818,246.119 818,247.5 z" fill="#5B502F" id="path22828"/>
-        <path d="M829,239.5 C829,240.328 828.328,241 827.5,241 C826.672,241 826,240.328 826,239.5 C826,238.672 826.672,238 827.5,238 C828.328,238 829,238.672 829,239.5 z" fill="#FFFFFF" id="path22830"/>
-        <path d="M817,247.5 C817,248.328 816.328,249 815.5,249 C814.672,249 814,248.328 814,247.5 C814,246.672 814.672,246 815.5,246 C816.328,246 817,246.672 817,247.5 z" fill="#FFFFFF" id="path22832"/>
-        <path d="M806,239.5 C806,240.328 805.328,241 804.5,241 C803.672,241 803,240.328 803,239.5 C803,238.672 803.672,238 804.5,238 C805.328,238 806,238.672 806,239.5 z" fill="#FFFFFF" id="path22834"/>
-        <path d="M794,247.5 C794,248.328 793.328,249 792.5,249 C791.672,249 791,248.328 791,247.5 C791,246.672 791.672,246 792.5,246 C793.328,246 794,246.672 794,247.5 z" fill="#FFFFFF" id="path22836"/>
+      <g>
+        <path d="M816.969,245.469 L814.031,249.531 L803.031,241.531 L805.969,237.469 z" fill="#46682F"/>
+        <path d="M814.125,245.406 L816.875,249.594 L828.875,241.594 L826.125,237.406 z" fill="#70372F"/>
+        <path d="M791.125,245.419 L793.875,249.575 L805.875,241.575 L803.125,237.419 z" fill="#2C5476"/>
+        <path d="M816.375,246.281 L814.625,248.719 L803.625,240.719 L805.375,238.281 z" fill="#8CD05F"/>
+        <path d="M814.656,246.25 L816.344,248.75 L828.344,240.75 L826.656,238.25 z" fill="#E06D5F"/>
+        <path d="M791.656,246.263 L793.344,248.763 L805.344,240.763 L803.656,238.263 z" fill="#58A9ED"/>
+        <path d="M830,239.5 C830,240.881 828.881,242 827.5,242 C826.119,242 825,240.881 825,239.5 C825,238.119 826.119,237 827.5,237 C828.881,237 830,238.119 830,239.5 z" fill="#70372F"/>
+        <path d="M795,247.5 C795,248.881 793.881,250 792.5,250 C791.119,250 790,248.881 790,247.5 C790,246.119 791.119,245 792.5,245 C793.881,245 795,246.119 795,247.5 z" fill="#2C5476"/>
+        <path d="M807,239.5 C807,240.881 805.881,242 804.5,242 C803.119,242 802,240.881 802,239.5 C802,238.119 803.119,237 804.5,237 C805.881,237 807,238.119 807,239.5 z" fill="#395E53"/>
+        <path d="M818,247.5 C818,248.881 816.881,250 815.5,250 C814.119,250 813,248.881 813,247.5 C813,246.119 814.119,245 815.5,245 C816.881,245 818,246.119 818,247.5 z" fill="#5B502F"/>
+        <path d="M829,239.5 C829,240.328 828.328,241 827.5,241 C826.672,241 826,240.328 826,239.5 C826,238.672 826.672,238 827.5,238 C828.328,238 829,238.672 829,239.5 z" fill="#FFFFFF"/>
+        <path d="M817,247.5 C817,248.328 816.328,249 815.5,249 C814.672,249 814,248.328 814,247.5 C814,246.672 814.672,246 815.5,246 C816.328,246 817,246.672 817,247.5 z" fill="#FFFFFF"/>
+        <path d="M806,239.5 C806,240.328 805.328,241 804.5,241 C803.672,241 803,240.328 803,239.5 C803,238.672 803.672,238 804.5,238 C805.328,238 806,238.672 806,239.5 z" fill="#FFFFFF"/>
+        <path d="M794,247.5 C794,248.328 793.328,249 792.5,249 C791.672,249 791,248.328 791,247.5 C791,246.672 791.672,246 792.5,246 C793.328,246 794,246.672 794,247.5 z" fill="#FFFFFF"/>
       </g>
+      <path d="M800,208 L800,209 L802,209 L802,208 L800,208 z M804,208 L804,209 L806,209 L806,208 L804,208 z M814,208 L814,209 L816,209 L816,208 L814,208 z M818,208 L818,209 L820,209 L820,208 L818,208 z M800.313,213 C799.647,216.533 797.267,218.5 795,218.5 L794,218.5 L794,219.5 L795,219.5 C796.042,219.5 797.082,219.196 798,218.594 L798,219.5 L799,219.5 C801.879,219.5 804.615,217.022 805.313,213 L804.313,213 C803.647,216.533 801.267,218.5 799,218.5 L798.125,218.5 C799.686,217.42 800.885,215.509 801.313,213 L800.313,213 z M814.688,213 C815.385,217.022 818.121,219.5 821,219.5 L822,219.5 L822,218.594 C822.918,219.196 823.958,219.5 825,219.5 L826,219.5 L826,218.5 L825,218.5 C822.733,218.5 820.353,216.533 819.688,213 L818.688,213 C819.115,215.509 820.314,217.42 821.875,218.5 L821,218.5 C818.733,218.5 816.353,216.533 815.688,213 L814.688,213 z" fill="#989898"/>
+      <path d="M808,208 L808,210 L799,210 L799,212 L808,212 L808,234 L812,234 L812,212 L821,212 L821,210 L812,210 L812,208 L808,208 z" fill="#B5B5B5"/>
     </g>
     <g id="route-pipeline">
-      <g id="g25089">
-        <g id="g25091">
-          <path d="M756.969,245.469 L754.031,249.531 L743.031,241.531 L745.969,237.469 z" fill="#46682F" id="path25093"/>
-          <path d="M754.125,245.406 L756.875,249.594 L768.875,241.594 L766.125,237.406 z" fill="#70372F" id="path25095"/>
-          <path d="M731.125,245.419 L733.875,249.575 L745.875,241.575 L743.125,237.419 z" fill="#2C5476" id="path25097"/>
-        </g>
-        <path d="M756.375,246.281 L754.625,248.719 L743.625,240.719 L745.375,238.281 z" fill="#8CD05F" id="path25101"/>
-        <path d="M754.656,246.25 L756.344,248.75 L768.344,240.75 L766.656,238.25 z" fill="#E06D5F" id="path25105"/>
-        <path d="M731.656,246.263 L733.344,248.763 L745.344,240.763 L743.656,238.263 z" fill="#58A9ED" id="path25107"/>
-        <path d="M770,239.5 C770,240.881 768.881,242 767.5,242 C766.119,242 765,240.881 765,239.5 C765,238.119 766.119,237 767.5,237 C768.881,237 770,238.119 770,239.5 z" fill="#70372F" id="path25109"/>
-        <path d="M735,247.5 C735,248.881 733.881,250 732.5,250 C731.119,250 730,248.881 730,247.5 C730,246.119 731.119,245 732.5,245 C733.881,245 735,246.119 735,247.5 z" fill="#2C5476" id="path25111"/>
-        <path d="M747,239.5 C747,240.881 745.881,242 744.5,242 C743.119,242 742,240.881 742,239.5 C742,238.119 743.119,237 744.5,237 C745.881,237 747,238.119 747,239.5 z" fill="#395E53" id="path25113"/>
-        <path d="M758,247.5 C758,248.881 756.881,250 755.5,250 C754.119,250 753,248.881 753,247.5 C753,246.119 754.119,245 755.5,245 C756.881,245 758,246.119 758,247.5 z" fill="#5B502F" id="path25115"/>
-        <path d="M769,239.5 C769,240.328 768.328,241 767.5,241 C766.672,241 766,240.328 766,239.5 C766,238.672 766.672,238 767.5,238 C768.328,238 769,238.672 769,239.5 z" fill="#FFFFFF" id="path25117"/>
-        <path d="M757,247.5 C757,248.328 756.328,249 755.5,249 C754.672,249 754,248.328 754,247.5 C754,246.672 754.672,246 755.5,246 C756.328,246 757,246.672 757,247.5 z" fill="#FFFFFF" id="path25119"/>
-        <path d="M746,239.5 C746,240.328 745.328,241 744.5,241 C743.672,241 743,240.328 743,239.5 C743,238.672 743.672,238 744.5,238 C745.328,238 746,238.672 746,239.5 z" fill="#FFFFFF" id="path25121"/>
-        <path d="M734,247.5 C734,248.328 733.328,249 732.5,249 C731.672,249 731,248.328 731,247.5 C731,246.672 731.672,246 732.5,246 C733.328,246 734,246.672 734,247.5 z" fill="#FFFFFF" id="path25123"/>
+      <g>
+        <path d="M756.969,245.469 L754.031,249.531 L743.031,241.531 L745.969,237.469 z" fill="#46682F"/>
+        <path d="M754.125,245.406 L756.875,249.594 L768.875,241.594 L766.125,237.406 z" fill="#70372F"/>
+        <path d="M731.125,245.419 L733.875,249.575 L745.875,241.575 L743.125,237.419 z" fill="#2C5476"/>
+        <path d="M756.375,246.281 L754.625,248.719 L743.625,240.719 L745.375,238.281 z" fill="#8CD05F"/>
+        <path d="M754.656,246.25 L756.344,248.75 L768.344,240.75 L766.656,238.25 z" fill="#E06D5F"/>
+        <path d="M731.656,246.263 L733.344,248.763 L745.344,240.763 L743.656,238.263 z" fill="#58A9ED"/>
+        <path d="M770,239.5 C770,240.881 768.881,242 767.5,242 C766.119,242 765,240.881 765,239.5 C765,238.119 766.119,237 767.5,237 C768.881,237 770,238.119 770,239.5 z" fill="#70372F"/>
+        <path d="M735,247.5 C735,248.881 733.881,250 732.5,250 C731.119,250 730,248.881 730,247.5 C730,246.119 731.119,245 732.5,245 C733.881,245 735,246.119 735,247.5 z" fill="#2C5476"/>
+        <path d="M747,239.5 C747,240.881 745.881,242 744.5,242 C743.119,242 742,240.881 742,239.5 C742,238.119 743.119,237 744.5,237 C745.881,237 747,238.119 747,239.5 z" fill="#395E53"/>
+        <path d="M758,247.5 C758,248.881 756.881,250 755.5,250 C754.119,250 753,248.881 753,247.5 C753,246.119 754.119,245 755.5,245 C756.881,245 758,246.119 758,247.5 z" fill="#5B502F"/>
+        <path d="M769,239.5 C769,240.328 768.328,241 767.5,241 C766.672,241 766,240.328 766,239.5 C766,238.672 766.672,238 767.5,238 C768.328,238 769,238.672 769,239.5 z" fill="#FFFFFF"/>
+        <path d="M757,247.5 C757,248.328 756.328,249 755.5,249 C754.672,249 754,248.328 754,247.5 C754,246.672 754.672,246 755.5,246 C756.328,246 757,246.672 757,247.5 z" fill="#FFFFFF"/>
+        <path d="M746,239.5 C746,240.328 745.328,241 744.5,241 C743.672,241 743,240.328 743,239.5 C743,238.672 743.672,238 744.5,238 C745.328,238 746,238.672 746,239.5 z" fill="#FFFFFF"/>
+        <path d="M734,247.5 C734,248.328 733.328,249 732.5,249 C731.672,249 731,248.328 731,247.5 C731,246.672 731.672,246 732.5,246 C733.328,246 734,246.672 734,247.5 z" fill="#FFFFFF"/>
       </g>
-      <g id="g26258-9">
-        <path d="M735.5,213 C734.119,213 733,215.239 733,218 C733,220.761 734.119,223 735.5,223 L746,223 L746,213 L735.5,213 z M750,213 L750,223 L764.5,223 L764.5,213 L750,213 z" fill="#B5B5B5" id="rect25143-4"/>
-        <path d="M767,218 C767,220.761 765.881,223 764.5,223 C763.119,223 762,220.761 762,218 C762,215.239 763.119,213 764.5,213 C765.881,213 767,215.239 767,218 z" fill="#989898" id="path25154-8"/>
-        <path d="M747,210 L747,224 L745,234 L747,234 L748.594,226 L753.406,226 L755,234 L757,234 L755,224 L754,224 L749,224 L749,210 L747,210 z M753,210 L753,212 L755,212 L755,210 L753,210 z M741,213 C740,213 738.5,215.239 738.5,218 C738.5,220.761 740,223 741,223 L743,223 C741.619,223 740,220.761 740,218 C740,215.239 741.619,213 743,213 L741,213 z M756,213 C755,213 753.5,215.239 753.5,218 C753.5,220.761 755,223 756,223 L758,223 C756.619,223 755,220.761 755,218 C755,215.239 756.619,213 758,213 L756,213 z M764.5,213 C763.119,213 762,215.239 762,218 C762,220.761 763.119,223 764.5,223 C765.881,223 767,220.761 767,218 C767,215.239 765.881,213 764.5,213 z" fill="#989898" id="path25145-3"/>
+      <g>
+        <path d="M735.5,213 C734.119,213 733,215.239 733,218 C733,220.761 734.119,223 735.5,223 L746,223 L746,213 L735.5,213 z M750,213 L750,223 L764.5,223 L764.5,213 L750,213 z" fill="#B5B5B5"/>
+        <path d="M767,218 C767,220.761 765.881,223 764.5,223 C763.119,223 762,220.761 762,218 C762,215.239 763.119,213 764.5,213 C765.881,213 767,215.239 767,218 z" fill="#989898"/>
+        <path d="M747,210 L747,224 L745,234 L747,234 L748.594,226 L753.406,226 L755,234 L757,234 L755,224 L754,224 L749,224 L749,210 L747,210 z M753,210 L753,212 L755,212 L755,210 L753,210 z M741,213 C740,213 738.5,215.239 738.5,218 C738.5,220.761 740,223 741,223 L743,223 C741.619,223 740,220.761 740,218 C740,215.239 741.619,213 743,213 L741,213 z M756,213 C755,213 753.5,215.239 753.5,218 C753.5,220.761 755,223 756,223 L758,223 C756.619,223 755,220.761 755,218 C755,215.239 756.619,213 758,213 L756,213 z M764.5,213 C763.119,213 762,215.239 762,218 C762,220.761 763.119,223 764.5,223 C765.881,223 767,220.761 767,218 C767,215.239 765.881,213 764.5,213 z" fill="#989898"/>
       </g>
     </g>
     <g id="route-ferry">
-      <g id="g25015">
-        <g id="g25017">
-          <path d="M696.969,245.469 L694.031,249.531 L683.031,241.531 L685.969,237.469 z" fill="#46682F" id="path25019"/>
-          <path d="M694.125,245.406 L696.875,249.594 L708.875,241.594 L706.125,237.406 z" fill="#70372F" id="path25021"/>
-          <path d="M671.125,245.419 L673.875,249.575 L685.875,241.575 L683.125,237.419 z" fill="#2C5476" id="path25023"/>
-        </g>
-        <path d="M696.375,246.281 L694.625,248.719 L683.625,240.719 L685.375,238.281 z" fill="#8CD05F" id="path25027"/>
-        <path d="M694.656,246.25 L696.344,248.75 L708.344,240.75 L706.656,238.25 z" fill="#E06D5F" id="path25031"/>
-        <path d="M671.656,246.263 L673.344,248.763 L685.344,240.763 L683.656,238.263 z" fill="#58A9ED" id="path25033"/>
-        <path d="M710,239.5 C710,240.881 708.881,242 707.5,242 C706.119,242 705,240.881 705,239.5 C705,238.119 706.119,237 707.5,237 C708.881,237 710,238.119 710,239.5 z" fill="#70372F" id="path25035"/>
-        <path d="M675,247.5 C675,248.881 673.881,250 672.5,250 C671.119,250 670,248.881 670,247.5 C670,246.119 671.119,245 672.5,245 C673.881,245 675,246.119 675,247.5 z" fill="#2C5476" id="path25037"/>
-        <path d="M687,239.5 C687,240.881 685.881,242 684.5,242 C683.119,242 682,240.881 682,239.5 C682,238.119 683.119,237 684.5,237 C685.881,237 687,238.119 687,239.5 z" fill="#395E53" id="path25039"/>
-        <path d="M698,247.5 C698,248.881 696.881,250 695.5,250 C694.119,250 693,248.881 693,247.5 C693,246.119 694.119,245 695.5,245 C696.881,245 698,246.119 698,247.5 z" fill="#5B502F" id="path25041"/>
-        <path d="M709,239.5 C709,240.328 708.328,241 707.5,241 C706.672,241 706,240.328 706,239.5 C706,238.672 706.672,238 707.5,238 C708.328,238 709,238.672 709,239.5 z" fill="#FFFFFF" id="path25043"/>
-        <path d="M697,247.5 C697,248.328 696.328,249 695.5,249 C694.672,249 694,248.328 694,247.5 C694,246.672 694.672,246 695.5,246 C696.328,246 697,246.672 697,247.5 z" fill="#FFFFFF" id="path25045"/>
-        <path d="M686,239.5 C686,240.328 685.328,241 684.5,241 C683.672,241 683,240.328 683,239.5 C683,238.672 683.672,238 684.5,238 C685.328,238 686,238.672 686,239.5 z" fill="#FFFFFF" id="path25047"/>
-        <path d="M674,247.5 C674,248.328 673.328,249 672.5,249 C671.672,249 671,248.328 671,247.5 C671,246.672 671.672,246 672.5,246 C673.328,246 674,246.672 674,247.5 z" fill="#FFFFFF" id="path25049"/>
+      <g>
+        <path d="M696.969,245.469 L694.031,249.531 L683.031,241.531 L685.969,237.469 z" fill="#46682F"/>
+        <path d="M694.125,245.406 L696.875,249.594 L708.875,241.594 L706.125,237.406 z" fill="#70372F"/>
+        <path d="M671.125,245.419 L673.875,249.575 L685.875,241.575 L683.125,237.419 z" fill="#2C5476"/>
+        <path d="M696.375,246.281 L694.625,248.719 L683.625,240.719 L685.375,238.281 z" fill="#8CD05F"/>
+        <path d="M694.656,246.25 L696.344,248.75 L708.344,240.75 L706.656,238.25 z" fill="#E06D5F"/>
+        <path d="M671.656,246.263 L673.344,248.763 L685.344,240.763 L683.656,238.263 z" fill="#58A9ED"/>
+        <path d="M710,239.5 C710,240.881 708.881,242 707.5,242 C706.119,242 705,240.881 705,239.5 C705,238.119 706.119,237 707.5,237 C708.881,237 710,238.119 710,239.5 z" fill="#70372F"/>
+        <path d="M675,247.5 C675,248.881 673.881,250 672.5,250 C671.119,250 670,248.881 670,247.5 C670,246.119 671.119,245 672.5,245 C673.881,245 675,246.119 675,247.5 z" fill="#2C5476"/>
+        <path d="M687,239.5 C687,240.881 685.881,242 684.5,242 C683.119,242 682,240.881 682,239.5 C682,238.119 683.119,237 684.5,237 C685.881,237 687,238.119 687,239.5 z" fill="#395E53"/>
+        <path d="M698,247.5 C698,248.881 696.881,250 695.5,250 C694.119,250 693,248.881 693,247.5 C693,246.119 694.119,245 695.5,245 C696.881,245 698,246.119 698,247.5 z" fill="#5B502F"/>
+        <path d="M709,239.5 C709,240.328 708.328,241 707.5,241 C706.672,241 706,240.328 706,239.5 C706,238.672 706.672,238 707.5,238 C708.328,238 709,238.672 709,239.5 z" fill="#FFFFFF"/>
+        <path d="M697,247.5 C697,248.328 696.328,249 695.5,249 C694.672,249 694,248.328 694,247.5 C694,246.672 694.672,246 695.5,246 C696.328,246 697,246.672 697,247.5 z" fill="#FFFFFF"/>
+        <path d="M686,239.5 C686,240.328 685.328,241 684.5,241 C683.672,241 683,240.328 683,239.5 C683,238.672 683.672,238 684.5,238 C685.328,238 686,238.672 686,239.5 z" fill="#FFFFFF"/>
+        <path d="M674,247.5 C674,248.328 673.328,249 672.5,249 C671.672,249 671,248.328 671,247.5 C671,246.672 671.672,246 672.5,246 C673.328,246 674,246.672 674,247.5 z" fill="#FFFFFF"/>
       </g>
-      <path d="M687,205.969 L686,206.969 L686,208.969 L683,208.969 L682,209.969 L682,216.875 L684,216.156 L684,211.969 L685,210.969 L687,210.969 L687,215.062 L688,214.688 L688,210.969 L692,210.969 L692,214.5 L693,214.781 L693,210.969 L695,210.969 L696,211.969 L696,215.594 L698,216.156 L698,209.969 L697,208.969 L694,208.969 L694,206.969 L693,205.969 L687,205.969 z M690,214.969 L679,218.969 L679,228.031 C678.979,228.024 678.958,228.007 678.938,228 C677.518,227.513 676.407,227.031 676.407,227.031 C676.077,226.883 675.693,226.924 675.401,227.137 C675.109,227.35 674.953,227.703 674.993,228.062 C675.033,228.421 675.263,228.731 675.594,228.875 C675.594,228.875 676.816,229.393 678.313,229.906 C679.81,230.42 681.548,230.969 683,230.969 C684.453,230.969 686.191,230.42 687.688,229.906 C689.185,229.393 690.407,228.875 690.407,228.875 C690.407,228.875 691.518,228.393 692.938,227.906 C694.357,227.42 696.119,226.969 697,226.969 C697.881,226.969 699.643,227.42 701.062,227.906 C702.482,228.393 703.594,228.875 703.594,228.875 C703.924,229.023 704.307,228.983 704.599,228.77 C704.891,228.557 705.047,228.204 705.007,227.844 C704.967,227.485 704.738,227.175 704.406,227.031 C704.406,227.031 703.184,226.513 701.687,226 C701.465,225.924 701.231,225.856 701,225.781 L701,217.969 L690,214.969 z M697,228.969 C695.548,228.969 693.809,229.487 692.312,230 C690.815,230.513 689.594,231.031 689.594,231.031 C689.594,231.031 688.482,231.513 687.062,232 C685.643,232.487 683.881,232.969 683,232.969 C682.119,232.969 680.357,232.487 678.937,232 C677.518,231.513 676.406,231.031 676.406,231.031 C676.076,230.883 675.693,230.924 675.401,231.137 C675.109,231.35 674.953,231.703 674.993,232.062 C675.033,232.421 675.262,232.731 675.594,232.875 C675.594,232.875 676.815,233.393 678.312,233.906 C679.809,234.42 681.548,234.969 683,234.969 C684.452,234.969 686.19,234.42 687.687,233.906 C689.184,233.393 690.406,232.875 690.406,232.875 C690.406,232.875 691.518,232.393 692.937,231.906 C694.357,231.42 696.119,230.969 697,230.969 C697.881,230.969 699.643,231.42 701.062,231.906 C702.482,232.393 703.594,232.875 703.594,232.875 C703.924,233.023 704.307,232.983 704.599,232.77 C704.891,232.557 705.047,232.204 705.007,231.844 C704.967,231.485 704.738,231.175 704.406,231.031 C704.406,231.031 703.184,230.513 701.687,230 C700.19,229.487 698.452,228.969 697,228.969 z" fill="#000000" id="route-ferry-stroke"/>
+      <path d="M685.666,226.974 C687.013,226.992 688.315,227.464 689.361,228.313 L689.88,228.772 L689.98,228.772 L690.599,228.213 C692.56,226.592 695.351,226.446 697.47,227.853 L701.984,218.985 L698.988,216.988 L698.988,209.898 C698.895,208.3 697.592,207.04 695.992,207.001 L694.993,207.001 C695.062,205.967 694.278,205.073 693.244,205.004 C693.161,204.999 693.078,204.999 692.996,205.004 L687.004,205.004 C685.969,204.936 685.075,205.719 685.007,206.754 C685.001,206.836 685.001,206.919 685.007,207.001 L684.008,207.001 C682.408,207.04 681.105,208.3 681.012,209.898 L681.012,216.988 L678.016,218.985 L682.51,228.033 C683.437,227.382 684.534,227.014 685.666,226.974 z M683.009,209.898 C683.03,209.379 683.467,208.977 683.985,208.998 C683.993,208.998 684,208.998 684.008,208.999 L695.992,208.999 C696.509,208.965 696.956,209.356 696.991,209.873 C696.993,209.915 696.993,209.956 696.991,209.997 L696.991,215.989 L690,211.995 L683.009,215.889 C683.009,215.889 683.009,209.898 683.009,209.898 z M702.982,230.969 L702.982,232.966 C702.458,233.005 701.97,233.249 701.624,233.645 C701.082,234.221 700.39,234.636 699.627,234.844 C698.399,235.206 697.071,234.929 696.092,234.105 L695.313,233.406 C694.705,232.801 693.724,232.801 693.116,233.406 C692.836,233.645 692.576,233.905 692.277,234.145 C690.813,235.314 688.719,235.255 687.324,234.005 L686.545,233.306 C685.973,232.806 685.119,232.806 684.547,233.306 C684.168,233.605 683.828,233.945 683.449,234.245 C682.042,235.286 680.107,235.237 678.755,234.125 L678.136,233.586 C677.847,233.255 677.451,233.035 677.018,232.966 L677.018,230.969 C677.534,230.905 678.057,231.003 678.516,231.249 C679.071,231.593 679.599,231.98 680.093,232.407 C680.503,232.854 681.121,233.044 681.711,232.906 C681.936,232.84 682.146,232.731 682.33,232.587 C682.65,232.347 682.91,232.068 683.229,231.808 C684.648,230.632 686.703,230.632 688.122,231.808 C688.442,232.068 688.742,232.367 689.061,232.627 C689.633,233.127 690.487,233.127 691.059,232.627 C691.378,232.367 691.678,232.068 691.997,231.808 C693.42,230.621 695.488,230.621 696.911,231.808 C697.21,232.068 697.49,232.347 697.789,232.587 C698.361,233.087 699.215,233.087 699.787,232.587 L700.725,231.768 C701.364,231.25 702.161,230.968 702.982,230.969 z" fill="#000000" id="route-ferry-stroke"/>
     </g>
     <g id="route-tram">
-      <g id="railway-subway-3">
-        <path d="M636.031,232 L637,234 L638,235 L639.5,234 L638.531,232 z" fill="#989898" id="path4893-1"/>
-        <path d="M623.5,232 L622.531,234 L621.531,235 L620.031,234 L621,232 z" fill="#989898" id="path5119-4"/>
-        <path d="M625,208 L619,214 L619,229 L621,231 L639,231 L641,229 L641,214 L635,208 L625,208 z M626,210 L634,210 L634,212 L626,212 L626,210 z M622,214 L624,214 L636,214 L638,214 L639,215 L639,219 L636,221 L624,221 L621,219 L621,215 L622,214 z M621,225 L624,225 L626,227 L626,228 L622,228 L621,227 L621,225 z M636,225 L639,225 L639,227 L638,228 L634,228 L634,227 L636,225 z" fill="#989898" id="rect5077-7"/>
+      <g>
+        <path d="M636.969,245.469 L634.031,249.531 L623.031,241.531 L625.969,237.469 z" fill="#46682F"/>
+        <path d="M634.125,245.406 L636.875,249.594 L648.875,241.594 L646.125,237.406 z" fill="#70372F"/>
+        <path d="M611.125,245.419 L613.875,249.575 L625.875,241.575 L623.125,237.419 z" fill="#2C5476"/>
+        <path d="M636.375,246.281 L634.625,248.719 L623.625,240.719 L625.375,238.281 z" fill="#8CD05F"/>
+        <path d="M634.656,246.25 L636.344,248.75 L648.344,240.75 L646.656,238.25 z" fill="#E06D5F"/>
+        <path d="M611.656,246.263 L613.344,248.763 L625.344,240.763 L623.656,238.263 z" fill="#58A9ED"/>
+        <path d="M650,239.5 C650,240.881 648.881,242 647.5,242 C646.119,242 645,240.881 645,239.5 C645,238.119 646.119,237 647.5,237 C648.881,237 650,238.119 650,239.5 z" fill="#70372F"/>
+        <path d="M615,247.5 C615,248.881 613.881,250 612.5,250 C611.119,250 610,248.881 610,247.5 C610,246.119 611.119,245 612.5,245 C613.881,245 615,246.119 615,247.5 z" fill="#2C5476"/>
+        <path d="M627,239.5 C627,240.881 625.881,242 624.5,242 C623.119,242 622,240.881 622,239.5 C622,238.119 623.119,237 624.5,237 C625.881,237 627,238.119 627,239.5 z" fill="#395E53"/>
+        <path d="M638,247.5 C638,248.881 636.881,250 635.5,250 C634.119,250 633,248.881 633,247.5 C633,246.119 634.119,245 635.5,245 C636.881,245 638,246.119 638,247.5 z" fill="#5B502F"/>
+        <path d="M649,239.5 C649,240.328 648.328,241 647.5,241 C646.672,241 646,240.328 646,239.5 C646,238.672 646.672,238 647.5,238 C648.328,238 649,238.672 649,239.5 z" fill="#FFFFFF"/>
+        <path d="M637,247.5 C637,248.328 636.328,249 635.5,249 C634.672,249 634,248.328 634,247.5 C634,246.672 634.672,246 635.5,246 C636.328,246 637,246.672 637,247.5 z" fill="#FFFFFF"/>
+        <path d="M626,239.5 C626,240.328 625.328,241 624.5,241 C623.672,241 623,240.328 623,239.5 C623,238.672 623.672,238 624.5,238 C625.328,238 626,238.672 626,239.5 z" fill="#FFFFFF"/>
+        <path d="M614,247.5 C614,248.328 613.328,249 612.5,249 C611.672,249 611,248.328 611,247.5 C611,246.672 611.672,246 612.5,246 C613.328,246 614,246.672 614,247.5 z" fill="#FFFFFF"/>
       </g>
-      <g id="g22976">
-        <g id="g22978">
-          <path d="M636.969,245.469 L634.031,249.531 L623.031,241.531 L625.969,237.469 z" fill="#46682F" id="path22980"/>
-          <path d="M634.125,245.406 L636.875,249.594 L648.875,241.594 L646.125,237.406 z" fill="#70372F" id="path22982"/>
-          <path d="M611.125,245.419 L613.875,249.575 L625.875,241.575 L623.125,237.419 z" fill="#2C5476" id="path22984"/>
-        </g>
-        <path d="M636.375,246.281 L634.625,248.719 L623.625,240.719 L625.375,238.281 z" fill="#8CD05F" id="path22988"/>
-        <path d="M634.656,246.25 L636.344,248.75 L648.344,240.75 L646.656,238.25 z" fill="#E06D5F" id="path22992"/>
-        <path d="M611.656,246.263 L613.344,248.763 L625.344,240.763 L623.656,238.263 z" fill="#58A9ED" id="path22994"/>
-        <path d="M650,239.5 C650,240.881 648.881,242 647.5,242 C646.119,242 645,240.881 645,239.5 C645,238.119 646.119,237 647.5,237 C648.881,237 650,238.119 650,239.5 z" fill="#70372F" id="path22996"/>
-        <path d="M615,247.5 C615,248.881 613.881,250 612.5,250 C611.119,250 610,248.881 610,247.5 C610,246.119 611.119,245 612.5,245 C613.881,245 615,246.119 615,247.5 z" fill="#2C5476" id="path22998"/>
-        <path d="M627,239.5 C627,240.881 625.881,242 624.5,242 C623.119,242 622,240.881 622,239.5 C622,238.119 623.119,237 624.5,237 C625.881,237 627,238.119 627,239.5 z" fill="#395E53" id="path23000"/>
-        <path d="M638,247.5 C638,248.881 636.881,250 635.5,250 C634.119,250 633,248.881 633,247.5 C633,246.119 634.119,245 635.5,245 C636.881,245 638,246.119 638,247.5 z" fill="#5B502F" id="path23002"/>
-        <path d="M649,239.5 C649,240.328 648.328,241 647.5,241 C646.672,241 646,240.328 646,239.5 C646,238.672 646.672,238 647.5,238 C648.328,238 649,238.672 649,239.5 z" fill="#FFFFFF" id="path23004"/>
-        <path d="M637,247.5 C637,248.328 636.328,249 635.5,249 C634.672,249 634,248.328 634,247.5 C634,246.672 634.672,246 635.5,246 C636.328,246 637,246.672 637,247.5 z" fill="#FFFFFF" id="path23006"/>
-        <path d="M626,239.5 C626,240.328 625.328,241 624.5,241 C623.672,241 623,240.328 623,239.5 C623,238.672 623.672,238 624.5,238 C625.328,238 626,238.672 626,239.5 z" fill="#FFFFFF" id="path23008"/>
-        <path d="M614,247.5 C614,248.328 613.328,249 612.5,249 C611.672,249 611,248.328 611,247.5 C611,246.672 611.672,246 612.5,246 C613.328,246 614,246.672 614,247.5 z" fill="#FFFFFF" id="path23010"/>
+      <g>
+        <path d="M635.031,232 L636,234 L637,235 L638.5,234 L637.531,232 z" fill="#989898"/>
+        <path d="M624.5,232 L623.531,234 L622.531,235 L621.031,234 L622,232 z" fill="#989898"/>
+        <path d="M626,209 L621,215 L621,229 L623,231 L637,231 L639,229 L639,215 L634,209 L626,209 z M626,210 L634,210 L634,212 L626,212 L626,210 z M624,215 L626,215 L634,215 L636,215 L637,216 L637,220 L634,220 L626,220 L623,220 L623,216 L624,215 z M623,225 L626,225 L628,227 L628,228 L624,228 L623,227 L623,225 z M634,225 L637,225 L637,227 L636,228 L632,228 L632,227 L634,225 z" fill="#989898"/>
+        <path d="M625,205 L625,206 L629,206 L629,208 L631,208 L631,206 L635,206 L635,205 z" fill="#B5B5B5"/>
       </g>
     </g>
     <g id="route-detour">
+      <g>
+        <path d="M576.969,245.469 L574.031,249.531 L563.031,241.531 L565.969,237.469 z" fill="#46682F"/>
+        <path d="M574.125,245.406 L576.875,249.594 L588.875,241.594 L586.125,237.406 z" fill="#70372F"/>
+        <path d="M551.125,245.419 L553.875,249.575 L565.875,241.575 L563.125,237.419 z" fill="#2C5476"/>
+        <path d="M576.375,246.281 L574.625,248.719 L563.625,240.719 L565.375,238.281 z" fill="#8CD05F"/>
+        <path d="M574.656,246.25 L576.344,248.75 L588.344,240.75 L586.656,238.25 z" fill="#E06D5F"/>
+        <path d="M551.656,246.263 L553.344,248.763 L565.344,240.763 L563.656,238.263 z" fill="#58A9ED"/>
+        <path d="M590,239.5 C590,240.881 588.881,242 587.5,242 C586.119,242 585,240.881 585,239.5 C585,238.119 586.119,237 587.5,237 C588.881,237 590,238.119 590,239.5 z" fill="#70372F"/>
+        <path d="M555,247.5 C555,248.881 553.881,250 552.5,250 C551.119,250 550,248.881 550,247.5 C550,246.119 551.119,245 552.5,245 C553.881,245 555,246.119 555,247.5 z" fill="#2C5476"/>
+        <path d="M567,239.5 C567,240.881 565.881,242 564.5,242 C563.119,242 562,240.881 562,239.5 C562,238.119 563.119,237 564.5,237 C565.881,237 567,238.119 567,239.5 z" fill="#395E53"/>
+        <path d="M578,247.5 C578,248.881 576.881,250 575.5,250 C574.119,250 573,248.881 573,247.5 C573,246.119 574.119,245 575.5,245 C576.881,245 578,246.119 578,247.5 z" fill="#5B502F"/>
+        <path d="M589,239.5 C589,240.328 588.328,241 587.5,241 C586.672,241 586,240.328 586,239.5 C586,238.672 586.672,238 587.5,238 C588.328,238 589,238.672 589,239.5 z" fill="#FFFFFF"/>
+        <path d="M577,247.5 C577,248.328 576.328,249 575.5,249 C574.672,249 574,248.328 574,247.5 C574,246.672 574.672,246 575.5,246 C576.328,246 577,246.672 577,247.5 z" fill="#FFFFFF"/>
+        <path d="M566,239.5 C566,240.328 565.328,241 564.5,241 C563.672,241 563,240.328 563,239.5 C563,238.672 563.672,238 564.5,238 C565.328,238 566,238.672 566,239.5 z" fill="#FFFFFF"/>
+        <path d="M554,247.5 C554,248.328 553.328,249 552.5,249 C551.672,249 551,248.328 551,247.5 C551,246.672 551.672,246 552.5,246 C553.328,246 554,246.672 554,247.5 z" fill="#FFFFFF"/>
+      </g>
       <path d="M557,214 L555,216 L555,231 L557,233 L585,233 L587,231 L587,216 L585,214 L557,214" fill="#FC6C14"/>
       <path d="M574,219.5 L579,223.5 L574,227.5 L574,225 L563,225 L563,222 L574,222" fill="#000000"/>
-      <g id="g22876">
-        <g id="g22878">
-          <path d="M576.969,245.469 L574.031,249.531 L563.031,241.531 L565.969,237.469 z" fill="#46682F" id="path22880"/>
-          <path d="M574.125,245.406 L576.875,249.594 L588.875,241.594 L586.125,237.406 z" fill="#70372F" id="path22882"/>
-          <path d="M551.125,245.419 L553.875,249.575 L565.875,241.575 L563.125,237.419 z" fill="#2C5476" id="path22884"/>
-        </g>
-        <path d="M576.375,246.281 L574.625,248.719 L563.625,240.719 L565.375,238.281 z" fill="#8CD05F" id="path22888"/>
-        <path d="M574.656,246.25 L576.344,248.75 L588.344,240.75 L586.656,238.25 z" fill="#E06D5F" id="path22892"/>
-        <path d="M551.656,246.263 L553.344,248.763 L565.344,240.763 L563.656,238.263 z" fill="#58A9ED" id="path22894"/>
-        <path d="M590,239.5 C590,240.881 588.881,242 587.5,242 C586.119,242 585,240.881 585,239.5 C585,238.119 586.119,237 587.5,237 C588.881,237 590,238.119 590,239.5 z" fill="#70372F" id="path22896"/>
-        <path d="M555,247.5 C555,248.881 553.881,250 552.5,250 C551.119,250 550,248.881 550,247.5 C550,246.119 551.119,245 552.5,245 C553.881,245 555,246.119 555,247.5 z" fill="#2C5476" id="path22898"/>
-        <path d="M567,239.5 C567,240.881 565.881,242 564.5,242 C563.119,242 562,240.881 562,239.5 C562,238.119 563.119,237 564.5,237 C565.881,237 567,238.119 567,239.5 z" fill="#395E53" id="path22900"/>
-        <path d="M578,247.5 C578,248.881 576.881,250 575.5,250 C574.119,250 573,248.881 573,247.5 C573,246.119 574.119,245 575.5,245 C576.881,245 578,246.119 578,247.5 z" fill="#5B502F" id="path22902"/>
-        <path d="M589,239.5 C589,240.328 588.328,241 587.5,241 C586.672,241 586,240.328 586,239.5 C586,238.672 586.672,238 587.5,238 C588.328,238 589,238.672 589,239.5 z" fill="#FFFFFF" id="path22904"/>
-        <path d="M577,247.5 C577,248.328 576.328,249 575.5,249 C574.672,249 574,248.328 574,247.5 C574,246.672 574.672,246 575.5,246 C576.328,246 577,246.672 577,247.5 z" fill="#FFFFFF" id="path22906"/>
-        <path d="M566,239.5 C566,240.328 565.328,241 564.5,241 C563.672,241 563,240.328 563,239.5 C563,238.672 563.672,238 564.5,238 C565.328,238 566,238.672 566,239.5 z" fill="#FFFFFF" id="path22908"/>
-        <path d="M554,247.5 C554,248.328 553.328,249 552.5,249 C551.672,249 551,248.328 551,247.5 C551,246.672 551.672,246 552.5,246 C553.328,246 554,246.672 554,247.5 z" fill="#FFFFFF" id="path22910"/>
-      </g>
-      <path d="M557,216.013 L557,216.513 L557,230.513 L557,231.013 L557.5,231.013 L584.5,231.013 L585,231.013 L585,230.513 L585,216.513 L585,216.013 L584.5,216.013 L557.5,216.013 L557,216.013 z M558,217.013 L584,217.013 L584,230.013 L558,230.013 L558,217.013 z" fill="#000000" id="rect22914"/>
+      <path d="M557,216.013 L557,216.513 L557,230.513 L557,231.013 L557.5,231.013 L584.5,231.013 L585,231.013 L585,230.513 L585,216.513 L585,216.013 L584.5,216.013 L557.5,216.013 L557,216.013 z M558,217.013 L584,217.013 L584,230.013 L558,230.013 L558,217.013 z" fill="#000000"/>
     </g>
     <g id="route-train">
-      <path d="M503.5,211 L502,212 L501.531,214 L498.25,214 C497.696,214 497.384,214.463 497.25,215 L497,216 C496.866,216.537 497.446,217 498,217 L522,217 C522.554,217 523.134,216.537 523,216 L522.75,215 C522.616,214.463 522.304,214 521.75,214 L518.969,214 L518.5,212 L517,211 L516,212 L516.469,214 L504.031,214 L504.5,212 L503.5,211 z M501.5,215 C501.776,215 502,215.224 502,215.5 C502,215.776 501.776,216 501.5,216 C501.224,216 501,215.776 501,215.5 C501,215.224 501.224,215 501.5,215 z M518.5,215 C518.776,215 519,215.224 519,215.5 C519,215.776 518.776,216 518.5,216 C518.224,216 518,215.776 518,215.5 C518,215.224 518.224,215 518.5,215 z M500.562,218 L500.094,220 L497.25,220 C496.696,220 496.384,220.463 496.25,221 L496,222 C495.866,222.537 496.446,223 497,223 L523,223 C523.554,223 524.134,222.537 524,222 L523.75,221 C523.616,220.463 523.304,220 522.75,220 L520.406,220 L519.938,218 L517.438,218 L517.906,220 L502.594,220 L503.062,218 L500.562,218 z M500.5,221 C500.776,221 501,221.224 501,221.5 C501,221.776 500.776,222 500.5,222 C500.224,222 500,221.776 500,221.5 C500,221.224 500.224,221 500.5,221 z M519.5,221 C519.776,221 520,221.224 520,221.5 C520,221.776 519.776,222 519.5,222 C519.224,222 519,221.776 519,221.5 C519,221.224 519.224,221 519.5,221 z M499.156,224 L498.688,226 L496.25,226 C495.696,226 495.384,226.463 495.25,227 L495,228 C494.866,228.537 495.446,229 496,229 L524,229 C524.554,229 525.134,228.537 525,228 L524.75,227 C524.616,226.463 524.304,226 523.75,226 L521.812,226 L521.344,224 L518.844,224 L519.312,226 L501.188,226 L501.656,224 L499.156,224 z M499.5,227 C499.776,227 500,227.224 500,227.5 C500,227.776 499.776,228 499.5,228 C499.224,228 499,227.776 499,227.5 C499,227.224 499.224,227 499.5,227 z M520.5,227 C520.776,227 521,227.224 521,227.5 C521,227.776 520.776,228 520.5,228 C520.224,228 520,227.776 520,227.5 C520,227.224 520.224,227 520.5,227 z M497.719,230 L497,233 L498.5,234 L499.5,233 L500.219,230 L497.719,230 z M520.281,230 L521,233 L522,234 L523.5,233 L522.781,230 L520.281,230 z" fill="#989898" id="rect17528-7-8"/>
-      <g id="g22838">
-        <g id="g22840">
-          <path d="M516.969,245.469 L514.031,249.531 L503.031,241.531 L505.969,237.469 z" fill="#46682F" id="path22842"/>
-          <path d="M514.125,245.406 L516.875,249.594 L528.875,241.594 L526.125,237.406 z" fill="#70372F" id="path22844"/>
-          <path d="M491.125,245.419 L493.875,249.575 L505.875,241.575 L503.125,237.419 z" fill="#2C5476" id="path22846"/>
-        </g>
-        <path d="M516.375,246.281 L514.625,248.719 L503.625,240.719 L505.375,238.281 z" fill="#8CD05F" id="path22850"/>
-        <path d="M514.656,246.25 L516.344,248.75 L528.344,240.75 L526.656,238.25 z" fill="#E06D5F" id="path22854"/>
-        <path d="M491.656,246.263 L493.344,248.763 L505.344,240.763 L503.656,238.263 z" fill="#58A9ED" id="path22856"/>
-        <path d="M530,239.5 C530,240.881 528.881,242 527.5,242 C526.119,242 525,240.881 525,239.5 C525,238.119 526.119,237 527.5,237 C528.881,237 530,238.119 530,239.5 z" fill="#70372F" id="path22858"/>
-        <path d="M495,247.5 C495,248.881 493.881,250 492.5,250 C491.119,250 490,248.881 490,247.5 C490,246.119 491.119,245 492.5,245 C493.881,245 495,246.119 495,247.5 z" fill="#2C5476" id="path22860"/>
-        <path d="M507,239.5 C507,240.881 505.881,242 504.5,242 C503.119,242 502,240.881 502,239.5 C502,238.119 503.119,237 504.5,237 C505.881,237 507,238.119 507,239.5 z" fill="#395E53" id="path22862"/>
-        <path d="M518,247.5 C518,248.881 516.881,250 515.5,250 C514.119,250 513,248.881 513,247.5 C513,246.119 514.119,245 515.5,245 C516.881,245 518,246.119 518,247.5 z" fill="#5B502F" id="path22864"/>
-        <path d="M529,239.5 C529,240.328 528.328,241 527.5,241 C526.672,241 526,240.328 526,239.5 C526,238.672 526.672,238 527.5,238 C528.328,238 529,238.672 529,239.5 z" fill="#FFFFFF" id="path22866"/>
-        <path d="M517,247.5 C517,248.328 516.328,249 515.5,249 C514.672,249 514,248.328 514,247.5 C514,246.672 514.672,246 515.5,246 C516.328,246 517,246.672 517,247.5 z" fill="#FFFFFF" id="path22868"/>
-        <path d="M506,239.5 C506,240.328 505.328,241 504.5,241 C503.672,241 503,240.328 503,239.5 C503,238.672 503.672,238 504.5,238 C505.328,238 506,238.672 506,239.5 z" fill="#FFFFFF" id="path22870"/>
-        <path d="M494,247.5 C494,248.328 493.328,249 492.5,249 C491.672,249 491,248.328 491,247.5 C491,246.672 491.672,246 492.5,246 C493.328,246 494,246.672 494,247.5 z" fill="#FFFFFF" id="path22872"/>
+      <g>
+        <path d="M516.969,245.469 L514.031,249.531 L503.031,241.531 L505.969,237.469 z" fill="#46682F"/>
+        <path d="M514.125,245.406 L516.875,249.594 L528.875,241.594 L526.125,237.406 z" fill="#70372F"/>
+        <path d="M491.125,245.419 L493.875,249.575 L505.875,241.575 L503.125,237.419 z" fill="#2C5476"/>
+        <path d="M516.375,246.281 L514.625,248.719 L503.625,240.719 L505.375,238.281 z" fill="#8CD05F"/>
+        <path d="M514.656,246.25 L516.344,248.75 L528.344,240.75 L526.656,238.25 z" fill="#E06D5F"/>
+        <path d="M491.656,246.263 L493.344,248.763 L505.344,240.763 L503.656,238.263 z" fill="#58A9ED"/>
+        <path d="M530,239.5 C530,240.881 528.881,242 527.5,242 C526.119,242 525,240.881 525,239.5 C525,238.119 526.119,237 527.5,237 C528.881,237 530,238.119 530,239.5 z" fill="#70372F"/>
+        <path d="M495,247.5 C495,248.881 493.881,250 492.5,250 C491.119,250 490,248.881 490,247.5 C490,246.119 491.119,245 492.5,245 C493.881,245 495,246.119 495,247.5 z" fill="#2C5476"/>
+        <path d="M507,239.5 C507,240.881 505.881,242 504.5,242 C503.119,242 502,240.881 502,239.5 C502,238.119 503.119,237 504.5,237 C505.881,237 507,238.119 507,239.5 z" fill="#395E53"/>
+        <path d="M518,247.5 C518,248.881 516.881,250 515.5,250 C514.119,250 513,248.881 513,247.5 C513,246.119 514.119,245 515.5,245 C516.881,245 518,246.119 518,247.5 z" fill="#5B502F"/>
+        <path d="M529,239.5 C529,240.328 528.328,241 527.5,241 C526.672,241 526,240.328 526,239.5 C526,238.672 526.672,238 527.5,238 C528.328,238 529,238.672 529,239.5 z" fill="#FFFFFF"/>
+        <path d="M517,247.5 C517,248.328 516.328,249 515.5,249 C514.672,249 514,248.328 514,247.5 C514,246.672 514.672,246 515.5,246 C516.328,246 517,246.672 517,247.5 z" fill="#FFFFFF"/>
+        <path d="M506,239.5 C506,240.328 505.328,241 504.5,241 C503.672,241 503,240.328 503,239.5 C503,238.672 503.672,238 504.5,238 C505.328,238 506,238.672 506,239.5 z" fill="#FFFFFF"/>
+        <path d="M494,247.5 C494,248.328 493.328,249 492.5,249 C491.672,249 491,248.328 491,247.5 C491,246.672 491.672,246 492.5,246 C493.328,246 494,246.672 494,247.5 z" fill="#FFFFFF"/>
       </g>
+      <path d="M503.5,211 L502,212 L501.531,214 L498.25,214 C497.696,214 497.384,214.463 497.25,215 L497,216 C496.866,216.537 497.446,217 498,217 L522,217 C522.554,217 523.134,216.537 523,216 L522.75,215 C522.616,214.463 522.304,214 521.75,214 L518.969,214 L518.5,212 L517,211 L516,212 L516.469,214 L504.031,214 L504.5,212 L503.5,211 z M501.5,215 C501.776,215 502,215.224 502,215.5 C502,215.776 501.776,216 501.5,216 C501.224,216 501,215.776 501,215.5 C501,215.224 501.224,215 501.5,215 z M518.5,215 C518.776,215 519,215.224 519,215.5 C519,215.776 518.776,216 518.5,216 C518.224,216 518,215.776 518,215.5 C518,215.224 518.224,215 518.5,215 z M500.562,218 L500.094,220 L497.25,220 C496.696,220 496.384,220.463 496.25,221 L496,222 C495.866,222.537 496.446,223 497,223 L523,223 C523.554,223 524.134,222.537 524,222 L523.75,221 C523.616,220.463 523.304,220 522.75,220 L520.406,220 L519.938,218 L517.438,218 L517.906,220 L502.594,220 L503.062,218 L500.562,218 z M500.5,221 C500.776,221 501,221.224 501,221.5 C501,221.776 500.776,222 500.5,222 C500.224,222 500,221.776 500,221.5 C500,221.224 500.224,221 500.5,221 z M519.5,221 C519.776,221 520,221.224 520,221.5 C520,221.776 519.776,222 519.5,222 C519.224,222 519,221.776 519,221.5 C519,221.224 519.224,221 519.5,221 z M499.156,224 L498.688,226 L496.25,226 C495.696,226 495.384,226.463 495.25,227 L495,228 C494.866,228.537 495.446,229 496,229 L524,229 C524.554,229 525.134,228.537 525,228 L524.75,227 C524.616,226.463 524.304,226 523.75,226 L521.812,226 L521.344,224 L518.844,224 L519.312,226 L501.188,226 L501.656,224 L499.156,224 z M499.5,227 C499.776,227 500,227.224 500,227.5 C500,227.776 499.776,228 499.5,228 C499.224,228 499,227.776 499,227.5 C499,227.224 499.224,227 499.5,227 z M520.5,227 C520.776,227 521,227.224 521,227.5 C521,227.776 520.776,228 520.5,228 C520.224,228 520,227.776 520,227.5 C520,227.224 520.224,227 520.5,227 z M497.719,230 L497,233 L498.5,234 L499.5,233 L500.219,230 L497.719,230 z M520.281,230 L521,233 L522,234 L523.5,233 L522.781,230 L520.281,230 z" fill="#989898"/>
     </g>
     <g id="route-bus">
-      <path d="M442,208 L440,210 L440,228 L441,229 L461,229 L462,228 L462,210 L460,208 L442,208 z M447,210 L455,210 L455,212 L447,212 L447,210 z M443,214 L445,214 L457,214 L459,214 L460,215 L460,219 L457,221 L445,221 L442,219 L442,215 L443,214 z M442,224 L445,224 L447,226 L447,227 L443,227 L442,226 L442,224 z M457,224 L460,224 L460,226 L459,227 L455,227 L455,226 L457,224 z" fill="#989898" id="rect5077-9"/>
-      <path d="M441,230 L446,230 L446,232 L445,233 L442,233 L441,232 z" fill="#989898" id="path22279"/>
-      <path d="M456,230 L461,230 L461,232 L460,233 L457,233 L456,232 z" fill="#989898" id="path22281"/>
-      <g id="g22697-4">
-        <g id="g22699-6">
-          <path d="M456.969,245.469 L454.031,249.531 L443.031,241.531 L445.969,237.469 z" fill="#46682F" id="path22701-2"/>
-          <path d="M454.125,245.406 L456.875,249.594 L468.875,241.594 L466.125,237.406 z" fill="#70372F" id="path22703-6"/>
-          <path d="M431.125,245.419 L433.875,249.575 L445.875,241.575 L443.125,237.419 z" fill="#2C5476" id="path22705-7"/>
-        </g>
-        <path d="M456.375,246.281 L454.625,248.719 L443.625,240.719 L445.375,238.281 z" fill="#8CD05F" id="path22709-0"/>
-        <path d="M454.656,246.25 L456.344,248.75 L468.344,240.75 L466.656,238.25 z" fill="#E06D5F" id="path22713-1"/>
-        <path d="M431.656,246.263 L433.344,248.763 L445.344,240.763 L443.656,238.263 z" fill="#58A9ED" id="path22715-7"/>
-        <path d="M470,239.5 C470,240.881 468.881,242 467.5,242 C466.119,242 465,240.881 465,239.5 C465,238.119 466.119,237 467.5,237 C468.881,237 470,238.119 470,239.5 z" fill="#70372F" id="path22717-4"/>
-        <path d="M435,247.5 C435,248.881 433.881,250 432.5,250 C431.119,250 430,248.881 430,247.5 C430,246.119 431.119,245 432.5,245 C433.881,245 435,246.119 435,247.5 z" fill="#2C5476" id="path22719-8"/>
-        <path d="M447,239.5 C447,240.881 445.881,242 444.5,242 C443.119,242 442,240.881 442,239.5 C442,238.119 443.119,237 444.5,237 C445.881,237 447,238.119 447,239.5 z" fill="#395E53" id="path22721-0"/>
-        <path d="M458,247.5 C458,248.881 456.881,250 455.5,250 C454.119,250 453,248.881 453,247.5 C453,246.119 454.119,245 455.5,245 C456.881,245 458,246.119 458,247.5 z" fill="#5B502F" id="path22723-7"/>
-        <path d="M469,239.5 C469,240.328 468.328,241 467.5,241 C466.671,241 466,240.328 466,239.5 C466,238.672 466.671,238 467.5,238 C468.328,238 469,238.672 469,239.5 z" fill="#FFFFFF" id="path22725-7"/>
-        <path d="M457,247.5 C457,248.328 456.328,249 455.5,249 C454.671,249 454,248.328 454,247.5 C454,246.672 454.671,246 455.5,246 C456.328,246 457,246.672 457,247.5 z" fill="#FFFFFF" id="path22727-1"/>
-        <path d="M446,239.5 C446,240.328 445.328,241 444.5,241 C443.672,241 443,240.328 443,239.5 C443,238.672 443.672,238 444.5,238 C445.328,238 446,238.672 446,239.5 z" fill="#FFFFFF" id="path22729-7"/>
-        <path d="M434,247.5 C434,248.328 433.328,249 432.5,249 C431.672,249 431,248.328 431,247.5 C431,246.672 431.672,246 432.5,246 C433.328,246 434,246.672 434,247.5 z" fill="#FFFFFF" id="path22731-4"/>
+      <g>
+        <path d="M456.969,245.469 L454.031,249.531 L443.031,241.531 L445.969,237.469 z" fill="#46682F"/>
+        <path d="M454.125,245.406 L456.875,249.594 L468.875,241.594 L466.125,237.406 z" fill="#70372F"/>
+        <path d="M431.125,245.419 L433.875,249.575 L445.875,241.575 L443.125,237.419 z" fill="#2C5476"/>
+        <path d="M456.375,246.281 L454.625,248.719 L443.625,240.719 L445.375,238.281 z" fill="#8CD05F"/>
+        <path d="M454.656,246.25 L456.344,248.75 L468.344,240.75 L466.656,238.25 z" fill="#E06D5F"/>
+        <path d="M431.656,246.263 L433.344,248.763 L445.344,240.763 L443.656,238.263 z" fill="#58A9ED"/>
+        <path d="M470,239.5 C470,240.881 468.881,242 467.5,242 C466.119,242 465,240.881 465,239.5 C465,238.119 466.119,237 467.5,237 C468.881,237 470,238.119 470,239.5 z" fill="#70372F"/>
+        <path d="M435,247.5 C435,248.881 433.881,250 432.5,250 C431.119,250 430,248.881 430,247.5 C430,246.119 431.119,245 432.5,245 C433.881,245 435,246.119 435,247.5 z" fill="#2C5476"/>
+        <path d="M447,239.5 C447,240.881 445.881,242 444.5,242 C443.119,242 442,240.881 442,239.5 C442,238.119 443.119,237 444.5,237 C445.881,237 447,238.119 447,239.5 z" fill="#395E53"/>
+        <path d="M458,247.5 C458,248.881 456.881,250 455.5,250 C454.119,250 453,248.881 453,247.5 C453,246.119 454.119,245 455.5,245 C456.881,245 458,246.119 458,247.5 z" fill="#5B502F"/>
+        <path d="M469,239.5 C469,240.328 468.328,241 467.5,241 C466.671,241 466,240.328 466,239.5 C466,238.672 466.671,238 467.5,238 C468.328,238 469,238.672 469,239.5 z" fill="#FFFFFF"/>
+        <path d="M457,247.5 C457,248.328 456.328,249 455.5,249 C454.671,249 454,248.328 454,247.5 C454,246.672 454.671,246 455.5,246 C456.328,246 457,246.672 457,247.5 z" fill="#FFFFFF"/>
+        <path d="M446,239.5 C446,240.328 445.328,241 444.5,241 C443.672,241 443,240.328 443,239.5 C443,238.672 443.672,238 444.5,238 C445.328,238 446,238.672 446,239.5 z" fill="#FFFFFF"/>
+        <path d="M434,247.5 C434,248.328 433.328,249 432.5,249 C431.672,249 431,248.328 431,247.5 C431,246.672 431.672,246 432.5,246 C433.328,246 434,246.672 434,247.5 z" fill="#FFFFFF"/>
       </g>
+      <path d="M444.167,208 C441.894,208 439.167,209.239 439.167,212.577 L439.167,221.665 L439.167,228 C439.167,228 439.167,229.667 440.833,229.667 L440.833,231.333 C440.833,231.333 440.833,233 442.5,233 C444.167,233 444.167,231.333 444.167,231.333 L444.167,229.667 L455.833,229.667 L455.833,231.333 C455.833,231.333 455.833,233 457.5,233 C459.167,233 459.167,231.333 459.167,231.333 L459.167,229.667 C459.167,229.667 460.833,229.667 460.833,228 L460.833,212.577 C460.833,209.168 458.773,208 456.501,208 L444.167,208 z M444.583,210.5 L455.417,210.5 C455.647,210.5 455.833,210.686 455.833,210.917 C455.833,211.148 455.647,211.333 455.417,211.333 L444.583,211.333 C444.352,211.333 444.167,211.148 444.167,210.917 C444.167,210.686 444.352,210.5 444.583,210.5 z M442.5,213 L457.5,213 C459.167,213 459.167,214.611 459.167,214.611 L459.167,219.667 C459.167,219.667 459.167,221.333 457.5,221.333 L442.5,221.333 C440.833,221.333 440.833,219.667 440.833,219.667 L440.833,214.667 C440.833,214.667 440.833,213 442.5,213 z M442.5,224.667 C443.42,224.667 444.167,225.413 444.167,226.333 C444.167,227.254 443.42,228 442.5,228 C441.579,228 440.833,227.254 440.833,226.333 C440.833,225.413 441.579,224.667 442.5,224.667 z M457.5,224.667 C458.42,224.667 459.167,225.413 459.167,226.333 C459.167,227.254 458.42,228 457.5,228 C456.579,228 455.833,227.254 455.833,226.333 C455.833,225.413 456.579,224.667 457.5,224.667 z" fill="#989898"/>
     </g>
     <g id="route-horse">
-      <g id="g22697-52">
-        <g id="g22699-662">
-          <path d="M396.969,245.469 L394.031,249.531 L383.031,241.531 L385.969,237.469 z" fill="#46682F" id="path22701-42"/>
-          <path d="M394.125,245.406 L396.875,249.594 L408.875,241.594 L406.125,237.406 z" fill="#70372F" id="path22703-52"/>
-          <path d="M371.125,245.419 L373.875,249.575 L385.875,241.575 L383.125,237.419 z" fill="#2C5476" id="path22705-62"/>
-        </g>
-        <path d="M396.375,246.281 L394.625,248.719 L383.625,240.719 L385.375,238.281 z" fill="#8CD05F" id="path22709-32"/>
-        <path d="M394.656,246.25 L396.344,248.75 L408.344,240.75 L406.656,238.25 z" fill="#E06D5F" id="path22713-92"/>
-        <path d="M371.656,246.263 L373.344,248.763 L385.344,240.763 L383.656,238.263 z" fill="#58A9ED" id="path22715-22"/>
-        <path d="M410,239.5 C410,240.881 408.881,242 407.5,242 C406.119,242 405,240.881 405,239.5 C405,238.119 406.119,237 407.5,237 C408.881,237 410,238.119 410,239.5 z" fill="#70372F" id="path22717-92"/>
-        <path d="M375,247.5 C375,248.881 373.881,250 372.5,250 C371.119,250 370,248.881 370,247.5 C370,246.119 371.119,245 372.5,245 C373.881,245 375,246.119 375,247.5 z" fill="#2C5476" id="path22719-52"/>
-        <path d="M387,239.5 C387,240.881 385.881,242 384.5,242 C383.119,242 382,240.881 382,239.5 C382,238.119 383.119,237 384.5,237 C385.881,237 387,238.119 387,239.5 z" fill="#395E53" id="path22721-82"/>
-        <path d="M398,247.5 C398,248.881 396.881,250 395.5,250 C394.119,250 393,248.881 393,247.5 C393,246.119 394.119,245 395.5,245 C396.881,245 398,246.119 398,247.5 z" fill="#5B502F" id="path22723-12"/>
-        <path d="M409,239.5 C409,240.328 408.328,241 407.5,241 C406.672,241 406,240.328 406,239.5 C406,238.672 406.672,238 407.5,238 C408.328,238 409,238.672 409,239.5 z" fill="#FFFFFF" id="path22725-42"/>
-        <path d="M397,247.5 C397,248.328 396.328,249 395.5,249 C394.672,249 394,248.328 394,247.5 C394,246.672 394.672,246 395.5,246 C396.328,246 397,246.672 397,247.5 z" fill="#FFFFFF" id="path22727-182"/>
-        <path d="M386,239.5 C386,240.328 385.328,241 384.5,241 C383.672,241 383,240.328 383,239.5 C383,238.672 383.672,238 384.5,238 C385.328,238 386,238.672 386,239.5 z" fill="#FFFFFF" id="path22729-22"/>
-        <path d="M374,247.5 C374,248.328 373.328,249 372.5,249 C371.672,249 371,248.328 371,247.5 C371,246.672 371.672,246 372.5,246 C373.328,246 374,246.672 374,247.5 z" fill="#FFFFFF" id="path22731-432"/>
+      <g>
+        <path d="M396.969,245.469 L394.031,249.531 L383.031,241.531 L385.969,237.469 z" fill="#46682F"/>
+        <path d="M394.125,245.406 L396.875,249.594 L408.875,241.594 L406.125,237.406 z" fill="#70372F"/>
+        <path d="M371.125,245.419 L373.875,249.575 L385.875,241.575 L383.125,237.419 z" fill="#2C5476"/>
+        <path d="M396.375,246.281 L394.625,248.719 L383.625,240.719 L385.375,238.281 z" fill="#8CD05F"/>
+        <path d="M394.656,246.25 L396.344,248.75 L408.344,240.75 L406.656,238.25 z" fill="#E06D5F"/>
+        <path d="M371.656,246.263 L373.344,248.763 L385.344,240.763 L383.656,238.263 z" fill="#58A9ED"/>
+        <path d="M410,239.5 C410,240.881 408.881,242 407.5,242 C406.119,242 405,240.881 405,239.5 C405,238.119 406.119,237 407.5,237 C408.881,237 410,238.119 410,239.5 z" fill="#70372F"/>
+        <path d="M375,247.5 C375,248.881 373.881,250 372.5,250 C371.119,250 370,248.881 370,247.5 C370,246.119 371.119,245 372.5,245 C373.881,245 375,246.119 375,247.5 z" fill="#2C5476"/>
+        <path d="M387,239.5 C387,240.881 385.881,242 384.5,242 C383.119,242 382,240.881 382,239.5 C382,238.119 383.119,237 384.5,237 C385.881,237 387,238.119 387,239.5 z" fill="#395E53"/>
+        <path d="M398,247.5 C398,248.881 396.881,250 395.5,250 C394.119,250 393,248.881 393,247.5 C393,246.119 394.119,245 395.5,245 C396.881,245 398,246.119 398,247.5 z" fill="#5B502F"/>
+        <path d="M409,239.5 C409,240.328 408.328,241 407.5,241 C406.672,241 406,240.328 406,239.5 C406,238.672 406.672,238 407.5,238 C408.328,238 409,238.672 409,239.5 z" fill="#FFFFFF"/>
+        <path d="M397,247.5 C397,248.328 396.328,249 395.5,249 C394.672,249 394,248.328 394,247.5 C394,246.672 394.672,246 395.5,246 C396.328,246 397,246.672 397,247.5 z" fill="#FFFFFF"/>
+        <path d="M386,239.5 C386,240.328 385.328,241 384.5,241 C383.672,241 383,240.328 383,239.5 C383,238.672 383.672,238 384.5,238 C385.328,238 386,238.672 386,239.5 z" fill="#FFFFFF"/>
+        <path d="M374,247.5 C374,248.328 373.328,249 372.5,249 C371.672,249 371,248.328 371,247.5 C371,246.672 371.672,246 372.5,246 C373.328,246 374,246.672 374,247.5 z" fill="#FFFFFF"/>
       </g>
-      <path d="M387.5,204 C386.119,204 385,205.119 385,206.5 C385,207.881 386.119,209 387.5,209 C388.881,209 390,207.881 390,206.5 C390,205.119 388.881,204 387.5,204 z M401,207.156 L398,211 L393.719,216 L393,216 L391,216 L390,215.656 L390,211 C390,210.446 389.554,210 389,210 L386,210 C385.446,210 385,210.446 385,211 L385,215 L383,215 L379,215 L375,219 L374,225 L376,225 L377,223 L378,220 L379,218.656 L379,222.156 L377,226.5 L377,232 C377,233 377,234 378.5,234 C380,234 380,233 380,232 L380,226.5 L381.156,224 L383,224 L383,226.5 L385.5,232.5 C385.751,233.435 386.405,234 387.25,234 C388.059,234 388.346,233.124 388,232 L386,226.5 L386,224.188 L389,225 L393,225 L393,232 C393,232.5 393,234 394.5,234 C396,234 396,232.5 396,232 L396,225 L401,216 L403,216 L405,217 L406,216 L406,214 L402,211 L401,211 z M385,216 L388,216 L391,219 L391,223 L390,224 L389,223 L389,220 L385,217 z" fill="#000000" id="route-horse-stroke"/>
+      <path d="M387.5,205 C386.119,205 385,206.119 385,207.5 C385,208.881 386.119,210 387.5,210 C388.881,210 390,208.881 390,207.5 C390,206.119 388.881,205 387.5,205 z M401,208.156 L398,212 L393.719,217 L393,217 L391,217 L390,216.656 L390,212 C390,211.446 389.554,211 389,211 L386,211 C385.446,211 385,211.446 385,212 L385,216 L383,216 L379,216 L375,220 L374,226 L376,226 L377,224 L378,221 L379,219.656 L379,223.156 L377,227.5 L377,233 C377,234 377,235 378.5,235 C380,235 380,234 380,233 L380,227.5 L381.156,225 L383,225 L383,227.5 L385.5,233.5 C385.751,234.435 386.405,235 387.25,235 C388.059,235 388.346,234.124 388,233 L386,227.5 L386,225.188 L389,226 L393,226 L393,233 C393,233.5 393,235 394.5,235 C396,235 396,233.5 396,233 L396,226 L401,217 L403,217 L405,218 L406,217 L406,215 L402,212 L401,212 z M385,217 L388,217 L391,220 L391,224 L390,225 L389,224 L389,221 L385,218 z" fill="#000000" id="route-horse-stroke"/>
     </g>
     <g id="route-foot">
-      <g id="g22697-5">
-        <g id="g22699-66">
-          <path d="M336.969,245.469 L334.031,249.531 L323.031,241.531 L325.969,237.469 z" fill="#46682F" id="path22701-4"/>
-          <path d="M334.125,245.406 L336.875,249.594 L348.875,241.594 L346.125,237.406 z" fill="#70372F" id="path22703-5"/>
-          <path d="M311.125,245.419 L313.875,249.575 L325.875,241.575 L323.125,237.419 z" fill="#2C5476" id="path22705-6"/>
-        </g>
-        <path d="M336.375,246.281 L334.625,248.719 L323.625,240.719 L325.375,238.281 z" fill="#8CD05F" id="path22709-3"/>
-        <path d="M334.656,246.25 L336.344,248.75 L348.344,240.75 L346.656,238.25 z" fill="#E06D5F" id="path22713-9"/>
-        <path d="M311.656,246.263 L313.344,248.763 L325.344,240.763 L323.656,238.263 z" fill="#58A9ED" id="path22715-2"/>
-        <path d="M350,239.5 C350,240.881 348.881,242 347.5,242 C346.119,242 345,240.881 345,239.5 C345,238.119 346.119,237 347.5,237 C348.881,237 350,238.119 350,239.5 z" fill="#70372F" id="path22717-9"/>
-        <path d="M315,247.5 C315,248.881 313.881,250 312.5,250 C311.119,250 310,248.881 310,247.5 C310,246.119 311.119,245 312.5,245 C313.881,245 315,246.119 315,247.5 z" fill="#2C5476" id="path22719-5"/>
-        <path d="M327,239.5 C327,240.881 325.881,242 324.5,242 C323.119,242 322,240.881 322,239.5 C322,238.119 323.119,237 324.5,237 C325.881,237 327,238.119 327,239.5 z" fill="#395E53" id="path22721-8"/>
-        <path d="M338,247.5 C338,248.881 336.881,250 335.5,250 C334.119,250 333,248.881 333,247.5 C333,246.119 334.119,245 335.5,245 C336.881,245 338,246.119 338,247.5 z" fill="#5B502F" id="path22723-1"/>
-        <path d="M349,239.5 C349,240.328 348.328,241 347.5,241 C346.672,241 346,240.328 346,239.5 C346,238.672 346.672,238 347.5,238 C348.328,238 349,238.672 349,239.5 z" fill="#FFFFFF" id="path22725-4"/>
-        <path d="M337,247.5 C337,248.328 336.328,249 335.5,249 C334.672,249 334,248.328 334,247.5 C334,246.672 334.672,246 335.5,246 C336.328,246 337,246.672 337,247.5 z" fill="#FFFFFF" id="path22727-18"/>
-        <path d="M326,239.5 C326,240.328 325.328,241 324.5,241 C323.672,241 323,240.328 323,239.5 C323,238.672 323.672,238 324.5,238 C325.328,238 326,238.672 326,239.5 z" fill="#FFFFFF" id="path22729-2"/>
-        <path d="M314,247.5 C314,248.328 313.328,249 312.5,249 C311.672,249 311,248.328 311,247.5 C311,246.672 311.672,246 312.5,246 C313.328,246 314,246.672 314,247.5 z" fill="#FFFFFF" id="path22731-43"/>
+      <g>
+        <path d="M336.969,245.469 L334.031,249.531 L323.031,241.531 L325.969,237.469 z" fill="#46682F"/>
+        <path d="M334.125,245.406 L336.875,249.594 L348.875,241.594 L346.125,237.406 z" fill="#70372F"/>
+        <path d="M311,245.419 L313.75,249.575 L325.75,241.575 L323,237.419 z" fill="#2C5476"/>
+        <path d="M336.375,246.281 L334.625,248.719 L323.625,240.719 L325.375,238.281 z" fill="#8CD05F"/>
+        <path d="M334.656,246.25 L336.344,248.75 L348.344,240.75 L346.656,238.25 z" fill="#E06D5F"/>
+        <path d="M311.656,246.263 L313.344,248.763 L325.344,240.763 L323.656,238.263 z" fill="#58A9ED"/>
+        <path d="M350,239.5 C350,240.881 348.881,242 347.5,242 C346.119,242 345,240.881 345,239.5 C345,238.119 346.119,237 347.5,237 C348.881,237 350,238.119 350,239.5 z" fill="#70372F"/>
+        <path d="M315,247.5 C315,248.881 313.881,250 312.5,250 C311.119,250 310,248.881 310,247.5 C310,246.119 311.119,245 312.5,245 C313.881,245 315,246.119 315,247.5 z" fill="#2C5476"/>
+        <path d="M327,239.5 C327,240.881 325.881,242 324.5,242 C323.119,242 322,240.881 322,239.5 C322,238.119 323.119,237 324.5,237 C325.881,237 327,238.119 327,239.5 z" fill="#395E53"/>
+        <path d="M338,247.5 C338,248.881 336.881,250 335.5,250 C334.119,250 333,248.881 333,247.5 C333,246.119 334.119,245 335.5,245 C336.881,245 338,246.119 338,247.5 z" fill="#5B502F"/>
+        <path d="M349,239.5 C349,240.328 348.328,241 347.5,241 C346.672,241 346,240.328 346,239.5 C346,238.672 346.672,238 347.5,238 C348.328,238 349,238.672 349,239.5 z" fill="#FFFFFF"/>
+        <path d="M337,247.5 C337,248.328 336.328,249 335.5,249 C334.672,249 334,248.328 334,247.5 C334,246.672 334.672,246 335.5,246 C336.328,246 337,246.672 337,247.5 z" fill="#FFFFFF"/>
+        <path d="M326,239.5 C326,240.328 325.328,241 324.5,241 C323.672,241 323,240.328 323,239.5 C323,238.672 323.672,238 324.5,238 C325.328,238 326,238.672 326,239.5 z" fill="#FFFFFF"/>
+        <path d="M314,247.5 C314,248.328 313.328,249 312.5,249 C311.672,249 311,248.328 311,247.5 C311,246.672 311.672,246 312.5,246 C313.328,246 314,246.672 314,247.5 z" fill="#FFFFFF"/>
       </g>
       <path d="M332,212.5 C332,213.881 330.881,215 329.5,215 C328.119,215 327,213.881 327,212.5 C327,211.119 328.119,210 329.5,210 C330.881,210 332,211.119 332,212.5 z M327,216 L328,216 L328.5,216 L337,222.5 L337,224 L336,224 L331,220.125 L331,224 L333,228 L335,233 L334,234 L333,234 L331,229 L327,223 L327,218.344 L324.5,220.5 L322.5,224 L321,224 L321,223 L322.5,220 L327,216 z M327.844,226.406 L325.531,234 L324.5,234 L323.5,233 L326.312,224.562 z" fill="#000000" id="route-foot-stroke"/>
     </g>
     <g id="route-bicycle">
-      <g id="g22697">
-        <g id="g22699">
-          <path d="M276.974,245.469 L274.036,249.531 L263.036,241.531 L265.974,237.469 z" fill="#46682F" id="path22701"/>
-          <path d="M274.13,245.406 L276.88,249.594 L288.88,241.594 L286.13,237.406 z" fill="#70372F" id="path22703"/>
-          <path d="M251.13,245.419 L253.88,249.575 L265.88,241.575 L263.13,237.419 z" fill="#2C5476" id="path22705"/>
-        </g>
-        <path d="M276.38,246.281 L274.63,248.719 L263.63,240.719 L265.38,238.281 z" fill="#8CD05F" id="path22709"/>
-        <path d="M274.661,246.25 L276.349,248.75 L288.349,240.75 L286.661,238.25 z" fill="#E06D5F" id="path22713"/>
-        <path d="M251.661,246.263 L253.349,248.763 L265.349,240.763 L263.661,238.263 z" fill="#58A9ED" id="path22715"/>
-        <path d="M290.005,239.5 C290.005,240.881 288.886,242 287.505,242 C286.124,242 285.005,240.881 285.005,239.5 C285.005,238.119 286.124,237 287.505,237 C288.886,237 290.005,238.119 290.005,239.5 z" fill="#70372F" id="path22717"/>
-        <path d="M255.005,247.5 C255.005,248.881 253.886,250 252.505,250 C251.124,250 250.005,248.881 250.005,247.5 C250.005,246.119 251.124,245 252.505,245 C253.886,245 255.005,246.119 255.005,247.5 z" fill="#2C5476" id="path22719"/>
-        <path d="M267.005,239.5 C267.005,240.881 265.886,242 264.505,242 C263.124,242 262.005,240.881 262.005,239.5 C262.005,238.119 263.124,237 264.505,237 C265.886,237 267.005,238.119 267.005,239.5 z" fill="#395E53" id="path22721"/>
-        <path d="M278.005,247.5 C278.005,248.881 276.886,250 275.505,250 C274.124,250 273.005,248.881 273.005,247.5 C273.005,246.119 274.124,245 275.505,245 C276.886,245 278.005,246.119 278.005,247.5 z" fill="#5B502F" id="path22723"/>
-        <path d="M289.005,239.5 C289.005,240.328 288.333,241 287.505,241 C286.676,241 286.005,240.328 286.005,239.5 C286.005,238.672 286.676,238 287.505,238 C288.333,238 289.005,238.672 289.005,239.5 z" fill="#FFFFFF" id="path22725"/>
-        <path d="M277.005,247.5 C277.005,248.328 276.333,249 275.505,249 C274.676,249 274.005,248.328 274.005,247.5 C274.005,246.672 274.676,246 275.505,246 C276.333,246 277.005,246.672 277.005,247.5 z" fill="#FFFFFF" id="path22727"/>
-        <path d="M266.005,239.5 C266.005,240.328 265.333,241 264.505,241 C263.677,241 263.005,240.328 263.005,239.5 C263.005,238.672 263.677,238 264.505,238 C265.333,238 266.005,238.672 266.005,239.5 z" fill="#FFFFFF" id="path22729"/>
-        <path d="M254.005,247.5 C254.005,248.328 253.333,249 252.505,249 C251.677,249 251.005,248.328 251.005,247.5 C251.005,246.672 251.677,246 252.505,246 C253.333,246 254.005,246.672 254.005,247.5 z" fill="#FFFFFF" id="path22731"/>
+      <g>
+        <path d="M276.974,245.469 L274.036,249.531 L263.036,241.531 L265.974,237.469 z" fill="#46682F"/>
+        <path d="M274.13,245.406 L276.88,249.594 L288.88,241.594 L286.13,237.406 z" fill="#70372F"/>
+        <path d="M251.13,245.419 L253.88,249.575 L265.88,241.575 L263.13,237.419 z" fill="#2C5476"/>
+        <path d="M276.38,246.281 L274.63,248.719 L263.63,240.719 L265.38,238.281 z" fill="#8CD05F"/>
+        <path d="M274.661,246.25 L276.349,248.75 L288.349,240.75 L286.661,238.25 z" fill="#E06D5F"/>
+        <path d="M251.661,246.263 L253.349,248.763 L265.349,240.763 L263.661,238.263 z" fill="#58A9ED"/>
+        <path d="M290.005,239.5 C290.005,240.881 288.886,242 287.505,242 C286.124,242 285.005,240.881 285.005,239.5 C285.005,238.119 286.124,237 287.505,237 C288.886,237 290.005,238.119 290.005,239.5 z" fill="#70372F"/>
+        <path d="M255.005,247.5 C255.005,248.881 253.886,250 252.505,250 C251.124,250 250.005,248.881 250.005,247.5 C250.005,246.119 251.124,245 252.505,245 C253.886,245 255.005,246.119 255.005,247.5 z" fill="#2C5476"/>
+        <path d="M267.005,239.5 C267.005,240.881 265.886,242 264.505,242 C263.124,242 262.005,240.881 262.005,239.5 C262.005,238.119 263.124,237 264.505,237 C265.886,237 267.005,238.119 267.005,239.5 z" fill="#395E53"/>
+        <path d="M278.005,247.5 C278.005,248.881 276.886,250 275.505,250 C274.124,250 273.005,248.881 273.005,247.5 C273.005,246.119 274.124,245 275.505,245 C276.886,245 278.005,246.119 278.005,247.5 z" fill="#5B502F"/>
+        <path d="M289.005,239.5 C289.005,240.328 288.333,241 287.505,241 C286.676,241 286.005,240.328 286.005,239.5 C286.005,238.672 286.676,238 287.505,238 C288.333,238 289.005,238.672 289.005,239.5 z" fill="#FFFFFF"/>
+        <path d="M277.005,247.5 C277.005,248.328 276.333,249 275.505,249 C274.676,249 274.005,248.328 274.005,247.5 C274.005,246.672 274.676,246 275.505,246 C276.333,246 277.005,246.672 277.005,247.5 z" fill="#FFFFFF"/>
+        <path d="M266.005,239.5 C266.005,240.328 265.333,241 264.505,241 C263.677,241 263.005,240.328 263.005,239.5 C263.005,238.672 263.677,238 264.505,238 C265.333,238 266.005,238.672 266.005,239.5 z" fill="#FFFFFF"/>
+        <path d="M254.005,247.5 C254.005,248.328 253.333,249 252.505,249 C251.677,249 251.005,248.328 251.005,247.5 C251.005,246.672 251.677,246 252.505,246 C253.333,246 254.005,246.672 254.005,247.5 z" fill="#FFFFFF"/>
       </g>
-      <path d="M262.599,211 L262.599,213 L263.443,213 L264.005,216 L261.505,216 L256.005,226 L256.005,227 L257.005,228 L268.005,228 L275.568,218.531 L279.505,227 L280.005,227 L281.005,227 L281.005,226 L275.005,213 L278.005,213 L278.005,212 L277.005,211 L273.005,211 L273.005,213 L274.411,216 L266.068,216 L265.505,213 L267.599,213 L267.599,212 L266.599,211 L262.599,211 z M262.505,218 L264.505,218 L266.505,226 L258.005,226 L262.505,218 z M266.505,218 L273.505,218 L268.005,224.5 L266.505,218 z M257.505,220 C253.915,220 251.005,222.91 251.005,226.5 C251.005,230.09 253.915,233 257.505,233 C260.208,233 262.525,231.347 263.505,229 L261.255,229 C260.449,230.216 259.073,231 257.505,231 C255.02,231 253.005,228.985 253.005,226.5 C253.005,224.176 254.775,222.301 257.036,222.062 L258.161,220.031 C257.943,220.009 257.73,220 257.505,220 z M279.349,220 L280.286,222.094 C282.397,222.466 284.005,224.283 284.005,226.5 C284.005,228.985 281.99,231 279.505,231 C277.02,231 275.005,228.985 275.005,226.5 C275.005,225.126 275.628,223.919 276.599,223.094 L275.724,221.219 C274.082,222.398 273.005,224.324 273.005,226.5 C273.005,230.09 275.915,233 279.505,233 C283.095,233 286.005,230.09 286.005,226.5 C286.005,222.91 283.095,220 279.505,220 C279.452,220 279.402,219.999 279.349,220 z M261.692,221.531 L260.692,223.312 C261.159,223.779 261.497,224.366 261.724,225 L263.817,225 C263.493,223.628 262.733,222.413 261.692,221.531 z" fill="#000000" id="route-bicycle-stroke"/>
+      <path d="M262.594,211 L262.594,213 L263.438,213 L264,216 L261.5,216 L256,226 L256,227 L257,228 L268,228 L275.563,218.531 L279.5,227 L280,227 L281,227 L281,226 L275,213 L278,213 L278,212 L277,211 L273,211 L273,213 L274.406,216 L266.063,216 L265.5,213 L267.594,213 L267.594,212 L266.594,211 L262.594,211 z M262.5,218 L264.5,218 L266.5,226 L258,226 L262.5,218 z M266.5,218 L273.5,218 L268,224.5 L266.5,218 z M257.5,220 C253.91,220 251,222.91 251,226.5 C251,230.09 253.91,233 257.5,233 C260.203,233 262.52,231.347 263.5,229 L261.25,229 C260.444,230.216 259.068,231 257.5,231 C255.015,231 253,228.985 253,226.5 C253,224.176 254.77,222.301 257.031,222.062 L258.156,220.031 C257.938,220.009 257.725,220 257.5,220 z M279.344,220 L280.281,222.094 C282.392,222.466 284,224.283 284,226.5 C284,228.985 281.985,231 279.5,231 C277.015,231 275,228.985 275,226.5 C275,225.126 275.623,223.919 276.594,223.094 L275.719,221.219 C274.077,222.398 273,224.324 273,226.5 C273,230.09 275.91,233 279.5,233 C283.09,233 286,230.09 286,226.5 C286,222.91 283.09,220 279.5,220 C279.447,220 279.397,219.999 279.344,220 z M261.688,221.531 L260.688,223.312 C261.154,223.779 261.492,224.366 261.719,225 L263.812,225 C263.488,223.628 262.728,222.413 261.688,221.531 z" fill="#000000" id="route-bicycle-stroke"/>
     </g>
     <g id="route-road">
-      <path d="M202.5,212 L199.625,218 L198,218 L197,219 L197,221 L198.406,221 L198,222 L198,227 L198,228 L198,228 C198,228 198.608,228.608 199,229 L200,229 L204,229 L206,230 L214,230 L216,229 L220,229 L221,229 L222,228 L222,228 L222,227 L222,222 L221.594,221 L223,221 L223,219 L222,218 L220.375,218 L217.5,212 z M203.5,215 L216.5,215 L218,219 L217,220 L203,220 L202,219 z M201,223 L204,223 L205,225 L205,226 L201,226 L200,225 L200,224 z M216,223 L219,223 L220,224 L220,225 L219,226 L215,226 L215,225 z M199,230 L199,232 L200,233 L203,233 L204,232 L204,230 z M216,230 L216,232 L217,233 L220,233 L221,232 L221,230 z" fill="#989898" id="path21794"/>
-      <g id="g21796">
-        <g id="g21798">
-          <path d="M216.969,245.469 L214.031,249.531 L203.031,241.531 L205.969,237.469 z" fill="#46682F" id="path21800"/>
-          <path d="M214.125,245.406 L216.875,249.594 L228.875,241.594 L226.125,237.406 z" fill="#70372F" id="path21802"/>
-          <path d="M191.125,245.419 L193.875,249.575 L205.875,241.575 L203.125,237.419 z" fill="#2C5476" id="path21804"/>
-        </g>
-        <path d="M216.375,246.281 L214.625,248.719 L203.625,240.719 L205.375,238.281 z" fill="#8CD05F" id="path21808"/>
-        <path d="M214.656,246.25 L216.344,248.75 L228.344,240.75 L226.656,238.25 z" fill="#E06D5F" id="path21812"/>
-        <path d="M191.656,246.263 L193.344,248.763 L205.344,240.763 L203.656,238.263 z" fill="#58A9ED" id="path21814"/>
-        <path d="M230,239.5 C230,240.881 228.881,242 227.5,242 C226.119,242 225,240.881 225,239.5 C225,238.119 226.119,237 227.5,237 C228.881,237 230,238.119 230,239.5 z" fill="#70372F" id="path21816"/>
-        <path d="M195,247.5 C195,248.881 193.881,250 192.5,250 C191.119,250 190,248.881 190,247.5 C190,246.119 191.119,245 192.5,245 C193.881,245 195,246.119 195,247.5 z" fill="#2C5476" id="path21818"/>
-        <path d="M207,239.5 C207,240.881 205.881,242 204.5,242 C203.119,242 202,240.881 202,239.5 C202,238.119 203.119,237 204.5,237 C205.881,237 207,238.119 207,239.5 z" fill="#395E53" id="path21820"/>
-        <path d="M218,247.5 C218,248.881 216.881,250 215.5,250 C214.119,250 213,248.881 213,247.5 C213,246.119 214.119,245 215.5,245 C216.881,245 218,246.119 218,247.5 z" fill="#5B502F" id="path21822"/>
-        <path d="M229,239.5 C229,240.328 228.328,241 227.5,241 C226.672,241 226,240.328 226,239.5 C226,238.672 226.672,238 227.5,238 C228.328,238 229,238.672 229,239.5 z" fill="#FFFFFF" id="path21824"/>
-        <path d="M217,247.5 C217,248.328 216.328,249 215.5,249 C214.672,249 214,248.328 214,247.5 C214,246.672 214.672,246 215.5,246 C216.328,246 217,246.672 217,247.5 z" fill="#FFFFFF" id="path21826"/>
-        <path d="M206,239.5 C206,240.328 205.328,241 204.5,241 C203.672,241 203,240.328 203,239.5 C203,238.672 203.672,238 204.5,238 C205.328,238 206,238.672 206,239.5 z" fill="#FFFFFF" id="path21828"/>
-        <path d="M194,247.5 C194,248.328 193.328,249 192.5,249 C191.672,249 191,248.328 191,247.5 C191,246.672 191.672,246 192.5,246 C193.328,246 194,246.672 194,247.5 z" fill="#FFFFFF" id="path21830"/>
+      <g>
+        <path d="M216.969,245.469 L214.031,249.531 L203.031,241.531 L205.969,237.469 z" fill="#46682F"/>
+        <path d="M214.125,245.406 L216.875,249.594 L228.875,241.594 L226.125,237.406 z" fill="#70372F"/>
+        <path d="M191.125,245.419 L193.875,249.575 L205.875,241.575 L203.125,237.419 z" fill="#2C5476"/>
+        <path d="M216.375,246.281 L214.625,248.719 L203.625,240.719 L205.375,238.281 z" fill="#8CD05F"/>
+        <path d="M214.656,246.25 L216.344,248.75 L228.344,240.75 L226.656,238.25 z" fill="#E06D5F"/>
+        <path d="M191.656,246.263 L193.344,248.763 L205.344,240.763 L203.656,238.263 z" fill="#58A9ED"/>
+        <path d="M230,239.5 C230,240.881 228.881,242 227.5,242 C226.119,242 225,240.881 225,239.5 C225,238.119 226.119,237 227.5,237 C228.881,237 230,238.119 230,239.5 z" fill="#70372F"/>
+        <path d="M195,247.5 C195,248.881 193.881,250 192.5,250 C191.119,250 190,248.881 190,247.5 C190,246.119 191.119,245 192.5,245 C193.881,245 195,246.119 195,247.5 z" fill="#2C5476"/>
+        <path d="M207,239.5 C207,240.881 205.881,242 204.5,242 C203.119,242 202,240.881 202,239.5 C202,238.119 203.119,237 204.5,237 C205.881,237 207,238.119 207,239.5 z" fill="#395E53"/>
+        <path d="M218,247.5 C218,248.881 216.881,250 215.5,250 C214.119,250 213,248.881 213,247.5 C213,246.119 214.119,245 215.5,245 C216.881,245 218,246.119 218,247.5 z" fill="#5B502F"/>
+        <path d="M229,239.5 C229,240.328 228.328,241 227.5,241 C226.672,241 226,240.328 226,239.5 C226,238.672 226.672,238 227.5,238 C228.328,238 229,238.672 229,239.5 z" fill="#FFFFFF"/>
+        <path d="M217,247.5 C217,248.328 216.328,249 215.5,249 C214.672,249 214,248.328 214,247.5 C214,246.672 214.672,246 215.5,246 C216.328,246 217,246.672 217,247.5 z" fill="#FFFFFF"/>
+        <path d="M206,239.5 C206,240.328 205.328,241 204.5,241 C203.672,241 203,240.328 203,239.5 C203,238.672 203.672,238 204.5,238 C205.328,238 206,238.672 206,239.5 z" fill="#FFFFFF"/>
+        <path d="M194,247.5 C194,248.328 193.328,249 192.5,249 C191.672,249 191,248.328 191,247.5 C191,246.672 191.672,246 192.5,246 C193.328,246 194,246.672 194,247.5 z" fill="#FFFFFF"/>
       </g>
+      <path d="M202.5,212 L199.625,218 L198,218 L197,219 L197,221 L198.406,221 L198,222 L198,227 L198,228 L198,228 C198,228 198.608,228.608 199,229 L200,229 L204,229 L206,230 L214,230 L216,229 L220,229 L221,229 L222,228 L222,228 L222,227 L222,222 L221.594,221 L223,221 L223,219 L222,218 L220.375,218 L217.5,212 z M203.5,215 L216.5,215 L218,219 L217,220 L203,220 L202,219 z M201,223 L204,223 L205,225 L205,226 L201,226 L200,225 L200,224 z M216,223 L219,223 L220,224 L220,225 L219,226 L215,226 L215,225 z M199,230 L199,232 L200,233 L203,233 L204,232 L204,230 z M216,230 L216,232 L217,233 L220,233 L221,232 L221,230 z" fill="#989898"/>
     </g>
     <g id="route">
-      <g id="g21796-6">
-        <g id="g21798-3">
-          <path d="M156.969,232.469 L154.031,236.531 L143.031,228.531 L145.969,224.469 z" fill="#46682F" id="path21800-1"/>
-          <path d="M154.125,232.406 L156.875,236.594 L168.875,228.594 L166.125,224.406 z" fill="#70372F" id="path21802-6"/>
-          <path d="M131.125,232.419 L133.875,236.575 L145.875,228.575 L143.125,224.419 z" fill="#2C5476" id="path21804-1"/>
-        </g>
-        <path d="M156.375,233.281 L154.625,235.719 L143.625,227.719 L145.375,225.281 z" fill="#8CD05F" id="path21808-4"/>
-        <path d="M154.656,233.25 L156.344,235.75 L168.344,227.75 L166.656,225.25 z" fill="#E06D5F" id="path21812-6"/>
-        <path d="M131.656,233.263 L133.344,235.763 L145.344,227.763 L143.656,225.263 z" fill="#58A9ED" id="path21814-3"/>
-        <path d="M170,226.5 C170,227.881 168.881,229 167.5,229 C166.119,229 165,227.881 165,226.5 C165,225.119 166.119,224 167.5,224 C168.881,224 170,225.119 170,226.5 z" fill="#70372F" id="path21816-0"/>
-        <path d="M135,234.5 C135,235.881 133.881,237 132.5,237 C131.119,237 130,235.881 130,234.5 C130,233.119 131.119,232 132.5,232 C133.881,232 135,233.119 135,234.5 z" fill="#2C5476" id="path21818-5"/>
-        <path d="M147,226.5 C147,227.881 145.881,229 144.5,229 C143.119,229 142,227.881 142,226.5 C142,225.119 143.119,224 144.5,224 C145.881,224 147,225.119 147,226.5 z" fill="#395E53" id="path21820-6"/>
-        <path d="M158,234.5 C158,235.881 156.881,237 155.5,237 C154.119,237 153,235.881 153,234.5 C153,233.119 154.119,232 155.5,232 C156.881,232 158,233.119 158,234.5 z" fill="#5B502F" id="path21822-2"/>
-        <path d="M169,226.5 C169,227.328 168.328,228 167.5,228 C166.672,228 166,227.328 166,226.5 C166,225.672 166.672,225 167.5,225 C168.328,225 169,225.672 169,226.5 z" fill="#FFFFFF" id="path21824-7"/>
-        <path d="M157,234.5 C157,235.328 156.328,236 155.5,236 C154.672,236 154,235.328 154,234.5 C154,233.672 154.672,233 155.5,233 C156.328,233 157,233.672 157,234.5 z" fill="#FFFFFF" id="path21826-1"/>
-        <path d="M146,226.5 C146,227.328 145.329,228 144.5,228 C143.672,228 143,227.328 143,226.5 C143,225.672 143.672,225 144.5,225 C145.329,225 146,225.672 146,226.5 z" fill="#FFFFFF" id="path21828-2"/>
-        <path d="M134,234.5 C134,235.328 133.329,236 132.5,236 C131.672,236 131,235.328 131,234.5 C131,233.672 131.672,233 132.5,233 C133.329,233 134,233.672 134,234.5 z" fill="#FFFFFF" id="path21830-4"/>
+      <g>
+        <path d="M156.969,232.469 L154.031,236.531 L143.031,228.531 L145.969,224.469 z" fill="#46682F"/>
+        <path d="M154.125,232.406 L156.875,236.594 L168.875,228.594 L166.125,224.406 z" fill="#70372F"/>
+        <path d="M131.125,232.419 L133.875,236.575 L145.875,228.575 L143.125,224.419 z" fill="#2C5476"/>
+        <path d="M156.375,233.281 L154.625,235.719 L143.625,227.719 L145.375,225.281 z" fill="#8CD05F"/>
+        <path d="M154.656,233.25 L156.344,235.75 L168.344,227.75 L166.656,225.25 z" fill="#E06D5F"/>
+        <path d="M131.656,233.263 L133.344,235.763 L145.344,227.763 L143.656,225.263 z" fill="#58A9ED"/>
+        <path d="M170,226.5 C170,227.881 168.881,229 167.5,229 C166.119,229 165,227.881 165,226.5 C165,225.119 166.119,224 167.5,224 C168.881,224 170,225.119 170,226.5 z" fill="#70372F"/>
+        <path d="M135,234.5 C135,235.881 133.881,237 132.5,237 C131.119,237 130,235.881 130,234.5 C130,233.119 131.119,232 132.5,232 C133.881,232 135,233.119 135,234.5 z" fill="#2C5476"/>
+        <path d="M147,226.5 C147,227.881 145.881,229 144.5,229 C143.119,229 142,227.881 142,226.5 C142,225.119 143.119,224 144.5,224 C145.881,224 147,225.119 147,226.5 z" fill="#395E53"/>
+        <path d="M158,234.5 C158,235.881 156.881,237 155.5,237 C154.119,237 153,235.881 153,234.5 C153,233.119 154.119,232 155.5,232 C156.881,232 158,233.119 158,234.5 z" fill="#5B502F"/>
+        <path d="M169,226.5 C169,227.328 168.328,228 167.5,228 C166.672,228 166,227.328 166,226.5 C166,225.672 166.672,225 167.5,225 C168.328,225 169,225.672 169,226.5 z" fill="#FFFFFF"/>
+        <path d="M157,234.5 C157,235.328 156.328,236 155.5,236 C154.672,236 154,235.328 154,234.5 C154,233.672 154.672,233 155.5,233 C156.328,233 157,233.672 157,234.5 z" fill="#FFFFFF"/>
+        <path d="M146,226.5 C146,227.328 145.329,228 144.5,228 C143.672,228 143,227.328 143,226.5 C143,225.672 143.672,225 144.5,225 C145.329,225 146,225.672 146,226.5 z" fill="#FFFFFF"/>
+        <path d="M134,234.5 C134,235.328 133.329,236 132.5,236 C131.672,236 131,235.328 131,234.5 C131,233.672 131.672,233 132.5,233 C133.329,233 134,233.672 134,234.5 z" fill="#FFFFFF"/>
       </g>
     </g>
     <g id="boundary">
-      <g id="g24949">
-        <path d="M90.5,251.5 L79.5,240.5 L100.5,219.5 L111.5,230.5 z" fill="#58A9ED" id="path24911"/>
-        <path d="M79.5,240.5 L68.5,229.5 L89.5,208.5 L100.5,219.5 z" fill="#8CD05F" id="path24909"/>
-        <g id="path24886">
+      <g>
+        <path d="M90.5,251.5 L79.5,240.5 L100.5,219.5 L111.5,230.5 z" fill="#58A9ED"/>
+        <path d="M79.5,240.5 L68.5,229.5 L89.5,208.5 L100.5,219.5 z" fill="#8CD05F"/>
+        <g>
           <path d="M79.5,240.5 L90,230 L100.5,219.5" fill="#FFFFFF"/>
           <path d="M79.5,240.5 L90,230 L100.5,219.5" fill-opacity="0" stroke="#444444" stroke-width="1" stroke-dasharray="2,1"/>
         </g>
-        <path d="M83,240 C83,241.657 81.657,243 80,243 C78.343,243 77,241.657 77,240 C77,238.343 78.343,237 80,237 C81.657,237 83,238.343 83,240 z" fill="#444444" id="path21818-5-8"/>
-        <path d="M82,240 C82,241.105 81.105,242 80,242 C78.896,242 78,241.105 78,240 C78,238.895 78.896,238 80,238 C81.105,238 82,238.895 82,240 z" fill="#FFFFFF" id="path21830-4-8"/>
-        <path d="M103,220 C103,221.657 101.657,223 100,223 C98.343,223 97,221.657 97,220 C97,218.343 98.343,217 100,217 C101.657,217 103,218.343 103,220 z" fill="#444444" id="path24882"/>
-        <path d="M102,220 C102,221.105 101.105,222 100,222 C98.896,222 98,221.105 98,220 C98,218.895 98.896,218 100,218 C101.105,218 102,218.895 102,220 z" fill="#FFFFFF" id="path24884"/>
-        <path d="M93,230 C93,231.657 91.657,233 90,233 C88.343,233 87,231.657 87,230 C87,228.343 88.343,227 90,227 C91.657,227 93,228.343 93,230 z" fill="#444444" id="path24888"/>
-        <path d="M92,230 C92,231.105 91.105,232 90,232 C88.896,232 88,231.105 88,230 C88,228.895 88.896,228 90,228 C91.105,228 92,228.895 92,230 z" fill="#FFFFFF" id="path24890"/>
+        <path d="M83,240 C83,241.657 81.657,243 80,243 C78.343,243 77,241.657 77,240 C77,238.343 78.343,237 80,237 C81.657,237 83,238.343 83,240 z" fill="#444444"/>
+        <path d="M82,240 C82,241.105 81.105,242 80,242 C78.896,242 78,241.105 78,240 C78,238.895 78.896,238 80,238 C81.105,238 82,238.895 82,240 z" fill="#FFFFFF"/>
+        <path d="M103,220 C103,221.657 101.657,223 100,223 C98.343,223 97,221.657 97,220 C97,218.343 98.343,217 100,217 C101.657,217 103,218.343 103,220 z" fill="#444444"/>
+        <path d="M102,220 C102,221.105 101.105,222 100,222 C98.896,222 98,221.105 98,220 C98,218.895 98.896,218 100,218 C101.105,218 102,218.895 102,220 z" fill="#FFFFFF"/>
+        <path d="M93,230 C93,231.657 91.657,233 90,233 C88.343,233 87,231.657 87,230 C87,228.343 88.343,227 90,227 C91.657,227 93,228.343 93,230 z" fill="#444444"/>
+        <path d="M92,230 C92,231.105 91.105,232 90,232 C88.896,232 88,231.105 88,230 C88,228.895 88.896,228 90,228 C91.105,228 92,228.895 92,230 z" fill="#FFFFFF"/>
       </g>
     </g>
     <g id="relation">
-      <g id="g23477">
-        <path d="M26.906,220 C26.96,220.323 27,220.662 27,221 C27,221.338 26.96,221.677 26.906,222 L35.094,222 C35.027,221.674 35,221.345 35,221 C35,220.655 35.027,220.325 35.094,220 L26.906,220 z M25.875,224.438 C25.485,224.988 25.018,225.483 24.469,225.875 L31.844,233.219 C32.211,232.675 32.703,232.175 33.25,231.812 L25.875,224.438 z M20,226.906 L20,235.094 C20.325,235.027 20.655,235 21,235 C21.345,235 21.675,235.027 22,235.094 L22,226.906 C21.677,226.96 21.338,227 21,227 C20.662,227 20.323,226.96 20,226.906 z" fill="#CCCCCC" id="path23097"/>
-        <g id="g23138">
-          <path d="M40,217 C42.209,217 44,218.791 44,221 C44,223.209 42.209,225 40,225 C37.791,225 36,223.209 36,221 C36,218.791 37.791,217 40,217 z" fill="#70372F" id="path23132"/>
-          <path d="M40,218 C41.657,218 43,219.343 43,221 C43,222.657 41.657,224 40,224 C38.343,224 37,222.657 37,221 C37,219.343 38.343,218 40,218 z" fill="#E06D5F" id="path23134"/>
-          <path d="M40,220 C40.552,220 41,220.448 41,221 C41,221.552 40.552,222 40,222 C39.448,222 39,221.552 39,221 C39,220.448 39.448,220 40,220 z" fill="#FFFFFF" id="path23136"/>
+      <g>
+        <path d="M26.906,220 C26.96,220.323 27,220.662 27,221 C27,221.338 26.96,221.677 26.906,222 L35.094,222 C35.027,221.674 35,221.345 35,221 C35,220.655 35.027,220.325 35.094,220 L26.906,220 z M25.875,224.438 C25.485,224.988 25.018,225.483 24.469,225.875 L31.844,233.219 C32.211,232.675 32.703,232.175 33.25,231.812 L25.875,224.438 z M20,226.906 L20,235.094 C20.325,235.027 20.655,235 21,235 C21.345,235 21.675,235.027 22,235.094 L22,226.906 C21.677,226.96 21.338,227 21,227 C20.662,227 20.323,226.96 20,226.906 z" fill="#CCCCCC"/>
+        <g>
+          <path d="M40,217 C42.209,217 44,218.791 44,221 C44,223.209 42.209,225 40,225 C37.791,225 36,223.209 36,221 C36,218.791 37.791,217 40,217 z" fill="#70372F"/>
+          <path d="M40,218 C41.657,218 43,219.343 43,221 C43,222.657 41.657,224 40,224 C38.343,224 37,222.657 37,221 C37,219.343 38.343,218 40,218 z" fill="#E06D5F"/>
+          <path d="M40,220 C40.552,220 41,220.448 41,221 C41,221.552 40.552,222 40,222 C39.448,222 39,221.552 39,221 C39,220.448 39.448,220 40,220 z" fill="#FFFFFF"/>
         </g>
-        <path d="M26,221 C26,223.761 23.761,226 21,226 C18.239,226 16,223.761 16,221 C16,218.239 18.239,216 21,216 C23.761,216 26,218.239 26,221 z" fill="#444444" id="path23083"/>
-        <path d="M25,221 C25,223.209 23.209,225 21,225 C18.791,225 17,223.209 17,221 C17,218.791 18.791,217 21,217 C23.209,217 25,218.791 25,221 z" fill="#CCCCCC" id="path23085"/>
-        <path d="M25,240 C25,242.209 23.209,244 21,244 C18.791,244 17,242.209 17,240 C17,237.791 18.791,236 21,236 C23.209,236 25,237.791 25,240 z" fill="#2C5476" id="path23079"/>
-        <path d="M24,240 C24,241.657 22.657,243 21,243 C19.343,243 18,241.657 18,240 C18,238.343 19.343,237 21,237 C22.657,237 24,238.343 24,240 z" fill="#58A9ED" id="path23081"/>
-        <path d="M22,240 C22,240.552 21.552,241 21,241 C20.448,241 20,240.552 20,240 C20,239.448 20.448,239 21,239 C21.552,239 22,239.448 22,240 z" fill="#FFFFFF" id="path23089"/>
-        <path d="M23,221 C23,222.105 22.105,223 21,223 C19.895,223 19,222.105 19,221 C19,219.895 19.895,219 21,219 C22.105,219 23,219.895 23,221 z" fill="#FFFFFF" id="path23154"/>
-        <g id="g23162">
-          <path d="M40,236 C40,238.209 38.209,240 36,240 C33.791,240 32,238.209 32,236 C32,233.791 33.791,232 36,232 C38.209,232 40,233.791 40,236 z" fill="#46682F" id="path23156"/>
-          <path d="M39,236 C39,237.657 37.657,239 36,239 C34.343,239 33,237.657 33,236 C33,234.343 34.343,233 36,233 C37.657,233 39,234.343 39,236 z" fill="#8CD05F" id="path23158"/>
-          <path d="M37,236 C37,236.552 36.552,237 36,237 C35.448,237 35,236.552 35,236 C35,235.448 35.448,235 36,235 C36.552,235 37,235.448 37,236 z" fill="#FFFFFF" id="path23160"/>
+        <g>
+          <path d="M25,240 C25,242.209 23.209,244 21,244 C18.791,244 17,242.209 17,240 C17,237.791 18.791,236 21,236 C23.209,236 25,237.791 25,240 z" fill="#2C5476"/>
+          <path d="M24,240 C24,241.657 22.657,243 21,243 C19.343,243 18,241.657 18,240 C18,238.343 19.343,237 21,237 C22.657,237 24,238.343 24,240 z" fill="#58A9ED"/>
+          <path d="M22,240 C22,240.552 21.552,241 21,241 C20.448,241 20,240.552 20,240 C20,239.448 20.448,239 21,239 C21.552,239 22,239.448 22,240 z" fill="#FFFFFF"/>
         </g>
-        <g id="g23167">
-          <path d="M40,236 C40,238.209 38.209,240 36,240 C33.791,240 32,238.209 32,236 C32,233.791 33.791,232 36,232 C38.209,232 40,233.791 40,236 z" fill="#46682F" id="path23169"/>
-          <path d="M39,236 C39,237.657 37.657,239 36,239 C34.343,239 33,237.657 33,236 C33,234.343 34.343,233 36,233 C37.657,233 39,234.343 39,236 z" fill="#8CD05F" id="path23171"/>
-          <path d="M37,236 C37,236.552 36.552,237 36,237 C35.448,237 35,236.552 35,236 C35,235.448 35.448,235 36,235 C36.552,235 37,235.448 37,236 z" fill="#FFFFFF" id="path23173"/>
+        <g>
+          <path d="M40,236 C40,238.209 38.209,240 36,240 C33.791,240 32,238.209 32,236 C32,233.791 33.791,232 36,232 C38.209,232 40,233.791 40,236 z" fill="#46682F"/>
+          <path d="M39,236 C39,237.657 37.657,239 36,239 C34.343,239 33,237.657 33,236 C33,234.343 34.343,233 36,233 C37.657,233 39,234.343 39,236 z" fill="#8CD05F"/>
+          <path d="M37,236 C37,236.552 36.552,237 36,237 C35.448,237 35,236.552 35,236 C35,235.448 35.448,235 36,235 C36.552,235 37,235.448 37,236 z" fill="#FFFFFF"/>
+        </g>
+        <g>
+          <path d="M26,221 C26,223.761 23.761,226 21,226 C18.239,226 16,223.761 16,221 C16,218.239 18.239,216 21,216 C23.761,216 26,218.239 26,221 z" fill="#444444"/>
+          <path d="M25,221 C25,223.209 23.209,225 21,225 C18.791,225 17,223.209 17,221 C17,218.791 18.791,217 21,217 C23.209,217 25,218.791 25,221 z" fill="#CCCCCC"/>
+          <path d="M23,221 C23,222.105 22.105,223 21,223 C19.895,223 19,222.105 19,221 C19,219.895 19.895,219 21,219 C22.105,219 23,219.895 23,221 z" fill="#FFFFFF"/>
         </g>
       </g>
     </g>
@@ -907,22 +946,29 @@
       <path d="M384,323.5 C384,324.881 382.881,326 381.5,326 C380.119,326 379,324.881 379,323.5 C379,322.119 380.119,321 381.5,321 C382.881,321 384,322.119 384,323.5 z" fill="#FFFFFF"/>
       <path d="M363,323.5 L363,323.5 C363,323.776 362.776,324 362.5,324 L362.5,324 C362.224,324 362,323.776 362,323.5 L362,323.5 C362,323.224 362.224,323 362.5,323 L362.5,323 C362.776,323 363,323.224 363,323.5 z" fill="#FFFFFF" opacity="0.5"/>
     </g>
+    <g id="piste-line">
+      <path d="M821.768,160.834 C821.768,162.169 820.686,163.251 819.351,163.251 C818.016,163.251 816.934,162.169 816.934,160.834 C816.934,159.499 818.016,158.417 819.351,158.417 C820.686,158.417 821.768,159.499 821.768,160.834 z M819.705,172.742 C819.605,172.549 819.37,172.47 819.174,172.564 C818.07,173.24 816.723,173.388 815.5,172.967 L805.3,167.859 L809.683,165.668 L809.683,160.834 L812.1,162.042 L812.1,166.876 L814.517,168.085 L816.934,166.876 L814.517,165.668 L814.517,158.417 L809.683,156 L807.266,157.208 L807.266,164.459 L802.883,166.651 L798.581,164.508 C798.381,164.41 798.139,164.493 798.041,164.693 C797.943,164.893 798.026,165.135 798.226,165.233 L815.145,173.692 C815.654,173.91 816.204,174.014 816.757,173.998 C817.723,173.982 818.672,173.739 819.528,173.289 C819.727,173.19 819.808,172.949 819.709,172.749 C819.708,172.747 819.707,172.744 819.705,172.742 z" fill="#000000" id="piste-line-stroke2"/>
+      <path d="M829.5,179 C830.881,179 832,180.119 832,181.5 C832,182.881 830.881,184 829.5,184 C828.593,184.004 828.127,183.598 827.529,183 L792.471,183 C791.978,183.678 791.297,183.92 790.5,184 C789.119,184 788,182.881 788,181.5 C788,180.119 789.119,179 790.5,179 C791.407,178.996 791.873,179.402 792.471,180 L827.529,180 C828.022,179.322 828.703,179.08 829.5,179 z" fill="#000000" id="piste-line-stroke1"/>
+      <path d="M796,181 L796,182 L792.95,182 L793,181.5 L792.95,181 L796,181 z M807,181 L802,181 L802,182 L807,182 L807,181 z M818,181 L813,181 L813,182 L818,182 L818,181 z M827.05,181 L824,181 L824,182 L827.05,182 L827,181.5 L827.05,181 z" fill="#AAAAAA" id="piste-line-dashes"/>
+      <path d="M831,181.5 C831,182.328 830.328,183 829.5,183 C828.672,183 828,182.328 828,181.5 C828,180.672 828.672,180 829.5,180 C830.328,180 831,180.672 831,181.5 z" fill="#FFFFFF"/>
+      <path d="M792,181.5 C792,182.328 791.328,183 790.5,183 C789.672,183 789,182.328 789,181.5 C789,180.672 789.672,180 790.5,180 C791.328,180 792,180.672 792,181.5 z" fill="#FFFFFF"/>
+    </g>
     <g id="pipeline-line">
-      <g id="g26258">
-        <path d="M736.5,155 C735.119,155 734,157.239 734,160 C734,162.761 735.119,165 736.5,165 L747,165 L747,155 L736.5,155 z M751,155 L751,165 L765.5,165 L765.5,155 L751,155 z" fill="#B5B5B5" id="rect25143"/>
-        <path d="M768,160 C768,162.761 766.881,165 765.5,165 C764.119,165 763,162.761 763,160 C763,157.239 764.119,155 765.5,155 C766.881,155 768,157.239 768,160 z" fill="#989898" id="path25154"/>
-        <path d="M748,152 L748,166 L746,176 L748,176 L749.594,168 L754.406,168 L756,176 L758,176 L756,166 L755,166 L750,166 L750,152 L748,152 z M754,152 L754,154 L756,154 L756,152 L754,152 z M742,155 C741,155 739.5,157.239 739.5,160 C739.5,162.761 741,165 742,165 L744,165 C742.619,165 741,162.761 741,160 C741,157.239 742.619,155 744,155 L742,155 z M757,155 C756,155 754.5,157.239 754.5,160 C754.5,162.761 756,165 757,165 L759,165 C757.619,165 756,162.761 756,160 C756,157.239 757.619,155 759,155 L757,155 z M765.5,155 C764.119,155 763,157.239 763,160 C763,162.761 764.119,165 765.5,165 C766.881,165 768,162.761 768,160 C768,157.239 766.881,155 765.5,155 z" fill="#989898" id="path25145"/>
+      <g>
+        <path d="M736.5,155 C735.119,155 734,157.239 734,160 C734,162.761 735.119,165 736.5,165 L747,165 L747,155 L736.5,155 z M751,155 L751,165 L765.5,165 L765.5,155 L751,155 z" fill="#B5B5B5"/>
+        <path d="M768,160 C768,162.761 766.881,165 765.5,165 C764.119,165 763,162.761 763,160 C763,157.239 764.119,155 765.5,155 C766.881,155 768,157.239 768,160 z" fill="#989898"/>
+        <path d="M748,152 L748,166 L746,176 L748,176 L749.594,168 L754.406,168 L756,176 L758,176 L756,166 L755,166 L750,166 L750,152 L748,152 z M754,152 L754,154 L756,154 L756,152 L754,152 z M742,155 C741,155 739.5,157.239 739.5,160 C739.5,162.761 741,165 742,165 L744,165 C742.619,165 741,162.761 741,160 C741,157.239 742.619,155 744,155 L742,155 z M757,155 C756,155 754.5,157.239 754.5,160 C754.5,162.761 756,165 757,165 L759,165 C757.619,165 756,162.761 756,160 C756,157.239 757.619,155 759,155 L757,155 z M765.5,155 C764.119,155 763,157.239 763,160 C763,162.761 764.119,165 765.5,165 C766.881,165 768,162.761 768,160 C768,157.239 766.881,155 765.5,155 z" fill="#989898"/>
       </g>
       <path d="M769.5,179 C770.881,179 772,180.119 772,181.5 C772,182.881 770.881,184 769.5,184 C768.076,183.93 767.556,183.207 767.05,182 L732.95,182 C732.591,183.231 731.753,183.874 730.5,184 C729.119,184 728,182.881 728,181.5 C728,180.119 729.119,179 730.5,179 C731.924,179.069 732.443,179.793 732.95,181 L767.05,181 C767.409,179.768 768.247,179.126 769.5,179 z" fill="#000000" id="pipeline-line-stroke"/>
-      <path d="M771,181.5 C771,182.328 770.328,183 769.5,183 C768.672,183 768,182.328 768,181.5 C768,180.672 768.672,180 769.5,180 C770.328,180 771,180.672 771,181.5 z" fill="#FFFFFF" id="path3936-9"/>
-      <path d="M732,181.5 C732,182.328 731.328,183 730.5,183 C729.672,183 729,182.328 729,181.5 C729,180.672 729.672,180 730.5,180 C731.328,180 732,180.672 732,181.5 z" fill="#FFFFFF" id="path3940-7"/>
+      <path d="M771,181.5 C771,182.328 770.328,183 769.5,183 C768.672,183 768,182.328 768,181.5 C768,180.672 768.672,180 769.5,180 C770.328,180 771,180.672 771,181.5 z" fill="#FFFFFF"/>
+      <path d="M732,181.5 C732,182.328 731.328,183 730.5,183 C729.672,183 729,182.328 729,181.5 C729,180.672 729.672,180 730.5,180 C731.328,180 732,180.672 732,181.5 z" fill="#FFFFFF"/>
     </g>
     <g id="ferry-line">
-      <path d="M687,146 L686,147 L686,149 L683,149 L682,150 L682,156.906 L684,156.188 L684,152 L685,151 L687,151 L687,155.094 L688,154.719 L688,151 L692,151 L692,154.531 L693,154.812 L693,151 L695,151 L696,152 L696,155.625 L698,156.188 L698,150 L697,149 L694,149 L694,147 L693,146 L687,146 z M690,155 L679,159 L679,168.062 C678.979,168.055 678.958,168.038 678.938,168.031 C677.518,167.545 676.407,167.062 676.407,167.062 C676.077,166.915 675.693,166.955 675.401,167.168 C675.109,167.381 674.953,167.734 674.993,168.093 C675.033,168.452 675.263,168.763 675.594,168.906 C675.594,168.906 676.816,169.424 678.313,169.938 C679.81,170.451 681.548,171 683,171 C684.453,171 686.191,170.451 687.688,169.938 C689.185,169.424 690.407,168.906 690.407,168.906 C690.407,168.906 691.518,168.424 692.938,167.938 C694.357,167.451 696.119,167 697,167 C697.881,167 699.643,167.451 701.062,167.938 C702.482,168.424 703.594,168.906 703.594,168.906 C703.924,169.054 704.307,169.014 704.599,168.801 C704.891,168.588 705.047,168.235 705.007,167.876 C704.967,167.516 704.738,167.206 704.406,167.062 C704.406,167.062 703.185,166.545 701.688,166.031 C701.465,165.955 701.231,165.887 701,165.812 L701,158 L690,155 z M697,169 C695.548,169 693.81,169.518 692.312,170.031 C690.815,170.545 689.594,171.062 689.594,171.062 C689.594,171.062 688.482,171.545 687.062,172.031 C685.643,172.518 683.881,173 683,173 C682.119,173 680.357,172.518 678.938,172.031 C677.518,171.545 676.406,171.062 676.406,171.062 C676.076,170.915 675.693,170.955 675.401,171.168 C675.109,171.381 674.953,171.734 674.993,172.093 C675.033,172.452 675.262,172.763 675.594,172.906 C675.594,172.906 676.815,173.424 678.312,173.938 C679.81,174.451 681.548,175 683,175 C684.452,175 686.19,174.451 687.688,173.938 C689.185,173.424 690.406,172.906 690.406,172.906 C690.406,172.906 691.518,172.424 692.938,171.938 C694.357,171.451 696.119,171 697,171 C697.881,171 699.643,171.451 701.062,171.938 C702.482,172.424 703.594,172.906 703.594,172.906 C703.924,173.054 704.307,173.014 704.599,172.801 C704.891,172.588 705.047,172.235 705.007,171.876 C704.967,171.516 704.738,171.206 704.406,171.062 C704.406,171.062 703.185,170.545 701.688,170.031 C700.19,169.518 698.452,169 697,169 z" fill="#000000" id="ferry-line-stroke2"/>
+      <path d="M685.666,166.974 C687.013,166.992 688.315,167.464 689.361,168.313 L689.88,168.772 L689.98,168.772 L690.599,168.213 C692.56,166.592 695.351,166.446 697.47,167.853 L701.984,158.985 L698.988,156.988 L698.988,149.898 C698.895,148.3 697.592,147.04 695.992,147.001 L694.993,147.001 C695.062,145.967 694.278,145.073 693.244,145.004 C693.161,144.999 693.078,144.999 692.996,145.004 L687.004,145.004 C685.969,144.936 685.075,145.719 685.007,146.754 C685.001,146.836 685.001,146.919 685.007,147.001 L684.008,147.001 C682.408,147.04 681.105,148.3 681.012,149.898 L681.012,156.988 L678.016,158.985 L682.51,168.033 C683.437,167.382 684.534,167.014 685.666,166.974 z M683.009,149.898 C683.03,149.379 683.467,148.977 683.985,148.998 C683.993,148.998 684,148.998 684.008,148.999 L695.992,148.999 C696.509,148.965 696.956,149.356 696.991,149.873 C696.993,149.915 696.993,149.956 696.991,149.997 L696.991,155.989 L690,151.995 L683.009,155.889 C683.009,155.889 683.009,149.898 683.009,149.898 z M702.982,170.969 L702.982,172.966 C702.458,173.005 701.97,173.249 701.624,173.645 C701.082,174.221 700.39,174.636 699.627,174.844 C698.399,175.206 697.071,174.929 696.092,174.105 L695.313,173.406 C694.705,172.801 693.724,172.801 693.116,173.406 C692.836,173.645 692.576,173.905 692.277,174.145 C690.813,175.314 688.719,175.255 687.324,174.005 L686.545,173.306 C685.973,172.806 685.119,172.806 684.547,173.306 C684.168,173.605 683.828,173.945 683.449,174.245 C682.042,175.286 680.107,175.237 678.755,174.125 L678.136,173.586 C677.847,173.255 677.451,173.035 677.018,172.966 L677.018,170.969 C677.534,170.905 678.057,171.003 678.516,171.249 C679.071,171.593 679.599,171.98 680.093,172.407 C680.503,172.854 681.121,173.044 681.711,172.906 C681.936,172.84 682.146,172.731 682.33,172.587 C682.65,172.347 682.91,172.068 683.229,171.808 C684.648,170.632 686.703,170.632 688.122,171.808 C688.442,172.068 688.742,172.367 689.061,172.627 C689.633,173.127 690.487,173.127 691.059,172.627 C691.378,172.367 691.678,172.068 691.997,171.808 C693.42,170.621 695.488,170.621 696.911,171.808 C697.21,172.068 697.49,172.347 697.789,172.587 C698.361,173.087 699.215,173.087 699.787,172.587 L700.725,171.768 C701.364,171.25 702.161,170.968 702.982,170.969 z" fill="#000000" id="ferry-line-stroke2"/>
       <path d="M709.5,179 C710.881,179 712,180.119 712,181.5 C712,182.881 710.881,184 709.5,184 C708.593,184.004 708.127,183.598 707.529,183 L672.471,183 C671.978,183.678 671.297,183.92 670.5,184 C669.119,184 668,182.881 668,181.5 C668,180.119 669.119,179 670.5,179 C671.407,178.996 671.873,179.402 672.471,180 L707.529,180 C708.022,179.322 708.703,179.08 709.5,179 z" fill="#000000" id="ferry-line-stroke1"/>
       <path d="M676,181 L676,182 L672.95,182 L673,181.5 L672.95,181 L676,181 z M687,181 L682,181 L682,182 L687,182 L687,181 z M698,181 L693,181 L693,182 L698,182 L698,181 z M707.05,181 L704,181 L704,182 L707.05,182 L707,181.5 L707.05,181 z" fill="#AAAAAA" id="ferry-line-dashes"/>
-      <path d="M711,181.5 C711,182.328 710.328,183 709.5,183 C708.672,183 708,182.328 708,181.5 C708,180.672 708.672,180 709.5,180 C710.328,180 711,180.672 711,181.5 z" fill="#FFFFFF" id="path6848-7"/>
-      <path d="M672,181.5 C672,182.328 671.328,183 670.5,183 C669.672,183 669,182.328 669,181.5 C669,180.672 669.672,180 670.5,180 C671.328,180 672,180.672 672,181.5 z" fill="#FFFFFF" id="path6852-2"/>
+      <path d="M711,181.5 C711,182.328 710.328,183 709.5,183 C708.672,183 708,182.328 708,181.5 C708,180.672 708.672,180 709.5,180 C710.328,180 711,180.672 711,181.5 z" fill="#FFFFFF"/>
+      <path d="M672,181.5 C672,182.328 671.328,183 670.5,183 C669.672,183 669,182.328 669,181.5 C669,180.672 669.672,180 670.5,180 C671.328,180 672,180.672 672,181.5 z" fill="#FFFFFF"/>
     </g>
     <g id="category-water">
       <path d="M616.762,181 C616.762,181 616.225,179.154 616.417,178.25 C616.638,177.203 618.071,175.5 618.071,175.5 C618.071,175.5 619.505,173.797 619.726,172.75 C619.917,171.846 619.381,170 619.381,170 C619.381,170 618.844,168.154 619.036,167.25 C619.257,166.203 620.69,164.5 620.69,164.5 C620.69,164.5 622.124,162.797 622.345,161.75 C622.536,160.846 622,159 622,159 L638.5,159 C638.5,159 639.933,160.703 640.155,161.75 C640.346,162.654 639.809,164.5 639.809,164.5 C639.809,164.5 639.273,166.346 639.464,167.25 C639.686,168.297 641.119,170 641.119,170 C641.119,170 642.552,171.703 642.774,172.75 C642.965,173.654 642.428,175.5 642.428,175.5 C642.428,175.5 641.892,177.346 642.083,178.25 C642.305,179.297 643.738,181 643.738,181 z" fill="#000000" id="category-water-stroke1"/>
@@ -932,83 +978,94 @@
       <path d="M562,181 L565,170 L568,159 L572,159 L575,170 L578,181 z" fill="#000000" id="category-path-stroke"/>
     </g>
     <g id="category-rail">
-      <path d="M503.5,158 L502,159 L501.531,161 L498.25,161 C497.696,161 497.384,161.463 497.25,162 L497,163 C496.866,163.537 497.446,164 498,164 L522,164 C522.554,164 523.134,163.537 523,163 L522.75,162 C522.616,161.463 522.304,161 521.75,161 L518.969,161 L518.5,159 L517,158 L516,159 L516.469,161 L504.031,161 L504.5,159 L503.5,158 z M501.5,162 C501.776,162 502,162.224 502,162.5 C502,162.776 501.776,163 501.5,163 C501.224,163 501,162.776 501,162.5 C501,162.224 501.224,162 501.5,162 z M518.5,162 C518.776,162 519,162.224 519,162.5 C519,162.776 518.776,163 518.5,163 C518.224,163 518,162.776 518,162.5 C518,162.224 518.224,162 518.5,162 z M500.562,165 L500.094,167 L497.25,167 C496.696,167 496.384,167.463 496.25,168 L496,169 C495.866,169.537 496.446,170 497,170 L523,170 C523.554,170 524.134,169.537 524,169 L523.75,168 C523.616,167.463 523.304,167 522.75,167 L520.406,167 L519.938,165 L517.438,165 L517.906,167 L502.594,167 L503.062,165 L500.562,165 z M500.5,168 C500.776,168 501,168.224 501,168.5 C501,168.776 500.776,169 500.5,169 C500.224,169 500,168.776 500,168.5 C500,168.224 500.224,168 500.5,168 z M519.5,168 C519.776,168 520,168.224 520,168.5 C520,168.776 519.776,169 519.5,169 C519.224,169 519,168.776 519,168.5 C519,168.224 519.224,168 519.5,168 z M499.156,171 L498.688,173 L496.25,173 C495.696,173 495.384,173.463 495.25,174 L495,175 C494.866,175.537 495.446,176 496,176 L524,176 C524.554,176 525.134,175.537 525,175 L524.75,174 C524.616,173.463 524.304,173 523.75,173 L521.812,173 L521.344,171 L518.844,171 L519.312,173 L501.188,173 L501.656,171 L499.156,171 z M499.5,174 C499.776,174 500,174.224 500,174.5 C500,174.776 499.776,175 499.5,175 C499.224,175 499,174.776 499,174.5 C499,174.224 499.224,174 499.5,174 z M520.5,174 C520.776,174 521,174.224 521,174.5 C521,174.776 520.776,175 520.5,175 C520.224,175 520,174.776 520,174.5 C520,174.224 520.224,174 520.5,174 z M497.719,177 L497,180 L498.5,181 L499.5,180 L500.219,177 L497.719,177 z M520.281,177 L521,180 L522,181 L523.5,180 L522.781,177 L520.281,177 z" fill="#989898" id="rect17528-7-7"/>
+      <path d="M503.5,158 L502,159 L501.531,161 L498.25,161 C497.696,161 497.384,161.463 497.25,162 L497,163 C496.866,163.537 497.446,164 498,164 L522,164 C522.554,164 523.134,163.537 523,163 L522.75,162 C522.616,161.463 522.304,161 521.75,161 L518.969,161 L518.5,159 L517,158 L516,159 L516.469,161 L504.031,161 L504.5,159 L503.5,158 z M501.5,162 C501.776,162 502,162.224 502,162.5 C502,162.776 501.776,163 501.5,163 C501.224,163 501,162.776 501,162.5 C501,162.224 501.224,162 501.5,162 z M518.5,162 C518.776,162 519,162.224 519,162.5 C519,162.776 518.776,163 518.5,163 C518.224,163 518,162.776 518,162.5 C518,162.224 518.224,162 518.5,162 z M500.562,165 L500.094,167 L497.25,167 C496.696,167 496.384,167.463 496.25,168 L496,169 C495.866,169.537 496.446,170 497,170 L523,170 C523.554,170 524.134,169.537 524,169 L523.75,168 C523.616,167.463 523.304,167 522.75,167 L520.406,167 L519.938,165 L517.438,165 L517.906,167 L502.594,167 L503.062,165 L500.562,165 z M500.5,168 C500.776,168 501,168.224 501,168.5 C501,168.776 500.776,169 500.5,169 C500.224,169 500,168.776 500,168.5 C500,168.224 500.224,168 500.5,168 z M519.5,168 C519.776,168 520,168.224 520,168.5 C520,168.776 519.776,169 519.5,169 C519.224,169 519,168.776 519,168.5 C519,168.224 519.224,168 519.5,168 z M499.156,171 L498.688,173 L496.25,173 C495.696,173 495.384,173.463 495.25,174 L495,175 C494.866,175.537 495.446,176 496,176 L524,176 C524.554,176 525.134,175.537 525,175 L524.75,174 C524.616,173.463 524.304,173 523.75,173 L521.812,173 L521.344,171 L518.844,171 L519.312,173 L501.188,173 L501.656,171 L499.156,171 z M499.5,174 C499.776,174 500,174.224 500,174.5 C500,174.776 499.776,175 499.5,175 C499.224,175 499,174.776 499,174.5 C499,174.224 499.224,174 499.5,174 z M520.5,174 C520.776,174 521,174.224 521,174.5 C521,174.776 520.776,175 520.5,175 C520.224,175 520,174.776 520,174.5 C520,174.224 520.224,174 520.5,174 z M497.719,177 L497,180 L498.5,181 L499.5,180 L500.219,177 L497.719,177 z M520.281,177 L521,180 L522,181 L523.5,180 L522.781,177 L520.281,177 z" fill="#989898"/>
     </g>
     <g id="category-roads">
-      <path d="M442.5,160 L439.625,166 L438,166 L437,167 L437,169 L438.406,169 L438,170 L438,175 L438,176 L438,176 C438,176 438.608,176.608 439,177 L440,177 L444,177 L446,178 L454,178 L456,177 L460,177 L461,177 L462,176 L462,176 L462,175 L462,170 L461.594,169 L463,169 L463,167 L462,166 L460.375,166 L457.5,160 z M443.5,163 L456.5,163 L458,167 L457,168 L443,168 L442,167 z M441,171 L444,171 L445,173 L445,174 L441,174 L440,173 L440,172 z M456,171 L459,171 L460,172 L460,173 L459,174 L455,174 L455,173 z M439,178 L439,180 L440,181 L443,181 L444,180 L444,178 z M456,178 L456,180 L457,181 L460,181 L461,180 L461,178 z" fill="#989898" id="path4709"/>
+      <path d="M442.5,160 L439.625,166 L438,166 L437,167 L437,169 L438.406,169 L438,170 L438,175 L438,176 L438,176 C438,176 438.608,176.608 439,177 L440,177 L444,177 L446,178 L454,178 L456,177 L460,177 L461,177 L462,176 L462,176 L462,175 L462,170 L461.594,169 L463,169 L463,167 L462,166 L460.375,166 L457.5,160 z M443.5,163 L456.5,163 L458,167 L457,168 L443,168 L442,167 z M441,171 L444,171 L445,173 L445,174 L441,174 L440,173 L440,172 z M456,171 L459,171 L460,172 L460,173 L459,174 L455,174 L455,173 z M439,178 L439,180 L440,181 L443,181 L444,180 L444,178 z M456,178 L456,180 L457,181 L460,181 L461,180 L461,178 z" fill="#989898"/>
     </g>
     <g id="other-line">
       <path d="M409.5,179 C410.881,179 412,180.119 412,181.5 C412,182.881 410.881,184 409.5,184 C408.57,184.002 408.113,183.584 407.5,182.971 L407.5,183 L372.5,183 L372.5,182.971 C371.996,183.663 371.316,183.918 370.5,184 C369.119,184 368,182.881 368,181.5 C368,180.119 369.119,179 370.5,179 C371.43,178.998 371.887,179.417 372.5,180.029 L372.5,180 L407.5,180 L407.5,180.029 C408.004,179.336 408.684,179.082 409.5,179 z" fill="#444444" id="other-line-casing1"/>
       <path d="M407.05,181 L407,181.5 L407.05,182 L372.95,182 L373,181.5 L372.95,181 L407.05,181 z" fill="#000000" id="other-line-stroke1"/>
-      <path d="M411,181.5 C411,182.328 410.328,183 409.5,183 C408.672,183 408,182.328 408,181.5 C408,180.672 408.672,180 409.5,180 C410.328,180 411,180.672 411,181.5 z" fill="#FFFFFF" id="path4657"/>
-      <path d="M372,181.5 C372,182.328 371.328,183 370.5,183 C369.672,183 369,182.328 369,181.5 C369,180.672 369.672,180 370.5,180 C371.328,180 372,180.672 372,181.5 z" fill="#FFFFFF" id="path4661"/>
-      <path d="M382.375,176 L385.375,165 L388.375,154 L392.375,154 L395.375,165 L398.375,176 z" fill="#989898" id="path26176-5-7-8"/>
+      <path d="M411,181.5 C411,182.328 410.328,183 409.5,183 C408.672,183 408,182.328 408,181.5 C408,180.672 408.672,180 409.5,180 C410.328,180 411,180.672 411,181.5 z" fill="#FFFFFF"/>
+      <path d="M372,181.5 C372,182.328 371.328,183 370.5,183 C369.672,183 369,182.328 369,181.5 C369,180.672 369.672,180 370.5,180 C371.328,180 372,180.672 372,181.5 z" fill="#FFFFFF"/>
+      <path d="M382.375,176 L385.375,165 L388.375,154 L392.375,154 L395.375,165 L398.375,176 z" fill="#989898"/>
     </g>
     <g id="power-line">
       <path d="M349.5,179 C350.881,179 352,180.119 352,181.5 C352,182.881 350.881,184 349.5,184 C348.075,183.93 347.556,183.207 347.05,182 L312.949,182 C312.591,183.232 311.753,183.874 310.5,184 C309.119,184 308,182.881 308,181.5 C308,180.119 309.119,179 310.5,179 C311.924,179.069 312.443,179.793 312.949,181 L347.05,181 C347.409,179.768 348.247,179.126 349.5,179 z" fill="#000000" id="power-line-stroke"/>
-      <path d="M351,181.5 C351,182.328 350.328,183 349.5,183 C348.672,183 348,182.328 348,181.5 C348,180.672 348.672,180 349.5,180 C350.328,180 351,180.672 351,181.5 z" fill="#FFFFFF" id="path3936"/>
-      <path d="M312,181.5 C312,182.328 311.328,183 310.5,183 C309.672,183 309,182.328 309,181.5 C309,180.672 309.672,180 310.5,180 C311.328,180 312,180.672 312,181.5 z" fill="#FFFFFF" id="path3940"/>
-      <path d="M320,150 L320,151 L322,151 L322,150 L320,150 z M324,150 L324,151 L326,151 L326,150 L324,150 z M334,150 L334,151 L336,151 L336,150 L334,150 z M338,150 L338,151 L340,151 L340,150 L338,150 z M320.312,155 C319.647,158.533 317.267,160.5 315,160.5 L314,160.5 L314,161.5 L315,161.5 C316.042,161.5 317.082,161.196 318,160.594 L318,161.5 L319,161.5 C321.879,161.5 324.615,159.022 325.312,155 L324.312,155 C323.647,158.533 321.267,160.5 319,160.5 L318.125,160.5 C319.686,159.42 320.885,157.509 321.312,155 L320.312,155 z M334.687,155 C335.385,159.022 338.121,161.5 341,161.5 L342,161.5 L342,160.594 C342.918,161.196 343.958,161.5 345,161.5 L346,161.5 L346,160.5 L345,160.5 C342.733,160.5 340.353,158.533 339.687,155 L338.687,155 C339.115,157.509 340.314,159.42 341.875,160.5 L341,160.5 C338.733,160.5 336.353,158.533 335.687,155 L334.687,155 z" fill="#989898" id="rect4103"/>
-      <path d="M328,150 L328,152 L319,152 L319,154 L328,154 L328,176 L332,176 L332,154 L341,154 L341,152 L332,152 L332,150 L328,150 z" fill="#B5B5B5" id="rect4101"/>
+      <path d="M351,181.5 C351,182.328 350.328,183 349.5,183 C348.672,183 348,182.328 348,181.5 C348,180.672 348.672,180 349.5,180 C350.328,180 351,180.672 351,181.5 z" fill="#FFFFFF"/>
+      <path d="M312,181.5 C312,182.328 311.328,183 310.5,183 C309.672,183 309,182.328 309,181.5 C309,180.672 309.672,180 310.5,180 C311.328,180 312,180.672 312,181.5 z" fill="#FFFFFF"/>
+      <path d="M320,150 L320,151 L322,151 L322,150 L320,150 z M324,150 L324,151 L326,151 L326,150 L324,150 z M334,150 L334,151 L336,151 L336,150 L334,150 z M338,150 L338,151 L340,151 L340,150 L338,150 z M320.312,155 C319.647,158.533 317.267,160.5 315,160.5 L314,160.5 L314,161.5 L315,161.5 C316.042,161.5 317.082,161.196 318,160.594 L318,161.5 L319,161.5 C321.879,161.5 324.615,159.022 325.312,155 L324.312,155 C323.647,158.533 321.267,160.5 319,160.5 L318.125,160.5 C319.686,159.42 320.885,157.509 321.312,155 L320.312,155 z M334.687,155 C335.385,159.022 338.121,161.5 341,161.5 L342,161.5 L342,160.594 C342.918,161.196 343.958,161.5 345,161.5 L346,161.5 L346,160.5 L345,160.5 C342.733,160.5 340.353,158.533 339.687,155 L338.687,155 C339.115,157.509 340.314,159.42 341.875,160.5 L341,160.5 C338.733,160.5 336.353,158.533 335.687,155 L334.687,155 z" fill="#989898"/>
+      <path d="M328,150 L328,152 L319,152 L319,154 L328,154 L328,176 L332,176 L332,154 L341,154 L341,152 L332,152 L332,150 L328,150 z" fill="#B5B5B5"/>
     </g>
     <g id="waterway-ditch">
-      <path d="M266,154 L261.75,176 L263.75,176 L268,154 L266,154 z M272.5,154 L276.75,176 L278.75,176 L274.5,154 L272.5,154 z" fill="#B5B5B5" id="path7019"/>
       <path d="M289.5,179 C290.881,179 292,180.119 292,181.5 C292,182.881 290.881,184 289.5,184 C288.259,183.944 287.613,183.339 287.154,182.25 L252.846,182.25 C252.509,183.364 251.607,183.888 250.5,184 C249.119,184 248,182.881 248,181.5 C248,180.119 249.119,179 250.5,179 C251.741,179.056 252.387,179.661 252.846,180.75 L287.154,180.75 C287.491,179.636 288.393,179.111 289.5,179 z" fill="#000000" id="waterway-ditch-stroke1"/>
       <path d="M264.762,176 L269,154 L271.5,154 L275.738,176 z" fill="#000000" id="waterway-ditch-stroke2"/>
-      <path d="M291,181.5 C291,182.328 290.328,183 289.5,183 C288.672,183 288,182.328 288,181.5 C288,180.672 288.672,180 289.5,180 C290.328,180 291,180.672 291,181.5 z" fill="#FFFFFF" id="path26188-3"/>
-      <path d="M252,181.5 C252,182.328 251.328,183 250.5,183 C249.672,183 249,182.328 249,181.5 C249,180.672 249.672,180 250.5,180 C251.328,180 252,180.672 252,181.5 z" fill="#FFFFFF" id="path26192-1"/>
+      <path d="M266,154 L261.75,176 L263.75,176 L268,154 L266,154 z M272.5,154 L276.75,176 L278.75,176 L274.5,154 L272.5,154 z" fill="#B5B5B5"/>
+      <path d="M291,181.5 C291,182.328 290.328,183 289.5,183 C288.672,183 288,182.328 288,181.5 C288,180.672 288.672,180 289.5,180 C290.328,180 291,180.672 291,181.5 z" fill="#FFFFFF"/>
+      <path d="M252,181.5 C252,182.328 251.328,183 250.5,183 C249.672,183 249,182.328 249,181.5 C249,180.672 249.672,180 250.5,180 C251.328,180 252,180.672 252,181.5 z" fill="#FFFFFF"/>
     </g>
     <g id="waterway-canal">
       <path d="M229.5,179 C230.881,179 232,180.119 232,181.5 C232,182.881 230.881,184 229.5,184 C228.259,183.944 227.613,183.339 227.154,182.25 L192.846,182.25 C192.509,183.364 191.607,183.888 190.5,184 C189.119,184 188,182.881 188,181.5 C188,180.119 189.119,179 190.5,179 C191.741,179.056 192.387,179.661 192.846,180.75 L227.154,180.75 C227.491,179.636 228.393,179.111 229.5,179 z" fill="#000000" id="waterway-canal-stroke1"/>
       <path d="M202,154 C202,154 202.535,155.846 202.344,156.75 C202.122,157.797 200.688,159.5 200.688,159.5 C200.688,159.5 199.253,161.203 199.031,162.25 C198.84,163.154 199.375,165 199.375,165 C199.375,165 199.91,166.846 199.719,167.75 C199.497,168.797 198.063,170.5 198.063,170.5 C198.063,170.5 196.628,172.203 196.406,173.25 C196.215,174.154 196.75,176 196.75,176 L223.75,176 C223.75,176 222.315,174.297 222.094,173.25 C221.903,172.346 222.438,170.5 222.438,170.5 C222.438,170.5 222.972,168.654 222.781,167.75 C222.56,166.703 221.125,165 221.125,165 C221.125,165 219.69,163.297 219.469,162.25 C219.278,161.346 219.813,159.5 219.813,159.5 C219.813,159.5 220.347,157.654 220.156,156.75 C219.935,155.703 218.5,154 218.5,154 z M208,156 L212,156 L214,158 L216,170 L212,172 L208,172 L204,170 L206,158 z M212.2,164 L213,168 L207,168 L207.8,164 z M211.6,161 L212,163 L208,163 L208.4,161 z M211,158 L211.4,160 L208.6,160 L209,158 z" fill="#000000" id="waterway-canal-stroke2"/>
       <path d="M204,170 L216,170 L212,172 L208,172 z" fill="#000000" id="waterway-canal-stroke3" opacity="0.601"/>
-      <path d="M231,181.5 C231,182.328 230.328,183 229.5,183 C228.672,183 228,182.328 228,181.5 C228,180.672 228.672,180 229.5,180 C230.328,180 231,180.672 231,181.5 z" fill="#FFFFFF" id="path6848"/>
-      <path d="M192,181.5 C192,182.328 191.328,183 190.5,183 C189.672,183 189,182.328 189,181.5 C189,180.672 189.672,180 190.5,180 C191.328,180 192,180.672 192,181.5 z" fill="#FFFFFF" id="path6852"/>
+      <path d="M231,181.5 C231,182.328 230.328,183 229.5,183 C228.672,183 228,182.328 228,181.5 C228,180.672 228.672,180 229.5,180 C230.328,180 231,180.672 231,181.5 z" fill="#FFFFFF"/>
+      <path d="M192,181.5 C192,182.328 191.328,183 190.5,183 C189.672,183 189,182.328 189,181.5 C189,180.672 189.672,180 190.5,180 C191.328,180 192,180.672 192,181.5 z" fill="#FFFFFF"/>
     </g>
     <g id="waterway-stream">
       <path d="M169.5,179 C170.881,179 172,180.119 172,181.5 C172,182.881 170.881,184 169.5,184 C168.259,183.944 167.613,183.339 167.154,182.25 L132.846,182.25 C132.509,183.364 131.607,183.888 130.5,184 C129.119,184 128,182.881 128,181.5 C128,180.119 129.119,179 130.5,179 C131.741,179.056 132.387,179.661 132.846,180.75 L167.154,180.75 C167.491,179.636 168.393,179.111 169.5,179 z" fill="#000000" id="waterway-stream-stroke1"/>
       <path d="M142.762,176 C142.762,176 142.226,174.154 142.417,173.25 C142.638,172.203 144.071,170.5 144.071,170.5 C144.071,170.5 145.505,168.797 145.726,167.75 C145.917,166.846 145.381,165 145.381,165 C145.381,165 144.845,163.154 145.036,162.25 C145.257,161.203 146.691,159.5 146.691,159.5 C146.691,159.5 148.124,157.797 148.345,156.75 C148.536,155.846 148,154 148,154 L152.5,154 C152.5,154 153.933,155.703 154.155,156.75 C154.346,157.654 153.81,159.5 153.81,159.5 C153.81,159.5 153.273,161.346 153.464,162.25 C153.686,163.297 155.119,165 155.119,165 C155.119,165 156.553,166.703 156.774,167.75 C156.965,168.654 156.429,170.5 156.429,170.5 C156.429,170.5 155.892,172.346 156.083,173.25 C156.305,174.297 157.738,176 157.738,176 z" fill="#000000" id="waterway-stream-stroke2"/>
       <path d="M143.966,167.759 C143.751,168.559 143.145,169.092 142.612,168.949 C142.078,168.806 141.82,168.041 142.034,167.241 C142.248,166.441 142.855,165.908 143.388,166.051 C143.922,166.194 144.18,166.959 143.966,167.759 z M145.799,157.75 C146.351,156.793 146.217,155.682 145.5,155.268 C144.783,154.854 143.753,155.293 143.201,156.25 C142.649,157.207 142.783,158.318 143.5,158.732 C144.217,159.146 145.247,158.707 145.799,157.75 z M155.422,161.708 C155.208,160.908 155.467,160.143 156,160 C156.534,159.857 157.14,160.39 157.354,161.19 C157.569,161.99 157.31,162.755 156.777,162.898 C156.243,163.041 155.637,162.508 155.422,161.708 z M158.299,172.75 C157.747,171.793 157.881,170.682 158.598,170.268 C159.316,169.854 160.345,170.293 160.897,171.25 C161.449,172.207 161.316,173.318 160.598,173.732 C159.881,174.146 158.851,173.707 158.299,172.75 z" fill="#000000" id="waterway-stream-stroke3" opacity="0.5"/>
-      <path d="M171,181.5 C171,182.328 170.328,183 169.5,183 C168.672,183 168,182.328 168,181.5 C168,180.672 168.672,180 169.5,180 C170.328,180 171,180.672 171,181.5 z" fill="#FFFFFF" id="path26188"/>
-      <path d="M132,181.5 C132,182.328 131.328,183 130.5,183 C129.672,183 129,182.328 129,181.5 C129,180.672 129.672,180 130.5,180 C131.328,180 132,180.672 132,181.5 z" fill="#FFFFFF" id="path26192"/>
+      <path d="M171,181.5 C171,182.328 170.328,183 169.5,183 C168.672,183 168,182.328 168,181.5 C168,180.672 168.672,180 169.5,180 C170.328,180 171,180.672 171,181.5 z" fill="#FFFFFF"/>
+      <path d="M132,181.5 C132,182.328 131.328,183 130.5,183 C129.672,183 129,182.328 129,181.5 C129,180.672 129.672,180 130.5,180 C131.328,180 132,180.672 132,181.5 z" fill="#FFFFFF"/>
     </g>
     <g id="waterway-river">
       <path d="M109.5,179 C110.881,179 112,180.119 112,181.5 C112,182.881 110.881,184 109.5,184 C108.593,184.004 108.127,183.598 107.529,183 L72.471,183 C71.978,183.678 71.297,183.92 70.5,184 C69.119,184 68,182.881 68,181.5 C68,180.119 69.119,179 70.5,179 C71.407,178.996 71.873,179.402 72.471,180 L107.529,180 C108.022,179.322 108.703,179.08 109.5,179 z" fill="#000000" id="waterway-river-stroke1"/>
       <path d="M76.762,176 C76.762,176 76.226,174.154 76.417,173.25 C76.638,172.203 78.071,170.5 78.071,170.5 C78.071,170.5 79.505,168.797 79.726,167.75 C79.917,166.846 79.381,165 79.381,165 C79.381,165 78.845,163.154 79.036,162.25 C79.257,161.203 80.691,159.5 80.691,159.5 C80.691,159.5 82.124,157.797 82.345,156.75 C82.536,155.846 82,154 82,154 L98.5,154 C98.5,154 99.933,155.703 100.155,156.75 C100.346,157.654 99.81,159.5 99.81,159.5 C99.81,159.5 99.273,161.346 99.464,162.25 C99.686,163.297 101.119,165 101.119,165 C101.119,165 102.553,166.703 102.774,167.75 C102.965,168.654 102.429,170.5 102.429,170.5 C102.429,170.5 101.892,172.346 102.083,173.25 C102.305,174.297 103.738,176 103.738,176 z" fill="#000000" id="waterway-river-stroke2"/>
       <path d="M77.966,167.759 C77.752,168.559 77.145,169.092 76.612,168.949 C76.078,168.806 75.82,168.041 76.034,167.241 C76.248,166.441 76.855,165.908 77.388,166.051 C77.922,166.194 78.18,166.959 77.966,167.759 z M79.799,157.75 C80.351,156.793 80.217,155.682 79.5,155.268 C78.783,154.854 77.753,155.293 77.201,156.25 C76.649,157.207 76.783,158.318 77.5,158.732 C78.217,159.146 79.247,158.707 79.799,157.75 z M101.422,161.708 C101.208,160.908 101.467,160.143 102,160 C102.534,159.857 103.14,160.39 103.354,161.19 C103.569,161.99 103.31,162.755 102.777,162.898 C102.243,163.041 101.637,162.508 101.422,161.708 z M104.299,172.75 C103.747,171.793 103.881,170.682 104.598,170.268 C105.316,169.854 106.345,170.293 106.897,171.25 C107.449,172.207 107.316,173.318 106.598,173.732 C105.881,174.146 104.851,173.707 104.299,172.75 z" fill="#000000" id="waterway-river-stroke3" opacity="0.5"/>
-      <path d="M111,181.5 C111,182.328 110.328,183 109.5,183 C108.672,183 108,182.328 108,181.5 C108,180.672 108.672,180 109.5,180 C110.328,180 111,180.672 111,181.5 z" fill="#FFFFFF" id="path26105"/>
-      <path d="M72,181.5 C72,182.328 71.328,183 70.5,183 C69.672,183 69,182.328 69,181.5 C69,180.672 69.672,180 70.5,180 C71.328,180 72,180.672 72,181.5 z" fill="#FFFFFF" id="path26109"/>
+      <path d="M111,181.5 C111,182.328 110.328,183 109.5,183 C108.672,183 108,182.328 108,181.5 C108,180.672 108.672,180 109.5,180 C110.328,180 111,180.672 111,181.5 z" fill="#FFFFFF"/>
+      <path d="M72,181.5 C72,182.328 71.328,183 70.5,183 C69.672,183 69,182.328 69,181.5 C69,180.672 69.672,180 70.5,180 C71.328,180 72,180.672 72,181.5 z" fill="#FFFFFF"/>
     </g>
     <g id="railway-monorail">
       <path d="M49.5,179 C50.881,179 52,180.119 52,181.5 C52,182.881 50.881,184 49.5,184 C48.593,184.004 48.127,183.598 47.529,183 L12.471,183 C11.978,183.678 11.297,183.92 10.5,184 C9.119,184 8,182.881 8,181.5 C8,180.119 9.119,179 10.5,179 C11.407,178.996 11.873,179.402 12.471,180 L47.529,180 C48.022,179.322 48.703,179.08 49.5,179 z" fill="#000000" id="railway-monorail-stroke"/>
       <path d="M16,181 L16,182 L12.95,182 L13,181.5 L12.95,181 L16,181 z M27,181 L22,181 L22,182 L27,182 L27,181 z M38,181 L33,181 L33,182 L38,182 L38,181 z M47.05,181 L44,181 L44,182 L47.05,182 L47,181.5 L47.05,181 z" fill="#AAAAAA" id="railway-monorail-dashes"/>
-      <path d="M50.833,181.5 C50.833,182.328 50.162,183 49.333,183 C48.505,183 47.833,182.328 47.833,181.5 C47.833,180.672 48.505,180 49.333,180 C50.162,180 50.833,180.672 50.833,181.5 z" fill="#FFFFFF" id="path7251"/>
-      <path d="M11.833,181.5 C11.833,182.328 11.162,183 10.333,183 C9.505,183 8.833,182.328 8.833,181.5 C8.833,180.672 9.505,180 10.333,180 C11.162,180 11.833,180.672 11.833,181.5 z" fill="#FFFFFF" id="path7255"/>
-      <path d="M25.833,150 L20.833,156 L20.833,169 L22.833,171 L36.833,171 L38.833,169 L38.833,156 L33.833,150 L25.833,150 z M25.833,151 L33.833,151 L33.833,153 L25.833,153 L25.833,151 z M23.833,156 L25.833,156 L33.833,156 L35.833,156 L36.833,157 L36.833,161 L33.833,161 L25.833,161 L22.833,161 L22.833,157 L23.833,156 z M22.833,164 L26.833,164 L27.833,166 L27.833,167 L23.833,167 L22.833,166 L22.833,164 z M32.833,164 L36.833,164 L36.833,166 L35.833,167 L31.833,167 L31.833,166 L32.833,164 z" fill="#989898" id="path7225"/>
-      <path d="M28.833,172 L30.833,172 L30.833,175 L28.833,175 z" fill="#B5B5B5" id="rect7259"/>
-      <path d="M30.833,171 L31.833,172 L31.833,174 L33.833,174 L33.833,171 z" fill="#989898" id="path7261"/>
-      <path d="M28.833,171 L27.833,172 L27.833,174 L25.833,174 L25.833,171 z" fill="#989898" id="path7263"/>
-      <path d="M26.833,176 L29.833,176 L32.833,176 L32.833,175 L26.833,175 z" fill="#B5B5B5" id="rect7265"/>
+      <path d="M50.833,181.5 C50.833,182.328 50.162,183 49.333,183 C48.505,183 47.833,182.328 47.833,181.5 C47.833,180.672 48.505,180 49.333,180 C50.162,180 50.833,180.672 50.833,181.5 z" fill="#FFFFFF"/>
+      <path d="M11.833,181.5 C11.833,182.328 11.162,183 10.333,183 C9.505,183 8.833,182.328 8.833,181.5 C8.833,180.672 9.505,180 10.333,180 C11.162,180 11.833,180.672 11.833,181.5 z" fill="#FFFFFF"/>
+      <path d="M22.833,171 L20.833,169 L20.833,156 L25.833,150 L33.833,150 L38.833,156 L38.833,169 L36.833,171 L33.833,171 L33.833,174 L31.833,174 L31.833,172 L30.833,171 L28.833,171 L27.833,172 L27.833,174 L25.833,174 L25.833,171 L22.833,171 z M36.833,164 L32.833,164 L31.833,166 L31.833,167 L35.833,167 L36.833,166 L36.833,164 z M26.833,164 L22.833,164 L22.833,166 L23.833,167 L27.833,167 L27.833,166 L26.833,164 z M35.833,156 L23.833,156 L22.833,157 L22.833,161 L36.833,161 L36.833,157 L35.833,156 z M33.833,151 L25.833,151 L25.833,153 L33.833,153 L33.833,151 z" fill="#989898"/>
+      <path d="M30.833,172 L30.833,175 L32.833,175 L32.833,176 L26.833,176 L26.833,175 L28.833,175 L28.833,172 L30.833,172 z" fill="#B5B5B5"/>
+    </g>
+    <g id="railway-tram">
+      <path d="M829.5,119 C830.881,119 832,120.119 832,121.5 C832,122.881 830.881,124 829.5,124 C828.593,124.004 828.127,123.598 827.529,123 L792.471,123 C791.978,123.678 791.297,123.92 790.5,124 C789.119,124 788,122.881 788,121.5 C788,120.119 789.119,119 790.5,119 C791.407,118.996 791.873,119.402 792.471,120 L827.529,120 C828.021,119.322 828.703,119.08 829.5,119 z" fill="#000000" id="railway-tram-stroke"/>
+      <path d="M796,121 L796,122 L792.95,122 L793,121.5 L792.95,121 L796,121 z M807,121 L802,121 L802,122 L807,122 L807,121 z M818,121 L813,121 L813,122 L818,122 L818,121 z M827.05,121 L824,121 L824,122 L827.05,122 L827,121.5 L827.05,121 z" fill="#AAAAAA" id="railway-tram-dashes"/>
+      <path d="M831,121.5 C831,122.328 830.328,123 829.5,123 C828.672,123 828,122.328 828,121.5 C828,120.672 828.672,120 829.5,120 C830.328,120 831,120.672 831,121.5 z" fill="#FFFFFF"/>
+      <path d="M792,121.5 C792,122.328 791.328,123 790.5,123 C789.672,123 789,122.328 789,121.5 C789,120.672 789.672,120 790.5,120 C791.328,120 792,120.672 792,121.5 z" fill="#FFFFFF"/>
+      <g>
+        <path d="M814,113 L815.5,117 L818,117 L816.5,113 z" fill="#989898"/>
+        <path d="M805.469,113 L804,117 L801.5,117 L802.969,113 z" fill="#989898"/>
+        <path d="M806.444,90 L802,96 L802,110 L803.778,112 L816.222,112 L818,110 L818,96 L813.556,90 L806.444,90 z M806.444,91 L813.556,91 L813.556,93 L806.444,93 L806.444,91 z M804.667,96 L806.444,96 L813.556,96 L815.333,96 L816.222,97 L816.222,101 L813.556,101 L806.444,101 L803.778,101 L803.778,97 L804.667,96 z M803.778,106 L806.444,106 L808.222,108 L808.222,109 L804.667,109 L803.778,108 L803.778,106 z M813.556,106 L816.222,106 L816.222,108 L815.333,109 L811.778,109 L811.778,108 L813.556,106 z" fill="#989898"/>
+        <path d="M805,86 L805,87 L809,87 L809,89 L811,89 L811,87 L815,87 L815,86 z" fill="#989898"/>
+      </g>
     </g>
     <g id="railway-light-rail">
       <path d="M769.5,119 C770.881,119 772,120.119 772,121.5 C772,122.881 770.881,124 769.5,124 C768.593,124.004 768.127,123.598 767.529,123 L732.471,123 C731.978,123.678 731.297,123.92 730.5,124 C729.119,124 728,122.881 728,121.5 C728,120.119 729.119,119 730.5,119 C731.407,118.996 731.873,119.402 732.471,120 L767.529,120 C768.022,119.322 768.703,119.08 769.5,119 z" fill="#000000" id="railway-light-rail-stroke"/>
       <path d="M736,121 L736,122 L732.95,122 L733,121.5 L732.95,121 L736,121 z M747,121 L742,121 L742,122 L747,122 L747,121 z M758,121 L753,121 L753,122 L758,122 L758,121 z M767.05,121 L764,121 L764,122 L767.05,122 L767,121.5 L767.05,121 z" fill="#AAAAAA" id="railway-light-rail-dashes"/>
-      <path d="M771,121.5 C771,122.328 770.328,123 769.5,123 C768.672,123 768,122.328 768,121.5 C768,120.672 768.672,120 769.5,120 C770.328,120 771,120.672 771,121.5 z" fill="#FFFFFF" id="path26158-5"/>
-      <path d="M732,121.5 C732,122.328 731.328,123 730.5,123 C729.672,123 729,122.328 729,121.5 C729,120.672 729.672,120 730.5,120 C731.328,120 732,120.672 732,121.5 z" fill="#FFFFFF" id="path26162-0"/>
-      <path d="M755.031,113 L756,115 L757,116 L758.5,115 L757.531,113 z" fill="#989898" id="path7074"/>
-      <path d="M744.5,113 L743.531,115 L742.531,116 L741.031,115 L742,113 z" fill="#989898" id="path7096"/>
-      <path d="M746,90 L741,96 L741,110 L743,112 L757,112 L759,110 L759,96 L754,90 L746,90 z M746,91 L754,91 L754,93 L746,93 L746,91 z M744,96 L746,96 L754,96 L756,96 L757,97 L757,101 L754,101 L746,101 L743,101 L743,97 L744,96 z M743,106 L746,106 L748,108 L748,109 L744,109 L743,108 L743,106 z M754,106 L757,106 L757,108 L756,109 L752,109 L752,108 L754,106 z" fill="#989898" id="path7098"/>
-      <path d="M745,86 L745,87 L749,87 L749,89 L751,89 L751,87 L755,87 L755,86 z" fill="#B5B5B5" id="path7167"/>
+      <path d="M771,121.5 C771,122.328 770.328,123 769.5,123 C768.672,123 768,122.328 768,121.5 C768,120.672 768.672,120 769.5,120 C770.328,120 771,120.672 771,121.5 z" fill="#FFFFFF"/>
+      <path d="M732,121.5 C732,122.328 731.328,123 730.5,123 C729.672,123 729,122.328 729,121.5 C729,120.672 729.672,120 730.5,120 C731.328,120 732,120.672 732,121.5 z" fill="#FFFFFF"/>
+      <g>
+        <path d="M742.5,112 L745.833,112 L745,113.488 L755,113.488 L754.167,112 L757.5,112 L760,116.464 L756.667,116.464 L755.833,114.976 L744.167,114.976 L743.333,116.464 L740,116.464 L742.5,112 z" fill="#989898"/>
+        <path d="M745.111,90 L739,95.727 L739,109.091 L741.444,111 L758.556,111 L761,109.091 L761,95.727 L754.889,90 L745.111,90 z M745.111,90.955 L754.889,90.955 L754.889,92.864 L745.111,92.864 L745.111,90.955 z M742.667,95.727 L745.111,95.727 L754.889,95.727 L757.333,95.727 L758.556,96.682 L758.556,100.5 L754.889,100.5 L745.111,100.5 L741.444,100.5 L741.444,96.682 L742.667,95.727 z M741.444,105.273 L745.111,105.273 L747.556,107.182 L747.556,108.136 L742.667,108.136 L741.444,107.182 L741.444,105.273 z M754.889,105.273 L758.556,105.273 L758.556,107.182 L757.333,108.136 L752.444,108.136 L752.444,107.182 L754.889,105.273 z" fill="#989898"/>
+        <path d="M745,86 L745,87 L749,87 L749,89 L751,89 L751,87 L755,87 L755,86 z" fill="#989898"/>
+      </g>
     </g>
     <g id="railway-subway">
       <path d="M709.5,119 C710.881,119 712,120.119 712,121.5 C712,122.881 710.881,124 709.5,124 C708.593,124.004 708.127,123.598 707.529,123 L672.471,123 C671.978,123.678 671.297,123.92 670.5,124 C669.119,124 668,122.881 668,121.5 C668,120.119 669.119,119 670.5,119 C671.407,118.996 671.873,119.402 672.471,120 L707.529,120 C708.021,119.322 708.703,119.08 709.5,119 z" fill="#000000" id="railway-subway-stroke"/>
       <path d="M676,121 L676,122 L672.95,122 L673,121.5 L672.95,121 L676,121 z M687,121 L682,121 L682,122 L687,122 L687,121 z M698,121 L693,121 L693,122 L698,122 L698,121 z M707.05,121 L704,121 L704,122 L707.05,122 L707,121.5 L707.05,121 z" fill="#AAAAAA" id="railway-subway-dashes"/>
-      <path d="M696.031,113 L697,115 L698,116 L699.5,115 L698.531,113 z" fill="#989898" id="path4893"/>
-      <path d="M711,121.5 C711,122.328 710.328,123 709.5,123 C708.672,123 708,122.328 708,121.5 C708,120.672 708.672,120 709.5,120 C710.328,120 711,120.672 711,121.5 z" fill="#FFFFFF" id="path4909"/>
-      <path d="M672,121.5 C672,122.328 671.328,123 670.5,123 C669.672,123 669,122.328 669,121.5 C669,120.672 669.672,120 670.5,120 C671.328,120 672,120.672 672,121.5 z" fill="#FFFFFF" id="path4913"/>
-      <path d="M683.5,113 L682.531,115 L681.531,116 L680.031,115 L681,113 z" fill="#989898" id="path5119"/>
-      <path d="M685,89 L679,95 L679,110 L681,112 L699,112 L701,110 L701,95 L695,89 L685,89 z M686,91 L694,91 L694,93 L686,93 L686,91 z M682,95 L684,95 L696,95 L698,95 L699,96 L699,100 L696,102 L684,102 L681,100 L681,96 L682,95 z M681,106 L684,106 L686,108 L686,109 L682,109 L681,108 L681,106 z M696,106 L699,106 L699,108 L698,109 L694,109 L694,108 L696,106 z" fill="#989898" id="rect5077"/>
-      <path d="M683,84 C678,84 674,87 674,93 L674,113 L677,112 L677,93 C677,89 680,87 683,87 L689,87 L691,87 L697,87 C700,87 703,89 703,93 L703,112 L706,113 L706,93 C706,87 701.932,84.822 697,84 L691,84 L689,84 z" fill="#B5B5B5" id="rect5093"/>
+      <path d="M711,121.5 C711,122.328 710.328,123 709.5,123 C708.672,123 708,122.328 708,121.5 C708,120.672 708.672,120 709.5,120 C710.328,120 711,120.672 711,121.5 z" fill="#FFFFFF"/>
+      <path d="M672,121.5 C672,122.328 671.328,123 670.5,123 C669.672,123 669,122.328 669,121.5 C669,120.672 669.672,120 670.5,120 C671.328,120 672,120.672 672,121.5 z" fill="#FFFFFF"/>
+      <g>
+        <path d="M682.5,112 L685.833,112 L685,113.488 L695,113.488 L694.167,112 L697.5,112 L700,116.464 L696.667,116.464 L695.833,114.976 L684.167,114.976 L683.333,116.464 L680,116.464 L682.5,112 z" fill="#989898"/>
+        <path d="M685,89 L679,94.739 L679,109.087 L681,111 L699,111 L701,109.087 L701,94.739 L695,89 L685,89 z M686,90.913 L694,90.913 L694,92.826 L686,92.826 L686,90.913 z M682,94.739 L684,94.739 L696,94.739 L698,94.739 L699,95.696 L699,99.522 L696,101.435 L684,101.435 L681,99.522 L681,95.696 L682,94.739 z M681,105.261 L684,105.261 L686,107.174 L686,108.13 L682,108.13 L681,107.174 L681,105.261 z M696,105.261 L699,105.261 L699,107.174 L698,108.13 L694,108.13 L694,107.174 L696,105.261 z" fill="#989898"/>
+        <path d="M683,84 C678,84 674,87 674,93 L674,113 L677,112 L677,93 C677,89 680,87 683,87 L689,87 L691,87 L697,87 C700,87 703,89 703,93 L703,112 L706,113 L706,93 C706,87 701.932,84.822 697,84 L691,84 L689,84 z" fill="#B5B5B5"/>
+      </g>
     </g>
     <g id="railway-abandoned">
       <g id="railway-abandoned-base">
@@ -1311,6 +1368,9 @@
     </g>
   </g>
   <g id="icons">
+    <g id="icon-no">
+      <path d="M650,2 C645.582,2 642,5.582 642,10 C642,14.418 645.582,18 650,18 C654.418,18 658,14.418 658,10 C658,5.582 654.418,2 650,2 z M650,4.065 C653.278,4.065 655.935,6.722 655.935,10 C655.935,11.267 655.531,12.439 654.855,13.403 L646.597,5.145 C647.561,4.469 648.733,4.065 650,4.065 z M645.145,6.597 L653.403,14.855 C652.439,15.531 651.267,15.935 650,15.935 C646.722,15.935 644.065,13.278 644.065,10 C644.065,8.733 644.469,7.561 645.145,6.597 z" fill="#000000" id="icon-no-shape"/>
+    </g>
     <g id="icon-more">
       <path d="M636,12 C634.895,12 634,11.105 634,10 C634,8.895 634.895,8 636,8 C637.105,8 638,8.895 638,10 C638,11.105 637.105,12 636,12 z M630,12 C631.105,12 632,11.105 632,10 C632,8.895 631.105,8 630,8 C628.895,8 628,8.895 628,10 C628,11.105 628.895,12 630,12 z M624,12 C625.105,12 626,11.105 626,10 C626,8.895 625.105,8 624,8 C622.895,8 622,8.895 622,10 C622,11.105 622.895,12 624,12 z" fill="#000000" id="icon-more-shape"/>
     </g>
@@ -1321,7 +1381,7 @@
       <path d="M590.125,6 L590.762,6.023 L591.199,6.336 C591.949,7.172 591.949,7.172 594.199,9.682 C596.449,12.191 596.449,12.191 597.199,13.027 C597.648,13.528 597.588,14.283 597.063,14.712 C596.539,15.142 595.75,15.084 595.301,14.583 C594.551,13.746 594.551,13.746 592.301,11.237 C591.617,10.474 590.933,9.712 590.25,8.949 C589.566,9.712 588.883,10.474 588.199,11.237 C585.949,13.746 585.949,13.746 585.199,14.583 C584.75,15.084 583.961,15.142 583.437,14.712 C582.912,14.283 582.852,13.528 583.301,13.027 C584.051,12.191 584.051,12.191 586.301,9.682 C588.551,7.172 588.551,7.172 589.301,6.336 C589.657,6.056 589.653,6.017 590.125,6 z" fill="#000000" id="icon-up-shape"/>
     </g>
     <g id="icon-forward">
-      <path d="M566.63,4 C565.527,4.079 565.939,3.887 565.301,4.353 C564.852,4.843 564.912,5.581 565.437,6.001 C566.312,6.702 566.312,6.702 568.937,8.805 C569.734,9.444 570.532,10.083 571.329,10.722 C570.532,11.361 569.734,12.001 568.937,12.64 C566.312,14.743 566.312,14.743 565.437,15.444 C564.912,15.864 564.852,16.602 565.301,17.092 C565.75,17.582 566.539,17.639 567.063,17.219 C567.938,16.518 567.938,16.518 570.563,14.414 C573.188,12.311 573.188,12.311 574.063,11.61 C574.646,11.143 574.646,10.302 574.063,9.835 C573.188,9.134 573.188,9.134 570.563,7.031 C567.938,4.927 567.938,4.927 567.063,4.226 L566.63,4 z" fill="#000000" id="icon-backward-shape"/>
+      <path d="M566.63,4 C565.527,4.079 565.939,3.887 565.301,4.353 C564.852,4.843 564.912,5.581 565.437,6.001 C566.312,6.702 566.312,6.702 568.937,8.805 C569.734,9.444 570.532,10.083 571.329,10.722 C570.532,11.361 569.734,12.001 568.937,12.64 C566.312,14.743 566.312,14.743 565.437,15.444 C564.912,15.864 564.852,16.602 565.301,17.092 C565.75,17.582 566.539,17.639 567.063,17.219 C567.938,16.518 567.938,16.518 570.563,14.414 C573.188,12.311 573.188,12.311 574.063,11.61 C574.646,11.143 574.646,10.302 574.063,9.835 C573.188,9.134 573.188,9.134 570.563,7.031 C567.938,4.927 567.938,4.927 567.063,4.226 L566.63,4 z" fill="#000000" id="icon-forward-shape"/>
     </g>
     <g id="icon-backward">
       <path d="M552.87,4 C553.973,4.079 553.561,3.887 554.199,4.353 C554.648,4.843 554.588,5.581 554.063,6.001 C553.188,6.702 553.188,6.702 550.563,8.805 C549.766,9.444 548.968,10.083 548.171,10.722 C548.968,11.361 549.766,12.001 550.563,12.64 C553.188,14.743 553.188,14.743 554.063,15.444 C554.588,15.864 554.648,16.602 554.199,17.092 C553.75,17.582 552.961,17.639 552.437,17.219 C551.562,16.518 551.562,16.518 548.937,14.414 C546.312,12.311 546.312,12.311 545.437,11.61 C544.854,11.143 544.854,10.302 545.437,9.835 C546.312,9.134 546.312,9.134 548.937,7.031 C551.562,4.927 551.562,4.927 552.437,4.226 L552.87,4 z" fill="#000000" id="icon-backward-shape"/>
@@ -1347,6 +1407,9 @@
     <g id="icon-bug">
       <path d="M406,3 L406,4 L408,6.406 L408,8 L412,8 L412,6.406 L414,4 L414,3 L413,3 L411,5 L409,5 L407,3 L406,3 z M407,9 L406,10 L403,10 L402,11 L403,12 L406,12 L406,13 L404,14 L403,15 L403,16 L404,16 L406,15 L408,17 L412,17 L414,15 L416,16 L417,16 L417,15 L416,14 L414,13 L414,12 L417,12 L418,11 L417,10 L414,10 L413,9 L407,9 z" fill="#000000" id="icon-bug-shape"/>
     </g>
+    <g id="icon-out-link">
+      <path d="M390.13,3.582 L390.041,4.159 C390.032,4.214 390.025,4.262 390.01,4.37 L390.009,4.381 C390.002,4.421 389.999,4.472 389.999,4.534 L389.999,5.233 C389.999,5.311 390.01,5.398 390.033,5.496 L390.179,6.112 L384.932,6.112 C384.819,6.112 384.731,6.148 384.65,6.229 C384.565,6.314 384.53,6.4 384.53,6.516 L384.53,13.824 C384.53,13.94 384.565,14.026 384.648,14.108 C384.732,14.192 384.819,14.228 384.932,14.228 L393.454,14.228 C393.57,14.228 393.658,14.192 393.746,14.105 C393.83,14.023 393.867,13.937 393.866,13.824 L393.866,10.124 L394.668,10.73 C394.845,10.864 395.039,10.97 395.249,11.048 C395.465,11.126 395.684,11.169 395.911,11.175 L396.396,11.189 L396.396,13.824 C396.396,14.226 396.315,14.61 396.153,14.972 C395.995,15.318 395.784,15.626 395.52,15.89 C395.256,16.154 394.949,16.364 394.6,16.522 C394.244,16.679 393.861,16.758 393.454,16.758 L384.932,16.758 C384.533,16.758 384.149,16.68 383.786,16.522 C383.429,16.366 383.118,16.153 382.856,15.886 C382.6,15.623 382.393,15.317 382.236,14.965 C382.079,14.607 382,14.224 382,13.824 L382,6.516 C382,6.116 382.078,5.734 382.235,5.369 C382.391,5.012 382.599,4.704 382.86,4.442 C383.121,4.181 383.432,3.973 383.786,3.82 C384.147,3.661 384.531,3.582 384.932,3.582 L390.13,3.582 z M396.656,3.582 L392.091,3.582 C391.836,3.582 391.604,3.677 391.418,3.853 C391.214,4.054 391.116,4.307 391.142,4.582 L391.139,5.216 C391.14,5.476 391.23,5.712 391.408,5.894 C391.586,6.079 391.826,6.175 392.091,6.175 L393.018,6.175 L387.765,11.443 C387.584,11.611 387.485,11.856 387.489,12.127 C387.495,12.388 387.587,12.617 387.762,12.795 L388.389,13.43 C388.586,13.616 388.82,13.705 389.075,13.705 C389.334,13.705 389.569,13.613 389.749,13.433 L395.015,8.181 L395.015,9.101 C395.016,9.358 395.111,9.593 395.293,9.775 C395.475,9.957 395.712,10.051 395.974,10.051 L396.656,10.051 C396.873,10.075 397.121,9.982 397.316,9.793 C397.509,9.605 397.608,9.367 397.608,9.101 L397.608,4.534 C397.608,4.284 397.509,4.054 397.329,3.871 C397.15,3.685 396.915,3.582 396.656,3.582 z" fill="#000000" id="icon-out-link-shape"/>
+    </g>
     <g id="icon-geolocate">
       <path d="M374.97,3.748 C375.931,3.873 376.382,4.536 376.16,5.464 C375.611,6.839 375.611,6.839 373.961,10.964 C372.311,15.089 372.311,15.089 371.76,16.464 C371.249,17.742 369.35,17.376 369.35,16 L369.35,10 L364,10 C362.587,10 362.259,8.023 363.597,7.567 C364.975,7.097 366.354,6.627 367.732,6.157 C370.02,5.377 372.309,4.597 374.597,3.817 L374.97,3.748 z" fill="#000000" id="icon-geolocate-shape"/>
     </g>
@@ -1374,9 +1437,6 @@
     <g id="icon-plus">
       <path d="M250,3.75 C250.69,3.75 251.25,4.31 251.25,5 L251.25,8.75 L255,8.75 C255.69,8.75 256.25,9.31 256.25,10 C256.25,10.69 255.69,11.25 255,11.25 L251.25,11.25 L251.25,15 C251.25,15.69 250.69,16.25 250,16.25 C249.31,16.25 248.75,15.69 248.75,15 L248.75,11.25 L245,11.25 C244.31,11.25 243.75,10.69 243.75,10 C243.75,9.31 244.31,8.75 245,8.75 L248.75,8.75 L248.75,5 C248.75,4.31 249.31,3.75 250,3.75 z" fill="#000000" id="icon-plus-shape"/>
     </g>
-    <g id="icon-out-link">
-      <path d="M390.13,3.582 L390.041,4.159 C390.032,4.214 390.025,4.262 390.01,4.37 L390.009,4.381 C390.002,4.421 389.999,4.472 389.999,4.534 L389.999,5.233 C389.999,5.311 390.01,5.398 390.033,5.496 L390.179,6.112 L384.932,6.112 C384.819,6.112 384.731,6.148 384.65,6.229 C384.565,6.314 384.53,6.4 384.53,6.516 L384.53,13.824 C384.53,13.94 384.565,14.026 384.648,14.108 C384.732,14.192 384.819,14.228 384.932,14.228 L393.454,14.228 C393.57,14.228 393.658,14.192 393.746,14.105 C393.83,14.023 393.867,13.937 393.866,13.824 L393.866,10.124 L394.668,10.73 C394.845,10.864 395.039,10.97 395.249,11.048 C395.465,11.126 395.684,11.169 395.911,11.175 L396.396,11.189 L396.396,13.824 C396.396,14.226 396.315,14.61 396.153,14.972 C395.995,15.318 395.784,15.626 395.52,15.89 C395.256,16.154 394.949,16.364 394.6,16.522 C394.244,16.679 393.861,16.758 393.454,16.758 L384.932,16.758 C384.533,16.758 384.149,16.68 383.786,16.522 C383.429,16.366 383.118,16.153 382.856,15.886 C382.6,15.623 382.393,15.317 382.236,14.965 C382.079,14.607 382,14.224 382,13.824 L382,6.516 C382,6.116 382.078,5.734 382.235,5.369 C382.391,5.012 382.599,4.704 382.86,4.442 C383.121,4.181 383.432,3.973 383.786,3.82 C384.147,3.661 384.531,3.582 384.932,3.582 L390.13,3.582 z M396.656,3.582 L392.091,3.582 C391.836,3.582 391.604,3.677 391.418,3.853 C391.214,4.054 391.116,4.307 391.142,4.582 L391.139,5.216 C391.14,5.476 391.23,5.712 391.408,5.894 C391.586,6.079 391.826,6.175 392.091,6.175 L393.018,6.175 L387.765,11.443 C387.584,11.611 387.485,11.856 387.489,12.127 C387.495,12.388 387.587,12.617 387.762,12.795 L388.389,13.43 C388.586,13.616 388.82,13.705 389.075,13.705 C389.334,13.705 389.569,13.613 389.749,13.433 L395.015,8.181 L395.015,9.101 C395.016,9.358 395.111,9.593 395.293,9.775 C395.475,9.957 395.712,10.051 395.974,10.051 L396.656,10.051 C396.873,10.075 397.121,9.982 397.316,9.793 C397.509,9.605 397.608,9.367 397.608,9.101 L397.608,4.534 C397.608,4.284 397.509,4.054 397.329,3.871 C397.15,3.685 396.915,3.582 396.656,3.582 z" fill="#000000" id="icon-out-link-shape"/>
-    </g>
     <g id="icon-load">
       <path d="M236.25,8.687 C236.94,8.687 237.5,9.247 237.5,9.937 L237.5,15.937 C237.5,16.628 236.94,17.187 236.25,17.187 L224.25,17.187 C223.56,17.187 223,16.628 223,15.937 L223,9.937 C223,9.247 223.56,8.687 224.25,8.687 C224.94,8.687 225.5,9.247 225.5,9.937 L225.5,14.687 L235,14.687 L235,9.937 C235,9.247 235.56,8.687 236.25,8.687 z" fill="#000000" id="icon-load-shape2"/>
       <path d="M230.154,12.687 L230.644,12.67 L230.985,12.428 C231.361,12.021 231.737,11.614 232.113,11.207 C232.737,10.531 233.361,9.854 233.985,9.178 C234.359,8.773 234.334,8.14 233.928,7.765 C233.522,7.391 232.89,7.416 232.515,7.822 C232.177,8.188 231.838,8.555 231.5,8.922 L231.5,3.25 C231.5,2.56 230.94,2 230.25,2 C229.56,2 229,2.56 229,3.25 L229,8.922 C228.662,8.555 228.323,8.188 227.985,7.822 C227.61,7.416 226.978,7.391 226.572,7.765 C226.166,8.14 226.141,8.773 226.515,9.178 C226.89,9.585 226.89,9.585 228.015,10.803 C229.14,12.022 229.14,12.022 229.515,12.428 C229.893,12.703 229.681,12.614 230.154,12.687 z" fill="#000000" id="icon-load-shape1"/>
@@ -1414,7 +1474,7 @@
       <path d="M29.833,3 C26.612,3 24,5.612 24,8.833 C24,12.055 29.833,17 29.833,17 C29.833,17 35.667,12.055 35.667,8.833 C35.667,5.612 33.055,3 29.833,3 z M30.016,6.5 C31.304,6.5 32.349,7.545 32.349,8.833 C32.349,10.122 31.304,11.167 30.016,11.167 C28.727,11.167 27.682,10.122 27.682,8.833 C27.682,7.545 28.727,6.5 30.016,6.5 z" fill="#000000" id="icon-point-shape"/>
     </g>
     <g id="icon-alert">
-      <path d="M11.292,14.388 C11.292,14.3 11.268,14.227 11.217,14.168 C11.169,14.111 11.099,14.081 11.011,14.081 L9.733,14.081 C9.655,14.081 9.587,14.109 9.528,14.165 C9.469,14.22 9.442,14.295 9.442,14.388 L9.442,15.609 C9.442,15.698 9.469,15.769 9.528,15.821 C9.587,15.873 9.655,15.899 9.733,15.899 L11.011,15.899 C11.203,15.899 11.299,15.802 11.292,15.609 z M10.936,13.301 C11.013,13.301 11.08,13.272 11.139,13.215 C11.196,13.156 11.226,13.088 11.226,13.012 L11.351,7.756 C11.351,7.678 11.321,7.61 11.262,7.553 C11.205,7.494 11.137,7.466 11.059,7.466 L9.681,7.466 C9.594,7.466 9.521,7.494 9.469,7.553 C9.417,7.61 9.391,7.678 9.391,7.756 L9.492,13.012 C9.492,13.088 9.521,13.156 9.579,13.215 C9.636,13.272 9.703,13.301 9.782,13.301 z M10.362,3.997 C10.544,3.997 10.7,4.056 10.831,4.174 C10.962,4.295 11.072,4.427 11.16,4.578 L17.55,15.626 C17.607,15.715 17.652,15.809 17.687,15.911 C17.725,16.015 17.742,16.124 17.742,16.239 C17.742,16.511 17.636,16.707 17.427,16.825 C17.217,16.944 16.991,17.003 16.754,17.003 L3.987,17.003 C3.749,17.003 3.525,16.944 3.314,16.825 C3.104,16.707 3,16.511 3,16.239 C3,16.129 3.017,16.02 3.049,15.916 C3.083,15.81 3.13,15.715 3.191,15.626 L9.566,4.578 C9.655,4.427 9.762,4.295 9.892,4.174 C10.024,4.056 10.179,3.997 10.362,3.997" fill="#000000" id="icon-alert-shape"/>
+      <path d="M11.292,14.383 C11.292,14.295 11.267,14.222 11.217,14.163 C11.169,14.106 11.099,14.077 11.011,14.077 L9.733,14.077 C9.655,14.077 9.587,14.104 9.528,14.16 C9.469,14.215 9.442,14.29 9.442,14.383 L9.442,15.603 C9.442,15.692 9.469,15.763 9.528,15.815 C9.587,15.867 9.655,15.893 9.733,15.893 L11.011,15.893 C11.203,15.893 11.299,15.796 11.292,15.603 z M10.936,13.297 C11.013,13.297 11.08,13.267 11.139,13.21 C11.196,13.151 11.226,13.083 11.226,13.007 L11.351,7.754 C11.351,7.676 11.321,7.609 11.262,7.551 C11.205,7.492 11.137,7.465 11.059,7.465 L9.681,7.465 C9.594,7.465 9.521,7.492 9.469,7.551 C9.417,7.609 9.391,7.676 9.391,7.754 L9.492,13.007 C9.492,13.083 9.521,13.151 9.579,13.21 C9.636,13.267 9.703,13.297 9.781,13.297 z M10.362,3.997 C10.544,3.997 10.7,4.056 10.83,4.174 C10.962,4.295 11.072,4.427 11.16,4.577 L17.55,15.621 C17.607,15.709 17.652,15.803 17.687,15.905 C17.725,16.009 17.742,16.118 17.742,16.233 C17.742,16.505 17.636,16.7 17.426,16.818 C17.217,16.938 16.991,16.997 16.754,16.997 L3.987,16.997 C3.749,16.997 3.525,16.938 3.314,16.818 C3.104,16.7 3,16.505 3,16.233 C3,16.123 3.017,16.014 3.049,15.91 C3.083,15.804 3.13,15.709 3.191,15.621 L9.566,4.577 C9.655,4.427 9.762,4.295 9.892,4.174 C10.024,4.056 10.179,3.997 10.362,3.997" fill="#000000" id="icon-alert-shape"/>
     </g>
   </g>
 </svg>
diff --git a/test/index.html b/test/index.html
index d5f4ccad8..eb0588033 100644
--- a/test/index.html
+++ b/test/index.html
@@ -103,6 +103,7 @@
 
     <script src='spec/services/mapillary.js'></script>
     <script src='spec/services/nominatim.js'></script>
+    <script src='spec/services/openstreetcam.js'></script>
     <script src='spec/services/osm.js'></script>
     <script src='spec/services/taginfo.js'></script>
 
diff --git a/test/spec/actions/reverse.js b/test/spec/actions/reverse.js
index 8e6d4a204..7e99b9a44 100644
--- a/test/spec/actions/reverse.js
+++ b/test/spec/actions/reverse.js
@@ -310,4 +310,66 @@ describe('iD.actionReverse', function () {
         expect(target.tags['traffic_sign:left']).to.eql('stop');
     });
 
+    // For issue #4595
+    it('reverses the direction of a forward facing traffic_signals on the way', function () {
+        var node1 = iD.Node();
+        var node2 = iD.Node({tags: { 'traffic_signals:direction': 'forward', 'highway': 'traffic_signals' }});
+        var node3 = iD.Node();
+        var way = iD.Way({nodes: [node1.id, node2.id, node3.id]});
+        var graph = iD.actionReverse(way.id)(iD.Graph([node1, node2, node3, way]));
+        var target = graph.entity(node2.id);
+        expect(target.tags['traffic_signals:direction']).to.eql('backward');
+    });
+
+    it('reverses the direction of a backward facing traffic_signals on the way', function () {
+        var node1 = iD.Node();
+        var node2 = iD.Node({tags: { 'traffic_signals:direction': 'backward', 'highway': 'traffic_signals' }});
+        var node3 = iD.Node();
+        var way = iD.Way({nodes: [node1.id, node2.id, node3.id]});
+        var graph = iD.actionReverse(way.id)(iD.Graph([node1, node2, node3, way]));
+        var target = graph.entity(node2.id);
+        expect(target.tags['traffic_signals:direction']).to.eql('forward');
+    });
+
+   it('reverses the direction of a left facing traffic_signals on the way', function () {
+        var node1 = iD.Node();
+        var node2 = iD.Node({tags: { 'traffic_signals:direction': 'left', 'highway': 'traffic_signals' }});
+        var node3 = iD.Node();
+        var way = iD.Way({nodes: [node1.id, node2.id, node3.id]});
+        var graph = iD.actionReverse(way.id)(iD.Graph([node1, node2, node3, way]));
+        var target = graph.entity(node2.id);
+        expect(target.tags['traffic_signals:direction']).to.eql('right');
+    });
+
+    it('reverses the direction of a right facing traffic_signals on the way', function () {
+        var node1 = iD.Node();
+        var node2 = iD.Node({tags: { 'traffic_signals:direction': 'right', 'highway': 'traffic_signals' }});
+        var node3 = iD.Node();
+        var way = iD.Way({nodes: [node1.id, node2.id, node3.id]});
+        var graph = iD.actionReverse(way.id)(iD.Graph([node1, node2, node3, way]));
+        var target = graph.entity(node2.id);
+        expect(target.tags['traffic_signals:direction']).to.eql('left');
+    });
+
+    it('does not assign a direction to a directionless traffic_signals on the way during a reverse', function () {
+        var node1 = iD.Node();
+        var node2 = iD.Node({tags: { 'highway': 'traffic_signals' }});
+        var node3 = iD.Node();
+        var way = iD.Way({nodes: [node1.id, node2.id, node3.id]});
+        var graph = iD.actionReverse(way.id)(iD.Graph([node1, node2, node3, way]));
+        var target = graph.entity(node2.id);
+        expect(target.tags['traffic_signals:direction']).to.be.undefined;
+    });
+
+    it('ignores directions other than forward or backward on attached traffic_signals during a reverse', function () {
+        var node1 = iD.Node();
+        var node2 = iD.Node({tags: { 'traffic_signals:direction': 'empty', 'highway': 'traffic_signals' }});
+        var node3 = iD.Node();
+        var way = iD.Way({nodes: [node1.id, node2.id, node3.id]});
+        var graph = iD.actionReverse(way.id)(iD.Graph([node1, node2, node3, way]));
+        var target = graph.entity(node2.id);
+        expect(target.tags['traffic_signals:direction']).to.eql('empty');
+    });
+
+
 });
diff --git a/test/spec/presets/index.js b/test/spec/presets/index.js
index fbe9ceb8d..9178a4519 100644
--- a/test/spec/presets/index.js
+++ b/test/spec/presets/index.js
@@ -180,7 +180,7 @@ describe('iD.presetIndex', function() {
             var presets = iD.Context().presets(),
                 way = iD.Way({ tags: { area: 'yes', highway: 'pedestrian' }}),
                 graph = iD.Graph([way]);
-            expect(presets.match(way, graph).id).to.eql('highway/pedestrian');
+            expect(presets.match(way, graph).id).to.eql('highway/pedestrian_area');
         });
     });
 
diff --git a/test/spec/services/mapillary.js b/test/spec/services/mapillary.js
index dd184db05..26d674bc6 100644
--- a/test/spec/services/mapillary.js
+++ b/test/spec/services/mapillary.js
@@ -54,6 +54,7 @@ describe('iD.serviceMapillary', function() {
             var cache = mapillary.cache();
             expect(cache).to.have.property('images');
             expect(cache).to.have.property('objects');
+            expect(cache).to.have.property('sequences');
             expect(cache).to.have.property('detections');
 
             mapillary.init();
@@ -64,12 +65,12 @@ describe('iD.serviceMapillary', function() {
 
     describe('#reset', function() {
         it('resets cache and image', function() {
-            mapillary.cache({foo: 'bar'});
-            mapillary.selectedImage('baz');
+            mapillary.cache().foo = 'bar';
+            mapillary.selectImage({ key: 'baz', loc: [10,0] });
 
             mapillary.reset();
             expect(mapillary.cache()).to.not.have.property('foo');
-            expect(mapillary.selectedImage()).to.be.null;
+            expect(mapillary.getSelectedImage()).to.be.null;
         });
     });
 
@@ -348,6 +349,44 @@ describe('iD.serviceMapillary', function() {
         });
     });
 
+
+    describe('#sequences', function() {
+        it('returns sequence linestrings in the visible map area', function() {
+            var features = [
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], ca: 90 } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], ca: 90 } },
+                { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1], ca: 90 } }
+            ];
+
+            mapillary.cache().images.rtree.load(features);
+
+            var gj = {
+                type: 'Feature',
+                geometry: {
+                    type: 'LineString',
+                    coordinates: [[10,0], [10,0], [10,1]],
+                    properties: {
+                        key: '-',
+                        pano: false,
+                        coordinateProperties: {
+                            cas: [90, 90, 90],
+                            image_keys: ['0', '1', '2']
+                        }
+                    }
+                }
+            };
+
+            mapillary.cache().sequences.lineString['-'] = gj;
+            mapillary.cache().sequences.forImageKey['0'] = '-';
+            mapillary.cache().sequences.forImageKey['1'] = '-';
+            mapillary.cache().sequences.forImageKey['2'] = '-';
+
+            var res = mapillary.sequences(context.projection);
+            expect(res).to.deep.eql([gj]);
+        });
+    });
+
+
     describe('#signsSupported', function() {
         it('returns false for Internet Explorer', function() {
             ua = 'Trident/7.0; rv:11.0';
@@ -391,10 +430,11 @@ describe('iD.serviceMapillary', function() {
         });
     });
 
-    describe('#selectedImage', function() {
-        it('sets and gets selected image', function() {
-            mapillary.selectedImage('foo');
-            expect(mapillary.selectedImage()).to.eql('foo');
+    describe('#selectImage', function() {
+        it('gets and sets the selected image', function() {
+            var d = { key: 'baz', loc: [10,0] };
+            mapillary.selectImage(d);
+            expect(mapillary.getSelectedImage()).to.eql(d);
         });
     });
 
diff --git a/test/spec/services/openstreetcam.js b/test/spec/services/openstreetcam.js
new file mode 100644
index 000000000..e9d8dbc27
--- /dev/null
+++ b/test/spec/services/openstreetcam.js
@@ -0,0 +1,311 @@
+describe('iD.serviceOpenstreetcam', function() {
+    var dimensions = [64, 64],
+        ua = navigator.userAgent,
+        isPhantom = (navigator.userAgent.match(/PhantomJS/) !== null),
+        uaMock = function () { return ua; },
+        context, server, openstreetcam, orig;
+
+    before(function() {
+        iD.services.openstreetcam = iD.serviceOpenstreetcam;
+    });
+
+    after(function() {
+        delete iD.services.openstreetcam;
+    });
+
+    beforeEach(function() {
+        context = iD.Context().assetPath('../dist/');
+        context.projection
+            .scale(667544.214430109)  // z14
+            .translate([-116508, 0])  // 10,0
+            .clipExtent([[0,0], dimensions]);
+
+        server = sinon.fakeServer.create();
+        openstreetcam = iD.services.openstreetcam;
+        openstreetcam.reset();
+
+        /* eslint-disable no-global-assign */
+        /* mock userAgent */
+        if (isPhantom) {
+            orig = navigator;
+            navigator = Object.create(orig, { userAgent: { get: uaMock }});
+        } else {
+            orig = navigator.__lookupGetter__('userAgent');
+            navigator.__defineGetter__('userAgent', uaMock);
+        }
+    });
+
+    afterEach(function() {
+        server.restore();
+
+        /* restore userAgent */
+        if (isPhantom) {
+            navigator = orig;
+        } else {
+            navigator.__defineGetter__('userAgent', orig);
+        }
+        /* eslint-enable no-global-assign */
+    });
+
+
+    describe('#init', function() {
+        it('Initializes cache one time', function() {
+            var cache = openstreetcam.cache();
+            expect(cache).to.have.property('images');
+            expect(cache).to.have.property('sequences');
+
+            openstreetcam.init();
+            var cache2 = openstreetcam.cache();
+            expect(cache).to.equal(cache2);
+        });
+    });
+
+    describe('#reset', function() {
+        it('resets cache and image', function() {
+            openstreetcam.cache().foo = 'bar';
+            openstreetcam.selectImage({key: 'baz'});
+
+            openstreetcam.reset();
+            expect(openstreetcam.cache()).to.not.have.property('foo');
+            expect(openstreetcam.getSelectedImage()).to.be.null;
+        });
+    });
+
+    describe('#loadImages', function() {
+        it('fires loadedImages when images are loaded', function() {
+            var spy = sinon.spy();
+            openstreetcam.on('loadedImages', spy);
+            openstreetcam.loadImages(context.projection);
+
+            var data = {
+                status: { apiCode: '600', httpCode: 200, httpMessage: 'Success' },
+                currentPageItems:[{
+                    id: '1',
+                    sequence_id: '100',
+                    sequence_index: '1',
+                    lat: '0',
+                    lng: '10.001',
+                    name: 'storage6\/files\/photo\/foo1.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo1.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo1.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                }, {
+                    id: '2',
+                    sequence_id: '100',
+                    sequence_index: '2',
+                    lat: '0',
+                    lng: '10.002',
+                    name: 'storage6\/files\/photo\/foo2.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo2.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo2.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                }, {
+                    id: '3',
+                    sequence_id: '100',
+                    sequence_index: '3',
+                    lat: '0',
+                    lng: '10.003',
+                    name: 'storage6\/files\/photo\/foo3.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo3.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo3.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                }],
+                totalFilteredItems: ['3']
+            };
+
+            server.respondWith('POST', /nearby-photos/,
+                [200, { 'Content-Type': 'application/json' }, JSON.stringify(data) ]);
+            server.respond();
+
+            expect(spy).to.have.been.calledOnce;
+        });
+
+        it('does not load images around null island', function() {
+            var spy = sinon.spy();
+            context.projection.translate([0,0]);
+            openstreetcam.on('loadedImages', spy);
+            openstreetcam.loadImages(context.projection);
+
+            var data = {
+                status: { apiCode: '600', httpCode: 200, httpMessage: 'Success' },
+                currentPageItems:[{
+                    id: '1',
+                    sequence_id: '100',
+                    sequence_index: '1',
+                    lat: '0',
+                    lng: '0',
+                    name: 'storage6\/files\/photo\/foo1.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo1.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo1.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                }, {
+                    id: '2',
+                    sequence_id: '100',
+                    sequence_index: '2',
+                    lat: '0',
+                    lng: '0',
+                    name: 'storage6\/files\/photo\/foo2.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo2.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo2.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                }, {
+                    id: '3',
+                    sequence_id: '100',
+                    sequence_index: '3',
+                    lat: '0',
+                    lng: '0',
+                    name: 'storage6\/files\/photo\/foo3.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo3.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo3.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                }],
+                totalFilteredItems: ['3']
+            };
+
+            server.respondWith('POST', /nearby-photos/,
+                [200, { 'Content-Type': 'application/json' }, JSON.stringify(data) ]);
+            server.respond();
+
+            expect(spy).to.have.been.not.called;
+        });
+
+        it.skip('loads multiple pages of image results', function() {
+            var spy = sinon.spy();
+            openstreetcam.on('loadedImages', spy);
+            openstreetcam.loadImages(context.projection);
+
+            var features0 = [],
+                features1 = [],
+                i;
+
+            for (i = 0; i < 1000; i++) {
+                features0.push({
+                    id: String(i),
+                    sequence_id: '100',
+                    sequence_index: String(i),
+                    lat: '10',
+                    lng: '0',
+                    name: 'storage6\/files\/photo\/foo' + String(i) +'.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo' + String(i) +'.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo' + String(i) +'.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                });
+            }
+            for (i = 0; i < 500; i++) {
+                features1.push({
+                    id: String(i),
+                    sequence_id: '100',
+                    sequence_index: String(1000 + i),
+                    lat: '10',
+                    lng: '0',
+                    name: 'storage6\/files\/photo\/foo' + String(1000 + i) +'.jpg',
+                    lth_name: 'storage6\/files\/photo\/lth\/foo' + String(1000 + i) +'.jpg',
+                    th_name: 'storage6\/files\/photo\/th\/foo' + String(1000 + i) +'.jpg',
+                    shot_date: '2017-09-24 23:58:07',
+                    heading: '90',
+                    username: 'test'
+                });
+            }
+
+            var response0 = {
+                    status: { apiCode: '600', httpCode: 200, httpMessage: 'Success' },
+                    currentPageItems: [features0],
+                    totalFilteredItems: ['1000']
+                },
+                response1 = {
+                    status: { apiCode: '600', httpCode: 200, httpMessage: 'Success' },
+                    currentPageItems: [features1],
+                    totalFilteredItems: ['500']
+                };
+
+            server.respondWith('POST', /nearby-photos/, function (request) {
+                var response;
+                if (request.requestBody.match(/page=1/) !== null) {
+                    response = JSON.stringify(response0);
+                } else if (request.requestBody.match(/page=2/) !== null) {
+                    response = JSON.stringify(response1);
+                }
+                request.respond(200, {'Content-Type': 'application/json'}, response);
+            });
+            server.respond();
+
+            expect(spy).to.have.been.calledTwice;
+        });
+    });
+
+
+    describe('#images', function() {
+        it('returns images in the visible map area', function() {
+            var features = [
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 0 } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 1 } },
+                { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1], ca: 90, sequence_id: '100', sequence_index: 2 } }
+            ];
+
+            openstreetcam.cache().images.rtree.load(features);
+            var res = openstreetcam.images(context.projection);
+
+            expect(res).to.deep.eql([
+                { key: '0', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 0 },
+                { key: '1', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 1 }
+            ]);
+        });
+
+        it('limits results no more than 3 stacked images in one spot', function() {
+            var features = [
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 0 } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 1 } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '2', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 2 } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '3', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 3 } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '4', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 4 } }
+            ];
+
+            openstreetcam.cache().images.rtree.load(features);
+            var res = openstreetcam.images(context.projection);
+            expect(res).to.have.length.of.at.most(3);
+        });
+    });
+
+
+    describe('#sequences', function() {
+        it('returns sequence linestrings in the visible map area', function() {
+            var features = [
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 0 } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], ca: 90, sequence_id: '100', sequence_index: 1 } },
+                { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1], ca: 90, sequence_id: '100', sequence_index: 2 } }
+            ];
+
+            openstreetcam.cache().images.rtree.load(features);
+            openstreetcam.cache().sequences['100'] = { rotation: 0, images: [ features[0].data, features[1].data, features[2].data ] };
+
+            var res = openstreetcam.sequences(context.projection);
+            expect(res).to.deep.eql([{
+                type: 'LineString',
+                coordinates: [[10,0], [10,0], [10,1]],
+                properties: { key: '100' }
+            }]);
+        });
+    });
+
+    describe('#selectedImage', function() {
+        it('sets and gets selected image', function() {
+            openstreetcam.selectImage('foo');
+            expect(openstreetcam.getSelectedImage()).to.eql('foo');
+        });
+    });
+
+});
diff --git a/test/spec/services/osm.js b/test/spec/services/osm.js
index a38c69bf3..3f51916f1 100644
--- a/test/spec/services/osm.js
+++ b/test/spec/services/osm.js
@@ -52,6 +52,21 @@ describe('iD.serviceOsm', function () {
         expect(connection.changesetURL(2)).to.match(/^https:/);
     });
 
+    describe('#getConnectionId', function() {
+        it('changes the connection id every time connection is reset', function() {
+            var cid1 = connection.getConnectionId();
+            connection.reset();
+            var cid2 = connection.getConnectionId();
+            expect(cid2).to.be.above(cid1);
+        });
+        it('changes the connection id every time connection is switched', function() {
+            var cid1 = connection.getConnectionId();
+            connection.switch({ urlroot: 'https://api06.dev.openstreetmap.org' });
+            var cid2 = connection.getConnectionId();
+            expect(cid2).to.be.above(cid1);
+        });
+    });
+
     describe('#changesetURL', function() {
         it('provides a changeset url', function() {
             expect(connection.changesetURL(2)).to.eql('http://www.openstreetmap.org/changeset/2');
diff --git a/test/spec/svg/layers.js b/test/spec/svg/layers.js
index ec7ca46ed..e3cb29a89 100644
--- a/test/spec/svg/layers.js
+++ b/test/spec/svg/layers.js
@@ -26,12 +26,13 @@ describe('iD.svgLayers', function () {
     it('creates default data layers', function () {
         container.call(iD.svgLayers(projection, context));
         var nodes = container.selectAll('svg .data-layer').nodes();
-        expect(nodes.length).to.eql(5);
+        expect(nodes.length).to.eql(6);
         expect(d3.select(nodes[0]).classed('data-layer-osm')).to.be.true;
         expect(d3.select(nodes[1]).classed('data-layer-gpx')).to.be.true;
         expect(d3.select(nodes[2]).classed('data-layer-mapillary-images')).to.be.true;
         expect(d3.select(nodes[3]).classed('data-layer-mapillary-signs')).to.be.true;
-        expect(d3.select(nodes[4]).classed('data-layer-debug')).to.be.true;
+        expect(d3.select(nodes[4]).classed('data-layer-openstreetcam-images')).to.be.true;
+        expect(d3.select(nodes[5]).classed('data-layer-debug')).to.be.true;
     });
 
 });
diff --git a/test/spec/ui/flash.js b/test/spec/ui/flash.js
index 3fa10b0d1..d19970396 100644
--- a/test/spec/ui/flash.js
+++ b/test/spec/ui/flash.js
@@ -13,14 +13,8 @@ describe('iD.uiFlash', function () {
             .remove();
     });
 
-    it('returns a selection', function () {
-        var content = iD.uiFlash(200);
-        expect(content.size()).to.eql(1);
-        expect(content.classed('content')).to.be.ok;
-    });
-
     it('flash is shown', function() {
-        iD.uiFlash(200);
+        iD.uiFlash().duration(200)();
         var flashWrap = d3.selectAll('#flash-wrap');
         var footerWrap = d3.selectAll('#footer-wrap');
         expect(flashWrap.classed('footer-show')).to.be.ok;
@@ -28,7 +22,7 @@ describe('iD.uiFlash', function () {
     });
 
     it('flash goes away', function(done) {
-        iD.uiFlash(200);
+        iD.uiFlash().duration(200)();
         window.setTimeout(function() {
             d3.timerFlush();
             var flashWrap = d3.selectAll('#flash-wrap');