Merge branch 'master' into validation

css/25_areas.css

@@ -83,8 +83,6 @@ path.stroke.tag-landuse-aquaculture,
 path.stroke.tag-landuse-basin,
 path.stroke.tag-landuse-harbour,
 path.stroke.tag-landuse-reservoir,
-path.stroke.tag-man_made-groyne,
-path.stroke.tag-man_made-breakwater,
 path.stroke.tag-natural-water {
     stroke: rgb(119, 211, 222);
 }
@@ -298,31 +296,41 @@ path.fill.tag-landuse-farmyard {
 
 /* Dark Gray things */
 path.stroke.tag-amenity-parking,
+path.stroke.tag-landuse-railway,
+path.stroke.tag-landuse-quarry,
 path.stroke.tag-leisure-pitch.tag-sport-basketball,
 path.stroke.tag-leisure-pitch.tag-sport-skateboard,
+path.stroke.tag-man_made-groyne,
+path.stroke.tag-man_made-breakwater,
 path.stroke.tag-natural-bare_rock,
 path.stroke.tag-natural-scree,
-path.stroke.tag-landuse-railway,
-path.stroke.tag-landuse-quarry {
+path.stroke.tag-waterway-dam,
+path.stroke.tag-waterway-weir {
     stroke: rgb(170, 170, 170);
 }
 path.fill.tag-amenity-parking,
+path.fill.tag-landuse-railway,
+path.fill.tag-landuse-quarry,
 path.fill.tag-leisure-pitch.tag-sport-basketball,
 path.fill.tag-leisure-pitch.tag-sport-skateboard,
+path.fill.tag-man_made-groyne,
+path.fill.tag-man_made-breakwater,
 path.fill.tag-natural-bare_rock,
 path.fill.tag-natural-scree,
-path.fill.tag-landuse-railway,
-path.fill.tag-landuse-quarry {
+path.fill.tag-waterway-dam,
+path.fill.tag-waterway-weir {
     stroke: rgba(140, 140, 140, 0.5);
     fill: rgba(140, 140, 140, 0.5);
 }
 .preset-icon-fill-area.tag-amenity-parking,
+.preset-icon-fill-area.tag-landuse-railway,
+.preset-icon-fill-area.tag-landuse-quarry,
 .preset-icon-fill-area.tag-leisure-pitch.tag-sport-basketball,
 .preset-icon-fill-area.tag-leisure-pitch.tag-sport-skateboard,
 .preset-icon-fill-area.tag-natural-bare_rock,
 .preset-icon-fill-area.tag-natural-scree,
-.preset-icon-fill-area.tag-landuse-railway,
-.preset-icon-fill-area.tag-landuse-quarry {
+.preset-icon-fill-area.tag-waterway-dam,
+.preset-icon-fill-area.tag-waterway-weir {
     border-color: rgb(170, 170, 170);
     background-color: rgba(140, 140, 140, 0.5);
 }

css/45_waterways.css

@@ -12,16 +12,6 @@
     fill: #fff;
 }
 
-path.fill.tag-waterway {
-    stroke: rgba(119, 211, 222, 0.3);
-    fill: rgba(119, 211, 222, 0.3);
-}
-path.line.casing.tag-waterway {
-    stroke: #3d6c71;
-}
-path.line.stroke.tag-waterway {
-    stroke: #77d3de;
-}
 
 /* areas */
 path.area.stroke.tag-waterway-dock,
@@ -43,7 +33,7 @@ path.area.fill.tag-waterway-fuel {
 }
 
 /* lines */
-path.fill.tag-waterway {
+path.line.fill.tag-waterway {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }

css/50_misc.css

@@ -99,15 +99,15 @@ path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
     stroke: #ddd;
 }
 path.line.stroke.tag-barrier,
-path.stroke.tag-man_made-groyne,
-path.stroke.tag-man_made-breakwater {
+path.line.stroke.tag-man_made-groyne,
+path.line.stroke.tag-man_made-breakwater {
     stroke-width: 3px;
     stroke-linecap: round;
     stroke-dasharray: 15, 5, 1, 5;
 }
 .low-zoom path.line.stroke.tag-barrier,
-.low-zoom path.stroke.tag-man_made-groyne,
-.low-zoom path.stroke.tag-man_made-breakwater {
+.low-zoom path.line.stroke.tag-man_made-groyne,
+.low-zoom path.line.stroke.tag-man_made-breakwater {
     stroke-width: 2px;
     stroke-linecap: butt;
     stroke-dasharray: 8, 2, 2, 2;

css/80_app.css

@@ -2240,16 +2240,15 @@ div.combobox {
     width: 100%;
     overflow: hidden;
 }
-.tag-reference-body .tag-reference-description {
-    margin: 10px 5px 0 5px;
+.tag-reference-body.expanded {
+    padding-bottom: 10px;
 }
-.tag-reference-body a {
+.tag-reference-description {
+    margin: 10px 5px;
+}
+.tag-reference-link {
     display: block;
 }
-.tag-reference-body .tag-reference-description:last-child,
-.tag-reference-body a:last-child {
-    margin-bottom: 15px;
-}
 
 .preset-list .tag-reference-body {
     position: relative;

data/core.yaml

@@ -413,8 +413,6 @@ en:
       tooltip_note: "Center and zoom the map to focus on this note."
       tooltip_data: "Center and zoom the map to focus on this data."
       tooltip_issue: "Center and zoom the map to focus on this issue."
-    no_documentation_combination: There is no documentation available for this tag combination
-    no_documentation_key: There is no documentation available for this key
     show_more: Show More
     view_on_osm: View on openstreetmap.org
     view_on_keepRight: View on keepright.at
@@ -427,8 +425,8 @@ en:
     role: Role
     choose: Select feature type
     results: "{n} results for {search}"
-    reference: View on OpenStreetMap Wiki
-    edit_reference: Edit or translate description
+    no_documentation_key: There is no documentation available for this key
+    edit_reference: "edit/translate"
     wiki_reference: View documentation
     wiki_en_reference: View documentation in English
     back_tooltip: Change feature

dist/locales/en.json

@@ -508,8 +508,6 @@
                 "tooltip_data": "Center and zoom the map to focus on this data.",
                 "tooltip_issue": "Center and zoom the map to focus on this issue."
             },
-            "no_documentation_combination": "There is no documentation available for this tag combination",
-            "no_documentation_key": "There is no documentation available for this key",
             "show_more": "Show More",
             "view_on_osm": "View on openstreetmap.org",
             "view_on_keepRight": "View on keepright.at",
@@ -522,8 +520,8 @@
             "role": "Role",
             "choose": "Select feature type",
             "results": "{n} results for {search}",
-            "reference": "View on OpenStreetMap Wiki",
-            "edit_reference": "Edit or translate description",
+            "no_documentation_key": "There is no documentation available for this key",
+            "edit_reference": "edit/translate",
             "wiki_reference": "View documentation",
             "wiki_en_reference": "View documentation in English",
             "back_tooltip": "Change feature",

modules/ui/tag_reference.js

@@ -123,17 +123,14 @@ export function uiTagReference(tag) {
             _body
                 .append('p')
                 .attr('class', 'tag-reference-description')
-                .text(docs.description || t('inspector.no_documentation_key'));
-
-            _body
+                .text(docs.description || t('inspector.no_documentation_key'))
                 .append('a')
-                .attr('class', 'tag-reference-link')
+                .attr('class', 'tag-reference-edit')
                 .attr('target', '_blank')
                 .attr('tabindex', -1)
+                .attr('title', t('inspector.edit_reference'))
                 .attr('href', 'https://wiki.openstreetmap.org/wiki/' + docs.title)
-                .call(svgIcon('#iD-icon-out-link', 'inline'))
-                .append('span')
-                .text(t('inspector.edit_reference'));
+                .call(svgIcon('#iD-icon-edit', 'inline'));
 
             if (docs.wiki) {
                 _body