diff --git a/assets/ts/__v3api.d.ts b/assets/ts/__v3api.d.ts index f4c8a3e59f..5c8000635f 100644 --- a/assets/ts/__v3api.d.ts +++ b/assets/ts/__v3api.d.ts @@ -184,7 +184,7 @@ export interface Stop { "has_fare_machine?": boolean; fare_facilities: FareFacilityType[]; id: string; - "is_child?": boolean; + "child?": boolean; latitude: number; longitude: number; municipality: string | null; diff --git a/assets/ts/components/__tests__/StopCardTest.tsx b/assets/ts/components/__tests__/StopCardTest.tsx index 70c14a0267..644040d225 100644 --- a/assets/ts/components/__tests__/StopCardTest.tsx +++ b/assets/ts/components/__tests__/StopCardTest.tsx @@ -42,7 +42,7 @@ const stop: Stop = { "has_charlie_card_vendor?": false, "has_fare_machine?": false, id: "stop-id", - "is_child?": false, + "child?": false, latitude: 41.0, longitude: -71.0, municipality: "Boston", diff --git a/assets/ts/schedule/components/__schedule.d.ts b/assets/ts/schedule/components/__schedule.d.ts index 35f01bdbbb..26a223ac37 100644 --- a/assets/ts/schedule/components/__schedule.d.ts +++ b/assets/ts/schedule/components/__schedule.d.ts @@ -109,7 +109,7 @@ export interface RouteStop { route: RouteStopRoute | null; connections: RouteStopRoute[]; stop_features: string[]; - "is_terminus?": boolean; + "terminus?": boolean; "is_beginning?": boolean; closed_stop_info: ClosedStopInfo | null; } diff --git a/assets/ts/schedule/components/__tests__/test-data/lineDiagramData.json b/assets/ts/schedule/components/__tests__/test-data/lineDiagramData.json index 76acd1275a..f9fc606db9 100644 --- a/assets/ts/schedule/components/__tests__/test-data/lineDiagramData.json +++ b/assets/ts/schedule/components/__tests__/test-data/lineDiagramData.json @@ -18,7 +18,7 @@ "municipality": "Boston", "longitude": -71.033138, "latitude": 42.415684, - "is_child?": false, + "child?": false, "id": "5547", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -41,7 +41,7 @@ "custom_route?": false }, "name": "Elm St opp Haskell Ave", - "is_terminus?": true, + "terminus?": true, "is_beginning?": true, "id": "5547", "connections": [ @@ -77,7 +77,7 @@ "municipality": "Boston", "longitude": -71.033138, "latitude": 42.415684, - "is_child?": false, + "child?": false, "id": "5547", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -100,7 +100,7 @@ "custom_route?": false }, "name": "Elm St opp Haskell Ave", - "is_terminus?": true, + "terminus?": true, "is_beginning?": true, "id": "5547", "connections": [ @@ -136,7 +136,7 @@ "municipality": "Boston", "longitude": -71.033138, "latitude": 42.415684, - "is_child?": false, + "child?": false, "id": "5547", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -159,7 +159,7 @@ "custom_route?": false }, "name": "Elm St opp Haskell Ave", - "is_terminus?": true, + "terminus?": true, "is_beginning?": true, "id": "5547", "connections": [ diff --git a/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/outward.json b/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/outward.json index 57d5a9b6e0..bc97deb98e 100644 --- a/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/outward.json +++ b/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/outward.json @@ -7,7 +7,7 @@ "station_info": {}, "route": {}, "name": "Origin", - "is_terminus?": true, + "terminus?": true, "is_beginning?": true, "id": "tree-origin", "connections": [], @@ -23,7 +23,7 @@ "station_info": {}, "route": {}, "name": "Stop 0", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stop0", "connections": [], @@ -43,7 +43,7 @@ "station_info": {}, "route": {}, "name": "Stop 1", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stop1", "connections": [], @@ -63,7 +63,7 @@ "station_info": {}, "route": {}, "name": "Stop 2", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stop2", "connections": [], @@ -83,7 +83,7 @@ "station_info": {}, "route": {}, "name": "Stop 4", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stop4", "connections": [], @@ -103,7 +103,7 @@ "station_info": {}, "route": {}, "name": "Stop 3", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stop3", "connections": [], @@ -123,7 +123,7 @@ "station_info": {}, "route": {}, "name": "Branch Destination", - "is_terminus?": true, + "terminus?": true, "is_beginning?": false, "id": "tree-branch-destination", "connections": [], @@ -142,7 +142,7 @@ "station_info": {}, "route": {}, "name": "Twig Stop", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-twig-stop", "connections": [], @@ -161,7 +161,7 @@ "station_info": {}, "route": {}, "name": "Twig Destination", - "is_terminus?": true, + "terminus?": true, "is_beginning?": false, "id": "tree-twig-destination", "connections": [], @@ -177,7 +177,7 @@ "station_info": {}, "route": {}, "name": "Stop A", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stopA", "connections": [], @@ -193,7 +193,7 @@ "station_info": {}, "route": {}, "name": "Stop B", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stopB", "connections": [], @@ -209,7 +209,7 @@ "station_info": {}, "route": {}, "name": "Stop C", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "tree-stopC", "connections": [], @@ -225,7 +225,7 @@ "station_info": {}, "route": {}, "name": "Destination", - "is_terminus?": true, + "terminus?": true, "is_beginning?": false, "id": "tree-destination", "connections": [], diff --git a/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/simple.json b/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/simple.json index 412253819e..b7a32c418c 100644 --- a/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/simple.json +++ b/assets/ts/schedule/components/line-diagram/__tests__/lineDiagramData/simple.json @@ -15,7 +15,7 @@ "has_fare_machine?": false, "fare_facilities": [], "id": "line-origin", - "is_child?": false, + "child?": false, "latitude": 0, "longitude": 0, "municipality": null, @@ -27,7 +27,7 @@ }, "route": null, "name": "Origin", - "is_terminus?": true, + "terminus?": true, "is_beginning?": true, "id": "line-origin", "connections": [], @@ -66,7 +66,7 @@ "has_fare_machine?": false, "fare_facilities": [], "id": "line-stop1", - "is_child?": false, + "child?": false, "latitude": 0, "longitude": 0, "municipality": null, @@ -78,7 +78,7 @@ }, "route": null, "name": "Stop 1", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "line-stop1", "connections": [ @@ -131,7 +131,7 @@ "has_fare_machine?": false, "fare_facilities": [], "id": "line-stop2", - "is_child?": false, + "child?": false, "latitude": 0, "longitude": 0, "municipality": null, @@ -143,7 +143,7 @@ }, "route": null, "name": "Stop 2", - "is_terminus?": false, + "terminus?": false, "is_beginning?": false, "id": "line-stop2", "connections": [ @@ -196,7 +196,7 @@ "has_fare_machine?": false, "fare_facilities": [], "id": "line-destination", - "is_child?": false, + "child?": false, "latitude": 0, "longitude": 0, "municipality": null, @@ -208,7 +208,7 @@ }, "route": null, "name": "Destination", - "is_terminus?": true, + "terminus?": true, "is_beginning?": false, "id": "line-destination", "connections": [ diff --git a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfo.json b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfo.json index 53c812907e..c524dd3a4e 100644 --- a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfo.json +++ b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfo.json @@ -46,7 +46,7 @@ "name": "South Station", "longitude": -71.055242, "latitude": 42.352271, - "is_child?": false, + "child?": false, "id": "place-sstat", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -230,7 +230,7 @@ "name": "South Station", "longitude": -71.055242, "latitude": 42.352271, - "is_child?": false, + "child?": false, "id": "place-sstat", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -390,7 +390,7 @@ "name": "Back Bay", "longitude": -71.075727, "latitude": 42.34735, - "is_child?": false, + "child?": false, "id": "place-bbsta", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -505,7 +505,7 @@ "name": "Back Bay", "longitude": -71.075727, "latitude": 42.34735, - "is_child?": false, + "child?": false, "id": "place-bbsta", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -623,7 +623,7 @@ "name": "Ruggles", "longitude": -71.088961, "latitude": 42.336377, - "is_child?": false, + "child?": false, "id": "place-rugg", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -712,7 +712,7 @@ "name": "Ruggles", "longitude": -71.088961, "latitude": 42.336377, - "is_child?": false, + "child?": false, "id": "place-rugg", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -831,7 +831,7 @@ "name": "Route 128", "longitude": -71.147134, "latitude": 42.210308, - "is_child?": false, + "child?": false, "id": "place-NEC-2173", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -898,7 +898,7 @@ "name": "Route 128", "longitude": -71.147134, "latitude": 42.210308, - "is_child?": false, + "child?": false, "id": "place-NEC-2173", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -975,7 +975,7 @@ "name": "Canton Junction", "longitude": -71.15376, "latitude": 42.163204, - "is_child?": false, + "child?": false, "id": "place-NEC-2139", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1044,7 +1044,7 @@ "name": "Canton Junction", "longitude": -71.15376, "latitude": 42.163204, - "is_child?": false, + "child?": false, "id": "place-NEC-2139", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1113,7 +1113,7 @@ "name": "Sharon", "longitude": -71.184468, "latitude": 42.124553, - "is_child?": false, + "child?": false, "id": "place-NEC-2108", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1179,7 +1179,7 @@ "name": "Sharon", "longitude": -71.184468, "latitude": 42.124553, - "is_child?": false, + "child?": false, "id": "place-NEC-2108", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1248,7 +1248,7 @@ "name": "Mansfield", "longitude": -71.219917, "latitude": 42.032787, - "is_child?": false, + "child?": false, "id": "place-NEC-2040", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1314,7 +1314,7 @@ "name": "Mansfield", "longitude": -71.219917, "latitude": 42.032787, - "is_child?": false, + "child?": false, "id": "place-NEC-2040", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1383,7 +1383,7 @@ "name": "Attleboro", "longitude": -71.285094, "latitude": 41.940739, - "is_child?": false, + "child?": false, "id": "place-NEC-1969", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1449,7 +1449,7 @@ "name": "Attleboro", "longitude": -71.285094, "latitude": 41.940739, - "is_child?": false, + "child?": false, "id": "place-NEC-1969", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1521,7 +1521,7 @@ "name": "South Attleboro", "longitude": -71.354621, "latitude": 41.897943, - "is_child?": false, + "child?": false, "id": "place-NEC-1919", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1590,7 +1590,7 @@ "name": "South Attleboro", "longitude": -71.354621, "latitude": 41.897943, - "is_child?": false, + "child?": false, "id": "place-NEC-1919", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1655,7 +1655,7 @@ "name": "Providence", "longitude": -71.413301, "latitude": 41.829293, - "is_child?": false, + "child?": false, "id": "place-NEC-1851", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1717,7 +1717,7 @@ "name": "Providence", "longitude": -71.413301, "latitude": 41.829293, - "is_child?": false, + "child?": false, "id": "place-NEC-1851", "has_fare_machine?": false, "has_charlie_card_vendor?": false, diff --git a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfoWithDelays.json b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfoWithDelays.json index 9a51b1fcd3..f296166ca9 100644 --- a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfoWithDelays.json +++ b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/crTripInfoWithDelays.json @@ -109,7 +109,7 @@ "has_charlie_card_vendor?": true, "has_fare_machine?": true, "id": "place-bbsta", - "is_child?": false, + "child?": false, "latitude": 42.34735, "longitude": -71.075727, "municipality": "Boston", @@ -235,7 +235,7 @@ "has_charlie_card_vendor?": true, "has_fare_machine?": true, "id": "place-bbsta", - "is_child?": false, + "child?": false, "latitude": 42.34735, "longitude": -71.075727, "municipality": "Boston", @@ -334,7 +334,7 @@ "has_charlie_card_vendor?": true, "has_fare_machine?": true, "id": "place-rugg", - "is_child?": false, + "child?": false, "latitude": 42.336377, "longitude": -71.088961, "municipality": "Boston", @@ -434,7 +434,7 @@ "has_charlie_card_vendor?": true, "has_fare_machine?": true, "id": "place-rugg", - "is_child?": false, + "child?": false, "latitude": 42.336377, "longitude": -71.088961, "municipality": "Boston", @@ -479,7 +479,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-2108", - "is_child?": false, + "child?": false, "latitude": 42.124553, "longitude": -71.184468, "municipality": "Sharon", @@ -556,7 +556,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-2108", - "is_child?": false, + "child?": false, "latitude": 42.124553, "longitude": -71.184468, "municipality": "Sharon", @@ -632,7 +632,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-2040", - "is_child?": false, + "child?": false, "latitude": 42.032787, "longitude": -71.219917, "municipality": "Mansfield", @@ -709,7 +709,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-2040", - "is_child?": false, + "child?": false, "latitude": 42.032787, "longitude": -71.219917, "municipality": "Mansfield", @@ -785,7 +785,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-1969", - "is_child?": false, + "child?": false, "latitude": 41.940739, "longitude": -71.285094, "municipality": "Attleboro", @@ -862,7 +862,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-1969", - "is_child?": false, + "child?": false, "latitude": 41.940739, "longitude": -71.285094, "municipality": "Attleboro", @@ -938,7 +938,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-1919", - "is_child?": false, + "child?": false, "latitude": 41.897943, "longitude": -71.354621, "municipality": "Attleboro", @@ -1018,7 +1018,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-1919", - "is_child?": false, + "child?": false, "latitude": 41.897943, "longitude": -71.354621, "municipality": "Attleboro", @@ -1097,7 +1097,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-1851", - "is_child?": false, + "child?": false, "latitude": 41.829293, "longitude": -71.413301, "municipality": "Providence", @@ -1170,7 +1170,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "place-NEC-1851", - "is_child?": false, + "child?": false, "latitude": 41.829293, "longitude": -71.413301, "municipality": "Providence", diff --git a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfo.json b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfo.json index c28d079294..d7dbd40ec1 100644 --- a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfo.json +++ b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfo.json @@ -46,7 +46,7 @@ "name": "South Station", "longitude": -71.055242, "latitude": 42.352271, - "is_child?": false, + "child?": false, "id": "place-sstat", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -230,7 +230,7 @@ "name": "South Station", "longitude": -71.055242, "latitude": 42.352271, - "is_child?": false, + "child?": false, "id": "place-sstat", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -390,7 +390,7 @@ "name": "Courthouse", "longitude": -71.04685, "latitude": 42.35245, - "is_child?": false, + "child?": false, "id": "place-crtst", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -474,7 +474,7 @@ "name": "Courthouse", "longitude": -71.04685, "latitude": 42.35245, - "is_child?": false, + "child?": false, "id": "place-crtst", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -561,7 +561,7 @@ "name": "World Trade Center", "longitude": -71.04246, "latitude": 42.34863, - "is_child?": false, + "child?": false, "id": "place-wtcst", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -625,7 +625,7 @@ "name": "World Trade Center", "longitude": -71.04246, "latitude": 42.34863, - "is_child?": false, + "child?": false, "id": "place-wtcst", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -692,7 +692,7 @@ "name": "Silver Line Way", "longitude": -71.038385, "latitude": 42.347154, - "is_child?": false, + "child?": false, "id": "place-conrd", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -727,7 +727,7 @@ "name": "Silver Line Way", "longitude": -71.038385, "latitude": 42.347154, - "is_child?": false, + "child?": false, "id": "place-conrd", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -765,7 +765,7 @@ "name": "Northern Ave @ Harbor St", "longitude": -71.035301, "latitude": 42.346634, - "is_child?": false, + "child?": false, "id": "247", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -800,7 +800,7 @@ "name": "Northern Ave @ Harbor St", "longitude": -71.035301, "latitude": 42.346634, - "is_child?": false, + "child?": false, "id": "247", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -838,7 +838,7 @@ "name": "Northern Ave @ Tide St", "longitude": -71.031986, "latitude": 42.34508, - "is_child?": false, + "child?": false, "id": "30249", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -873,7 +873,7 @@ "name": "Northern Ave @ Tide St", "longitude": -71.031986, "latitude": 42.34508, - "is_child?": false, + "child?": false, "id": "30249", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -911,7 +911,7 @@ "name": "23 Drydock Ave", "longitude": -71.030268, "latitude": 42.344649, - "is_child?": false, + "child?": false, "id": "30250", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -946,7 +946,7 @@ "name": "23 Drydock Ave", "longitude": -71.030268, "latitude": 42.344649, - "is_child?": false, + "child?": false, "id": "30250", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -984,7 +984,7 @@ "name": "27 Drydock Ave", "longitude": -71.028419, "latitude": 42.344706, - "is_child?": false, + "child?": false, "id": "30251", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1019,7 +1019,7 @@ "name": "27 Drydock Ave", "longitude": -71.028419, "latitude": 42.344706, - "is_child?": false, + "child?": false, "id": "30251", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1057,7 +1057,7 @@ "name": "Drydock Ave @ Black Falcon Ave", "longitude": -71.027213, "latitude": 42.344232, - "is_child?": false, + "child?": false, "id": "31259", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1092,7 +1092,7 @@ "name": "Drydock Ave @ Black Falcon Ave", "longitude": -71.027213, "latitude": 42.344232, - "is_child?": false, + "child?": false, "id": "31259", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1130,7 +1130,7 @@ "name": "88 Black Falcon", "longitude": -71.026335, "latitude": 42.343753, - "is_child?": false, + "child?": false, "id": "31258", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1165,7 +1165,7 @@ "name": "88 Black Falcon", "longitude": -71.026335, "latitude": 42.343753, - "is_child?": false, + "child?": false, "id": "31258", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1203,7 +1203,7 @@ "name": "Drydock Ave @ Design Center Place", "longitude": -71.034476, "latitude": 42.3446, - "is_child?": false, + "child?": false, "id": "31255", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1238,7 +1238,7 @@ "name": "Drydock Ave @ Design Center Place", "longitude": -71.034476, "latitude": 42.3446, - "is_child?": false, + "child?": false, "id": "31255", "has_fare_machine?": false, "has_charlie_card_vendor?": false, diff --git a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfoWithPredictions.json b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfoWithPredictions.json index 7e020d1a58..ceeaec312a 100644 --- a/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfoWithPredictions.json +++ b/assets/ts/schedule/components/schedule-finder/__tests__/test-data/tripInfoWithPredictions.json @@ -72,7 +72,7 @@ "has_charlie_card_vendor?": true, "has_fare_machine?": true, "id": "place-forhl", - "is_child?": false, + "child?": false, "latitude": 42.300523, "longitude": -71.113686, "municipality": "Boston", @@ -195,7 +195,7 @@ "has_charlie_card_vendor?": true, "has_fare_machine?": true, "id": "place-forhl", - "is_child?": false, + "child?": false, "latitude": 42.300523, "longitude": -71.113686, "municipality": "Boston", @@ -274,7 +274,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "596", - "is_child?": false, + "child?": false, "latitude": 42.296502, "longitude": -71.117515, "municipality": "Boston", @@ -320,7 +320,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "596", - "is_child?": false, + "child?": false, "latitude": 42.296502, "longitude": -71.117515, "municipality": "Boston", @@ -365,7 +365,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "597", - "is_child?": false, + "child?": false, "latitude": 42.294377, "longitude": -71.11976, "municipality": "Boston", @@ -411,7 +411,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "597", - "is_child?": false, + "child?": false, "latitude": 42.294377, "longitude": -71.11976, "municipality": "Boston", @@ -456,7 +456,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "598", - "is_child?": false, + "child?": false, "latitude": 42.292893, "longitude": -71.121409, "municipality": "Boston", @@ -502,7 +502,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "598", - "is_child?": false, + "child?": false, "latitude": 42.292893, "longitude": -71.121409, "municipality": "Boston", @@ -547,7 +547,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "599", - "is_child?": false, + "child?": false, "latitude": 42.29162, "longitude": -71.122671, "municipality": "Boston", @@ -593,7 +593,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "599", - "is_child?": false, + "child?": false, "latitude": 42.29162, "longitude": -71.122671, "municipality": "Boston", @@ -638,7 +638,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "600", - "is_child?": false, + "child?": false, "latitude": 42.290289, "longitude": -71.124116, "municipality": "Boston", @@ -684,7 +684,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "600", - "is_child?": false, + "child?": false, "latitude": 42.290289, "longitude": -71.124116, "municipality": "Boston", @@ -729,7 +729,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "601", - "is_child?": false, + "child?": false, "latitude": 42.288805, "longitude": -71.125748, "municipality": "Boston", @@ -775,7 +775,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "601", - "is_child?": false, + "child?": false, "latitude": 42.288805, "longitude": -71.125748, "municipality": "Boston", @@ -820,7 +820,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "602", - "is_child?": false, + "child?": false, "latitude": 42.286987, "longitude": -71.128796, "municipality": "Boston", @@ -866,7 +866,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "602", - "is_child?": false, + "child?": false, "latitude": 42.286987, "longitude": -71.128796, "municipality": "Boston", @@ -911,7 +911,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "797", - "is_child?": false, + "child?": false, "latitude": 42.286845, "longitude": -71.130867, "municipality": "Boston", @@ -957,7 +957,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "797", - "is_child?": false, + "child?": false, "latitude": 42.286845, "longitude": -71.130867, "municipality": "Boston", @@ -1002,7 +1002,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "798", - "is_child?": false, + "child?": false, "latitude": 42.286415, "longitude": -71.132946, "municipality": "Boston", @@ -1048,7 +1048,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "798", - "is_child?": false, + "child?": false, "latitude": 42.286415, "longitude": -71.132946, "municipality": "Boston", @@ -1093,7 +1093,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "799", - "is_child?": false, + "child?": false, "latitude": 42.286334, "longitude": -71.135109, "municipality": "Boston", @@ -1139,7 +1139,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "799", - "is_child?": false, + "child?": false, "latitude": 42.286334, "longitude": -71.135109, "municipality": "Boston", @@ -1184,7 +1184,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "800", - "is_child?": false, + "child?": false, "latitude": 42.286307, "longitude": -71.137533, "municipality": "Boston", @@ -1230,7 +1230,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "800", - "is_child?": false, + "child?": false, "latitude": 42.286307, "longitude": -71.137533, "municipality": "Boston", @@ -1275,7 +1275,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "801", - "is_child?": false, + "child?": false, "latitude": 42.286195, "longitude": -71.139544, "municipality": "Boston", @@ -1321,7 +1321,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "801", - "is_child?": false, + "child?": false, "latitude": 42.286195, "longitude": -71.139544, "municipality": "Boston", @@ -1366,7 +1366,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "802", - "is_child?": false, + "child?": false, "latitude": 42.286108, "longitude": -71.143403, "municipality": "Boston", @@ -1412,7 +1412,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "802", - "is_child?": false, + "child?": false, "latitude": 42.286108, "longitude": -71.143403, "municipality": "Boston", @@ -1457,7 +1457,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "803", - "is_child?": false, + "child?": false, "latitude": 42.286077, "longitude": -71.145052, "municipality": "Boston", @@ -1503,7 +1503,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "803", - "is_child?": false, + "child?": false, "latitude": 42.286077, "longitude": -71.145052, "municipality": "Boston", @@ -1548,7 +1548,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "804", - "is_child?": false, + "child?": false, "latitude": 42.286034, "longitude": -71.147975, "municipality": "Boston", @@ -1594,7 +1594,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "804", - "is_child?": false, + "child?": false, "latitude": 42.286034, "longitude": -71.147975, "municipality": "Boston", @@ -1639,7 +1639,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "805", - "is_child?": false, + "child?": false, "latitude": 42.287193, "longitude": -71.14999, "municipality": "Boston", @@ -1685,7 +1685,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "805", - "is_child?": false, + "child?": false, "latitude": 42.287193, "longitude": -71.14999, "municipality": "Boston", @@ -1730,7 +1730,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "806", - "is_child?": false, + "child?": false, "latitude": 42.287564, "longitude": -71.152084, "municipality": "Boston", @@ -1776,7 +1776,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "806", - "is_child?": false, + "child?": false, "latitude": 42.287564, "longitude": -71.152084, "municipality": "Boston", @@ -1821,7 +1821,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "807", - "is_child?": false, + "child?": false, "latitude": 42.286119, "longitude": -71.155081, "municipality": "Boston", @@ -1867,7 +1867,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "807", - "is_child?": false, + "child?": false, "latitude": 42.286119, "longitude": -71.155081, "municipality": "Boston", @@ -1912,7 +1912,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "808", - "is_child?": false, + "child?": false, "latitude": 42.284044, "longitude": -71.156956, "municipality": "Boston", @@ -1958,7 +1958,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "808", - "is_child?": false, + "child?": false, "latitude": 42.284044, "longitude": -71.156956, "municipality": "Boston", @@ -2003,7 +2003,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "810", - "is_child?": false, + "child?": false, "latitude": 42.282033, "longitude": -71.157831, "municipality": "Boston", @@ -2049,7 +2049,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "810", - "is_child?": false, + "child?": false, "latitude": 42.282033, "longitude": -71.157831, "municipality": "Boston", @@ -2094,7 +2094,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "821", - "is_child?": false, + "child?": false, "latitude": 42.278989, "longitude": -71.159388, "municipality": "Boston", @@ -2140,7 +2140,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "821", - "is_child?": false, + "child?": false, "latitude": 42.278989, "longitude": -71.159388, "municipality": "Boston", @@ -2185,7 +2185,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "811", - "is_child?": false, + "child?": false, "latitude": 42.278583, "longitude": -71.159656, "municipality": "Boston", @@ -2231,7 +2231,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "811", - "is_child?": false, + "child?": false, "latitude": 42.278583, "longitude": -71.159656, "municipality": "Boston", @@ -2276,7 +2276,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "822", - "is_child?": false, + "child?": false, "latitude": 42.276476, "longitude": -71.160532, "municipality": "Boston", @@ -2322,7 +2322,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "822", - "is_child?": false, + "child?": false, "latitude": 42.276476, "longitude": -71.160532, "municipality": "Boston", @@ -2367,7 +2367,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "823", - "is_child?": false, + "child?": false, "latitude": 42.274491, "longitude": -71.160369, "municipality": "Boston", @@ -2413,7 +2413,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "823", - "is_child?": false, + "child?": false, "latitude": 42.274491, "longitude": -71.160369, "municipality": "Boston", @@ -2458,7 +2458,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "824", - "is_child?": false, + "child?": false, "latitude": 42.272959, "longitude": -71.16095, "municipality": "Boston", @@ -2504,7 +2504,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "824", - "is_child?": false, + "child?": false, "latitude": 42.272959, "longitude": -71.16095, "municipality": "Boston", @@ -2549,7 +2549,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "825", - "is_child?": false, + "child?": false, "latitude": 42.272129, "longitude": -71.161439, "municipality": "Boston", @@ -2595,7 +2595,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "825", - "is_child?": false, + "child?": false, "latitude": 42.272129, "longitude": -71.161439, "municipality": "Boston", @@ -2640,7 +2640,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "826", - "is_child?": false, + "child?": false, "latitude": 42.270125, "longitude": -71.16203, "municipality": "Boston", @@ -2686,7 +2686,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "826", - "is_child?": false, + "child?": false, "latitude": 42.270125, "longitude": -71.16203, "municipality": "Boston", @@ -2731,7 +2731,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10768", - "is_child?": false, + "child?": false, "latitude": 42.268863, "longitude": -71.161907, "municipality": "Boston", @@ -2777,7 +2777,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10768", - "is_child?": false, + "child?": false, "latitude": 42.268863, "longitude": -71.161907, "municipality": "Boston", @@ -2822,7 +2822,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "827", - "is_child?": false, + "child?": false, "latitude": 42.267596, "longitude": -71.162822, "municipality": "Boston", @@ -2868,7 +2868,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "827", - "is_child?": false, + "child?": false, "latitude": 42.267596, "longitude": -71.162822, "municipality": "Boston", @@ -2913,7 +2913,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "828", - "is_child?": false, + "child?": false, "latitude": 42.265745, "longitude": -71.162965, "municipality": "Boston", @@ -2959,7 +2959,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "828", - "is_child?": false, + "child?": false, "latitude": 42.265745, "longitude": -71.162965, "municipality": "Boston", @@ -3004,7 +3004,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "829", - "is_child?": false, + "child?": false, "latitude": 42.264749, "longitude": -71.162978, "municipality": "Boston", @@ -3050,7 +3050,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "829", - "is_child?": false, + "child?": false, "latitude": 42.264749, "longitude": -71.162978, "municipality": "Boston", @@ -3095,7 +3095,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "830", - "is_child?": false, + "child?": false, "latitude": 42.262782, "longitude": -71.163277, "municipality": "Boston", @@ -3141,7 +3141,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "830", - "is_child?": false, + "child?": false, "latitude": 42.262782, "longitude": -71.163277, "municipality": "Boston", @@ -3186,7 +3186,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "831", - "is_child?": false, + "child?": false, "latitude": 42.260813, "longitude": -71.159719, "municipality": "Boston", @@ -3232,7 +3232,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "831", - "is_child?": false, + "child?": false, "latitude": 42.260813, "longitude": -71.159719, "municipality": "Boston", @@ -3277,7 +3277,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "832", - "is_child?": false, + "child?": false, "latitude": 42.260206, "longitude": -71.158675, "municipality": "Boston", @@ -3323,7 +3323,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "832", - "is_child?": false, + "child?": false, "latitude": 42.260206, "longitude": -71.158675, "municipality": "Boston", @@ -3368,7 +3368,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "618", - "is_child?": false, + "child?": false, "latitude": 42.258554, "longitude": -71.160671, "municipality": "Boston", @@ -3414,7 +3414,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "618", - "is_child?": false, + "child?": false, "latitude": 42.258554, "longitude": -71.160671, "municipality": "Boston", @@ -3459,7 +3459,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10618", - "is_child?": false, + "child?": false, "latitude": 42.256411, "longitude": -71.163235, "municipality": "Dedham", @@ -3505,7 +3505,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10618", - "is_child?": false, + "child?": false, "latitude": 42.256411, "longitude": -71.163235, "municipality": "Dedham", @@ -3550,7 +3550,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10835", - "is_child?": false, + "child?": false, "latitude": 42.253283, "longitude": -71.170494, "municipality": "Dedham", @@ -3596,7 +3596,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10835", - "is_child?": false, + "child?": false, "latitude": 42.253283, "longitude": -71.170494, "municipality": "Dedham", @@ -3641,7 +3641,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10833", - "is_child?": false, + "child?": false, "latitude": 42.258725, "longitude": -71.16853, "municipality": "Dedham", @@ -3687,7 +3687,7 @@ "has_charlie_card_vendor?": false, "has_fare_machine?": false, "id": "10833", - "is_child?": false, + "child?": false, "latitude": 42.258725, "longitude": -71.16853, "municipality": "Dedham", diff --git a/assets/ts/schedule/components/schedule-finder/daily-schedule/__tests__/TableRowTest.tsx b/assets/ts/schedule/components/schedule-finder/daily-schedule/__tests__/TableRowTest.tsx index 1691f45a89..2fd74dd2f2 100644 --- a/assets/ts/schedule/components/schedule-finder/daily-schedule/__tests__/TableRowTest.tsx +++ b/assets/ts/schedule/components/schedule-finder/daily-schedule/__tests__/TableRowTest.tsx @@ -146,7 +146,7 @@ describe("parseResults", () => { municipality: "Cambridge", longitude: -71.103404, latitude: 42.365291, - "is_child?": false, + "child?": false, id: "102", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -194,7 +194,7 @@ describe("parseResults", () => { municipality: "Cambridge", longitude: -71.106017, latitude: 42.366837, - "is_child?": false, + "child?": false, id: "104", "has_fare_machine?": false, "has_charlie_card_vendor?": false, diff --git a/assets/ts/stop/__tests__/helpers.tsx b/assets/ts/stop/__tests__/helpers.tsx index 64cd322e2c..0400a3ba71 100644 --- a/assets/ts/stop/__tests__/helpers.tsx +++ b/assets/ts/stop/__tests__/helpers.tsx @@ -45,7 +45,7 @@ const defaultStop: Stop = { "has_fare_machine?": false, fare_facilities: [] as FareFacilityType[], id: "stopId", - "is_child?": false, + "child?": false, latitude: 42.460574, longitude: -71.457804, municipality: "Boston", diff --git a/assets/ts/stop/__tests__/stopData.json b/assets/ts/stop/__tests__/stopData.json index 88438e700a..e39238c02d 100644 --- a/assets/ts/stop/__tests__/stopData.json +++ b/assets/ts/stop/__tests__/stopData.json @@ -58,7 +58,7 @@ "municipality": "Boston", "longitude": -71.055242, "latitude": 42.352271, - "is_child?": false, + "child?": false, "id": "place-sstat", "has_fare_machine?": true, "has_charlie_card_vendor?": true, @@ -1100,7 +1100,7 @@ "name": "Massachusetts Ave @ Prospect St", "longitude": -71.103404, "latitude": 42.365291, - "is_child?": false, + "child?": false, "id": "102", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1144,7 +1144,7 @@ "name": "Magazine St @ Green St", "longitude": -71.104311, "latitude": 42.365114, - "is_child?": false, + "child?": false, "id": "1060", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -1248,7 +1248,7 @@ "name": "Green St @ Magazine St", "longitude": -71.104405, "latitude": 42.364935, - "is_child?": false, + "child?": false, "id": "1123", "has_fare_machine?": false, "has_charlie_card_vendor?": false, diff --git a/assets/ts/tnm/__tests__/MapWrapperTest.tsx b/assets/ts/tnm/__tests__/MapWrapperTest.tsx index 8d7f25cb18..003e3a8b3b 100644 --- a/assets/ts/tnm/__tests__/MapWrapperTest.tsx +++ b/assets/ts/tnm/__tests__/MapWrapperTest.tsx @@ -23,7 +23,7 @@ const stop: Stop = { "has_charlie_card_vendor?": false, "has_fare_machine?": false, id: "stop-id", - "is_child?": false, + "child?": false, latitude: 41.0, longitude: -71.0, municipality: "Boston", diff --git a/assets/ts/tnm/__tests__/MarkerWrapperTest.tsx b/assets/ts/tnm/__tests__/MarkerWrapperTest.tsx index 0a3b6ed347..109f690c75 100644 --- a/assets/ts/tnm/__tests__/MarkerWrapperTest.tsx +++ b/assets/ts/tnm/__tests__/MarkerWrapperTest.tsx @@ -92,7 +92,7 @@ const stop: Stop = { "has_charlie_card_vendor?": false, "has_fare_machine?": false, id: "stop-id", - "is_child?": false, + "child?": false, latitude: 41.0, longitude: -71.0, municipality: "Boston", diff --git a/assets/ts/tnm/__tests__/RouteCardTest.tsx b/assets/ts/tnm/__tests__/RouteCardTest.tsx index c4a0b9fdb7..f468ab7ea2 100644 --- a/assets/ts/tnm/__tests__/RouteCardTest.tsx +++ b/assets/ts/tnm/__tests__/RouteCardTest.tsx @@ -42,7 +42,7 @@ const stop: Stop = { "has_charlie_card_vendor?": false, "has_fare_machine?": false, id: "stop-id", - "is_child?": false, + "child?": false, latitude: 41.0, longitude: -71.0, municipality: "Boston", diff --git a/assets/ts/tnm/__tests__/RouteSidebarHeaderTest.tsx b/assets/ts/tnm/__tests__/RouteSidebarHeaderTest.tsx index 16872a2f02..5d7eb5ae0f 100644 --- a/assets/ts/tnm/__tests__/RouteSidebarHeaderTest.tsx +++ b/assets/ts/tnm/__tests__/RouteSidebarHeaderTest.tsx @@ -16,7 +16,7 @@ const stop: Stop = { "has_charlie_card_vendor?": false, "has_fare_machine?": false, id: "stop-id", - "is_child?": false, + "child?": false, latitude: 41.0, longitude: -71.0, municipality: "Boston", diff --git a/assets/ts/tnm/__tests__/RoutesSidebarTest.tsx b/assets/ts/tnm/__tests__/RoutesSidebarTest.tsx index efe0f28cf2..46532084e6 100644 --- a/assets/ts/tnm/__tests__/RoutesSidebarTest.tsx +++ b/assets/ts/tnm/__tests__/RoutesSidebarTest.tsx @@ -93,7 +93,7 @@ describe("filterData", () => { "has_charlie_card_vendor?": false, "has_fare_machine?": false, fare_facilities: [], - "is_child?": false, + "child?": false, latitude: 0, longitude: 0, municipality: "Malden", diff --git a/assets/ts/tnm/__tests__/TransitNearMeMapTest.tsx b/assets/ts/tnm/__tests__/TransitNearMeMapTest.tsx index 0822e93d6b..24e7c80981 100644 --- a/assets/ts/tnm/__tests__/TransitNearMeMapTest.tsx +++ b/assets/ts/tnm/__tests__/TransitNearMeMapTest.tsx @@ -129,7 +129,7 @@ const stop: Stop = { "has_charlie_card_vendor?": false, "has_fare_machine?": false, id: "stop-id", - "is_child?": false, + "child?": false, latitude: 41.0, longitude: -71.0, municipality: "Boston", diff --git a/assets/ts/tnm/__tests__/state.json b/assets/ts/tnm/__tests__/state.json index c1d383f953..6ac1232aed 100644 --- a/assets/ts/tnm/__tests__/state.json +++ b/assets/ts/tnm/__tests__/state.json @@ -18,7 +18,7 @@ "name": "14 Summer St", "longitude": -71.074151, "latitude": 42.427777, - "is_child?": false, + "child?": false, "id": "5070", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -71,7 +71,7 @@ "name": "Malden Center", "longitude": -71.07411, "latitude": 42.426632, - "is_child?": false, + "child?": false, "id": "place-mlmnl", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -130,7 +130,7 @@ "name": "Centre St @ Pearl St", "longitude": -71.07644, "latitude": 42.426682, - "is_child?": false, + "child?": false, "id": "5338", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -153,7 +153,7 @@ "name": "Pleasant St @ Elm St", "longitude": -71.076625, "latitude": 42.427157, - "is_child?": false, + "child?": false, "id": "5328", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -176,7 +176,7 @@ "name": "Florence St @ Washington St", "longitude": -71.071159, "latitude": 42.42865, - "is_child?": false, + "child?": false, "id": "5369", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -199,7 +199,7 @@ "name": "Summer St @ Lincoln St", "longitude": -71.074265, "latitude": 42.430107, - "is_child?": false, + "child?": false, "id": "5074", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -222,7 +222,7 @@ "name": "Centre St @ Jackson St", "longitude": -71.070337, "latitude": 42.425461, - "is_child?": false, + "child?": false, "id": "15431", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -245,7 +245,7 @@ "name": "Centre St @ Stop & Shop", "longitude": -71.070368, "latitude": 42.42525, - "is_child?": false, + "child?": false, "id": "5289", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -268,7 +268,7 @@ "name": "Commercial St @ Charles St", "longitude": -71.07471, "latitude": 42.423378, - "is_child?": false, + "child?": false, "id": "45417", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -313,7 +313,7 @@ "name": "Wyoming Hill", "longitude": -71.069379, "latitude": 42.451731, - "is_child?": false, + "child?": false, "id": "place-WR-0062", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -387,7 +387,7 @@ "name": "Wellington", "longitude": -71.077082, "latitude": 42.40237, - "is_child?": false, + "child?": false, "id": "place-welln", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -457,7 +457,7 @@ "name": "Melrose Cedar Park", "longitude": -71.069789, "latitude": 42.458768, - "is_child?": false, + "child?": false, "id": "place-WR-0067", "has_fare_machine?": false, "has_charlie_card_vendor?": false, diff --git a/assets/ts/tnm/__tests__/tnmData.json b/assets/ts/tnm/__tests__/tnmData.json index 81c407d294..2653418faf 100644 --- a/assets/ts/tnm/__tests__/tnmData.json +++ b/assets/ts/tnm/__tests__/tnmData.json @@ -11,7 +11,7 @@ "name": "14 Summer St", "longitude": -71.074151, "latitude": 42.427777, - "is_child?": false, + "child?": false, "id": "5070", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -60,7 +60,7 @@ "name": "Malden Center", "longitude": -71.07411, "latitude": 42.426632, - "is_child?": false, + "child?": false, "id": "place-mlmnl", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -119,7 +119,7 @@ "name": "Centre St @ Pearl St", "longitude": -71.07644, "latitude": 42.426682, - "is_child?": false, + "child?": false, "id": "5338", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -142,7 +142,7 @@ "name": "Pleasant St @ Elm St", "longitude": -71.076625, "latitude": 42.427157, - "is_child?": false, + "child?": false, "id": "5328", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -165,7 +165,7 @@ "name": "Florence St @ Washington St", "longitude": -71.071159, "latitude": 42.42865, - "is_child?": false, + "child?": false, "id": "5369", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -188,7 +188,7 @@ "name": "Summer St @ Lincoln St", "longitude": -71.074265, "latitude": 42.430107, - "is_child?": false, + "child?": false, "id": "5074", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -211,7 +211,7 @@ "name": "Centre St @ Jackson St", "longitude": -71.070337, "latitude": 42.425461, - "is_child?": false, + "child?": false, "id": "15431", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -234,7 +234,7 @@ "name": "Centre St @ Stop & Shop", "longitude": -71.070368, "latitude": 42.42525, - "is_child?": false, + "child?": false, "id": "5289", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -257,7 +257,7 @@ "name": "Commercial St @ Charles St", "longitude": -71.07471, "latitude": 42.423378, - "is_child?": false, + "child?": false, "id": "45417", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -302,7 +302,7 @@ "name": "Wyoming Hill", "longitude": -71.069379, "latitude": 42.451731, - "is_child?": false, + "child?": false, "id": "place-WR-0062", "has_fare_machine?": false, "has_charlie_card_vendor?": false, @@ -376,7 +376,7 @@ "name": "Wellington", "longitude": -71.077082, "latitude": 42.40237, - "is_child?": false, + "child?": false, "id": "place-welln", "has_fare_machine?": true, "has_charlie_card_vendor?": false, @@ -446,7 +446,7 @@ "name": "Melrose Cedar Park", "longitude": -71.069789, "latitude": 42.458768, - "is_child?": false, + "child?": false, "id": "place-WR-0067", "has_fare_machine?": false, "has_charlie_card_vendor?": false, diff --git a/lib/alerts/accessibility.ex b/lib/alerts/accessibility.ex index a958956a13..899a0d1fca 100644 --- a/lib/alerts/accessibility.ex +++ b/lib/alerts/accessibility.ex @@ -7,8 +7,8 @@ defmodule Alerts.Accessibility do def effect_types, do: [:elevator_closure, :escalator_closure, :access_issue] - @spec is_accessibility_alert?(Alert.t()) :: boolean() - def is_accessibility_alert?(%Alert{effect: effect}), do: effect in effect_types() + @spec accessibility?(Alert.t()) :: boolean() + def accessibility?(%Alert{effect: effect}), do: effect in effect_types() @spec effect_type_to_group_title(effect_type()) :: String.t() def effect_type_to_group_title(effect), do: Alert.human_effect(%Alert{effect: effect}) <> "s" diff --git a/lib/alerts/alert.ex b/lib/alerts/alert.ex index 6077a00314..461a1165a4 100644 --- a/lib/alerts/alert.ex +++ b/lib/alerts/alert.ex @@ -221,16 +221,16 @@ defmodule Alerts.Alert do def icon(%{priority: :high, effect: :shuttle}), do: :shuttle def icon(_), do: :alert - @spec is_high_severity_or_high_priority(t) :: boolean() - def is_high_severity_or_high_priority(%{priority: :high}), do: true + @spec high_severity_or_high_priority?(t) :: boolean() + def high_severity_or_high_priority?(%{priority: :high}), do: true - def is_high_severity_or_high_priority(%{severity: severity}) when severity >= 7, + def high_severity_or_high_priority?(%{severity: severity}) when severity >= 7, do: true - def is_high_severity_or_high_priority(_), do: false + def high_severity_or_high_priority?(_), do: false - @spec is_diversion(t) :: boolean() - def is_diversion(%{effect: effect}), + @spec diversion?(t) :: boolean() + def diversion?(%{effect: effect}), do: effect in @diversion_effects @spec municipality(t) :: String.t() | nil diff --git a/lib/alerts/priority.ex b/lib/alerts/priority.ex index e05b3a86a2..80821b6927 100644 --- a/lib/alerts/priority.ex +++ b/lib/alerts/priority.ex @@ -44,13 +44,13 @@ defmodule Alerts.Priority do date = Timex.to_date(time) if Enum.all?(active_period, &outside_date_range?(date, &1)) and - is_urgent_alert?(params, time) == false, + urgent?(params, time) == false, do: :low, else: :high end def priority(%{severity: severity} = params, time) when severity >= 7 do - if is_urgent_alert?(params, time), do: :high, else: :low + if urgent?(params, time), do: :high, else: :low end def priority(%{effect: :access_issue}, _) do @@ -86,39 +86,39 @@ defmodule Alerts.Priority do * now is within a week of start date * now is within one week of end date """ - @spec is_urgent_alert?(map, DateTime.t()) :: boolean - def is_urgent_alert?(%{severity: severity}, _) when severity < 7 do + @spec urgent?(map, DateTime.t()) :: boolean + def urgent?(%{severity: severity}, _) when severity < 7 do false end - def is_urgent_alert?(%{active_period: []}, _) do + def urgent?(%{active_period: []}, _) do true end - def is_urgent_alert?(%{updated_at: updated_at, active_period: active_period}, time) do - within_one_week(time, updated_at) || Enum.any?(active_period, &is_urgent_period?(&1, time)) + def urgent?(%{updated_at: updated_at, active_period: active_period}, time) do + within_one_week(time, updated_at) || Enum.any?(active_period, &urgent_period?(&1, time)) end - def is_urgent_alert?(_, _) do + def urgent?(_, _) do false end - @spec is_urgent_period?({DateTime.t() | nil, DateTime.t() | nil}, DateTime.t()) :: boolean + @spec urgent_period?({DateTime.t() | nil, DateTime.t() | nil}, DateTime.t()) :: boolean - def is_urgent_period?({nil, nil}, %DateTime{}) do + def urgent_period?({nil, nil}, %DateTime{}) do true end - def is_urgent_period?({nil, %DateTime{} = until}, %DateTime{} = time) do + def urgent_period?({nil, %DateTime{} = until}, %DateTime{} = time) do within_one_week(until, time) end - def is_urgent_period?({%DateTime{} = from, nil}, %DateTime{} = time) do + def urgent_period?({%DateTime{} = from, nil}, %DateTime{} = time) do within_one_week(time, from) end - def is_urgent_period?({from, until}, time) do - is_urgent_period?({from, nil}, time) || is_urgent_period?({nil, until}, time) + def urgent_period?({from, until}, time) do + urgent_period?({from, nil}, time) || urgent_period?({nil, until}, time) end def within_one_week(time_1, time_2) do diff --git a/lib/algolia/stops.ex b/lib/algolia/stops.ex index 276153e2c9..762df64400 100644 --- a/lib/algolia/stops.ex +++ b/lib/algolia/stops.ex @@ -7,7 +7,7 @@ defmodule Algolia.Stops do @impl Algolia.Index def all do @repo.all - |> Enum.reject(& &1.is_child?) + |> Enum.reject(& &1.child?) end @impl Algolia.Index diff --git a/lib/cms/partial/paragraph/column_multi.ex b/lib/cms/partial/paragraph/column_multi.ex index 516ad9fac5..9619969e7f 100644 --- a/lib/cms/partial/paragraph/column_multi.ex +++ b/lib/cms/partial/paragraph/column_multi.ex @@ -32,9 +32,9 @@ defmodule CMS.Partial.Paragraph.ColumnMulti do @spec new(Keyword.t()) :: __MODULE__.t() def new(opts \\ []), do: struct(__MODULE__, opts) - @spec is_grouped?(__MODULE__.t()) :: boolean - def is_grouped?(%__MODULE__{display_options: "grouped"}), do: true - def is_grouped?(_), do: false + @spec grouped?(__MODULE__.t()) :: boolean + def grouped?(%__MODULE__{display_options: "grouped"}), do: true + def grouped?(_), do: false @spec includes?(__MODULE__.t(), atom) :: boolean def includes?(%__MODULE__{columns: columns}, type) do diff --git a/lib/cms/partial/paragraph/descriptive_link.ex b/lib/cms/partial/paragraph/descriptive_link.ex index c791b783f2..8fece02084 100644 --- a/lib/cms/partial/paragraph/descriptive_link.ex +++ b/lib/cms/partial/paragraph/descriptive_link.ex @@ -38,7 +38,7 @@ defmodule CMS.Partial.Paragraph.DescriptiveLink do } end - @spec is_alone?(__MODULE__.t()) :: boolean - def is_alone?(%__MODULE__{parent: "field_paragraphs"}), do: true - def is_alone?(%__MODULE__{}), do: false + @spec alone?(__MODULE__.t()) :: boolean + def alone?(%__MODULE__{parent: "field_paragraphs"}), do: true + def alone?(%__MODULE__{}), do: false end diff --git a/lib/dotcom/realtime_schedule.ex b/lib/dotcom/realtime_schedule.ex index fb7ecdc81c..32801df898 100644 --- a/lib/dotcom/realtime_schedule.ex +++ b/lib/dotcom/realtime_schedule.ex @@ -123,7 +123,7 @@ defmodule Dotcom.RealtimeSchedule do defp get_high_priority_alerts_for_route(route_id, now, alerts_fn) do [route_id] |> alerts_fn.(now) - |> Enum.filter(&Alerts.Alert.is_high_severity_or_high_priority(&1)) + |> Enum.filter(&Alerts.Alert.high_severity_or_high_priority?(&1)) |> json_safe_alerts(now) end diff --git a/lib/dotcom_web/channels/predictions_channel.ex b/lib/dotcom_web/channels/predictions_channel.ex index 8505e3db81..4d9eeb3a6c 100644 --- a/lib/dotcom_web/channels/predictions_channel.ex +++ b/lib/dotcom_web/channels/predictions_channel.ex @@ -49,7 +49,7 @@ defmodule DotcomWeb.PredictionsChannel do is_nil(prediction.trip) || is_skipped_or_cancelled?(prediction) || is_in_past?(prediction) || - is_at_terminal_stop?(prediction) + terminal_stop?(prediction) end) end @@ -60,10 +60,10 @@ defmodule DotcomWeb.PredictionsChannel do prediction.schedule_relationship in [:skipped, :cancelled] end - defp is_in_future?(%Prediction{time: %DateTime{} = dt}), + defp future?(%Prediction{time: %DateTime{} = dt}), do: Util.time_is_greater_or_equal?(dt, Util.now()) - defp is_in_future?(%Prediction{ + defp future?(%Prediction{ schedule_relationship: sr, stop_sequence: seq, time: nil, @@ -79,13 +79,13 @@ defmodule DotcomWeb.PredictionsChannel do end end - defp is_in_future?(_), do: false + defp future?(_), do: false # Keeping this style until we change all of these. # credo:disable-for-next-line Credo.Check.Readability.PredicateFunctionNames - defp is_in_past?(prediction), do: !is_in_future?(prediction) + defp is_in_past?(prediction), do: !future?(prediction) - defp is_at_terminal_stop?(%Prediction{ + defp terminal_stop?(%Prediction{ arrival_time: arrival, departure_time: departure, stop_sequence: seq, diff --git a/lib/dotcom_web/controllers/bus_stop_change_controller.ex b/lib/dotcom_web/controllers/bus_stop_change_controller.ex index 99a5dcea42..423043226c 100644 --- a/lib/dotcom_web/controllers/bus_stop_change_controller.ex +++ b/lib/dotcom_web/controllers/bus_stop_change_controller.ex @@ -45,7 +45,7 @@ defmodule DotcomWeb.BusStopChangeController do end defp assign_bus_stop_alerts(conn, alerts) do - assign(conn, :alerts, Enum.filter(alerts, &is_stop_move_or_closure?/1)) + assign(conn, :alerts, Enum.filter(alerts, &stop_move_or_closure?/1)) end # These are %HistoricalAlert{} structs that we store in AWS S3. @@ -61,7 +61,7 @@ defmodule DotcomWeb.BusStopChangeController do end) end - defp is_stop_move_or_closure?(%Alert{effect: effect}), + defp stop_move_or_closure?(%Alert{effect: effect}), do: effect in [:stop_closure, :stop_moved] # These are alerts exported from the Alerts UI application into diff --git a/lib/dotcom_web/controllers/schedule/line_controller.ex b/lib/dotcom_web/controllers/schedule/line_controller.ex index 0e5117addd..8483511dd2 100644 --- a/lib/dotcom_web/controllers/schedule/line_controller.ex +++ b/lib/dotcom_web/controllers/schedule/line_controller.ex @@ -143,7 +143,7 @@ defmodule DotcomWeb.ScheduleController.LineController do defp tag_default_service(services) do current_service_id = services - |> Enum.filter(&is_current_service?/1) + |> Enum.filter(¤t_service?/1) |> get_default_service(services) |> Map.get(:id, "") @@ -154,7 +154,7 @@ defmodule DotcomWeb.ScheduleController.LineController do # - within the :start_date and :end_date (REJECT otherwise) # - today NOT present in :removed_dates (REJECT if present) # - today IS present in :added_dates - defp is_current_service?(service) do + defp current_service?(service) do service_date_string = Date.to_iso8601(service.service_date) end_of_rating = Schedules.Repo.end_of_rating() diff --git a/lib/dotcom_web/controllers/schedule/trip_info.ex b/lib/dotcom_web/controllers/schedule/trip_info.ex index 309edbf747..d10001c3a5 100644 --- a/lib/dotcom_web/controllers/schedule/trip_info.ex +++ b/lib/dotcom_web/controllers/schedule/trip_info.ex @@ -123,14 +123,14 @@ defmodule DotcomWeb.ScheduleController.TripInfo do @spec do_current_trip([Journey.t()], DateTime.t()) :: String.t() | nil defp do_current_trip(times, now) do - case Enum.find(times, &is_trip_after_now?(&1, now)) do + case Enum.find(times, &after_now?(&1, now)) do nil -> nil time -> PredictedSchedule.trip(time.departure).id end end - @spec is_trip_after_now?(Journey.t(), DateTime.t()) :: boolean - defp is_trip_after_now?(%Journey{departure: departure}, now) do + @spec after_now?(Journey.t(), DateTime.t()) :: boolean + defp after_now?(%Journey{departure: departure}, now) do # returns true if the Journey has a trip that's departing in the future PredictedSchedule.map_optional(departure, [:prediction, :schedule], false, fn x -> if x.time && x.trip do diff --git a/lib/dotcom_web/controllers/trip_plan_controller.ex b/lib/dotcom_web/controllers/trip_plan_controller.ex index 3c17e87dcc..617edd3d0a 100644 --- a/lib/dotcom_web/controllers/trip_plan_controller.ex +++ b/lib/dotcom_web/controllers/trip_plan_controller.ex @@ -309,7 +309,7 @@ defmodule DotcomWeb.TripPlanController do destination_id = leg.to.stop_id fares = - if Leg.is_fare_complete_transit_leg?(leg) do + if Leg.fare_complete_transit_leg?(leg) do recommended_fare = OneWay.recommended_fare(route, trip, origin_id, destination_id) base_fare = OneWay.base_fare(route, trip, origin_id, destination_id) reduced_fare = OneWay.reduced_fare(route, trip, origin_id, destination_id) @@ -369,7 +369,7 @@ defmodule DotcomWeb.TripPlanController do to: %NamedPosition{stop_id: destination_id} } = leg ) do - if Leg.is_fare_complete_transit_leg?(leg) do + if Leg.fare_complete_transit_leg?(leg) do Month.base_pass(route_id, trip_id, origin_id, destination_id) else nil @@ -386,7 +386,7 @@ defmodule DotcomWeb.TripPlanController do to: %NamedPosition{stop_id: destination_id} } = leg ) do - if Leg.is_fare_complete_transit_leg?(leg) do + if Leg.fare_complete_transit_leg?(leg) do Month.recommended_pass(route_id, trip_id, origin_id, destination_id) else nil @@ -403,7 +403,7 @@ defmodule DotcomWeb.TripPlanController do to: %NamedPosition{stop_id: destination_id} } = leg ) do - if Leg.is_fare_complete_transit_leg?(leg) do + if Leg.fare_complete_transit_leg?(leg) do Month.reduced_pass(route_id, trip_id, origin_id, destination_id) else nil @@ -600,7 +600,7 @@ defmodule DotcomWeb.TripPlanController do if is_nil(highest_fare) do false else - Transfer.is_subway?(highest_fare.mode) + Transfer.subway?(highest_fare.mode) end end ) diff --git a/lib/dotcom_web/plugs/canonical_hostname.ex b/lib/dotcom_web/plugs/canonical_hostname.ex index 9f81179114..a12a71172a 100644 --- a/lib/dotcom_web/plugs/canonical_hostname.ex +++ b/lib/dotcom_web/plugs/canonical_hostname.ex @@ -23,7 +23,7 @@ defmodule DotcomWeb.Plugs.CanonicalHostname do def call(%Plug.Conn{host: requested_hostname} = conn, _) do canonical_hostname = System.get_env("HOST") || "localhost" - if requested_hostname == canonical_hostname or is_private_ip(requested_hostname) do + if requested_hostname == canonical_hostname or private_ip?(requested_hostname) do conn else rewritten_url = Plug.Conn.request_url(%Plug.Conn{conn | host: canonical_hostname}) @@ -36,7 +36,7 @@ defmodule DotcomWeb.Plugs.CanonicalHostname do end # The health checker uses a private IP for a hostname - defp is_private_ip(hostname) do + defp private_ip?(hostname) do case hostname |> String.to_charlist() |> :inet.parse_ipv4_address() do {:ok, {byte0, byte1, _, _}} -> byte0 == 10 or (byte0 == 172 and byte1 >= 16 and byte1 <= 31) or diff --git a/lib/dotcom_web/templates/cms/paragraph/_descriptive_link.html.eex b/lib/dotcom_web/templates/cms/paragraph/_descriptive_link.html.eex index 50a19d6c67..75eec53402 100644 --- a/lib/dotcom_web/templates/cms/paragraph/_descriptive_link.html.eex +++ b/lib/dotcom_web/templates/cms/paragraph/_descriptive_link.html.eex @@ -10,8 +10,8 @@ ] %> -<%= extend_width_if DescriptiveLink.is_alone?(@content), :cards do %> +<%= extend_width_if DescriptiveLink.alone?(@content), :cards do %> <%= link(content, to: if(@content.link, do: cms_static_page_path(@conn, @content.link.url), else: ""), class: "c-descriptive-link") %> -<% end %> \ No newline at end of file +<% end %> diff --git a/lib/dotcom_web/templates/cms/paragraph/_paragraph.html.eex b/lib/dotcom_web/templates/cms/paragraph/_paragraph.html.eex index 09dd6c33d4..0818086986 100644 --- a/lib/dotcom_web/templates/cms/paragraph/_paragraph.html.eex +++ b/lib/dotcom_web/templates/cms/paragraph/_paragraph.html.eex @@ -1,6 +1,6 @@ <% multi? = match?(%ColumnMulti{}, @paragraph) - grouped? = ColumnMulti.is_grouped?(@paragraph) + grouped? = ColumnMulti.grouped?(@paragraph) has_fares? = multi? && ColumnMulti.includes?(@paragraph, :fares) has_links? = multi? && ColumnMulti.includes?(@paragraph, :links) diff --git a/lib/dotcom_web/templates/event/_calendar.html.eex b/lib/dotcom_web/templates/event/_calendar.html.eex index 72483497aa..aabdd99c46 100644 --- a/lib/dotcom_web/templates/event/_calendar.html.eex +++ b/lib/dotcom_web/templates/event/_calendar.html.eex @@ -24,7 +24,7 @@ <% todays_events = Map.get(events_by_day, day.day) %> <%= if todays_events != nil do %> <%= for event <- todays_events do %> - <% event_ended = is_ended?(event) %> + <% event_ended = ended?(event) %>