From 36da7fee4ed84dc7b06ce48d1ccd20ea7058715b Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 21 Mar 2013 13:42:08 -0700 Subject: [PATCH] Improve line defaults and categories --- data/locales.js | 8 +++- data/presets.yaml | 7 +++- data/presets/categories.json | 42 ++++++++++++++++++- data/presets/defaults.json | 9 ++-- data/presets/presets.json | 26 ++++++++++-- data/presets/presets/highway/path.json | 2 +- data/presets/presets/highway/road.json | 18 ++++++++ .../presets/presets/highway/unclassified.json | 2 +- 8 files changed, 97 insertions(+), 17 deletions(-) create mode 100644 data/presets/presets/highway/road.json diff --git a/data/locales.js b/data/locales.js index d27ebccc0..9e159756e 100644 --- a/data/locales.js +++ b/data/locales.js @@ -729,6 +729,10 @@ locale.en = { "name": "Residential Road", "terms": "" }, + "highway/road": { + "name": "Unknown Road", + "terms": "" + }, "highway/secondary": { "name": "Secondary Road", "terms": "" @@ -1086,11 +1090,11 @@ locale.en = { "terms": "" }, "railway/abandoned": { - "name": "Abandoned railway", + "name": "Abandoned Railway", "terms": "" }, "railway/disused": { - "name": "Disused railway", + "name": "Disused Railway", "terms": "" }, "railway/level_crossing": { diff --git a/data/presets.yaml b/data/presets.yaml index c7e9f78f9..8c4a42d36 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -358,6 +358,9 @@ en: highway/residential: name: Residential Road terms: "" + highway/road: + name: Unknown Road + terms: "" highway/secondary: name: Secondary Road terms: "" @@ -626,10 +629,10 @@ en: name: Railway terms: "" railway/abandoned: - name: Abandoned railway + name: Abandoned Railway terms: "" railway/disused: - name: Disused railway + name: Disused Railway terms: "" railway/level_crossing: name: Level Crossing diff --git a/data/presets/categories.json b/data/presets/categories.json index a47833d08..069f96bbf 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -1,6 +1,5 @@ [{ "geometry": "line", - "icon": "highway", "id": "Road", "icon": "category-roads", "members": [ @@ -11,7 +10,46 @@ "highway/secondary", "highway/tertiary", "highway/unclassified", + "highway/motorway_link", + "highway/trunk_link", + "highway/primary_link", + "highway/secondary_link", + "highway/tertiary_link", "highway/service", - "highway/track" + "highway/track", + "highway/road" + ] +}, { + "geometry": "line", + "id": "Rail", + "icon": "railway-rail", + "members": [ + "railway/rail", + "railway/subway", + "railway/tram", + "railway/monorail", + "railway/disused", + "railway/abandoned" + ] +}, { + "geometry": "line", + "id": "Path", + "icon": "highway-path", + "members": [ + "highway/footway", + "highway/cycleway", + "highway/bridleway", + "highway/path", + "highway/steps" + ] +}, { + "geometry": "line", + "id": "Water", + "icon": "waterway-river", + "members": [ + "waterway/river", + "waterway/stream", + "waterway/canal", + "waterway/ditch" ] }] diff --git a/data/presets/defaults.json b/data/presets/defaults.json index e43aa7a6e..72bc337e4 100644 --- a/data/presets/defaults.json +++ b/data/presets/defaults.json @@ -15,11 +15,10 @@ ], "line": [ "Road", - "highway/footway", - "highway/cycleway", - "railway/rail", - "waterway/river", - "waterway/stream", + "Rail", + "Path", + "Water", + "power/line", "other" ], "point": [ diff --git a/data/presets/presets.json b/data/presets/presets.json index c1e6f5246..0bd1d3777 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1213,7 +1213,7 @@ "name": "Motorway Link" }, "highway/path": { - "icon": "highway-footway", + "icon": "highway-path", "fields": [ "oneway", "structure", @@ -1290,6 +1290,24 @@ "terms": [], "name": "Residential Road" }, + "highway/road": { + "icon": "highway-road", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "road" + }, + "terms": [], + "name": "Unknown Road" + }, "highway/secondary": { "icon": "highway-secondary", "fields": [ @@ -1497,7 +1515,7 @@ "name": "Turning Circle" }, "highway/unclassified": { - "icon": "highway", + "icon": "highway-unclassified", "fields": [ "oneway", "structure", @@ -2529,7 +2547,7 @@ "structure" ], "terms": [], - "name": "Abandoned railway" + "name": "Abandoned Railway" }, "railway/disused": { "icon": "railway-disused", @@ -2543,7 +2561,7 @@ "structure" ], "terms": [], - "name": "Disused railway" + "name": "Disused Railway" }, "railway/level_crossing": { "icon": "cross", diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json index 7b877201d..b85f98373 100644 --- a/data/presets/presets/highway/path.json +++ b/data/presets/presets/highway/path.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "highway-path", "fields": [ "oneway", "structure", diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json new file mode 100644 index 000000000..bb74b6d0f --- /dev/null +++ b/data/presets/presets/highway/road.json @@ -0,0 +1,18 @@ +{ + "icon": "highway-road", + "fields": [ + "oneway", + "structure", + "access", + "maxspeed", + "surface" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "road" + }, + "terms": [], + "name": "Unknown Road" +} \ No newline at end of file diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index f6491fcd2..b8dc36200 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -1,5 +1,5 @@ { - "icon": "highway", + "icon": "highway-unclassified", "fields": [ "oneway", "structure",