diff --git a/data/fields/bridge/name.json b/data/fields/bridge/name.json new file mode 100644 index 000000000..4c76de20f --- /dev/null +++ b/data/fields/bridge/name.json @@ -0,0 +1,12 @@ +{ + "key": "bridge:name", + "type": "localized", + "label": "Bridge Name", + "reference": { + "key": "bridge" + }, + "prerequisiteTag": { + "key": "bridge", + "valueNot": "no" + } +} diff --git a/data/fields/structure_waterway.json b/data/fields/structure_waterway.json index d2ee7dd11..9b35ccfbd 100644 --- a/data/fields/structure_waterway.json +++ b/data/fields/structure_waterway.json @@ -1,13 +1,15 @@ { "type": "structureRadio", "keys": [ - "tunnel" + "tunnel", + "bridge" ], "label": "Structure", "placeholder": "Unknown", "strings": { "options": { - "tunnel": "Tunnel" + "tunnel": "Tunnel", + "bridge": "Bridge" } } } diff --git a/data/fields/tunnel/name.json b/data/fields/tunnel/name.json new file mode 100644 index 000000000..088bc5c84 --- /dev/null +++ b/data/fields/tunnel/name.json @@ -0,0 +1,8 @@ +{ + "key": "tunnel:name", + "type": "localized", + "label": "Tunnel Name", + "prerequisiteTag": { + "key": "tunnel" + } +} diff --git a/data/presets/highway/bridleway.json b/data/presets/highway/bridleway.json index d24cf38c4..d46fa2f3a 100644 --- a/data/presets/highway/bridleway.json +++ b/data/presets/highway/bridleway.json @@ -4,11 +4,13 @@ "surface", "width", "structure", + "tunnel/name", "access", "incline", "horse_scale" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "dog", diff --git a/data/presets/highway/busway.json b/data/presets/highway/busway.json index 4a8995355..c4415edc2 100644 --- a/data/presets/highway/busway.json +++ b/data/presets/highway/busway.json @@ -8,9 +8,11 @@ "surface", "operator", "structure", + "tunnel/name", "covered" ], "moreFields": [ + "bridge/name", "bridge/ref", "lit", "maxaxleload_bridge", diff --git a/data/presets/highway/construction.json b/data/presets/highway/construction.json index 97a85df94..6420fd590 100644 --- a/data/presets/highway/construction.json +++ b/data/presets/highway/construction.json @@ -8,9 +8,11 @@ "access", "oneway", "structure", + "tunnel/name", "note" ], "moreFields": [ + "bridge/name", "bridge/ref" ], "geometry": [ diff --git a/data/presets/highway/cycleway.json b/data/presets/highway/cycleway.json index a800ba1fc..7e2e70854 100644 --- a/data/presets/highway/cycleway.json +++ b/data/presets/highway/cycleway.json @@ -7,10 +7,12 @@ "smoothness", "width", "structure", + "tunnel/name", "access", "incline" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "dog", diff --git a/data/presets/highway/footway.json b/data/presets/highway/footway.json index 0d4b5d49a..454e6f7a0 100644 --- a/data/presets/highway/footway.json +++ b/data/presets/highway/footway.json @@ -5,10 +5,12 @@ "surface", "width", "structure", + "tunnel/name", "access", "incline" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "dog", diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json index de43f1d4a..6a6e443c5 100644 --- a/data/presets/highway/living_street.json +++ b/data/presets/highway/living_street.json @@ -7,9 +7,11 @@ "lanes", "surface", "structure", + "tunnel/name", "access" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "bicycle_road", diff --git a/data/presets/highway/motorway.json b/data/presets/highway/motorway.json index 8a7e52aa5..abb748439 100644 --- a/data/presets/highway/motorway.json +++ b/data/presets/highway/motorway.json @@ -8,9 +8,11 @@ "lanes", "surface", "structure", + "tunnel/name", "access" ], "moreFields": [ + "bridge/name", "bridge/ref", "charge_toll", "covered_no", diff --git a/data/presets/highway/motorway_link.json b/data/presets/highway/motorway_link.json index bf454b0de..2f551599f 100644 --- a/data/presets/highway/motorway_link.json +++ b/data/presets/highway/motorway_link.json @@ -10,9 +10,11 @@ "lanes", "surface", "structure", + "tunnel/name", "access" ], "moreFields": [ + "bridge/name", "bridge/ref", "charge_toll", "covered_no", diff --git a/data/presets/highway/path.json b/data/presets/highway/path.json index 580d1bac1..17a36d444 100644 --- a/data/presets/highway/path.json +++ b/data/presets/highway/path.json @@ -5,10 +5,12 @@ "surface", "width", "structure", + "tunnel/name", "access", "incline" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "dog", diff --git a/data/presets/highway/pedestrian_area.json b/data/presets/highway/pedestrian_area.json index 44b86017b..00245f6a5 100644 --- a/data/presets/highway/pedestrian_area.json +++ b/data/presets/highway/pedestrian_area.json @@ -9,6 +9,7 @@ "access" ], "moreFields": [ + "bridge/name", "bridge/ref" ], "geometry": [ diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json index 8e3daa6a5..fc11ede05 100644 --- a/data/presets/highway/primary.json +++ b/data/presets/highway/primary.json @@ -7,10 +7,12 @@ "lanes", "surface", "structure", + "tunnel/name", "ref_road_number", "access" ], "moreFields": [ + "bridge/name", "bridge/ref", "charge_toll", "covered_no", diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json index 82fbb450f..542e207d1 100644 --- a/data/presets/highway/primary_link.json +++ b/data/presets/highway/primary_link.json @@ -9,9 +9,11 @@ "lanes", "surface", "structure", + "tunnel/name", "access" ], "moreFields": [ + "bridge/name", "bridge/ref", "charge_toll", "covered_no", diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json index 0a9746fae..7c328dd2a 100644 --- a/data/presets/highway/residential.json +++ b/data/presets/highway/residential.json @@ -7,10 +7,12 @@ "lanes", "surface", "structure", + "tunnel/name", "access" ], "moreFields": [ "bridge/ref", + "bridge/name", "covered_no", "cycleway", "bicycle_road", diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json index a7f225f71..e9cfd4758 100644 --- a/data/presets/highway/service.json +++ b/data/presets/highway/service.json @@ -7,9 +7,11 @@ "maxspeed", "surface", "structure", + "tunnel/name", "access" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "flood_prone", diff --git a/data/presets/highway/service_area.json b/data/presets/highway/service_area.json index a18af8494..b3977a8d1 100644 --- a/data/presets/highway/service_area.json +++ b/data/presets/highway/service_area.json @@ -9,6 +9,7 @@ "access" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "flood_prone", diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index 97daf67df..bf9d118a8 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -6,11 +6,13 @@ "surface", "width", "structure", + "tunnel/name", "access", "incline", "smoothness" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "flood_prone", diff --git a/data/presets/highway/trunk.json b/data/presets/highway/trunk.json index c3fec98ef..635d73a32 100644 --- a/data/presets/highway/trunk.json +++ b/data/presets/highway/trunk.json @@ -9,10 +9,12 @@ "expressway-US", "surface", "structure", + "tunnel/name", "access" ], "moreFields": [ "bridge/ref", + "bridge/name", "charge_toll", "covered_no", "incline", diff --git a/data/presets/railway/construction.json b/data/presets/railway/construction.json index c66470178..759a1da49 100644 --- a/data/presets/railway/construction.json +++ b/data/presets/railway/construction.json @@ -6,10 +6,12 @@ "check_date", "note", "structure", + "tunnel/name", "gauge", "electrified" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "frequency_electrified", diff --git a/data/presets/railway/light_rail.json b/data/presets/railway/light_rail.json index 9d971b312..bcad47af4 100644 --- a/data/presets/railway/light_rail.json +++ b/data/presets/railway/light_rail.json @@ -4,12 +4,14 @@ "name", "operator", "structure", + "tunnel/name", "gauge", "electrified", "service_rail", "usage_rail" ], "moreFields": [ + "bridge/name", "bridge/ref", "covered_no", "frequency_electrified", diff --git a/data/presets/waterway/canal.json b/data/presets/waterway/canal.json index 24d498262..5a134d464 100644 --- a/data/presets/waterway/canal.json +++ b/data/presets/waterway/canal.json @@ -3,12 +3,14 @@ "fields": [ "name", "structure_waterway", + "tunnel/name", "width", "usage_waterway", "intermittent", "lock" ], "moreFields": [ + "bridge/name", "fishing", "gnis/feature_id-US", "salt",