Expand usage of Advisory Speed Limit field

data/fields/maxspeed.json

@@ -2,5 +2,8 @@
     "key": "maxspeed",
     "type": "roadspeed",
     "label": "Speed Limit",
-    "placeholder": "40, 50, 60..."
+    "placeholder": "40, 50, 60...",
+    "locationSet": {
+        "exclude": ["ca", "us"]
+    }
 }

data/fields/maxspeed/advisory.json

@@ -2,5 +2,8 @@
     "key": "maxspeed:advisory",
     "type": "roadspeed",
     "label": "Advisory Speed Limit",
-    "placeholder": "40, 50, 60..."
+    "placeholder": "40, 50, 60...",
+    "locationSet": {
+        "include": ["ca", "us"]
+    }
 }

data/fields/maxspeed/advisory_mutcd.json

@@ -0,0 +1,9 @@
+{
+    "key": "maxspeed:advisory",
+    "type": "roadspeed",
+    "label": "Advisory Speed Limit",
+    "placeholder": "40, 50, 60...",
+    "locationSet": {
+        "exclude": ["ca", "us"]
+    }
+}

data/fields/maxspeed_mutcd.json

@@ -0,0 +1,9 @@
+{
+    "key": "maxspeed",
+    "type": "roadspeed",
+    "label": "Speed Limit",
+    "placeholder": "40, 50, 60...",
+    "locationSet": {
+        "include": ["ca", "us"]
+    }
+}

data/presets/golf/cartpath.json

