switch to regional presets instead of regional fields

also limit to ramps of type motorway, trunk and primary.
2026-03-19 17:33:40 +00:00 · 2022-01-04 12:21:11 +01:00
parent 8b60bddd17
commit 8c59cdac6e
29 changed files with 305 additions and 68 deletions
--- a/data/fields/maxspeed/advisory_mutcd.json
+++ b/data/fields/maxspeed/advisory_mutcd.json
@@ -1,9 +0,0 @@
-{
-    "key": "maxspeed:advisory",
-    "type": "roadspeed",
-    "label": "Advisory Speed Limit",
-    "placeholder": "40, 50, 60...",
-    "locationSet": {
-        "exclude": ["ca", "us"]
-    }
-}
--- a/data/fields/maxspeed_mutcd.json
+++ b/data/fields/maxspeed_mutcd.json
@@ -1,9 +0,0 @@
-{
-    "key": "maxspeed",
-    "type": "roadspeed",
-    "label": "Speed Limit",
-    "placeholder": "40, 50, 60...",
-    "locationSet": {
-        "include": ["ca", "us"]
-    }
-}
--- a/data/presets/golf/cartpath.json
+++ b/data/presets/golf/cartpath.json
@@ -2,8 +2,7 @@
    "icon": "temaki-golf_cart",
    "fields": [
        "{golf/path}",
-        "maxspeed",
-        "maxspeed_mutcd"
+        "maxspeed"
    ],
    "geometry": [
        "line"
--- a/data/presets/highway/cycleway.json
+++ b/data/presets/highway/cycleway.json
@@ -14,7 +14,6 @@
        "dog",
        "lit",
        "maxspeed",
-        "maxspeed_mutcd",
        "maxweight_bridge",
        "not/name",
        "smoothness",
--- a/data/presets/highway/living_street.json
+++ b/data/presets/highway/living_street.json
@@ -4,7 +4,6 @@
        "name",
        "oneway",
        "maxspeed",
-        "maxspeed_mutcd",
        "lanes",
        "surface",
        "structure",
--- a/data/presets/highway/motorway.json
+++ b/data/presets/highway/motorway.json
@@ -5,7 +5,6 @@
        "ref_road_number",
        "oneway_yes",
        "maxspeed",
-        "maxspeed_mutcd",
        "lanes",
        "surface",
        "structure",
@@ -19,7 +18,6 @@
        "lit",
        "maxheight",
        "maxspeed/advisory",
-        "maxspeed/advisory_mutcd",
        "maxweight_bridge",
        "minspeed",
        "not/name",
--- a/data/presets/highway/motorway_link-US-CA.json
+++ b/data/presets/highway/motorway_link-US-CA.json
@@ -0,0 +1,48 @@
+{
+    "name": "Motorway Link",
+    "icon": "iD-highway-motorway-link",
+    "fields": [
+        "destination_oneway",
+        "destination/ref_oneway",
+        "junction/ref_oneway",
+        "oneway",
+        "maxspeed/advisory",
+        "lanes",
+        "surface",
+        "structure",
+        "access"
+    ],
+    "moreFields": [
+        "charge_toll",
+        "covered",
+        "destination/symbol_oneway",
+        "incline",
+        "junction_line",
+        "lit",
+        "maxheight",
+        "maxspeed",
+        "maxweight_bridge",
+        "name",
+        "ref_road_number",
+        "smoothness",
+        "toll",
+        "width"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "motorway_link"
+    },
+    "terms": [
+        "exit",
+        "ramp",
+        "road",
+        "street",
+        "on ramp",
+        "off ramp"
+    ],
+    "locationSet": {
+        "include": ["ca", "us"]
+    }
+}
--- a/data/presets/highway/motorway_link.json
+++ b/data/presets/highway/motorway_link.json
@@ -1,4 +1,5 @@
 {
+    "name": "Motorway Link",
    "icon": "iD-highway-motorway-link",
    "fields": [
        "destination_oneway",
@@ -6,7 +7,6 @@
        "junction/ref_oneway",
        "oneway",
        "maxspeed",
-        "maxspeed/advisory_mutcd",
        "lanes",
        "surface",
        "structure",
@@ -20,7 +20,6 @@
        "junction_line",
        "lit",
        "maxheight",
-        "maxspeed_mutcd",
        "maxspeed/advisory",
        "maxweight_bridge",
        "name",
@@ -43,5 +42,7 @@
        "on ramp",
        "off ramp"
    ],
-    "name": "Motorway Link"
+    "locationSet": {
+        "exclude": ["ca", "us"]
+    }
 }
--- a/data/presets/highway/primary.json
+++ b/data/presets/highway/primary.json
@@ -4,7 +4,6 @@
        "name",
        "oneway",
        "maxspeed",
-        "maxspeed_mutcd",
        "lanes",
        "surface",
        "structure",
@@ -21,7 +20,6 @@
        "lit",
        "maxheight",
        "maxspeed/advisory",
-        "maxspeed/advisory_mutcd",
        "maxweight_bridge",
        "not/name",
        "oneway/bicycle",
--- a/data/presets/highway/primary_link-US-CA.json
+++ b/data/presets/highway/primary_link-US-CA.json
@@ -0,0 +1,51 @@
+{
+    "name": "Primary Link",
+    "icon": "iD-highway-primary-link",
+    "fields": [
+        "destination_oneway",
+        "destination/ref_oneway",
+        "oneway",
+        "maxspeed/advisory",
+        "lanes",
+        "surface",
+        "structure",
+        "access"
+    ],
+    "moreFields": [
+        "charge_toll",
+        "covered",
+        "cycleway",
+        "destination/symbol_oneway",
+        "flood_prone",
+        "incline",
+        "junction_line",
+        "junction/ref_oneway",
+        "lit",
+        "maxheight",
+        "maxspeed",
+        "maxweight_bridge",
+        "name",
+        "oneway/bicycle",
+        "ref_road_number",
+        "smoothness",
+        "toll",
+        "trolley_wire",
+        "width"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "primary_link"
+    },
+    "terms": [
+        "on ramp",
+        "off ramp",
+        "ramp",
+        "road",
+        "street"
+    ],
+    "locationSet": {
+        "include": ["ca", "us"]
+    }
+}
--- a/data/presets/highway/primary_link.json
+++ b/data/presets/highway/primary_link.json
@@ -1,11 +1,11 @@
 {
+    "name": "Primary Link",
    "icon": "iD-highway-primary-link",
    "fields": [
        "destination_oneway",
        "destination/ref_oneway",
        "oneway",
        "maxspeed",
-        "maxspeed/advisory_mutcd",
        "lanes",
        "surface",
        "structure",
@@ -22,7 +22,6 @@
        "junction/ref_oneway",
        "lit",
        "maxheight",
-        "maxspeed_mutcd",
        "maxspeed/advisory",
        "maxweight_bridge",
        "name",
@@ -46,5 +45,7 @@
        "road",
        "street"
    ],
-    "name": "Primary Link"
+    "locationSet": {
+        "exclude": ["ca", "us"]
+    }
 }
--- a/data/presets/highway/residential.json
+++ b/data/presets/highway/residential.json
@@ -4,7 +4,6 @@
        "name",
        "oneway",
        "maxspeed",
-        "maxspeed_mutcd",
        "lanes",
        "surface",
        "structure",
@@ -19,7 +18,6 @@
        "lit",
        "maxheight",
        "maxspeed/advisory",
-        "maxspeed/advisory_mutcd",
        "maxweight_bridge",
        "not/name",
        "oneway/bicycle",
--- a/data/presets/highway/secondary_link.json
+++ b/data/presets/highway/secondary_link.json
@@ -1,4 +1,5 @@
 {
+    "name": "Secondary Link",
    "icon": "iD-highway-secondary-link",
    "fields": [
        "{highway/primary_link}"
@@ -18,6 +19,5 @@
        "ramp",
        "road",
        "street"
-    ],
-    "name": "Secondary Link"
+    ]
 }
