diff --git a/data/fields/maxspeed.json b/data/fields/maxspeed.json index 5ceb8fcc..328eba54 100644 --- a/data/fields/maxspeed.json +++ b/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"] + } } diff --git a/data/fields/maxspeed/advisory.json b/data/fields/maxspeed/advisory.json index 1dd5438b..c5dad1ff 100644 --- a/data/fields/maxspeed/advisory.json +++ b/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"] + } } diff --git a/data/fields/maxspeed/advisory_mutcd.json b/data/fields/maxspeed/advisory_mutcd.json new file mode 100644 index 00000000..79f1368c --- /dev/null +++ b/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"] + } +} diff --git a/data/fields/maxspeed_mutcd.json b/data/fields/maxspeed_mutcd.json new file mode 100644 index 00000000..0c1de069 --- /dev/null +++ b/data/fields/maxspeed_mutcd.json @@ -0,0 +1,9 @@ +{ + "key": "maxspeed", + "type": "roadspeed", + "label": "Speed Limit", + "placeholder": "40, 50, 60...", + "locationSet": { + "include": ["ca", "us"] + } +} diff --git a/data/presets/golf/cartpath.json b/data/presets/golf/cartpath.json index acf329fb..e915963c 100644 --- a/data/presets/golf/cartpath.json +++ b/data/presets/golf/cartpath.json @@ -2,7 +2,8 @@ "icon": "temaki-golf_cart", "fields": [ "{golf/path}", - "maxspeed" + "maxspeed", + "maxspeed_mutcd" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway.json b/data/presets/highway/cycleway.json index edeb251c..022549a0 100644 --- a/data/presets/highway/cycleway.json +++ b/data/presets/highway/cycleway.json @@ -14,6 +14,7 @@ "dog", "lit", "maxspeed", + "maxspeed_mutcd", "maxweight_bridge", "not/name", "smoothness", diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json index 7fd99b27..f1a4bc16 100644 --- a/data/presets/highway/living_street.json +++ b/data/presets/highway/living_street.json @@ -4,6 +4,7 @@ "name", "oneway", "maxspeed", + "maxspeed_mutcd", "lanes", "surface", "structure", diff --git a/data/presets/highway/motorway.json b/data/presets/highway/motorway.json index 797c1253..c0ab3d55 100644 --- a/data/presets/highway/motorway.json +++ b/data/presets/highway/motorway.json @@ -5,6 +5,7 @@ "ref_road_number", "oneway_yes", "maxspeed", + "maxspeed_mutcd", "lanes", "surface", "structure", @@ -18,6 +19,7 @@ "lit", "maxheight", "maxspeed/advisory", + "maxspeed/advisory_mutcd", "maxweight_bridge", "minspeed", "not/name", diff --git a/data/presets/highway/motorway_link.json b/data/presets/highway/motorway_link.json index 9775beb4..847298e6 100644 --- a/data/presets/highway/motorway_link.json +++ b/data/presets/highway/motorway_link.json @@ -6,7 +6,7 @@ "junction/ref_oneway", "oneway", "maxspeed", - "maxspeed/advisory", + "maxspeed/advisory_mutcd", "lanes", "surface", "structure", @@ -20,6 +20,8 @@ "junction_line", "lit", "maxheight", + "maxspeed_mutcd", + "maxspeed/advisory", "maxweight_bridge", "name", "ref_road_number", diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json index 371bae87..a58c0652 100644 --- a/data/presets/highway/primary.json +++ b/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", diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json index b76c5f8a..61f0a741 100644 --- a/data/presets/highway/primary_link.json +++ b/data/presets/highway/primary_link.json @@ -5,7 +5,7 @@ "destination/ref_oneway", "oneway", "maxspeed", - "maxspeed/advisory", + "maxspeed/advisory_mutcd", "lanes", "surface", "structure", @@ -22,6 +22,8 @@ "junction/ref_oneway", "lit", "maxheight", + "maxspeed_mutcd", + "maxspeed/advisory", "maxweight_bridge", "name", "oneway/bicycle", diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json index ee1dead9..7a35d34c 100644 --- a/data/presets/highway/residential.json +++ b/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", diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json index 74bfb908..51a257bf 100644 --- a/data/presets/highway/service.json +++ b/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", diff --git a/data/presets/highway/speed_camera.json b/data/presets/highway/speed_camera.json index 1fe0ce57..6853739d 100644 --- a/data/presets/highway/speed_camera.json +++ b/data/presets/highway/speed_camera.json @@ -7,7 +7,8 @@ "fields": [ "direction", "ref", - "maxspeed" + "maxspeed", + "maxspeed_mutcd" ], "tags": { "highway": "speed_camera" diff --git a/data/presets/highway/trunk.json b/data/presets/highway/trunk.json index 047f4dc1..912b4020 100644 --- a/data/presets/highway/trunk.json +++ b/data/presets/highway/trunk.json @@ -5,6 +5,7 @@ "ref_road_number", "oneway", "maxspeed", + "maxspeed_mutcd", "lanes", "surface", "structure", @@ -18,6 +19,7 @@ "lit", "maxheight", "maxspeed/advisory", + "maxspeed/advisory_mutcd", "maxweight_bridge", "minspeed", "not/name", diff --git a/data/presets/railway/construction.json b/data/presets/railway/construction.json index 1aca975e..f330a433 100644 --- a/data/presets/railway/construction.json +++ b/data/presets/railway/construction.json @@ -15,6 +15,7 @@ "highspeed", "incline", "maxspeed", + "maxspeed_mutcd", "service_rail", "usage_rail", "voltage_electrified" diff --git a/data/presets/railway/funicular.json b/data/presets/railway/funicular.json index 4add2fac..3cda97b7 100644 --- a/data/presets/railway/funicular.json +++ b/data/presets/railway/funicular.json @@ -13,6 +13,7 @@ "electrified", "frequency_electrified", "maxspeed", + "maxspeed_mutcd", "voltage_electrified" ], "geometry": [ diff --git a/data/presets/railway/light_rail.json b/data/presets/railway/light_rail.json index ec5f6336..66b67ab9 100644 --- a/data/presets/railway/light_rail.json +++ b/data/presets/railway/light_rail.json @@ -14,6 +14,7 @@ "frequency_electrified", "incline", "maxspeed", + "maxspeed_mutcd", "voltage_electrified" ], "geometry": [ diff --git a/data/presets/traffic_sign/maxspeed.json b/data/presets/traffic_sign/maxspeed.json index b5179284..b6b1f431 100644 --- a/data/presets/traffic_sign/maxspeed.json +++ b/data/presets/traffic_sign/maxspeed.json @@ -2,7 +2,8 @@ "icon": "maki-square-stroked", "fields": [ "{traffic_sign}", - "maxspeed" + "maxspeed", + "maxspeed_mutcd" ], "geometry": [ "point", diff --git a/data/presets/type/enforcement/maxspeed.json b/data/presets/type/enforcement/maxspeed.json index fe41fd48..5a69c870 100644 --- a/data/presets/type/enforcement/maxspeed.json +++ b/data/presets/type/enforcement/maxspeed.json @@ -1,7 +1,8 @@ { "icon": "iD-relation", "fields": [ - "maxspeed" + "maxspeed", + "maxspeed_mutcd" ], "geometry": [ "relation" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 7047386d..cfad7550 100644 --- a/interim/source_strings.yaml +++ b/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