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

Merge branch 'turn-restrictions'

Browse Source
This commit is contained in:
John Firebaugh
2014-05-21 14:22:22 -07:00
parent 4751c50a2e 8b6ce214a2
commit 48dc768bbb
58 changed files with 2252 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+9
View File
@@ -145,6 +145,15 @@ en:
multiple: "Split {n} lines/area boundaries."
not_eligible: Lines can't be split at their beginning or end.
multiple_ways: There are too many lines here to split.
restriction:
help:
select: Click to select a road segment.
toggle: Click to toggle turn restrictions.
toggle_on: 'Click to add a "{restriction}" restriction.'
toggle_off: 'Click to remove the "{restriction}" restriction.'
annotation:
create: Added a turn restriction
delete: Deleted a turn restriction
undo:
tooltip: "Undo: {action}"
nothing: Nothing to undo.
data/feature-icons.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/operations-sprite.json
+8 -1
View File
@@ -23,5 +23,12 @@
"icon-operation-disabled-orthogonalize": [160, 160],
"icon-operation-disabled-rotate": [180, 160],
"icon-operation-disabled-simplify": [200, 160],
"icon-operation-disabled-continue": [220, 160]
"icon-operation-disabled-continue": [220, 160],
"icon-restriction-yes": [50, 80],
"icon-restriction-no": [95, 80],
"icon-restriction-only": [140, 80],
"icon-restriction-yes-u": [185, 80],
"icon-restriction-no-u": [230, 80],
"icon-restriction-only-u": [275, 80]
}
data/presets.yaml
+27
View File
@@ -11,6 +11,8 @@ en:
name: Path
"category-rail":
name: Rail
"category-restriction":
name: Restriction
"category-road":
name: Road
"category-route":
@@ -138,6 +140,8 @@ en:
label: Emergency
entrance:
label: Type
except:
label: Exceptions
fax:
label: Fax
placeholder: +31 42 123 4567
@@ -294,6 +298,8 @@ en:
taoist: Taoist
restriction:
label: Type
restrictions:
label: Turn Restrictions
route:
label: Type
route_master:
@@ -1795,6 +1801,27 @@ en:
type/restriction:
name: Restriction
terms: "<translate with synonyms or related terms for 'Restriction', separated by commas>"
type/restriction/no_left_turn:
name: No Left Turn
terms: "<translate with synonyms or related terms for 'No Left Turn', separated by commas>"
type/restriction/no_right_turn:
name: No Right Turn
terms: "<translate with synonyms or related terms for 'No Right Turn', separated by commas>"
type/restriction/no_straight_on:
name: No Straight On
terms: "<translate with synonyms or related terms for 'No Straight On', separated by commas>"
type/restriction/no_u_turn:
name: "No U-turn"
terms: "<translate with synonyms or related terms for 'No U-turn', separated by commas>"
type/restriction/only_left_turn:
name: Left Turn Only
terms: "<translate with synonyms or related terms for 'Left Turn Only', separated by commas>"
type/restriction/only_right_turn:
name: Right Turn Only
terms: "<translate with synonyms or related terms for 'Right Turn Only', separated by commas>"
type/restriction/only_straight_ahead:
name: No Turns
terms: "<translate with synonyms or related terms for 'No Turns', separated by commas>"
type/route:
name: Route
terms: "<translate with synonyms or related terms for 'Route', separated by commas>"
data/presets/categories.json
+15
View File
@@ -68,6 +68,21 @@
"railway/abandoned"
]
},
"category-restriction": {
"geometry": "relation",
"name": "Restriction",
"icon": "restriction",
"members": [
"type/restriction/no_left_turn",
"type/restriction/no_right_turn",
"type/restriction/no_straight_on",
"type/restriction/no_u_turn",
"type/restriction/only_left_turn",
"type/restriction/only_right_turn",
"type/restriction/only_straight_ahead",
"type/restriction"
]
},
"category-road": {
"geometry": "line",
"name": "Road",
data/presets/categories/restriction.json
+15
View File
@@ -0,0 +1,15 @@
{
"geometry": "relation",
"name": "Restriction",
"icon": "restriction",
"members": [
"type/restriction/no_left_turn",
"type/restriction/no_right_turn",
"type/restriction/no_straight_on",
"type/restriction/no_u_turn",
"type/restriction/only_left_turn",
"type/restriction/only_right_turn",
"type/restriction/only_straight_ahead",
"type/restriction"
]
}
data/presets/defaults.json
+1 -1
View File
@@ -40,8 +40,8 @@
],
"relation": [
"category-route",
"category-restriction",
"type/boundary",
"type/restriction",
"type/multipolygon",
"relation"
]
data/presets/fields.json
+14
View File
@@ -320,6 +320,11 @@
"type": "typeCombo",
"label": "Type"
},
"except": {
"key": "except",
"type": "combo",
"label": "Exceptions"
},
"fax": {
"key": "fax",
"type": "tel",
@@ -716,6 +721,15 @@
"type": "combo",
"label": "Type"
},
"restrictions": {
"type": "restrictions",
"geometry": "vertex",
"icon": "restrictions",
"reference": {
"rtype": "restriction"
},
"label": "Turn Restrictions"
},
"route": {
"key": "route",
"type": "combo",
data/presets/fields/except.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "except",
"type": "combo",
"label": "Exceptions"
}
data/presets/fields/restrictions.json
+9
View File
@@ -0,0 +1,9 @@
{
"type": "restrictions",
"geometry": "vertex",
"icon": "restrictions",
"reference": {
"rtype": "restriction"
},
"label": "Turn Restrictions"
}
data/presets/presets.json
+100 -1
View File
@@ -7987,9 +7987,108 @@
"name": "Restriction",
"icon": "restriction",
"fields": [
"restriction"
"restriction",
"except"
]
},
"type/restriction/no_left_turn": {
"name": "No Left Turn",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_left_turn"
},
"fields": [
"except"
],
"icon": "restriction-no-left-turn"
},
"type/restriction/no_right_turn": {
"name": "No Right Turn",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_right_turn"
},
"fields": [
"except"
],
"icon": "restriction-no-right-turn"
},
"type/restriction/no_straight_on": {
"name": "No Straight On",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_straight_on"
},
"fields": [
"except"
],
"icon": "restriction-no-straight-on"
},
"type/restriction/no_u_turn": {
"name": "No U-turn",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_u_turn"
},
"fields": [
"except"
],
"icon": "restriction-no-u-turn"
},
"type/restriction/only_left_turn": {
"name": "Left Turn Only",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "only_left_turn"
},
"fields": [
"except"
],
"icon": "restriction-only-left-turn"
},
"type/restriction/only_right_turn": {
"name": "Right Turn Only",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "only_right_turn"
},
"fields": [
"except"
],
"icon": "restriction-only-right-turn"
},
"type/restriction/only_straight_ahead": {
"name": "No Turns",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "only_straight_ahead"
},
"fields": [
"except"
],
"icon": "restriction-only-straight-ahead"
},
"type/route": {
"geometry": [
"relation"
data/presets/presets/type/restriction.json
+2 -1
View File
@@ -8,6 +8,7 @@
"name": "Restriction",
"icon": "restriction",
"fields": [
"restriction"
"restriction",
"except"
]
}
data/presets/presets/type/restriction/no_left_turn.json
+14
View File
@@ -0,0 +1,14 @@
{
"name": "No Left Turn",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_left_turn"
},
"fields": [
"except"
],
"icon": "restriction-no-left-turn"
}
data/presets/presets/type/restriction/no_right_turn.json
+14
View File
@@ -0,0 +1,14 @@
{
"name": "No Right Turn",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_right_turn"
},
"fields": [
"except"
],
"icon": "restriction-no-right-turn"
}
data/presets/presets/type/restriction/no_straight_on.json
+14
View File
@@ -0,0 +1,14 @@
{
"name": "No Straight On",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_straight_on"
},
"fields": [
"except"
],
"icon": "restriction-no-straight-on"
}
data/presets/presets/type/restriction/no_u_turn.json
+14
View File
@@ -0,0 +1,14 @@
{
"name": "No U-turn",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "no_u_turn"
},
"fields": [
"except"
],
"icon": "restriction-no-u-turn"
}
data/presets/presets/type/restriction/only_left_turn.json
+14
View File
@@ -0,0 +1,14 @@
{
"name": "Left Turn Only",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "only_left_turn"
},
"fields": [
"except"
],
"icon": "restriction-only-left-turn"
}
data/presets/presets/type/restriction/only_right_turn.json
+14
View File
@@ -0,0 +1,14 @@
{
"name": "Right Turn Only",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "only_right_turn"
},
"fields": [
"except"
],
"icon": "restriction-only-right-turn"
}
data/presets/presets/type/restriction/only_straight_ahead.json
+14
View File
@@ -0,0 +1,14 @@
{
"name": "No Turns",
"geometry": [
"relation"
],
"tags": {
"type": "restriction",
"restriction": "only_straight_ahead"
},
"fields": [
"except"
],
"icon": "restriction-only-straight-ahead"
}
data/presets/schema/field.json
+2 -1
View File
@@ -63,7 +63,8 @@
"textarea",
"localized",
"wikipedia",
"typeCombo"
"typeCombo",
"restrictions"
],
"required": true
},
data/relation-icons.json
+8 -1
View File
@@ -14,5 +14,12 @@
"route-ferry": [740, 25],
"route-power": [800, 25],
"route-pipeline": [860, 25],
"route-master": [920, 25]
"route-master": [920, 25],
"restriction-no-straight-on": [980, 25],
"restriction-no-u-turn": [1040, 25],
"restriction-no-left-turn": [1100, 25],
"restriction-no-right-turn": [1160, 25],
"restriction-only-straight-ahead": [1220, 25],
"restriction-only-left-turn": [1280, 25],
"restriction-only-right-turn": [1340, 25]
}