--- a/data/presets/highway/service.json
+++ b/data/presets/highway/service.json
@@ -5,7 +5,6 @@
        "service",
        "oneway",
        "maxspeed",
-        "maxspeed_mutcd",
        "surface",
        "structure",
        "access"
@@ -18,7 +17,6 @@
        "lit",
        "maxheight",
        "maxspeed/advisory",
-        "maxspeed/advisory_mutcd",
        "maxweight_bridge",
        "oneway/bicycle",
        "smoothness",
--- a/data/presets/highway/speed_camera.json
+++ b/data/presets/highway/speed_camera.json
@@ -7,8 +7,7 @@
    "fields": [
        "direction",
        "ref",
-        "maxspeed",
-        "maxspeed_mutcd"
+        "maxspeed"
    ],
    "tags": {
        "highway": "speed_camera"
--- a/data/presets/highway/tertiary_link.json
+++ b/data/presets/highway/tertiary_link.json
@@ -1,4 +1,5 @@
 {
+    "name": "Tertiary Link",
    "icon": "iD-highway-tertiary-link",
    "fields": [
        "{highway/primary_link}"
@@ -18,6 +19,5 @@
        "ramp",
        "road",
        "street"
-    ],
-    "name": "Tertiary Link"
+    ]
 }
--- a/data/presets/highway/trunk.json
+++ b/data/presets/highway/trunk.json
@@ -5,7 +5,6 @@
        "ref_road_number",
        "oneway",
        "maxspeed",