@@ -2,7 +2,8 @@
     "icon": "temaki-golf_cart",
     "fields": [
         "{golf/path}",
-        "maxspeed"
+        "maxspeed",
+        "maxspeed_mutcd"
     ],
     "geometry": [
         "line"

data/presets/highway/cycleway.json

@@ -14,6 +14,7 @@
         "dog",
         "lit",
         "maxspeed",
+        "maxspeed_mutcd",
         "maxweight_bridge",
         "not/name",
         "smoothness",

data/presets/highway/living_street.json

@@ -4,6 +4,7 @@
         "name",
         "oneway",
         "maxspeed",
+        "maxspeed_mutcd",
         "lanes",
         "surface",
         "structure",

data/presets/highway/motorway.json

@@ -5,6 +5,7 @@
         "ref_road_number",
         "oneway_yes",
         "maxspeed",
+        "maxspeed_mutcd",
         "lanes",
         "surface",
         "structure",
@@ -17,6 +18,8 @@
         "junction_line",
         "lit",
         "maxheight",
+        "maxspeed/advisory",
+        "maxspeed/advisory_mutcd",
         "maxweight_bridge",
         "minspeed",
         "not/name",

data/presets/highway/motorway_link.json

@@ -6,6 +6,7 @@
         "junction/ref_oneway",
         "oneway",
         "maxspeed",
+        "maxspeed/advisory_mutcd",
         "lanes",
         "surface",
         "structure",
@@ -19,6 +20,7 @@
         "junction_line",
         "lit",
         "maxheight",
+        "maxspeed_mutcd",
         "maxspeed/advisory",
         "maxweight_bridge",
         "name",

data/presets/highway/primary.json

@@ -4,6 +4,7 @@
         "name",
         "oneway",
         "maxspeed",
+        "maxspeed_mutcd",
         "lanes",
         "surface",
         "structure",
@@ -20,6 +21,7 @@
         "lit",
         "maxheight",
         "maxspeed/advisory",
+        "maxspeed/advisory_mutcd",
         "maxweight_bridge",
         "not/name",
         "oneway/bicycle",

data/presets/highway/primary_link.json

@@ -5,6 +5,7 @@
         "destination/ref_oneway",
         "oneway",
         "maxspeed",
+        "maxspeed/advisory_mutcd",
         "lanes",
         "surface",
         "structure",
@@ -21,6 +22,7 @@
         "junction/ref_oneway",
         "lit",
         "maxheight",
+        "maxspeed_mutcd",
         "maxspeed/advisory",
         "maxweight_bridge",
         "name",

data/presets/highway/residential.json

@@ -4,6 +4,7 @@
         "name",
         "oneway",
         "maxspeed",
+        "maxspeed_mutcd",
         "lanes",
         "surface",
         "structure",
@@ -18,6 +19,7 @@
         "lit",
         "maxheight",
         "maxspeed/advisory",
+        "maxspeed/advisory_mutcd",
         "maxweight_bridge",
         "not/name",
         "oneway/bicycle",

data/presets/highway/service.json

@@ -5,6 +5,7 @@
         "service",
         "oneway",
         "maxspeed",
+        "maxspeed_mutcd",
         "surface",
         "structure",
         "access"
@@ -17,6 +18,7 @@
         "lit",
         "maxheight",
         "maxspeed/advisory",
+        "maxspeed/advisory_mutcd",
         "maxweight_bridge",
         "oneway/bicycle",
         "smoothness",

data/presets/highway/speed_camera.json

@@ -7,7 +7,8 @@
     "fields": [
         "direction",
         "ref",
-        "maxspeed"
+        "maxspeed",
+        "maxspeed_mutcd"
     ],
     "tags": {
         "highway": "speed_camera"

data/presets/highway/trunk.json

@@ -5,6 +5,7 @@
         "ref_road_number",
         "oneway",
         "maxspeed",
+        "maxspeed_mutcd",
         "lanes",
         "surface",
         "structure",
@@ -17,6 +18,8 @@
         "junction_line",
         "lit",
         "maxheight",
+        "maxspeed/advisory",
+        "maxspeed/advisory_mutcd",
         "maxweight_bridge",
         "minspeed",
         "not/name",

data/presets/railway/construction.json

@@ -15,6 +15,7 @@
         "highspeed",
         "incline",
         "maxspeed",
+        "maxspeed_mutcd",
         "service_rail",
         "usage_rail",
         "voltage_electrified"

data/presets/railway/funicular.json

@@ -13,6 +13,7 @@
         "electrified",
         "frequency_electrified",
         "maxspeed",
+        "maxspeed_mutcd",
         "voltage_electrified"
     ],
     "geometry": [

data/presets/railway/light_rail.json

@@ -14,6 +14,7 @@
         "frequency_electrified",
         "incline",
         "maxspeed",
+        "maxspeed_mutcd",
         "voltage_electrified"
     ],
     "geometry": [

data/presets/traffic_sign/maxspeed.json

@@ -2,7 +2,8 @@
     "icon": "maki-square-stroked",
     "fields": [
         "{traffic_sign}",
-        "maxspeed"
+        "maxspeed",
+        "maxspeed_mutcd"
     ],
     "geometry": [
         "point",

data/presets/type/enforcement/maxspeed.json

@@ -1,7 +1,8 @@
 {
     "icon": "iD-relation",
     "fields": [
-        "maxspeed"
+        "maxspeed",
+        "maxspeed_mutcd"
     ],
     "geometry": [
         "relation"

interim/source_strings.yaml

@@ -1496,6 +1496,18 @@ en:
         # maxspeed/advisory field placeholder
         placeholder: '40, 50, 60...'
         terms: '[translate with synonyms or related terms for ''Advisory Speed Limit'', separated by commas]'
+      maxspeed/advisory_mutcd:
+        # 'maxspeed:advisory=*'
+        label: Advisory Speed Limit
+        # maxspeed/advisory_mutcd field placeholder
+        placeholder: '40, 50, 60...'
+        terms: '[translate with synonyms or related terms for ''Advisory Speed Limit'', separated by commas]'
+      maxspeed_mutcd:
+        # maxspeed=*
+        label: Speed Limit
+        # maxspeed_mutcd field placeholder
+        placeholder: '40, 50, 60...'
+        terms: '[translate with synonyms or related terms for ''Speed Limit'', separated by commas]'
       maxstay:
         # maxstay=*
         label: Max Stay