diff --git a/data/presets.yaml b/data/presets.yaml index ab5770551..f6b2138d0 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -583,6 +583,9 @@ en: emergency: # emergency=* label: Emergency + enforcement: + # enforcement=* + label: Type entrance: # entrance=* label: Type @@ -6647,6 +6650,10 @@ en: # 'type=boundary, boundary=administrative' name: Administrative Boundary terms: '' + type/enforcement: + # type=enforcement + name: Enforcement + terms: '' type/multipolygon: # type=multipolygon name: Multipolygon diff --git a/data/presets/defaults.json b/data/presets/defaults.json index a6db43d57..71247c4da 100644 --- a/data/presets/defaults.json +++ b/data/presets/defaults.json @@ -54,6 +54,7 @@ "type/boundary", "type/waterway", "type/multipolygon", + "type/enforcement", "type/site", "relation" ] diff --git a/data/presets/fields.json b/data/presets/fields.json index 6c10c0cbf..2a857aa1b 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -99,6 +99,7 @@ "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "universal": true, "label": "Email"}, "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "emergency": {"key": "emergency", "type": "check", "label": "Emergency"}, + "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"}, "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"}, "except": {"key": "except", "type": "combo", "label": "Exceptions"}, "faces": {"key": "faces", "type": "number", "minValue": 0, "label": "Faces"}, diff --git a/data/presets/fields/enforcement.json b/data/presets/fields/enforcement.json new file mode 100644 index 000000000..e330ae569 --- /dev/null +++ b/data/presets/fields/enforcement.json @@ -0,0 +1,5 @@ +{ + "key": "enforcement", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 4fd66887b..a46eff7b5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -786,7 +786,7 @@ "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"}, "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "removeTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"}, "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2}, - "public_transport/stop_area": {"icon": "maki-bus", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "addTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "removeTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"}, + "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "addTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "removeTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"}, "public_transport/stop_position_aerialway": {"icon": "maki-aerialway", "fields": ["name", "ref_stop_position", "network", "operator"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"}, "public_transport/stop_position_bus": {"icon": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"}, "public_transport/stop_position_ferry": {"icon": "maki-ferry", "fields": ["name", "ref_stop_position", "network", "operator"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["boat", "dock", "ferry", "pier", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stopping Location"}, @@ -1009,6 +1009,7 @@ "type/multipolygon": {"icon": "iD-multipolygon", "geometry": ["area", "relation"], "tags": {"type": "multipolygon"}, "removeTags": {}, "name": "Multipolygon", "searchable": false, "matchScore": 0.1}, "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"}, "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"}, + "type/enforcement": {"icon": "iD-relation", "fields": ["name", "enforcement"], "geometry": ["relation"], "tags": {"type": "enforcement"}, "name": "Enforcement"}, "type/restriction": {"icon": "iD-restriction", "fields": ["name", "restriction", "except"], "geometry": ["relation"], "tags": {"type": "restriction"}, "name": "Restriction"}, "type/restriction/no_left_turn": {"icon": "iD-restriction-no-left-turn", "fields": ["except"], "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_left_turn"}, "name": "No Left Turn"}, "type/restriction/no_right_turn": {"icon": "iD-restriction-no-right-turn", "fields": ["except"], "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_right_turn"}, "name": "No Right Turn"}, diff --git a/data/presets/presets/public_transport/stop_area.json b/data/presets/presets/public_transport/stop_area.json index 2d2b873fd..00396e5e9 100644 --- a/data/presets/presets/public_transport/stop_area.json +++ b/data/presets/presets/public_transport/stop_area.json @@ -1,5 +1,5 @@ { - "icon": "maki-bus", + "icon": "iD-relation", "fields": [ "name", "ref", diff --git a/data/presets/presets/type/enforcement.json b/data/presets/presets/type/enforcement.json new file mode 100644 index 000000000..cf13cb6b1 --- /dev/null +++ b/data/presets/presets/type/enforcement.json @@ -0,0 +1,14 @@ +{ + "icon": "iD-relation", + "fields": [ + "name", + "enforcement" + ], + "geometry": [ + "relation" + ], + "tags": { + "type": "enforcement" + }, + "name": "Enforcement" +} diff --git a/data/taginfo.json b/data/taginfo.json index 5e9d3173c..c76bf847f 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -5146,7 +5146,7 @@ "value": "stop_area", "description": "🄿 Transit Stop Area", "object_types": ["relation"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true" }, { "key": "public_transport", @@ -6580,6 +6580,13 @@ "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/boundary.svg?sanitize=true" }, + { + "key": "type", + "value": "enforcement", + "description": "🄿 Enforcement", + "object_types": ["relation"], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true" + }, { "key": "type", "value": "restriction", @@ -7223,6 +7230,7 @@ {"key": "email", "description": "🄵 Email"}, {"key": "embankment", "description": "🄵 Type"}, {"key": "emergency", "description": "🄵 Emergency"}, + {"key": "enforcement", "description": "🄵 Type"}, {"key": "except", "description": "🄵 Exceptions"}, {"key": "faces", "description": "🄵 Faces"}, {"key": "fax", "description": "🄵 Fax"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index ea503fedb..fd7663ea9 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1988,6 +1988,9 @@ "emergency": { "label": "Emergency" }, + "enforcement": { + "label": "Type" + }, "entrance": { "label": "Type" }, @@ -7252,6 +7255,10 @@ "name": "Administrative Boundary", "terms": "" }, + "type/enforcement": { + "name": "Enforcement", + "terms": "" + }, "type/restriction": { "name": "Restriction", "terms": ""