diff --git a/css/feature-icons.css b/css/feature-icons.css index fb1112d14..7814465f0 100644 --- a/css/feature-icons.css +++ b/css/feature-icons.css @@ -1,4 +1,4 @@ -/* glue: 0.3 hash: a9f9bb5536 */ +/* glue: 0.3 hash: 302da125e7 */ .feature-waterway-stream, .feature-waterway-river, .feature-waterway-ditch, @@ -16,6 +16,7 @@ .feature-highway-trunk-link, .feature-highway-track, .feature-highway-tertiary, +.feature-highway-tertiary-link, .feature-highway-steps, .feature-highway-service, .feature-highway-secondary, @@ -306,8 +307,8 @@ .feature-highway-trunk{background-position:-60px -180px;width:60px;height:60px;} .feature-highway-trunk-link{background-position:-120px -180px;width:60px;height:60px;} .feature-highway-track{background-position:-180px -180px;width:60px;height:60px;} -.feature-highway-tertiary:link{background-position:-240px 0px;width:60px;height:60px;} -.feature-highway-tertiary{background-position:-240px -60px;width:60px;height:60px;} +.feature-highway-tertiary{background-position:-240px 0px;width:60px;height:60px;} +.feature-highway-tertiary-link{background-position:-240px -60px;width:60px;height:60px;} .feature-highway-steps{background-position:-240px -120px;width:60px;height:60px;} .feature-highway-service{background-position:-240px -180px;width:60px;height:60px;} .feature-highway-secondary{background-position:0px -240px;width:60px;height:60px;} diff --git a/data/presets/fields.json b/data/presets/fields.json index 1d6a62e5e..6bd523bfd 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -223,6 +223,12 @@ "type": "check", "label": "One Way" }, + "oneway_yes": { + "key": "oneway", + "type": "check", + "default": "yes", + "label": "One Way" + }, "opening_hours": { "key": "opening_hours", "type": "text", diff --git a/data/presets/fields/oneway_yes.json b/data/presets/fields/oneway_yes.json new file mode 100644 index 000000000..b73d5a366 --- /dev/null +++ b/data/presets/fields/oneway_yes.json @@ -0,0 +1,6 @@ +{ + "key": "oneway", + "type": "check", + "default": "yes", + "label": "One Way" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index e52af2afd..e9409fc2d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1185,6 +1185,29 @@ "terms": [], "name": "Motorway" }, + "highway/motorway_link": { + "icon": "highway-motorway-link", + "fields": [ + "oneway_yes", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "motorway_link" + }, + "terms": [ + "ramp", + "on ramp", + "off ramp" + ], + "name": "Motorway Link" + }, "highway/path": { "icon": "highway-footway", "fields": [ @@ -1222,6 +1245,29 @@ "terms": [], "name": "Primary Road" }, + "highway/primary_link": { + "icon": "highway-primary-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "primary_link" + }, + "terms": [ + "ramp", + "on ramp", + "off ramp" + ], + "name": "Primary Link" + }, "highway/residential": { "icon": "highway-residential", "fields": [ @@ -1259,6 +1305,29 @@ "terms": [], "name": "Secondary Road" }, + "highway/secondary_link": { + "icon": "highway-secondary-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "secondary_link" + }, + "terms": [ + "ramp", + "on ramp", + "off ramp" + ], + "name": "Secondary Link" + }, "highway/service": { "icon": "highway-service", "fields": [ @@ -1315,6 +1384,29 @@ "terms": [], "name": "Tertiary Road" }, + "highway/tertiary_link": { + "icon": "highway-tertiary-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "tertiary_link" + }, + "terms": [ + "ramp", + "on ramp", + "off ramp" + ], + "name": "Tertiary Link" + }, "highway/track": { "icon": "highway-track", "fields": [ @@ -1366,6 +1458,29 @@ "terms": [], "name": "Trunk Road" }, + "highway/trunk_link": { + "icon": "highway-trunk-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "trunk_link" + }, + "terms": [ + "ramp", + "on ramp", + "off ramp" + ], + "name": "Trunk Link" + }, "highway/turning_circle": { "icon": "circle", "geometry": [ @@ -2473,7 +2588,7 @@ "name": "Rail" }, "railway/subway": { - "icon": "railway-rail", + "icon": "railway-subway", "fields": [ "structure" ], diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json new file mode 100644 index 000000000..7480eb667 --- /dev/null +++ b/data/presets/presets/highway/motorway_link.json @@ -0,0 +1,19 @@ +{ + "icon": "highway-motorway-link", + "fields": [ + "oneway_yes", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "motorway_link" + }, + "terms": ["ramp", "on ramp", "off ramp"], + "name": "Motorway Link" +} diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json new file mode 100644 index 000000000..3ac4a2d99 --- /dev/null +++ b/data/presets/presets/highway/primary_link.json @@ -0,0 +1,19 @@ +{ + "icon": "highway-primary-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "primary_link" + }, + "terms": ["ramp", "on ramp", "off ramp"], + "name": "Primary Link" +} diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json new file mode 100644 index 000000000..b52a193e4 --- /dev/null +++ b/data/presets/presets/highway/secondary_link.json @@ -0,0 +1,19 @@ +{ + "icon": "highway-secondary-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "secondary_link" + }, + "terms": ["ramp", "on ramp", "off ramp"], + "name": "Secondary Link" +} diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json new file mode 100644 index 000000000..5f2436bd2 --- /dev/null +++ b/data/presets/presets/highway/tertiary_link.json @@ -0,0 +1,19 @@ +{ + "icon": "highway-tertiary-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "tertiary_link" + }, + "terms": ["ramp", "on ramp", "off ramp"], + "name": "Tertiary Link" +} diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json new file mode 100644 index 000000000..2bc192c16 --- /dev/null +++ b/data/presets/presets/highway/trunk_link.json @@ -0,0 +1,19 @@ +{ + "icon": "highway-trunk-link", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "trunk_link" + }, + "terms": ["ramp", "on ramp", "off ramp"], + "name": "Trunk Link" +} diff --git a/img/feature-icons.png b/img/feature-icons.png index d85f78ec6..605d7d62a 100644 Binary files a/img/feature-icons.png and b/img/feature-icons.png differ diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg index 62544dc18..2dde38edf 100644 --- a/img/source/line-presets.svg +++ b/img/source/line-presets.svg @@ -2788,7 +2788,7 @@