CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 08:17:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename Network Type network fields to Network Class to avoid colliding with network:type field (re: #6992)

Browse Source
This commit is contained in:
Quincy Morgan
2019-11-12 11:34:34 +01:00
parent a1a1dcf0d8
commit 88da0c51ee
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+3 -3
View File
@@ -1367,7 +1367,7 @@ en:
terms: '[translate with synonyms or related terms for ''Network Type'', separated by commas]'
network_bicycle:
# network=*
label: Network Type
label: Network Class
options:
# network=icn
icn: International
@@ -1381,7 +1381,7 @@ en:
placeholder: 'Local, Regional, National, International'
network_foot:
# network=*
label: Network Type
label: Network Class
options:
# network=iwn
iwn: International
@@ -1395,7 +1395,7 @@ en:
placeholder: 'Local, Regional, National, International'
network_horse:
# network=*
label: Network Type
label: Network Class
options:
# network=ihn
ihn: International
data/presets/fields.json
+3 -3
View File
@@ -244,9 +244,9 @@
"mtb/scale/uphill": {"key": "mtb:scale:uphill", "type": "combo", "label": "Mountain Biking Uphill Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", "4": "4: Avg. incline <30%, poor condition, big rocks/branches", "5": "5: Very steep, bike generally needs to be pushed or carried"}}},
"name": {"key": "name", "type": "localized", "label": "Name", "universal": true, "placeholder": "Common name (if any)", "terms": ["label", "title"]},
"natural": {"key": "natural", "type": "typeCombo", "label": "Natural"},
"network_bicycle": {"key": "network", "type": "combo", "label": "Network Type", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}},
"network_foot": {"key": "network", "type": "combo", "label": "Network Type", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lwn": "Local", "rwn": "Regional", "nwn": "National", "iwn": "International"}}},
"network_horse": {"key": "network", "type": "combo", "label": "Network Type", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lhn": "Local", "rhn": "Regional", "nhn": "National", "ihn": "International"}}},
"network_bicycle": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}},
"network_foot": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lwn": "Local", "rwn": "Regional", "nwn": "National", "iwn": "International"}}},
"network_horse": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lhn": "Local", "rhn": "Regional", "nhn": "National", "ihn": "International"}}},
"network_road": {"key": "network", "type": "networkCombo", "label": "Network"},
"network": {"key": "network", "type": "text", "label": "Network"},
"network/type": {"key": "network:type", "type": "combo", "label": "Network Type", "prerequisiteTag": {"key": "network"}},
data/presets/fields/network_bicycle.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"key": "network",
"type": "combo",
"label": "Network Type",
"label": "Network Class",
"placeholder": "Local, Regional, National, International",
"strings": {
"options": {
@@ -11,4 +11,4 @@
"icn": "International"
}
}
}
}
data/presets/fields/network_foot.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"key": "network",
"type": "combo",
"label": "Network Type",
"label": "Network Class",
"placeholder": "Local, Regional, National, International",
"strings": {
"options": {
@@ -11,4 +11,4 @@
"iwn": "International"
}
}
}
}
data/presets/fields/network_horse.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"key": "network",
"type": "combo",
"label": "Network Type",
"label": "Network Class",
"placeholder": "Local, Regional, National, International",
"strings": {
"options": {
data/taginfo.json
+12 -12
View File
@@ -1567,18 +1567,18 @@
{"key": "mtb:scale:uphill", "value": "4", "description": "🄵 Mountain Biking Uphill Difficulty"},
{"key": "mtb:scale:uphill", "value": "5", "description": "🄵 Mountain Biking Uphill Difficulty"},
{"key": "name", "description": "🄵 Name"},
{"key": "network", "value": "lcn", "description": "🄵 Network Type"},
{"key": "network", "value": "rcn", "description": "🄵 Network Type"},
{"key": "network", "value": "ncn", "description": "🄵 Network Type"},
{"key": "network", "value": "icn", "description": "🄵 Network Type"},
{"key": "network", "value": "lwn", "description": "🄵 Network Type"},
{"key": "network", "value": "rwn", "description": "🄵 Network Type"},
{"key": "network", "value": "nwn", "description": "🄵 Network Type"},
{"key": "network", "value": "iwn", "description": "🄵 Network Type"},
{"key": "network", "value": "lhn", "description": "🄵 Network Type"},
{"key": "network", "value": "rhn", "description": "🄵 Network Type"},
{"key": "network", "value": "nhn", "description": "🄵 Network Type"},
{"key": "network", "value": "ihn", "description": "🄵 Network Type"},
{"key": "network", "value": "lcn", "description": "🄵 Network Class"},
{"key": "network", "value": "rcn", "description": "🄵 Network Class"},
{"key": "network", "value": "ncn", "description": "🄵 Network Class"},
{"key": "network", "value": "icn", "description": "🄵 Network Class"},
{"key": "network", "value": "lwn", "description": "🄵 Network Class"},
{"key": "network", "value": "rwn", "description": "🄵 Network Class"},
{"key": "network", "value": "nwn", "description": "🄵 Network Class"},
{"key": "network", "value": "iwn", "description": "🄵 Network Class"},
{"key": "network", "value": "lhn", "description": "🄵 Network Class"},
{"key": "network", "value": "rhn", "description": "🄵 Network Class"},
{"key": "network", "value": "nhn", "description": "🄵 Network Class"},
{"key": "network", "value": "ihn", "description": "🄵 Network Class"},
{"key": "network", "description": "🄵 Network"},
{"key": "network:type", "description": "🄵 Network Type"},
{"key": "not:name", "description": "🄵 Incorrect Names"},
dist/locales/en.json
Vendored
+3 -3
View File
@@ -3639,7 +3639,7 @@
"label": "Natural"
},
"network_bicycle": {
"label": "Network Type",
"label": "Network Class",
"placeholder": "Local, Regional, National, International",
"options": {
"lcn": "Local",
@@ -3649,7 +3649,7 @@
}
},
"network_foot": {
"label": "Network Type",
"label": "Network Class",
"placeholder": "Local, Regional, National, International",
"options": {
"lwn": "Local",
@@ -3659,7 +3659,7 @@
}
},
"network_horse": {
"label": "Network Type",
"label": "Network Class",
"placeholder": "Local, Regional, National, International",
"options": {
"lhn": "Local",