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

Use restriction preset icons

Browse Source
This commit is contained in:
John Firebaugh
2014-05-16 13:43:13 -07:00
parent 15fb547bcc
commit f74f6ad54a
17 changed files with 170 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/feature-icons.css
+7 -4
View File
@@ -113,10 +113,6 @@
.feature-laundry{background-position:-108px -504px;}
.feature-car{background-position:-162px -504px;}
.feature-suitcase{background-position:-216px -504px;}
.feature-hairdresser{background-position:-0px -528px;}
.feature-chemist{background-position:-54px -528px;}
.feature-mobilephone{background-position:-108px -528px;}
.feature-scooter{background-position:-162px -528px;}
.preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
.preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
.preset-icon-line.feature-highway-primary{background-position:-140px -25px;}
@@ -172,3 +168,10 @@
.preset-icon-relation.feature-route-power{background-position:-800px -25px;}
.preset-icon-relation.feature-route-pipeline{background-position:-860px -25px;}
.preset-icon-relation.feature-route-master{background-position:-920px -25px;}
.preset-icon-relation.feature-restriction-no-straight-on{background-position:-980px -25px;}
.preset-icon-relation.feature-restriction-no-u-turn{background-position:-1040px -25px;}
.preset-icon-relation.feature-restriction-no-left-turn{background-position:-1100px -25px;}
.preset-icon-relation.feature-restriction-no-right-turn{background-position:-1160px -25px;}
.preset-icon-relation.feature-restriction-only-straight-ahead{background-position:-1220px -25px;}
.preset-icon-relation.feature-restriction-only-left-turn{background-position:-1280px -25px;}
.preset-icon-relation.feature-restriction-only-right-turn{background-position:-1340px -25px;}
data/feature-icons.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/presets.yaml
+13 -2
View File
@@ -11,6 +11,8 @@ en:
name: Path
"category-rail":
name: Rail
"category-restriction":
name: Restriction
"category-road":
name: Road
"category-route":
@@ -1802,8 +1804,17 @@ en:
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>"
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/presets.json
+47 -5
View File
@@ -7980,7 +7980,7 @@
"fields": [
"except"
],
"icon": "restriction"
"icon": "restriction-no-left-turn"
},
"type/restriction/no_right_turn": {
"name": "No Right Turn",
@@ -7994,7 +7994,7 @@
"fields": [
"except"
],
"icon": "restriction"
"icon": "restriction-no-right-turn"
},
"type/restriction/no_straight_on": {
"name": "No Straight On",
@@ -8008,10 +8008,10 @@
"fields": [
"except"
],
"icon": "restriction"
"icon": "restriction-no-straight-on"
},
"type/restriction/no_u_turn": {
"name": "No U Turn",
"name": "No U-turn",
"geometry": [
"relation"
],
@@ -8022,7 +8022,49 @@
"fields": [
"except"
],
"icon": "restriction"
"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": [
data/presets/presets/type/restriction/no_left_turn.json
+1 -1
View File
@@ -10,5 +10,5 @@
"fields": [
"except"
],
"icon": "restriction"
"icon": "restriction-no-left-turn"
}
data/presets/presets/type/restriction/no_right_turn.json
+1 -1
View File
@@ -10,5 +10,5 @@
"fields": [
"except"
],
"icon": "restriction"
"icon": "restriction-no-right-turn"
}
data/presets/presets/type/restriction/no_straight_on.json
+1 -1
View File
@@ -10,5 +10,5 @@
"fields": [
"except"
],
"icon": "restriction"
"icon": "restriction-no-straight-on"
}
data/presets/presets/type/restriction/no_u_turn.json
+2 -2
View File
@@ -1,5 +1,5 @@
{
"name": "No U Turn",
"name": "No U-turn",
"geometry": [
"relation"
],
@@ -10,5 +10,5 @@
"fields": [
"except"
],
"icon": "restriction"
"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/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]
}
dist/img/maki-sprite.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 107 KiB

dist/locales/en.json
Vendored
+16 -1
View File
@@ -416,6 +416,9 @@
"category-rail": {
"name": "Rail"
},
"category-restriction": {
"name": "Restriction"
},
"category-road": {
"name": "Road"
},
@@ -2844,7 +2847,19 @@
"terms": ""
},
"type/restriction/no_u_turn": {
"name": "No U Turn",
"name": "No U-turn",
"terms": ""
},
"type/restriction/only_left_turn": {
"name": "Left Turn Only",
"terms": ""
},
"type/restriction/only_right_turn": {
"name": "Right Turn Only",
"terms": ""
},
"type/restriction/only_straight_ahead": {
"name": "No Turns",
"terms": ""
},
"type/route": {