From fd23d135630c11967dd46c07e7b220b96325cf64 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 14 Jan 2019 10:58:40 -0500 Subject: [PATCH 1/3] Distinguish between "This highway" and "highway" forms of error parts. (closes #5703) --- data/core.yaml | 46 ++++++++++++++++++++++++------------------ data/keepRight.json | 48 +++++++++++++++++++++++++------------------- dist/locales/en.json | 46 ++++++++++++++++++++++++------------------ 3 files changed, 79 insertions(+), 61 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index f7e7e49d8..be50b7657 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -669,26 +669,32 @@ en: close_comment: Close and Comment ignore_comment: Ignore and Comment error_parts: - node: 'this node' - way: 'this way' - relation: 'this relation' - oneway: 'this oneway' - highway: 'this highway' - railway: 'this railway' - waterway: 'this waterway' - cycleway: 'this cycleway' - cycleway_footpath: 'this cycleway/footpath' - riverbank: 'this riverbank' - crossing: 'this crossing' - railway_crossing: 'this railway crossing' - bridge: 'this bridge' - tunnel: 'this tunnel' - boundary: 'this boundary' - turn_restriction: 'this turn restriction' - roundabout: 'this roundabout' - mini_roundabout: 'this mini-roundabout' - track: 'this track' - feature: 'this feature' + this_node: 'this node' + this_way: 'this way' + this_relation: 'this relation' + this_oneway: 'this oneway' + this_highway: 'this highway' + this_railway: 'this railway' + this_waterway: 'this waterway' + this_cycleway: 'this cycleway' + this_cycleway_footpath: 'this cycleway/footpath' + this_riverbank: 'this riverbank' + this_crossing: 'this crossing' + this_railway_crossing: 'this railway crossing' + this_bridge: 'this bridge' + this_tunnel: 'this tunnel' + this_boundary: 'this boundary' + this_turn_restriction: 'this turn restriction' + this_roundabout: 'this roundabout' + this_mini_roundabout: 'this mini-roundabout' + this_track: 'this track' + this_feature: 'this feature' + highway: 'highway' + railway: 'railway' + waterway: 'waterway' + cycleway: 'cycleway' + cycleway_footpath: 'cycleway/footpath' + riverbank: 'riverbank' place_of_worship: 'place of worship' pub: 'pub' restaurant: 'restaurant' diff --git a/data/keepRight.json b/data/keepRight.json index 52967eb7a..86419a8a2 100644 --- a/data/keepRight.json +++ b/data/keepRight.json @@ -1,26 +1,32 @@ { "localizeStrings": { - "this node": "node", - "this way": "way", - "this relation": "relation", - "this one-way": "oneway", - "this highway": "highway", - "this railway": "railway", - "this waterway": "waterway", - "this cycleway": "cycleway", - "this footpath": "footpath", - "this cycleway/footpath": "cycleway_footpath", - "this riverbank": "riverbank", - "this crossing": "crossing", - "this railway crossing": "railway_crossing", - "this bridge": "bridge", - "this tunnel": "tunnel", - "this boundary": "boundary", - "this turn-restriction": "turn_restriction", - "this roundabout": "roundabout", - "this mini-roundabout": "mini_roundabout", - "this track": "track", - "this feature": "feature", + "this node": "this_node", + "this way": "this_way", + "this relation": "this_relation", + "this one-way": "this_oneway", + "this highway": "this_highway", + "this railway": "this_railway", + "this waterway": "this_waterway", + "this cycleway": "this_cycleway", + "this footpath": "this_footpath", + "this cycleway/footpath": "this_cycleway_footpath", + "this riverbank": "this_riverbank", + "this crossing": "this_crossing", + "this railway crossing": "this_railway_crossing", + "this bridge": "this_bridge", + "this tunnel": "this_tunnel", + "this boundary": "this_boundary", + "this turn-restriction": "this_turn_restriction", + "this roundabout": "this_roundabout", + "this mini-roundabout": "this_mini_roundabout", + "this track": "this_track", + "this feature": "this_feature", + "highway": "highway", + "railway": "railway", + "waterway": "waterway", + "cycleway": "cycleway", + "cycleway_footpath": "cycleway/footpath", + "riverbank": "riverbank", "place_of_worship": "place_of_worship", "pub": "pub", "restaurant": "restaurant", diff --git a/dist/locales/en.json b/dist/locales/en.json index 7c08de65e..095332406 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -810,26 +810,32 @@ "close_comment": "Close and Comment", "ignore_comment": "Ignore and Comment", "error_parts": { - "node": "this node", - "way": "this way", - "relation": "this relation", - "oneway": "this oneway", - "highway": "this highway", - "railway": "this railway", - "waterway": "this waterway", - "cycleway": "this cycleway", - "cycleway_footpath": "this cycleway/footpath", - "riverbank": "this riverbank", - "crossing": "this crossing", - "railway_crossing": "this railway crossing", - "bridge": "this bridge", - "tunnel": "this tunnel", - "boundary": "this boundary", - "turn_restriction": "this turn restriction", - "roundabout": "this roundabout", - "mini_roundabout": "this mini-roundabout", - "track": "this track", - "feature": "this feature", + "this_node": "this node", + "this_way": "this way", + "this_relation": "this relation", + "this_oneway": "this oneway", + "this_highway": "this highway", + "this_railway": "this railway", + "this_waterway": "this waterway", + "this_cycleway": "this cycleway", + "this_cycleway_footpath": "this cycleway/footpath", + "this_riverbank": "this riverbank", + "this_crossing": "this crossing", + "this_railway_crossing": "this railway crossing", + "this_bridge": "this bridge", + "this_tunnel": "this tunnel", + "this_boundary": "this boundary", + "this_turn_restriction": "this turn restriction", + "this_roundabout": "this roundabout", + "this_mini_roundabout": "this mini-roundabout", + "this_track": "this track", + "this_feature": "this feature", + "highway": "highway", + "railway": "railway", + "waterway": "waterway", + "cycleway": "cycleway", + "cycleway_footpath": "cycleway/footpath", + "riverbank": "riverbank", "place_of_worship": "place of worship", "pub": "pub", "restaurant": "restaurant", From 67ef2bce1c366a6b701ec301c7934feaa4afe897 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 14 Jan 2019 11:15:56 -0500 Subject: [PATCH 2/3] Simplify and fix a few typos --- data/core.yaml | 4 ++-- dist/locales/en.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index be50b7657..213f77374 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -1111,11 +1111,11 @@ en: upload: "You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use." qa: title: Quality Assurance - intro: "*Quality Assurance* (Q/A) 3rd party tools help lead to better quality of OSM data. They list automatically deteted bugs, conflics, and issues with the data, which mappers can then go and fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer." + intro: "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer." tools_h: "Tools" tools: "The following tools are currently supported: [KeepRight](https://www.keepright.at/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/), [ImproveOSM](https://improveosm.org/en/), and more Q/A tools in the future." issues_h: "Handling Issues" - issues: "Handling Q/A issues is similar to handling notes. Clicking an existing Q/A issue populates the sidebar with details on the issue type and related features. Each tool has its own capabilities, but generally you can comment and/or close an issue. Expect iD to support a 'fix me' button to automatically fix simple issues in the future." + issues: "Handling Q/A issues is similar to handling notes. Click on a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue." field: restrictions: title: Turn Restrictions Help diff --git a/dist/locales/en.json b/dist/locales/en.json index 095332406..8fd294c7c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1343,11 +1343,11 @@ }, "qa": { "title": "Quality Assurance", - "intro": "*Quality Assurance* (Q/A) 3rd party tools help lead to better quality of OSM data. They list automatically deteted bugs, conflics, and issues with the data, which mappers can then go and fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer.", + "intro": "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer.", "tools_h": "Tools", "tools": "The following tools are currently supported: [KeepRight](https://www.keepright.at/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/), [ImproveOSM](https://improveosm.org/en/), and more Q/A tools in the future.", "issues_h": "Handling Issues", - "issues": "Handling Q/A issues is similar to handling notes. Clicking an existing Q/A issue populates the sidebar with details on the issue type and related features. Each tool has its own capabilities, but generally you can comment and/or close an issue. Expect iD to support a 'fix me' button to automatically fix simple issues in the future." + "issues": "Handling Q/A issues is similar to handling notes. Click on a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue." }, "field": { "restrictions": { From bf79a714f188da7dc8178c6506496f5bc9ad1b44 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 14 Jan 2019 11:42:32 -0500 Subject: [PATCH 3/3] "Forest" -> "Managed Forest" (closes #5709) --- data/presets.yaml | 4 ++-- data/presets/presets.json | 2 +- data/presets/presets/landuse/forest.json | 2 +- data/taginfo.json | 2 +- dist/locales/en.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index ef4ce6615..a708daf01 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4233,9 +4233,9 @@ en: terms: '' landuse/forest: # landuse=forest - name: Forest + name: Managed Forest # 'terms: cut,forest,lumber,tree' - terms: '' + terms: '' landuse/garages: # landuse=garages name: Garage Landuse diff --git a/data/presets/presets.json b/data/presets/presets.json index 67fa6891b..0da8cb97f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -484,7 +484,7 @@ "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"}, "landuse/farmland": {"icon": "maki-farm", "fields": ["name", "operator", "crop", "produce"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"}, "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"}, - "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "lumber", "tree"], "name": "Forest"}, + "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "lumber", "tree"], "name": "Managed Forest"}, "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"}, "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"}, "landuse/greenfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"}, diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json index 7aa27f500..6e134cd59 100644 --- a/data/presets/presets/landuse/forest.json +++ b/data/presets/presets/landuse/forest.json @@ -18,5 +18,5 @@ "lumber", "tree" ], - "name": "Forest" + "name": "Managed Forest" } diff --git a/data/taginfo.json b/data/taginfo.json index 3b8ff842c..c2b470191 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3234,7 +3234,7 @@ { "key": "landuse", "value": "forest", - "description": "🄿 Forest", + "description": "🄿 Managed Forest", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-alt1-15.svg?sanitize=true" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 8fd294c7c..fe2571857 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5497,7 +5497,7 @@ "terms": "crop,grow,plant" }, "landuse/forest": { - "name": "Forest", + "name": "Managed Forest", "terms": "cut,forest,lumber,tree" }, "landuse/garages": {