Require highway=service to match service roads (close #6775)

data/presets.yaml

@@ -4754,23 +4754,23 @@ en:
         # 'terms: road,street'
         terms: '<translate with synonyms or related terms for ''Service Road'', separated by commas>'
       highway/service/alley:
-        # service=alley
+        # 'highway=service, service=alley'
         name: Alley
         terms: '<translate with synonyms or related terms for ''Alley'', separated by commas>'
       highway/service/drive-through:
-        # service=drive-through
+        # 'highway=service, service=drive-through'
         name: Drive-Through
         terms: '<translate with synonyms or related terms for ''Drive-Through'', separated by commas>'
       highway/service/driveway:
-        # service=driveway
+        # 'highway=service, service=driveway'
         name: Driveway
         terms: '<translate with synonyms or related terms for ''Driveway'', separated by commas>'
       highway/service/emergency_access:
-        # service=emergency_access
+        # 'highway=service, service=emergency_access'
         name: Emergency Access
         terms: '<translate with synonyms or related terms for ''Emergency Access'', separated by commas>'
       highway/service/parking_aisle:
-        # service=parking_aisle
+        # 'highway=service, service=parking_aisle'
         name: Parking Aisle
         terms: '<translate with synonyms or related terms for ''Parking Aisle'', separated by commas>'
       highway/services:

data/presets/presets.json

@@ -509,11 +509,11 @@
     "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", "covered", "structure", "access"], "moreFields": ["flood_prone", "incline", "lanes", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "oneway/bicycle", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "matchScore": 0.9, "name": "Service Road"},
-    "highway/service/alley": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "alley"}, "addTags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"},
-    "highway/service/drive-through": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "drive-through"}, "addTags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"},
-    "highway/service/driveway": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "driveway"}, "addTags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"},
-    "highway/service/emergency_access": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "emergency_access"}, "addTags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"},
-    "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "parking_aisle"}, "addTags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
+    "highway/service/alley": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"},
+    "highway/service/drive-through": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"},
+    "highway/service/driveway": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"},
+    "highway/service/emergency_access": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"},
+    "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
     "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
     "highway/speed_camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
     "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "handrail", "step_count", "surface", "lit", "width"], "moreFields": ["covered", "dog", "indoor", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},

data/presets/presets/highway/service/alley.json

@@ -4,9 +4,6 @@
         "line"
     ],
     "tags": {
-        "service": "alley"
-    },
-    "addTags": {
         "highway": "service",
         "service": "alley"
     },

data/presets/presets/highway/service/drive-through.json

@@ -4,9 +4,6 @@
         "line"
     ],
     "tags": {
-        "service": "drive-through"
-    },
-    "addTags": {
         "highway": "service",
         "service": "drive-through"
     },

data/presets/presets/highway/service/driveway.json

@@ -4,9 +4,6 @@
         "line"
     ],
     "tags": {
-        "service": "driveway"
-    },
-    "addTags": {
         "highway": "service",
         "service": "driveway"
     },

data/presets/presets/highway/service/emergency_access.json

@@ -4,9 +4,6 @@
         "line"
     ],
     "tags": {
-        "service": "emergency_access"
-    },
-    "addTags": {
         "highway": "service",
         "service": "emergency_access"
     },

data/presets/presets/highway/service/parking_aisle.json

@@ -4,9 +4,6 @@
         "line"
     ],
     "tags": {
-        "service": "parking_aisle"
-    },
-    "addTags": {
         "highway": "service",
         "service": "parking_aisle"
     },