From cfc8da881b4e3e12c105f5564eddb90c7f0ddb4d Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 17 Jan 2019 11:52:49 -0500 Subject: [PATCH] Made road and unclassified highways inherit from residential Added smoothness to moreFields of highway/residential --- data/presets/presets.json | 8 ++++---- data/presets/presets/highway/primary.json | 8 ++++---- data/presets/presets/highway/residential.json | 7 ++++--- data/presets/presets/highway/road.json | 4 ++-- data/presets/presets/highway/unclassified.json | 16 ++-------------- 5 files changed, 16 insertions(+), 27 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 313fd5fc1..13e72e3f1 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -432,11 +432,11 @@ "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"}, "highway/pedestrian_line": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "moreFields": ["covered", "smoothness"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"}, "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["maxspeed/advisory", "cycleway", "maxheight", "covered", "lit", "smoothness", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"}, - "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["cycleway", "maxheight", "covered", "lit", "smoothness", "maxspeed/advisory", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"}, + "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["covered", "cycleway", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "smoothness"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"}, "highway/raceway": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "surface", "sport_racing_motor", "lit", "width", "lanes", "structure"], "geometry": ["point", "line", "area"], "tags": {"highway": "raceway"}, "addTags": {"highway": "raceway", "sport": "motor"}, "terms": ["auto*", "formula one", "kart", "motocross", "nascar", "race*", "track"], "name": "Racetrack (Motorsport)"}, - "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["cycleway", "maxheight", "covered", "lit", "maxspeed/advisory", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"}, + "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "smoothness"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"}, "highway/rest_area": {"icon": "maki-car", "fields": ["name", "operator", "opening_hours"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"}, - "highway/road": {"icon": "iD-highway-road", "fields": ["{highway/unclassified}"], "moreFields": ["{highway/unclassified}"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"}, + "highway/road": {"icon": "iD-highway-road", "fields": ["{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"}, "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"}, "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": ["road", "street"], "name": "Secondary Road"}, "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "structure", "access"], "moreFields": ["maxheight", "covered", "lit", "maxspeed/advisory", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "name": "Service Road"}, @@ -460,7 +460,7 @@ "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["toll", "maxheight", "covered", "lit", "smoothness", "minspeed"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"}, "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"}, "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"}, - "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["cycleway", "maxheight", "covered", "lit", "smoothness", "maxspeed/advisory", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"}, + "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"}, "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "*"}, "name": "Historic Site"}, "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "site_type", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"}, "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index 588531e64..a67d6487b 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -11,13 +11,13 @@ "access" ], "moreFields": [ - "cycleway", - "maxheight", "covered", + "cycleway", "lit", - "smoothness", + "oneway/bicycle", + "maxheight", "maxspeed/advisory", - "oneway/bicycle" + "smoothness" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index bbde8ecf2..400909b1a 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -10,12 +10,13 @@ "access" ], "moreFields": [ - "cycleway", - "maxheight", "covered", + "cycleway", "lit", + "oneway/bicycle", + "maxheight", "maxspeed/advisory", - "oneway/bicycle" + "smoothness" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json index d28e6ab20..ddb81396d 100644 --- a/data/presets/presets/highway/road.json +++ b/data/presets/presets/highway/road.json @@ -1,10 +1,10 @@ { "icon": "iD-highway-road", "fields": [ - "{highway/unclassified}" + "{highway/residential}" ], "moreFields": [ - "{highway/unclassified}" + "{highway/residential}" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index 285edd427..7a59116b3 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -1,22 +1,10 @@ { "icon": "iD-highway-unclassified", "fields": [ - "name", - "oneway", - "maxspeed", - "lanes", - "surface", - "structure", - "access" + "{highway/residential}" ], "moreFields": [ - "cycleway", - "maxheight", - "covered", - "lit", - "smoothness", - "maxspeed/advisory", - "oneway/bicycle" + "{highway/residential}" ], "geometry": [ "line"