-        "maxspeed_mutcd",
        "lanes",
        "surface",
        "structure",
@@ -19,7 +18,6 @@
        "lit",
        "maxheight",
        "maxspeed/advisory",
-        "maxspeed/advisory_mutcd",
        "maxweight_bridge",
        "minspeed",
        "not/name",
--- a/data/presets/highway/trunk_link-US-CA.json
+++ b/data/presets/highway/trunk_link-US-CA.json
@@ -0,0 +1,26 @@
+{
+    "name": "Trunk Link",
+    "icon": "iD-highway-trunk-link",
+    "fields": [
+        "{highway/motorway_link-US-CA}"
+    ],
+    "moreFields": [
+        "{highway/motorway_link-US-CA}"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "trunk_link"
+    },
+    "terms": [
+        "on ramp",
+        "off ramp",
+        "ramp",
+        "road",
+        "street"
+    ],
+    "locationSet": {
+        "include": ["ca", "us"]
+    }
+}
--- a/data/presets/highway/trunk_link.json
+++ b/data/presets/highway/trunk_link.json
@@ -1,4 +1,5 @@
 {
+    "name": "Trunk Link",
    "icon": "iD-highway-trunk-link",
    "fields": [
        "{highway/motorway_link}"
@@ -19,5 +20,7 @@
        "road",
        "street"
    ],
-    "name": "Trunk Link"
+    "locationSet": {
+        "exclude": ["ca", "us"]
+    }
 }
--- a/data/presets/railway/construction.json
+++ b/data/presets/railway/construction.json
@@ -15,7 +15,6 @@
        "highspeed",
        "incline",
        "maxspeed",
-        "maxspeed_mutcd",
        "service_rail",
        "usage_rail",
        "voltage_electrified"
--- a/data/presets/railway/funicular.json
+++ b/data/presets/railway/funicular.json
@@ -13,7 +13,6 @@
        "electrified",
        "frequency_electrified",
        "maxspeed",
-        "maxspeed_mutcd",
        "voltage_electrified"
    ],
    "geometry": [
--- a/data/presets/railway/light_rail.json
+++ b/data/presets/railway/light_rail.json
@@ -14,7 +14,6 @@
        "frequency_electrified",
        "incline",
        "maxspeed",
-        "maxspeed_mutcd",
        "voltage_electrified"
    ],
    "geometry": [
--- a/data/presets/traffic_sign/maxspeed.json
+++ b/data/presets/traffic_sign/maxspeed.json
@@ -2,8 +2,7 @@
    "icon": "maki-square-stroked",
    "fields": [
        "{traffic_sign}",
-        "maxspeed",
-        "maxspeed_mutcd"
+        "maxspeed"
    ],
    "geometry": [
        "point",
--- a/data/presets/type/enforcement/maxspeed.json
+++ b/data/presets/type/enforcement/maxspeed.json
@@ -1,8 +1,7 @@
 {
    "icon": "iD-relation",
    "fields": [
-        "maxspeed",
-        "maxspeed_mutcd"
+        "maxspeed"
    ],
    "geometry": [
        "relation"