CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into validation

Browse Source
This commit is contained in:
Quincy Morgan
2019-01-14 12:04:00 -05:00
parent 11b2102761 bf79a714f1
commit 21286467fa
7 changed files with 89 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+28 -22
View File
@@ -651,26 +651,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'
@@ -1087,11 +1093,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
data/keepRight.json
+27 -21
View File
@@ -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",
data/presets.yaml
+2 -2
View File
@@ -4233,9 +4233,9 @@ en:
terms: '<translate with synonyms or related terms for ''Farmyard'', separated by commas>'
landuse/forest:
# landuse=forest
name: Forest
name: Managed Forest
# 'terms: cut,forest,lumber,tree'
terms: '<translate with synonyms or related terms for ''Forest'', separated by commas>'
terms: '<translate with synonyms or related terms for ''Managed Forest'', separated by commas>'
landuse/garages:
# landuse=garages
name: Garage Landuse
data/presets/presets.json
+1 -1
View File
@@ -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"},
data/presets/presets/landuse/forest.json
+1 -1
View File
@@ -18,5 +18,5 @@
"lumber",
"tree"
],
"name": "Forest"
"name": "Managed Forest"
}
data/taginfo.json
+1 -1
View File
@@ -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"
},
dist/locales/en.json
Vendored
+29 -23
View File
@@ -791,26 +791,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",
@@ -1318,11 +1324,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": {
@@ -5578,7 +5584,7 @@
"terms": "crop,grow,plant"
},
"landuse/forest": {
"name": "Forest",
"name": "Managed Forest",
"terms": "cut,forest,lumber,tree"
},
"landuse/garages": {