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

Improve internet access fields somewhat (re: #7442)

Browse Source
This commit is contained in:
Quincy Morgan
2020-03-21 11:15:50 -07:00
parent 6e097e29e5
commit dd40f3b52d
6 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+11 -4
View File
@@ -1133,7 +1133,7 @@ en:
label: Intermittent
internet_access:
# internet_access=*
label: Internet Access
label: Internet Connection
options:
# internet_access=no
'no': 'No'
@@ -1146,12 +1146,19 @@ en:
# internet_access=yes
'yes': 'Yes'
# 'terms: wifi,wlan'
terms: '[translate with synonyms or related terms for ''Internet Access'', separated by commas]'
terms: '[translate with synonyms or related terms for ''Internet Connection'', separated by commas]'
internet_access/fee:
# 'internet_access:fee=*'
label: Internet Access Fee
label: Internet Access
options:
# 'internet_access:fee=customers'
customers: Customers Only
# 'internet_access:fee=no'
'no': Free
# 'internet_access:fee=yes'
'yes': Paid
# 'terms: wifi fee'
terms: '[translate with synonyms or related terms for ''Internet Access Fee'', separated by commas]'
terms: '[translate with synonyms or related terms for ''Internet Access'', separated by commas]'
internet_access/ssid:
# 'internet_access:ssid=*'
label: Wifi Network Name
data/presets/fields.json
+2 -2
View File
@@ -211,8 +211,8 @@
"inscription": {"key": "inscription", "type": "textarea", "label": "Inscription"},
"intermittent_yes": {"key": "intermittent", "type": "check", "label": "Intermittent", "default": "yes"},
"intermittent": {"key": "intermittent", "type": "check", "label": "Intermittent"},
"internet_access": {"key": "internet_access", "type": "combo", "label": "Internet Access", "strings": {"options": {"yes": "Yes", "no": "No", "wlan": "Wifi", "wired": "Wired", "terminal": "Terminal"}}, "terms": ["wifi", "wlan"]},
"internet_access/fee": {"key": "internet_access:fee", "type": "check", "label": "Internet Access Fee", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}, "terms": ["wifi fee"]},
"internet_access": {"key": "internet_access", "type": "combo", "label": "Internet Connection", "strings": {"options": {"yes": "Yes", "no": "No", "wlan": "Wifi", "wired": "Wired", "terminal": "Terminal"}}, "terms": ["wifi", "wlan"]},
"internet_access/fee": {"key": "internet_access:fee", "type": "combo", "label": "Internet Access", "strings": {"options": {"no": "Free", "yes": "Paid", "customers": "Customers Only"}}, "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}, "terms": ["wifi fee"]},
"internet_access/ssid": {"key": "internet_access:ssid", "type": "text", "label": "Wifi Network Name", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}, "terms": ["ssid"]},
"interval": {"key": "interval", "type": "text", "label": "Interval"},
"junction_line": {"key": "junction", "type": "combo", "label": "Junction", "strings": {"options": {"roundabout": "Roundabout", "circular": "Traffic Circle", "jughandle": "Jughandle"}}},
data/presets/fields/internet_access.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"key": "internet_access",
"type": "combo",
"label": "Internet Access",
"label": "Internet Connection",
"strings": {
"options": {
"yes": "Yes",
data/presets/fields/internet_access/fee.json
+6 -4
View File
@@ -1,12 +1,14 @@
{
"key": "internet_access:fee",
"type": "combo",
"label": "Internet Access Fee",
"label": "Internet Access",
"strings": {
"options": {
"yes": "Yes",
"no": "No",
"customers": "For not-facility-customers only",
"no": "Free",
"yes": "Paid",
"customers": "Customers Only"
}
},
"prerequisiteTag": {
"key": "internet_access",
"valueNot": "no"
data/taginfo.json
+8 -6
View File
@@ -580,7 +580,7 @@
{"key": "indoor", "value": "room", "description": "🄿 Room", "object_types": ["area"]},
{"key": "stairs", "value": "yes", "description": "🄿 Indoor Stairwell", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-steps.svg"},
{"key": "indoor", "value": "wall", "description": "🄿 Indoor Wall", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"},
{"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Access", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wifi.svg"},
{"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Connection", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wifi.svg"},
{"key": "junction", "value": "yes", "description": "🄿 Junction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"},
{"key": "landuse", "value": "basin", "description": "🄿 Basin (unsearchable), 🄳 ➜ natural=water + water=basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
{"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
@@ -1561,11 +1561,13 @@
{"key": "information", "description": "🄵 Type"},
{"key": "inscription", "description": "🄵 Inscription"},
{"key": "intermittent", "description": "🄵 Intermittent"},
{"key": "internet_access", "value": "yes", "description": "🄵 Internet Access"},
{"key": "internet_access", "value": "no", "description": "🄵 Internet Access"},
{"key": "internet_access", "value": "wired", "description": "🄵 Internet Access"},
{"key": "internet_access", "value": "terminal", "description": "🄵 Internet Access"},
{"key": "internet_access:fee", "description": "🄵 Internet Access Fee"},
{"key": "internet_access", "value": "yes", "description": "🄵 Internet Connection"},
{"key": "internet_access", "value": "no", "description": "🄵 Internet Connection"},
{"key": "internet_access", "value": "wired", "description": "🄵 Internet Connection"},
{"key": "internet_access", "value": "terminal", "description": "🄵 Internet Connection"},
{"key": "internet_access:fee", "value": "no", "description": "🄵 Internet Access"},
{"key": "internet_access:fee", "value": "yes", "description": "🄵 Internet Access"},
{"key": "internet_access:fee", "value": "customers", "description": "🄵 Internet Access"},
{"key": "internet_access:ssid", "description": "🄵 Wifi Network Name"},
{"key": "interval", "description": "🄵 Interval"},
{"key": "junction", "value": "roundabout", "description": "🄵 Junction"},
dist/locales/en.json
Vendored
+8 -3
View File
@@ -3585,7 +3585,7 @@
"terms": ""
},
"internet_access": {
"label": "Internet Access",
"label": "Internet Connection",
"terms": "wifi,wlan",
"options": {
"yes": "Yes",
@@ -3596,8 +3596,13 @@
}
},
"internet_access/fee": {
"label": "Internet Access Fee",
"terms": "wifi fee"
"label": "Internet Access",
"terms": "wifi fee",
"options": {
"no": "Free",
"yes": "Paid",
"customers": "Customers Only"
}
},
"internet_access/ssid": {
"label": "Wifi Network Name",