viewers > stop viewer', () => {
afterEach(restoreDateNowBehavior)
diff --git a/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap b/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap
index 4bedf264f..36a8543f2 100644
--- a/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap
+++ b/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap
@@ -8,13 +8,13 @@ Object {
"debouncePlanTimeMs": 0,
"homeTimezone": "America/Los_Angeles",
"language": Object {},
- "operators": Array [],
"realtimeEffectsDisplayThreshold": 120,
"routingTypes": Array [],
"stopViewer": Object {
"numberOfDepartures": 3,
"timeRange": 345600,
},
+ "transitOperators": Array [],
},
"currentQuery": Object {
"bikeSpeed": 3.58,
diff --git a/__tests__/test-utils/fixtures/geocoding/arcgis/findAddressCandidates-response.json b/__tests__/test-utils/fixtures/geocoding/arcgis/findAddressCandidates-response.json
deleted file mode 100644
index 9c63ea07f..000000000
--- a/__tests__/test-utils/fixtures/geocoding/arcgis/findAddressCandidates-response.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "spatialReference": {
- "wkid": 4326,
- "latestWkid": 4326
- },
- "candidates": [
- {
- "address": "Mill End, Clavering, Saffron Walden, Essex, England",
- "location": {
- "x": 0.12961000000007061,
- "y": 51.973520000000065
- },
- "score": 87.5,
- "attributes": {
- "Loc_name": "World",
- "Status": "T",
- "Score": 87.5,
- "Match_addr": "Mill End, Clavering, Saffron Walden, Essex, England",
- "LongLabel": "Mill End, Clavering, Saffron Walden, Essex, England, GBR",
- "ShortLabel": "Mill End",
- "Addr_type": "Locality",
- "Type": "Village",
- "PlaceName": "Mill End",
- "Place_addr": "Clavering, Saffron Walden, Essex, England",
- "Phone": "",
- "URL": "",
- "Rank": 15,
- "AddBldg": "",
- "AddNum": "",
- "AddNumFrom": "",
- "AddNumTo": "",
- "AddRange": "",
- "Side": "",
- "StPreDir": "",
- "StPreType": "",
- "StName": "",
- "StType": "",
- "StDir": "",
- "BldgType": "",
- "BldgName": "",
- "LevelType": "",
- "LevelName": "",
- "UnitType": "",
- "UnitName": "",
- "SubAddr": "",
- "StAddr": "",
- "Block": "",
- "Sector": "",
- "Nbrhd": "Mill End",
- "District": "Clavering",
- "City": "Saffron Walden",
- "MetroArea": "",
- "Subregion": "Essex",
- "Region": "England",
- "RegionAbbr": "ENG",
- "Territory": "",
- "Zone": "",
- "Postal": "",
- "PostalExt": "",
- "Country": "GBR",
- "LangCode": "ENG",
- "Distance": 0,
- "X": 0.12961000000007061,
- "Y": 51.973520000000065,
- "DisplayX": 0.12961000000007061,
- "DisplayY": 51.973520000000065,
- "Xmin": 0.11961000000007062,
- "Xmax": 0.13961000000007062,
- "Ymin": 51.963520000000067,
- "Ymax": 51.983520000000063,
- "ExInfo": ""
- },
- "extent": {
- "xmin": 0.11961000000007062,
- "ymin": 51.963520000000067,
- "xmax": 0.13961000000007062,
- "ymax": 51.983520000000063
- }
- },
- {
- "address": "Mill End, Hambleden, Henley-on-Thames, Oxfordshire, England",
- "location": {
- "x": -0.86689999999993006,
- "y": 51.558340000000044
- },
- "score": 87.5,
- "attributes": {
- "Loc_name": "World",
- "Status": "T",
- "Score": 87.5,
- "Match_addr": "Mill End, Hambleden, Henley-on-Thames, Oxfordshire, England",
- "LongLabel": "Mill End, Hambleden, Henley-on-Thames, Oxfordshire, England, GBR",
- "ShortLabel": "Mill End",
- "Addr_type": "Locality",
- "Type": "Village",
- "PlaceName": "Mill End",
- "Place_addr": "Hambleden, Henley-on-Thames, Oxfordshire, England",
- "Phone": "",
- "URL": "",
- "Rank": 15,
- "AddBldg": "",
- "AddNum": "",
- "AddNumFrom": "",
- "AddNumTo": "",
- "AddRange": "",
- "Side": "",
- "StPreDir": "",
- "StPreType": "",
- "StName": "",
- "StType": "",
- "StDir": "",
- "BldgType": "",
- "BldgName": "",
- "LevelType": "",
- "LevelName": "",
- "UnitType": "",
- "UnitName": "",
- "SubAddr": "",
- "StAddr": "",
- "Block": "",
- "Sector": "",
- "Nbrhd": "Mill End",
- "District": "Hambleden",
- "City": "Henley-on-Thames",
- "MetroArea": "",
- "Subregion": "Oxfordshire",
- "Region": "England",
- "RegionAbbr": "ENG",
- "Territory": "",
- "Zone": "",
- "Postal": "",
- "PostalExt": "",
- "Country": "GBR",
- "LangCode": "ENG",
- "Distance": 0,
- "X": -0.86689999999993006,
- "Y": 51.558340000000044,
- "DisplayX": -0.86689999999993006,
- "DisplayY": 51.558340000000044,
- "Xmin": -0.87689999999993007,
- "Xmax": -0.85689999999993005,
- "Ymin": 51.548340000000046,
- "Ymax": 51.568340000000042,
- "ExInfo": ""
- },
- "extent": {
- "xmin": -0.87689999999993007,
- "ymin": 51.548340000000046,
- "xmax": -0.85689999999993005,
- "ymax": 51.568340000000042
- }
- }
- ]
-}
diff --git a/__tests__/test-utils/fixtures/geocoding/arcgis/reverseGeocode-response.json b/__tests__/test-utils/fixtures/geocoding/arcgis/reverseGeocode-response.json
deleted file mode 100644
index 2b73a1e4c..000000000
--- a/__tests__/test-utils/fixtures/geocoding/arcgis/reverseGeocode-response.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "address": {
- "Match_addr": "SW Naito Pkwy, Portland, Oregon, 97204",
- "LongLabel": "SW Naito Pkwy, Portland, OR, 97204, USA",
- "ShortLabel": "SW Naito Pkwy",
- "Addr_type": "StreetName",
- "Type": "",
- "PlaceName": "",
- "AddNum": "",
- "Address": "SW Naito Pkwy",
- "Block": "",
- "Sector": "",
- "Neighborhood": "Downtown",
- "District": "",
- "City": "Portland",
- "MetroArea": "Portland-Vancouver Metro Area",
- "Subregion": "Multnomah County",
- "Region": "Oregon",
- "Territory": "",
- "Postal": "97204",
- "PostalExt": "",
- "CountryCode": "USA"
- },
- "location": {
- "x": -122.67320084756255,
- "y": 45.516175523600715,
- "spatialReference": {
- "wkid": 4326,
- "latestWkid": 4326
- }
- }
-}
diff --git a/__tests__/test-utils/fixtures/geocoding/arcgis/suggest-response.json b/__tests__/test-utils/fixtures/geocoding/arcgis/suggest-response.json
deleted file mode 100644
index 61c72abaf..000000000
--- a/__tests__/test-utils/fixtures/geocoding/arcgis/suggest-response.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "suggestions": [
- {
- "text": "Mill Ends City Park, Portland, OR, USA",
- "magicKey": "dHA9MCNsb2M9ODU3OTE0NyNsbmc9MzMjcGw9MzI4OTA3MSNsYnM9MTQ6MjAwNTI3NTc=",
- "isCollection": false
- },
- {
- "text": "Mill End Sports & Social, Penn Road, Mill End, Rickmansworth, Hertfordshire, England, WD3 8, GBR",
- "magicKey": "dHA9MCNsb2M9OTY5Mzc0MiNsbmc9MzMjcGw9NTA4NTQ2NiNsYnM9MTQ6MjAwNTI3NTI=",
- "isCollection": false
- }
- ]
-}
diff --git a/__tests__/test-utils/fixtures/geocoding/pelias/autocomplete-response.json b/__tests__/test-utils/fixtures/geocoding/pelias/autocomplete-response.json
deleted file mode 100644
index ea9758c84..000000000
--- a/__tests__/test-utils/fixtures/geocoding/pelias/autocomplete-response.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "geocoding": {
- "version": "0.2",
- "attribution": "http://lb-st-mapgeo.tri-met.org:4000/attribution",
- "query": {
- "text": "Mill Ends",
- "parser": "addressit",
- "parsed_text": {},
- "tokens": [
- "Mill",
- "Ends"
- ],
- "size": 10,
- "private": false,
- "focus.point.lat": 45.52,
- "focus.point.lon": -122.67,
- "lang": {
- "name": "English",
- "iso6391": "en",
- "iso6393": "eng",
- "defaulted": true
- }
- },
- "warnings": [
- "Invalid Parameter: api_key"
- ],
- "engine": {
- "name": "Pelias",
- "author": "Mapzen",
- "version": "1.0"
- },
- "timestamp": 1563948844191
- },
- "type": "FeatureCollection",
- "features": [{
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [
- -122.673377,
- 45.516278
- ]
- },
- "properties": {
- "id": "node/4243944023",
- "gid": "openstreetmap:venue:node/4243944023",
- "layer": "venue",
- "source": "openstreetmap",
- "source_id": "node/4243944023",
- "name": "Mill Ends Park",
- "distance": 0.491,
- "accuracy": "point",
- "country": "United States",
- "country_gid": "whosonfirst:country:85633793",
- "country_a": "USA",
- "region": "Oregon",
- "region_gid": "whosonfirst:region:85688513",
- "region_a": "OR",
- "county": "Multnomah County",
- "county_gid": "whosonfirst:county:102081631",
- "county_a": "MU",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "label": "Mill Ends Park, Portland, OR, USA"
- }
- }],
- "bbox": [
- -122.673377,
- 45.516278,
- -122.673377,
- 45.516278
- ]
-}
diff --git a/__tests__/test-utils/fixtures/geocoding/pelias/reverse-response.json b/__tests__/test-utils/fixtures/geocoding/pelias/reverse-response.json
deleted file mode 100644
index 0516458c4..000000000
--- a/__tests__/test-utils/fixtures/geocoding/pelias/reverse-response.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
- "geocoding": {
- "version": "0.2",
- "attribution": "http://lb-st-mapgeo.tri-met.org:4000/attribution",
- "query": {
- "size": 10,
- "private": false,
- "point.lat": 45.516198,
- "point.lon": -122.67324,
- "boundary.circle.lat": 45.516198,
- "boundary.circle.lon": -122.67324,
- "lang": {
- "name": "English",
- "iso6391": "en",
- "iso6393": "eng",
- "defaulted": true
- },
- "querySize": 20
- },
- "warnings": [
- "Invalid Parameter: api_key"
- ],
- "engine": {
- "name": "Pelias",
- "author": "Mapzen",
- "version": "1.0"
- },
- "timestamp": 1563949092620
- },
- "type": "FeatureCollection",
- "features": [{
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [
- -122.673245,
- 45.516201
- ]
- },
- "properties": {
- "id": "way/156366633",
- "gid": "openstreetmap:venue:way/156366633",
- "layer": "venue",
- "source": "openstreetmap",
- "source_id": "way/156366633",
- "name": "Mill Ends Park",
- "confidence": 0.9,
- "distance": 0.001,
- "accuracy": "point",
- "country": "United States",
- "country_gid": "whosonfirst:country:85633793",
- "country_a": "USA",
- "region": "Oregon",
- "region_gid": "whosonfirst:region:85688513",
- "region_a": "OR",
- "county": "Multnomah County",
- "county_gid": "whosonfirst:county:102081631",
- "county_a": "MU",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "label": "Mill Ends Park, Portland, OR, USA"
- },
- "bbox": [
- -122.6732557,
- 45.5161964,
- -122.673234,
- 45.5162067
- ]
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [
- -122.673609,
- 45.516337
- ]
- },
- "properties": {
- "id": "us/or/portland_metro:bd3f9863242e4ec7",
- "gid": "openaddresses:address:us/or/portland_metro:bd3f9863242e4ec7",
- "layer": "address",
- "source": "openaddresses",
- "source_id": "us/or/portland_metro:bd3f9863242e4ec7",
- "name": "833 SW Naito Pkwy",
- "housenumber": "833",
- "street": "SW Naito Pkwy",
- "postalcode": "97204",
- "confidence": 0.8,
- "distance": 0.033,
- "accuracy": "point",
- "country": "United States",
- "country_gid": "whosonfirst:country:85633793",
- "country_a": "USA",
- "region": "Oregon",
- "region_gid": "whosonfirst:region:85688513",
- "region_a": "OR",
- "county": "Multnomah County",
- "county_gid": "whosonfirst:county:102081631",
- "county_a": "MU",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "label": "833 SW Naito Pkwy, Portland, OR, USA"
- }
- }
- ],
- "bbox": [
- -122.673883,
- 45.5161964,
- -122.673234,
- 45.516689
- ]
-}
diff --git a/__tests__/test-utils/fixtures/geocoding/pelias/search-response.json b/__tests__/test-utils/fixtures/geocoding/pelias/search-response.json
deleted file mode 100644
index 61e6407a6..000000000
--- a/__tests__/test-utils/fixtures/geocoding/pelias/search-response.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "geocoding": {
- "version": "0.2",
- "attribution": "http://lb-st-mapgeo.tri-met.org:4000/attribution",
- "query": {
- "text": "Mill Ends",
- "size": 10,
- "private": false,
- "focus.point.lat": 45.52,
- "focus.point.lon": -122.67,
- "lang": {
- "name": "English",
- "iso6391": "en",
- "iso6393": "eng",
- "defaulted": true
- },
- "querySize": 20,
- "parser": "addressit",
- "parsed_text": {}
- },
- "warnings": [
- "Invalid Parameter: api_key"
- ],
- "engine": {
- "name": "Pelias",
- "author": "Mapzen",
- "version": "1.0"
- },
- "timestamp": 1563949031708
- },
- "type": "FeatureCollection",
- "features": [{
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [
- -122.673377,
- 45.516278
- ]
- },
- "properties": {
- "id": "node/4243944023",
- "gid": "openstreetmap:venue:node/4243944023",
- "layer": "venue",
- "source": "openstreetmap",
- "source_id": "node/4243944023",
- "name": "Mill Ends Park",
- "confidence": 1,
- "match_type": "exact",
- "distance": 0.491,
- "accuracy": "point",
- "country": "United States",
- "country_gid": "whosonfirst:country:85633793",
- "country_a": "USA",
- "region": "Oregon",
- "region_gid": "whosonfirst:region:85688513",
- "region_a": "OR",
- "county": "Multnomah County",
- "county_gid": "whosonfirst:county:102081631",
- "county_a": "MU",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "label": "Mill Ends Park, Portland, OR, USA"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [
- -122.681441,
- 45.511851
- ]
- },
- "properties": {
- "id": "2584-1136::TRIMET::station",
- "gid": "transit:station:2584-1136::TRIMET::station",
- "layer": "station",
- "source": "transit",
- "source_id": "2584-1136::trimet::station",
- "name": "PSU Urban Center/SW 5th & Mill MAX Station",
- "street": "SW 5th & Mill",
- "postalcode": "97201",
- "confidence": 1,
- "match_type": "exact",
- "distance": 1.273,
- "accuracy": "centroid",
- "country": "United States",
- "country_gid": "whosonfirst:country:85633793",
- "country_a": "USA",
- "region": "Oregon",
- "region_gid": "whosonfirst:region:85688513",
- "region_a": "OR",
- "county": "Multnomah County",
- "county_gid": "whosonfirst:county:102081631",
- "county_a": "MU",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "label": "PSU Urban Center/SW 5th & Mill MAX Station, Portland, OR, USA"
- }
- }
- ],
- "bbox": [
- -122.821522,
- 45.495264,
- -122.475528,
- 45.516278
- ]
-}
diff --git a/__tests__/util/__mocks__/itinerary.json b/__tests__/util/__mocks__/itinerary.json
deleted file mode 100644
index c00a605a4..000000000
--- a/__tests__/util/__mocks__/itinerary.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
- "route1": {
- "longName": "Across town",
- "mode": "BUS",
- "shortName": "10",
- "sortOrder": 10
- },
- "route2": {
- "longName": "Around town",
- "mode": "BUS",
- "shortName": "20",
- "sortOrder": 2
- },
- "route3": {
- "longName": "Around another town",
- "shortName": "3",
- "sortOrder": -999,
- "type": 3
- },
- "route4": {
- "longName": "Loop route",
- "mode": "BUS",
- "shortName": "2",
- "sortOrder": -999
- },
- "route5": {
- "longName": "A-line",
- "mode": "BUS",
- "shortName": "A",
- "sortOrder": -999
- },
- "route6": {
- "longName": "B-line",
- "mode": "BUS",
- "shortName": "B",
- "sortOrder": -999
- },
- "route7": {
- "longName": "A meandering route",
- "mode": "BUS",
- "sortOrder": -999
- },
- "route8": {
- "longName": "Zig-zagging route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2
- },
- "route9": {
- "longName": "Express route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2
- },
- "route10": {
- "longName": "Variation of express route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2
- },
- "route11": {
- "longName": "Local route",
- "mode": "BUS",
- "shortName": "6",
- "sortOrder": 2
- },
- "route12": {
- "longName": "Intercity Train",
- "mode": "RAIL",
- "shortName": "IC",
- "sortOrder": 2
- },
- "route13": {
- "longName": "Yellow line Subway",
- "mode": "SUBWAY",
- "shortName": "Yellow",
- "sortOrder": 2
- },
- "route14": {
- "longName": "Xpress route C",
- "mode": "BUS",
- "shortName": "30C",
- "sortOrder": 2
- },
- "route15": {
- "longName": "Express route X",
- "mode": "BUS",
- "shortName": "30X",
- "sortOrder": 2
- }
-}
diff --git a/__tests__/util/__snapshots__/geocoder.js.snap b/__tests__/util/__snapshots__/geocoder.js.snap
deleted file mode 100644
index 0ec26af09..000000000
--- a/__tests__/util/__snapshots__/geocoder.js.snap
+++ /dev/null
@@ -1,350 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`geocoder ARCGIS should get location from geocode feature 1`] = `
-Object {
- "lat": 51.973520000000065,
- "lon": 0.1296100000000706,
- "name": "Mill End, Clavering, Saffron Walden, Essex, England, GBR",
-}
-`;
-
-exports[`geocoder ARCGIS should make autocomplete query 1`] = `
-Object {
- "features": Array [
- Object {
- "isCollection": false,
- "magicKey": "dHA9MCNsb2M9ODU3OTE0NyNsbmc9MzMjcGw9MzI4OTA3MSNsYnM9MTQ6MjAwNTI3NTc=",
- "properties": Object {
- "label": "Mill Ends City Park, Portland, OR, USA",
- },
- "text": "Mill Ends City Park, Portland, OR, USA",
- },
- Object {
- "isCollection": false,
- "magicKey": "dHA9MCNsb2M9OTY5Mzc0MiNsbmc9MzMjcGw9NTA4NTQ2NiNsYnM9MTQ6MjAwNTI3NTI=",
- "properties": Object {
- "label": "Mill End Sports & Social, Penn Road, Mill End, Rickmansworth, Hertfordshire, England, WD3 8, GBR",
- },
- "text": "Mill End Sports & Social, Penn Road, Mill End, Rickmansworth, Hertfordshire, England, WD3 8, GBR",
- },
- ],
-}
-`;
-
-exports[`geocoder ARCGIS should make reverse query 1`] = `
-Object {
- "lat": 45.516198,
- "lon": -122.67324,
- "name": "SW Naito Pkwy, Portland, OR, 97204, USA",
-}
-`;
-
-exports[`geocoder ARCGIS should make search query 1`] = `
-Object {
- "features": Array [
- Object {
- "geometry": Object {
- "coordinates": Array [
- 0.1296100000000706,
- 51.973520000000065,
- ],
- "type": "point",
- },
- "properties": Object {
- "confidence": 0.875,
- "country": "GBR",
- "country_a": "GBR",
- "county": "Essex",
- "label": "Mill End, Clavering, Saffron Walden, Essex, England, GBR",
- "locality": "Saffron Walden",
- "name": "Mill End",
- "neighbourhood": "Mill End",
- "region": "England",
- "resultId": undefined,
- },
- "type": "feature",
- },
- Object {
- "geometry": Object {
- "coordinates": Array [
- -0.8668999999999301,
- 51.558340000000044,
- ],
- "type": "point",
- },
- "properties": Object {
- "confidence": 0.875,
- "country": "GBR",
- "country_a": "GBR",
- "county": "Oxfordshire",
- "label": "Mill End, Hambleden, Henley-on-Thames, Oxfordshire, England, GBR",
- "locality": "Henley-on-Thames",
- "name": "Mill End",
- "neighbourhood": "Mill End",
- "region": "England",
- "resultId": undefined,
- },
- "type": "feature",
- },
- ],
- "query": Object {
- "text": "Mill Ends",
- },
-}
-`;
-
-exports[`geocoder NoApiGeocoder should get location from geocode feature 1`] = `
-Object {
- "lat": 45.516198,
- "lon": -122.67324,
- "name": "45.516198, -122.673240",
-}
-`;
-
-exports[`geocoder NoApiGeocoder should make autocomplete query 1`] = `
-Object {
- "features": Array [],
-}
-`;
-
-exports[`geocoder NoApiGeocoder should make reverse query 1`] = `
-Object {
- "lat": 45.5162,
- "lon": -122.67324,
- "name": "45.5162, -122.67324",
-}
-`;
-
-exports[`geocoder NoApiGeocoder should make search query 1`] = `
-Object {
- "features": Array [],
-}
-`;
-
-exports[`geocoder PELIAS should get location from geocode feature 1`] = `
-Object {
- "lat": 45.516198,
- "lon": -122.67324,
- "name": "Mill Ends Park, Portland, OR, USA",
-}
-`;
-
-exports[`geocoder PELIAS should make autocomplete query 1`] = `
-Object {
- "bbox": Array [
- -122.673377,
- 45.516278,
- -122.673377,
- 45.516278,
- ],
- "features": Array [
- Object {
- "geometry": Object {
- "coordinates": Array [
- -122.673377,
- 45.516278,
- ],
- "type": "Point",
- },
- "properties": Object {
- "accuracy": "point",
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "country": "United States",
- "country_a": "USA",
- "country_gid": "whosonfirst:country:85633793",
- "county": "Multnomah County",
- "county_a": "MU",
- "county_gid": "whosonfirst:county:102081631",
- "distance": 0.491,
- "gid": "openstreetmap:venue:node/4243944023",
- "id": "node/4243944023",
- "label": "Mill Ends Park, Portland, OR, USA",
- "layer": "venue",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "name": "Mill Ends Park",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "region": "Oregon",
- "region_a": "OR",
- "region_gid": "whosonfirst:region:85688513",
- "source": "openstreetmap",
- "source_id": "node/4243944023",
- },
- "type": "Feature",
- },
- ],
- "geocoding": Object {
- "attribution": "http://lb-st-mapgeo.tri-met.org:4000/attribution",
- "engine": Object {
- "author": "Mapzen",
- "name": "Pelias",
- "version": "1.0",
- },
- "query": Object {
- "focus.point.lat": 45.52,
- "focus.point.lon": -122.67,
- "lang": Object {
- "defaulted": true,
- "iso6391": "en",
- "iso6393": "eng",
- "name": "English",
- },
- "parsed_text": Object {},
- "parser": "addressit",
- "private": false,
- "size": 10,
- "text": "Mill Ends",
- "tokens": Array [
- "Mill",
- "Ends",
- ],
- },
- "timestamp": 1563948844191,
- "version": "0.2",
- "warnings": Array [
- "Invalid Parameter: api_key",
- ],
- },
- "isomorphicMapzenSearchQuery": Object {
- "api_key": "dummy-mapzen-key",
- "text": "Mill Ends",
- },
- "type": "FeatureCollection",
-}
-`;
-
-exports[`geocoder PELIAS should make reverse query 1`] = `
-Object {
- "lat": 45.516198,
- "lon": -122.67324,
- "name": "Mill Ends Park, Portland, OR, USA",
-}
-`;
-
-exports[`geocoder PELIAS should make search query 1`] = `
-Object {
- "bbox": Array [
- -122.821522,
- 45.495264,
- -122.475528,
- 45.516278,
- ],
- "features": Array [
- Object {
- "geometry": Object {
- "coordinates": Array [
- -122.673377,
- 45.516278,
- ],
- "type": "Point",
- },
- "properties": Object {
- "accuracy": "point",
- "confidence": 1,
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "country": "United States",
- "country_a": "USA",
- "country_gid": "whosonfirst:country:85633793",
- "county": "Multnomah County",
- "county_a": "MU",
- "county_gid": "whosonfirst:county:102081631",
- "distance": 0.491,
- "gid": "openstreetmap:venue:node/4243944023",
- "id": "node/4243944023",
- "label": "Mill Ends Park, Portland, OR, USA",
- "layer": "venue",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "match_type": "exact",
- "name": "Mill Ends Park",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "region": "Oregon",
- "region_a": "OR",
- "region_gid": "whosonfirst:region:85688513",
- "source": "openstreetmap",
- "source_id": "node/4243944023",
- },
- "type": "Feature",
- },
- Object {
- "geometry": Object {
- "coordinates": Array [
- -122.681441,
- 45.511851,
- ],
- "type": "Point",
- },
- "properties": Object {
- "accuracy": "centroid",
- "confidence": 1,
- "continent": "North America",
- "continent_gid": "whosonfirst:continent:102191575",
- "country": "United States",
- "country_a": "USA",
- "country_gid": "whosonfirst:country:85633793",
- "county": "Multnomah County",
- "county_a": "MU",
- "county_gid": "whosonfirst:county:102081631",
- "distance": 1.273,
- "gid": "transit:station:2584-1136::TRIMET::station",
- "id": "2584-1136::TRIMET::station",
- "label": "PSU Urban Center/SW 5th & Mill MAX Station, Portland, OR, USA",
- "layer": "station",
- "locality": "Portland",
- "locality_gid": "whosonfirst:locality:101715829",
- "match_type": "exact",
- "name": "PSU Urban Center/SW 5th & Mill MAX Station",
- "neighbourhood": "Downtown",
- "neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
- "postalcode": "97201",
- "region": "Oregon",
- "region_a": "OR",
- "region_gid": "whosonfirst:region:85688513",
- "source": "transit",
- "source_id": "2584-1136::trimet::station",
- "street": "SW 5th & Mill",
- },
- "type": "Feature",
- },
- ],
- "geocoding": Object {
- "attribution": "http://lb-st-mapgeo.tri-met.org:4000/attribution",
- "engine": Object {
- "author": "Mapzen",
- "name": "Pelias",
- "version": "1.0",
- },
- "query": Object {
- "focus.point.lat": 45.52,
- "focus.point.lon": -122.67,
- "lang": Object {
- "defaulted": true,
- "iso6391": "en",
- "iso6393": "eng",
- "name": "English",
- },
- "parsed_text": Object {},
- "parser": "addressit",
- "private": false,
- "querySize": 20,
- "size": 10,
- "text": "Mill Ends",
- },
- "timestamp": 1563949031708,
- "version": "0.2",
- "warnings": Array [
- "Invalid Parameter: api_key",
- ],
- },
- "isomorphicMapzenSearchQuery": Object {
- "api_key": "dummy-mapzen-key",
- "size": 10,
- "text": "Mill Ends",
- },
- "type": "FeatureCollection",
-}
-`;
diff --git a/__tests__/util/__snapshots__/itinerary.js.snap b/__tests__/util/__snapshots__/itinerary.js.snap
deleted file mode 100644
index 6887d0868..000000000
--- a/__tests__/util/__snapshots__/itinerary.js.snap
+++ /dev/null
@@ -1,247 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`util > itinerary routeComparator should prioritize routes with integer shortNames over alphabetic shortNames 1`] = `
-Array [
- Object {
- "longName": "A-line",
- "mode": "BUS",
- "shortName": "A",
- "sortOrder": -999,
- },
- Object {
- "longName": "Loop route",
- "mode": "BUS",
- "shortName": "2",
- "sortOrder": -999,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should prioritize routes with shortNames over those with just longNames 1`] = `
-Array [
- Object {
- "longName": "B-line",
- "mode": "BUS",
- "shortName": "B",
- "sortOrder": -999,
- },
- Object {
- "longName": "A meandering route",
- "mode": "BUS",
- "sortOrder": -999,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should prioritize routes with valid sortOrder 1`] = `
-Array [
- Object {
- "longName": "Around town",
- "mode": "BUS",
- "shortName": "20",
- "sortOrder": 2,
- },
- Object {
- "longName": "Around another town",
- "shortName": "3",
- "sortOrder": -999,
- "type": 3,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should sort based off of route type 1`] = `
-Array [
- Object {
- "longName": "Yellow line Subway",
- "mode": "SUBWAY",
- "shortName": "Yellow",
- "sortOrder": 2,
- },
- Object {
- "longName": "Intercity Train",
- "mode": "RAIL",
- "shortName": "IC",
- "sortOrder": 2,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should sort routes based off of integer shortName 1`] = `
-Array [
- Object {
- "longName": "Loop route",
- "mode": "BUS",
- "shortName": "2",
- "sortOrder": -999,
- },
- Object {
- "longName": "Around another town",
- "shortName": "3",
- "sortOrder": -999,
- "type": 3,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should sort routes based off of longNames 1`] = `
-Array [
- Object {
- "longName": "Express route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2,
- },
- Object {
- "longName": "Variation of express route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should sort routes based off of shortNames 1`] = `
-Array [
- Object {
- "longName": "A-line",
- "mode": "BUS",
- "shortName": "A",
- "sortOrder": -999,
- },
- Object {
- "longName": "B-line",
- "mode": "BUS",
- "shortName": "B",
- "sortOrder": -999,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should sort routes based off of sortOrder 1`] = `
-Array [
- Object {
- "longName": "Around town",
- "mode": "BUS",
- "shortName": "20",
- "sortOrder": 2,
- },
- Object {
- "longName": "Across town",
- "mode": "BUS",
- "shortName": "10",
- "sortOrder": 10,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should sort routes on all of the criteria at once 1`] = `
-Array [
- Object {
- "longName": "Yellow line Subway",
- "mode": "SUBWAY",
- "shortName": "Yellow",
- "sortOrder": 2,
- },
- Object {
- "longName": "Intercity Train",
- "mode": "RAIL",
- "shortName": "IC",
- "sortOrder": 2,
- },
- Object {
- "longName": "Local route",
- "mode": "BUS",
- "shortName": "6",
- "sortOrder": 2,
- },
- Object {
- "longName": "Around town",
- "mode": "BUS",
- "shortName": "20",
- "sortOrder": 2,
- },
- Object {
- "longName": "Express route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2,
- },
- Object {
- "longName": "Variation of express route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2,
- },
- Object {
- "longName": "Zig-zagging route",
- "mode": "BUS",
- "shortName": "30",
- "sortOrder": 2,
- },
- Object {
- "longName": "Xpress route C",
- "mode": "BUS",
- "shortName": "30C",
- "sortOrder": 2,
- },
- Object {
- "longName": "Express route X",
- "mode": "BUS",
- "shortName": "30X",
- "sortOrder": 2,
- },
- Object {
- "longName": "Across town",
- "mode": "BUS",
- "shortName": "10",
- "sortOrder": 10,
- },
- Object {
- "longName": "A-line",
- "mode": "BUS",
- "shortName": "A",
- "sortOrder": -999,
- },
- Object {
- "longName": "B-line",
- "mode": "BUS",
- "shortName": "B",
- "sortOrder": -999,
- },
- Object {
- "longName": "Loop route",
- "mode": "BUS",
- "shortName": "2",
- "sortOrder": -999,
- },
- Object {
- "longName": "Around another town",
- "shortName": "3",
- "sortOrder": -999,
- "type": 3,
- },
- Object {
- "longName": "A meandering route",
- "mode": "BUS",
- "sortOrder": -999,
- },
-]
-`;
-
-exports[`util > itinerary routeComparator should sort routes with alphanumeric shortNames 1`] = `
-Array [
- Object {
- "longName": "Xpress route C",
- "mode": "BUS",
- "shortName": "30C",
- "sortOrder": 2,
- },
- Object {
- "longName": "Express route X",
- "mode": "BUS",
- "shortName": "30X",
- "sortOrder": 2,
- },
-]
-`;
diff --git a/__tests__/util/geocoder.js b/__tests__/util/geocoder.js
deleted file mode 100644
index ada6e8601..000000000
--- a/__tests__/util/geocoder.js
+++ /dev/null
@@ -1,188 +0,0 @@
-import nock from 'nock'
-
-import getGeocoder, { PeliasGeocoder } from '../../lib/util/geocoder'
-
-function mockResponsePath (geocoder, file) {
- return `__tests__/test-utils/fixtures/geocoding/${geocoder}/${file}`
-}
-
-describe('geocoder', () => {
- const geocoders = [
- {
- type: 'ARCGIS'
- }, {
- apiKey: 'dummy-mapzen-key',
- baseUrl: 'https://ws-st.trimet.org/pelias/v1',
- type: 'PELIAS'
- },
- // this entry represents no geocoder configuration. In this case it is
- // expected that the NoApiGeocoder will be used.
- undefined
- ]
-
- // nocks for ARCGIS
- const baseArcGisPath = '/arcgis/rest/services/World/GeocodeServer/'
- nock('https://geocode.arcgis.com')
- // autocomplete
- .get(`${baseArcGisPath}suggest`)
- .query(true)
- .replyWithFile(200, mockResponsePath('arcgis', 'suggest-response.json'))
- // reverse
- .get(`${baseArcGisPath}reverseGeocode`)
- .query(true)
- .replyWithFile(200, mockResponsePath('arcgis', 'reverseGeocode-response.json'))
- // search
- .get(`${baseArcGisPath}findAddressCandidates`)
- .query(true)
- .replyWithFile(200, mockResponsePath('arcgis', 'findAddressCandidates-response.json'))
- // a 2nd search for purposes of resolving getLocationFromGeocodedFeature test
- .get(`${baseArcGisPath}findAddressCandidates`)
- .query(true)
- .replyWithFile(200, mockResponsePath('arcgis', 'findAddressCandidates-response.json'))
-
- // nocks for PELIAS
- const basePeliasPath = '/pelias/v1/'
- nock('https://ws-st.trimet.org')
- // autocomplete
- .get(`${basePeliasPath}autocomplete`)
- .query(true)
- .replyWithFile(200, mockResponsePath('pelias', 'autocomplete-response.json'))
- // reverse
- .get(`${basePeliasPath}search`)
- .query(true)
- .replyWithFile(200, mockResponsePath('pelias', 'search-response.json'))
- // search
- .get(`${basePeliasPath}reverse`)
- .query(true)
- .replyWithFile(200, mockResponsePath('pelias', 'reverse-response.json'))
-
- geocoders.forEach(geocoder => {
- const geocoderType = geocoder
- ? geocoder.type
- : 'NoApiGeocoder'
- // the describe is in quotes to bypass a lint rule
- describe(`${geocoderType}`, () => {
- it('should make autocomplete query', async () => {
- const result = await getGeocoder(geocoder).autocomplete({ text: 'Mill Ends' })
- expect(result).toMatchSnapshot()
- })
-
- it('should make search query', async () => {
- const result = await getGeocoder(geocoder).search({ text: 'Mill Ends' })
- expect(result).toMatchSnapshot()
- })
-
- it('should make reverse query', async () => {
- const result = await getGeocoder(geocoder)
- .reverse({ point: { lat: 45.516198, lon: -122.673240 } })
- expect(result).toMatchSnapshot()
- })
-
- it('should get location from geocode feature', async () => {
- let mockFeature
- switch (geocoderType) {
- case 'ARCGIS':
- mockFeature = {
- magicKey: 'abcd',
- properties: {
- label: 'Mill Ends City Park, Portland, OR, USA'
- },
- text: 'Mill Ends City Park, Portland, OR, USA'
- }
- break
- case 'PELIAS':
- mockFeature = {
- geometry: {
- coordinates: [-122.673240, 45.516198],
- type: 'Point'
- },
- properties: {
- label: 'Mill Ends Park, Portland, OR, USA'
- }
- }
- break
- case 'NoApiGeocoder':
- mockFeature = {
- geometry: {
- coordinates: [-122.673240, 45.516198],
- type: 'Point'
- },
- properties: {
- label: '45.516198, -122.673240'
- }
- }
- break
- default:
- throw new Error(`no mock feature defined for geocoder type: ${geocoder.type}`)
- }
- const result = await getGeocoder(geocoder).getLocationFromGeocodedFeature(mockFeature)
- expect(result).toMatchSnapshot()
- })
-
- // geocoder-specific tests
- if (geocoderType === 'PELIAS') {
- const mockSources = 'gn,oa,osm,wof'
-
- // sources should not be sent unless they are explicitly defined in the
- // query. See https://github.com/ibi-group/trimet-mod-otp/issues/239
- it('should not send sources in autocomplete by default', () => {
- // create mock API to check query
- const mockPeliasAPI = {
- autocomplete: query => {
- expect(query.sources).not.toBe(expect.anything())
- return Promise.resolve()
- }
- }
- const pelias = new PeliasGeocoder(mockPeliasAPI, geocoder)
- pelias.autocomplete({ text: 'Mill Ends' })
- })
-
- // should send sources if they're defined in the config
- it('should send sources in autocomplete if defined in config', () => {
- // create mock API to check query
- const mockPeliasAPI = {
- autocomplete: query => {
- expect(query.sources).toBe(mockSources)
- return Promise.resolve()
- }
- }
- const pelias = new PeliasGeocoder(
- mockPeliasAPI,
- { ...geocoder, sources: mockSources }
- )
- pelias.autocomplete({ text: 'Mill Ends' })
- })
-
- // sources should not be sent unless they are explicitly defined in the
- // query. See https://github.com/ibi-group/trimet-mod-otp/issues/239
- it('should not send sources in search by default', () => {
- // create mock API to check query
- const mockPeliasAPI = {
- search: query => {
- expect(query.sources).not.toBe(expect.anything())
- return Promise.resolve()
- }
- }
- const pelias = new PeliasGeocoder(mockPeliasAPI, geocoder)
- pelias.search({ text: 'Mill Ends' })
- })
-
- // should send sources if they're defined in the config
- it('should send sources in search if defined in config', () => {
- // create mock API to check query
- const mockPeliasAPI = {
- search: query => {
- expect(query.sources).toBe(mockSources)
- return Promise.resolve()
- }
- }
- const pelias = new PeliasGeocoder(
- mockPeliasAPI,
- { ...geocoder, sources: mockSources }
- )
- pelias.search({ text: 'Mill Ends' })
- })
- }
- })
- })
-})
diff --git a/__tests__/util/itinerary.js b/__tests__/util/itinerary.js
deleted file mode 100644
index 74e5d5a56..000000000
--- a/__tests__/util/itinerary.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import {isTransit, routeComparator} from '../../lib/util/itinerary'
-
-const {
- route1,
- route2,
- route3,
- route4,
- route5,
- route6,
- route7,
- route8,
- route9,
- route10,
- route11,
- route12,
- route13,
- route14,
- route15
-} = require('./__mocks__/itinerary.json')
-
-function sortRoutes (...routes) {
- routes.sort(routeComparator)
- return routes
-}
-
-describe('util > itinerary', () => {
- it('isTransit should work', () => {
- expect(isTransit('CAR')).toBeFalsy()
- })
-
- describe('routeComparator', () => {
- it('should sort routes based off of sortOrder', () => {
- expect(sortRoutes(route1, route2)).toMatchSnapshot()
- })
-
- it('should prioritize routes with valid sortOrder', () => {
- expect(sortRoutes(route2, route3)).toMatchSnapshot()
- })
-
- it('should sort routes based off of integer shortName', () => {
- expect(sortRoutes(route3, route4)).toMatchSnapshot()
- })
-
- it('should prioritize routes with integer shortNames over alphabetic shortNames', () => {
- expect(sortRoutes(route4, route5)).toMatchSnapshot()
- })
-
- it('should sort routes based off of shortNames', () => {
- expect(sortRoutes(route5, route6)).toMatchSnapshot()
- })
-
- it('should sort routes with alphanumeric shortNames', () => {
- expect(sortRoutes(route14, route15)).toMatchSnapshot()
- })
-
- it('should prioritize routes with shortNames over those with just longNames', () => {
- expect(sortRoutes(route6, route7)).toMatchSnapshot()
- })
-
- it('should sort routes based off of longNames', () => {
- expect(sortRoutes(route9, route10)).toMatchSnapshot()
- })
-
- it('should sort routes on all of the criteria at once', () => {
- expect(sortRoutes(
- route1,
- route2,
- route3,
- route4,
- route5,
- route6,
- route7,
- route8,
- route9,
- route10,
- route11,
- route12,
- route13,
- route14,
- route15
- )).toMatchSnapshot()
- })
-
- it('should sort based off of route type', () => {
- expect(sortRoutes(route12, route13)).toMatchSnapshot()
- })
- })
-})
diff --git a/custom-icons.js b/custom-icons.js
new file mode 100644
index 000000000..dbd806f10
--- /dev/null
+++ b/custom-icons.js
@@ -0,0 +1,47 @@
+import {
+ ClassicBus,
+ ClassicGondola,
+ ClassicModeIcon,
+ Ferry,
+ LegIcon,
+ StandardGondola
+} from '@opentripplanner/icons'
+
+/**
+ * For more advanced users, you can replicate and customize components and
+ * observe the change in icons.
+ * - For LegIcon: https://github.com/opentripplanner/otp-ui/blob/master/packages/icons/src/trimet-leg-icon.js
+ * - For ModeIcon: https://github.com/opentripplanner/otp-ui/blob/master/packages/icons/src/trimet-mode-icon.js
+ * The example below shuffles some icons around from what you might normally
+ * expect for demonstration purposes.
+ */
+
+const CustomTransitIcon = Ferry
+const CustomRailIcon = ClassicGondola
+const CustomStreetcarIcon = StandardGondola
+const CustomBikeRentalIcon = ClassicBus
+
+export const CustomModeIcon = ({ mode, ...props }) => {
+ if (!mode) return null
+ switch (mode.toLowerCase()) {
+ // Place custom icons for each mode here.
+ case 'transit':
+ return
+ case 'rail':
+ return
+ default:
+ return
+ }
+}
+
+export const CustomLegIcon = ({ leg, ...props }) => {
+ if (
+ leg.routeLongName &&
+ leg.routeLongName.startsWith('MAX')
+ ) {
+ return
+ } else if (leg.rentedBike) {
+ return
+ }
+ return
+}
diff --git a/example.js b/example.js
index b29df8943..3d6530aa6 100644
--- a/example.js
+++ b/example.js
@@ -1,6 +1,7 @@
// import this polyfill in order to make webapp compatible with IE 11
import 'es6-math'
+import {ClassicLegIcon, ClassicModeIcon} from '@opentripplanner/icons'
import { createHashHistory } from 'history'
import { connectRouter, routerMiddleware } from 'connected-react-router'
import React, { Component } from 'react'
@@ -9,26 +10,35 @@ import { createStore, combineReducers, applyMiddleware, compose } from 'redux'
import { Provider } from 'react-redux'
import thunk from 'redux-thunk'
import createLogger from 'redux-logger'
-
// import Bootstrap Grid components for layout
import { Navbar, Grid, Row, Col } from 'react-bootstrap'
// import OTP-RR components
import {
- DefaultSearchForm,
- ErrorMessage,
+ DefaultMainPanel,
MobileMain,
- NarrativeRoutingResults,
ResponsiveWebapp,
Map,
- ViewerContainer,
AppMenu,
createOtpReducer
} from './lib'
-
// load the OTP configuration
import otpConfig from './config.yml'
+// Set useCustomIcons to true to override classic icons with the exports from
+// custom-icons.js
+const useCustomIcons = false
+
+// Define icon sets for modes.
+let MyLegIcon = ClassicLegIcon
+let MyModeIcon = ClassicModeIcon
+
+if (useCustomIcons) {
+ const CustomIcons = require('./custom-icons')
+ MyLegIcon = CustomIcons.CustomLegIcon
+ MyModeIcon = CustomIcons.CustomModeIcon
+}
+
// create an initial query for demo/testing purposes
const initialQuery = {
from: {
@@ -81,15 +91,8 @@ class OtpRRExample extends Component {
-
-
-
-
-
-
-
+
-
@@ -100,7 +103,12 @@ class OtpRRExample extends Component {
/** mobile view **/
const mobileView = (
- )} title={(OpenTripPlanner
)} />
+ }
+ title={OpenTripPlanner
}
+ />
)
/** the main webapp **/
@@ -108,6 +116,7 @@ class OtpRRExample extends Component {
)
}
diff --git a/lib/actions/api.js b/lib/actions/api.js
index 705822ecb..988e9900e 100644
--- a/lib/actions/api.js
+++ b/lib/actions/api.js
@@ -1,20 +1,22 @@
/* globals fetch */
import { push, replace } from 'connected-react-router'
+import haversine from 'haversine'
+import moment from 'moment'
import hash from 'object-hash'
+import coreUtils from '@opentripplanner/core-utils'
+import queryParams from '@opentripplanner/core-utils/lib/query-params'
import { createAction } from 'redux-actions'
import qs from 'qs'
-import moment from 'moment'
-import haversine from 'haversine'
import { rememberPlace } from './map'
-import { hasCar } from '../util/itinerary'
-import { getTripOptionsFromQuery, getUrlParams } from '../util/query'
-import queryParams from '../util/query-params'
import { getStopViewerConfig, queryIsValid } from '../util/state'
-import { randId } from '../util/storage'
-import { OTP_API_DATE_FORMAT, OTP_API_TIME_FORMAT } from '../util/time'
if (typeof (fetch) === 'undefined') require('isomorphic-fetch')
+const { hasCar } = coreUtils.itinerary
+const { getTripOptionsFromQuery, getUrlParams } = coreUtils.query
+const { randId } = coreUtils.storage
+const { OTP_API_DATE_FORMAT, OTP_API_TIME_FORMAT } = coreUtils.time
+
// Generic API actions
export const nonRealtimeRoutingResponse = createAction('NON_REALTIME_ROUTING_RESPONSE')
diff --git a/lib/actions/form.js b/lib/actions/form.js
index 66860f1a4..abaa4ff00 100644
--- a/lib/actions/form.js
+++ b/lib/actions/form.js
@@ -1,18 +1,10 @@
import debounce from 'lodash.debounce'
+import isEqual from 'lodash.isequal'
import moment from 'moment'
+import coreUtils from '@opentripplanner/core-utils'
import { createAction } from 'redux-actions'
-import isEqual from 'lodash.isequal'
-import {
- getDefaultQuery,
- getTripOptionsFromQuery,
- getUrlParams,
- planParamsToQuery
-} from '../util/query'
-import { getItem, randId } from '../util/storage'
import { queryIsValid } from '../util/state'
-import { OTP_API_TIME_FORMAT } from '../util/time'
-import { isMobile } from '../util/ui'
import {
MobileScreens,
setMainPanelContent,
@@ -21,6 +13,13 @@ import {
import { routingQuery } from './api'
+const {
+ getDefaultQuery,
+ getTripOptionsFromQuery,
+ getUrlParams,
+ planParamsToQuery
+} = coreUtils.query
+
export const settingQueryParam = createAction('SET_QUERY_PARAM')
export const clearActiveSearch = createAction('CLEAR_ACTIVE_SEARCH')
export const setActiveSearch = createAction('SET_ACTIVE_SEARCH')
@@ -35,7 +34,7 @@ export function resetForm () {
dispatch(settingQueryParam(otpState.user.defaults))
} else {
// Get user overrides and apply to default query
- const userOverrides = getItem('defaultQuery', {})
+ const userOverrides = coreUtils.storage.getItem('defaultQuery', {})
const defaultQuery = Object.assign(
getDefaultQuery(otpState.config),
userOverrides
@@ -69,7 +68,7 @@ export function parseUrlQueryString (params = getUrlParams()) {
Object.keys(params).forEach(key => {
if (!key.startsWith('ui_')) planParams[key] = params[key]
})
- const searchId = params.ui_activeSearch || randId()
+ const searchId = params.ui_activeSearch || coreUtils.storage.randId()
// Convert strings to numbers/objects and dispatch
dispatch(
setQueryParam(
@@ -89,10 +88,11 @@ let lastDebouncePlanTimeMs
export function formChanged (oldQuery, newQuery) {
return function (dispatch, getState) {
const otpState = getState().otp
+ const isMobile = coreUtils.ui.isMobile()
// If departArrive is set to 'NOW', update the query time to current
if (otpState.currentQuery && otpState.currentQuery.departArrive === 'NOW') {
- dispatch(settingQueryParam({ time: moment().format(OTP_API_TIME_FORMAT) }))
+ dispatch(settingQueryParam({ time: moment().format(coreUtils.time.OTP_API_TIME_FORMAT) }))
}
// Determine if either from/to location has changed
@@ -111,7 +111,7 @@ export function formChanged (oldQuery, newQuery) {
// either location changes only if not currently on welcome screen (otherwise
// when the current position is auto-set the screen will change unexpectedly).
if (
- isMobile() &&
+ isMobile &&
(fromChanged || toChanged) &&
otpState.ui.mobileScreen !== MobileScreens.WELCOME_SCREEN
) {
@@ -123,8 +123,8 @@ export function formChanged (oldQuery, newQuery) {
const { autoPlan, debouncePlanTimeMs } = otpState.config
const updatePlan =
autoPlan ||
- (!isMobile() && oneLocationChanged) || // TODO: make autoplan configurable at the parameter level?
- (isMobile() && fromChanged && toChanged)
+ (!isMobile && oneLocationChanged) || // TODO: make autoplan configurable at the parameter level?
+ (isMobile && fromChanged && toChanged)
if (updatePlan && queryIsValid(otpState)) { // trip plan should be made
// check if debouncing function needs to be (re)created
if (!debouncedPlanTrip || lastDebouncePlanTimeMs !== debouncePlanTimeMs) {
diff --git a/lib/actions/location.js b/lib/actions/location.js
index 7adf4cbda..e4b778986 100644
--- a/lib/actions/location.js
+++ b/lib/actions/location.js
@@ -18,7 +18,7 @@ export function getCurrentPosition (setAsType = null, onSuccess) {
dispatch(receivedPositionResponse({ position }))
if (setAsType) {
console.log('setting location to current position')
- dispatch(setLocationToCurrent({ type: setAsType }))
+ dispatch(setLocationToCurrent({ locationType: setAsType }))
onSuccess && onSuccess()
}
} else {
diff --git a/lib/actions/map.js b/lib/actions/map.js
index b1b0ece2e..f3ec18447 100644
--- a/lib/actions/map.js
+++ b/lib/actions/map.js
@@ -1,8 +1,9 @@
+import coreUtils from '@opentripplanner/core-utils'
+import getGeocoder from '@opentripplanner/geocoder'
import { createAction } from 'redux-actions'
import { routingQuery } from './api'
import { clearActiveSearch } from './form'
-import getGeocoder from '../util/geocoder'
/* SET_LOCATION action creator. Updates a from or to location in the store
*
@@ -35,6 +36,19 @@ export function clearLocation (payload) {
}
}
+/**
+ * Handler for @opentripplanner/location-field onLocationSelected
+ */
+export function onLocationSelected ({ locationType, location, resultType }) {
+ return function (dispatch, getState) {
+ if (resultType === 'CURRENT_LOCATION') {
+ dispatch(setLocationToCurrent({ locationType }))
+ } else {
+ dispatch(setLocation({ location, locationType }))
+ }
+ }
+}
+
export function setLocation (payload) {
return function (dispatch, getState) {
const otpState = getState().otp
@@ -45,12 +59,12 @@ export function setLocation (payload) {
.reverse({ point: payload.location })
.then((location) => {
dispatch(settingLocation({
- type: payload.type,
+ locationType: payload.locationType,
location
}))
}).catch(err => {
dispatch(settingLocation({
- type: payload.type,
+ locationType: payload.locationType,
location: payload.location
}))
console.warn(err)
@@ -83,11 +97,11 @@ export function switchLocations () {
const { from, to } = getState().otp.currentQuery
// First, reverse the locations.
dispatch(settingLocation({
- type: 'from',
+ locationType: 'from',
location: to
}))
dispatch(settingLocation({
- type: 'to',
+ locationType: 'to',
location: from
}))
// Then kick off a routing query (if the query is invalid, search will abort).
@@ -101,11 +115,12 @@ export const setElevationPoint = createAction('SET_ELEVATION_POINT')
export const setMapPopupLocation = createAction('SET_MAP_POPUP_LOCATION')
-export function setMapPopupLocationAndGeocode (payload) {
+export function setMapPopupLocationAndGeocode (mapEvent) {
+ const location = coreUtils.map.constructLocation(mapEvent.latlng)
return function (dispatch, getState) {
- dispatch(setMapPopupLocation(payload))
+ dispatch(setMapPopupLocation({ location }))
getGeocoder(getState().otp.config.geocoder)
- .reverse({ point: payload.location })
+ .reverse({ point: location })
.then((location) => {
dispatch(setMapPopupLocation({ location }))
}).catch(err => {
diff --git a/lib/actions/narrative.js b/lib/actions/narrative.js
index 8f016a400..56cc5279c 100644
--- a/lib/actions/narrative.js
+++ b/lib/actions/narrative.js
@@ -1,14 +1,14 @@
+import coreUtils from '@opentripplanner/core-utils'
import { createAction } from 'redux-actions'
import { setUrlSearch } from './api'
-import { getUrlParams } from '../util/query'
export function setActiveItinerary (payload) {
return function (dispatch, getState) {
// Trigger change in store.
dispatch(settingActiveitinerary(payload))
// Update URL params.
- const urlParams = getUrlParams()
+ const urlParams = coreUtils.query.getUrlParams()
urlParams.ui_activeItinerary = payload.index
dispatch(setUrlSearch(urlParams))
}
diff --git a/lib/actions/ui.js b/lib/actions/ui.js
index ad04d2805..9dc8decfe 100644
--- a/lib/actions/ui.js
+++ b/lib/actions/ui.js
@@ -1,13 +1,14 @@
+import { push } from 'connected-react-router'
+import coreUtils from '@opentripplanner/core-utils'
import { createAction } from 'redux-actions'
import { matchPath } from 'react-router'
-import { push } from 'connected-react-router'
import { findRoute } from './api'
import { setMapCenter, setMapZoom, setRouterId } from './config'
import { clearActiveSearch, parseUrlQueryString, setActiveSearch } from './form'
import { clearLocation } from './map'
import { setActiveItinerary } from './narrative'
-import { getUiUrlParams, getUrlParams } from '../util/query'
+import { getUiUrlParams } from '../util/state'
/**
* Wrapper function for history#push that preserves the current search or, if
@@ -103,7 +104,7 @@ export function handleBackButtonPress (e) {
const uiUrlParams = getUiUrlParams(otpState)
// Get new search ID from URL after back button pressed.
// console.log('back button pressed', e)
- const urlParams = getUrlParams()
+ const urlParams = coreUtils.query.getUrlParams()
const previousSearchId = urlParams.ui_activeSearch
const previousItinIndex = +urlParams.ui_activeItinerary || 0
const previousSearch = otpState.searches[previousSearchId]
diff --git a/lib/components/app/default-main-panel.js b/lib/components/app/default-main-panel.js
index ed3de24b6..e200c01ef 100644
--- a/lib/components/app/default-main-panel.js
+++ b/lib/components/app/default-main-panel.js
@@ -14,10 +14,11 @@ class DefaultMainPanel extends Component {
const {
activeSearch,
currentQuery,
- customIcons,
itineraryClass,
itineraryFooter,
+ LegIcon,
mainPanelContent,
+ ModeIcon,
showUserSettings
} = this.props
const showPlanTripButton = mainPanelContent === 'EDIT_DATETIME' ||
@@ -35,7 +36,7 @@ class DefaultMainPanel extends Component {
paddingBottom: 15,
overflow: 'auto'
}}>
-
+
{!activeSearch && !showPlanTripButton && showUserSettings &&
}
@@ -43,7 +44,8 @@ class DefaultMainPanel extends Component {
+ LegIcon={LegIcon}
+ />
- {paramNames.map(param => {
- const paramInfo = queryParams.find(qp => qp.name === param)
- // Check that the parameter applies to the specified routingType
- if (!paramInfo.routingTypes.includes(query.routingType)) return
-
- // Check that the applicability test (if provided) is satisfied
- if (typeof paramInfo.applicable === 'function' &&
- !paramInfo.applicable(query, config)) return
-
- // Create the UI component based on the selector type
- switch (paramInfo.selector) {
- case 'DROPDOWN':
- return
- case 'CHECKBOX':
- return
- }
- })}
-
- )
- }
-}
-
-// connect to redux store
-
-const mapStateToProps = (state, ownProps) => {
- return {
- config: state.otp.config,
- query: state.otp.currentQuery
- }
-}
-
-const mapDispatchToProps = (dispatch, ownProps) => {
- return {
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(GeneralSettingsPanel)
diff --git a/lib/components/form/location-field.js b/lib/components/form/location-field.js
deleted file mode 100644
index 7c52c6e6b..000000000
--- a/lib/components/form/location-field.js
+++ /dev/null
@@ -1,605 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import ReactDOM from 'react-dom'
-import {
- Button,
- FormGroup,
- FormControl,
- InputGroup,
- DropdownButton,
- MenuItem
-} from 'react-bootstrap'
-import { connect } from 'react-redux'
-import { throttle } from 'throttle-debounce'
-
-import LocationIcon from '../icons/location-icon'
-import { setLocation, setLocationToCurrent, clearLocation } from '../../actions/map'
-import { addLocationSearch, getCurrentPosition } from '../../actions/location'
-import { findNearbyStops } from '../../actions/api'
-import { distanceStringImperial } from '../../util/distance'
-import getGeocoder from '../../util/geocoder'
-import { formatStoredPlaceName } from '../../util/map'
-import { getActiveSearch, getShowUserSettings } from '../../util/state'
-import { isIE } from '../../util/ui'
-
-class LocationField extends Component {
- static propTypes = {
- config: PropTypes.object,
- currentPosition: PropTypes.object,
- hideExistingValue: PropTypes.bool,
- location: PropTypes.object,
- label: PropTypes.string,
- nearbyStops: PropTypes.array,
- sessionSearches: PropTypes.array,
- showClearButton: PropTypes.bool,
- static: PropTypes.bool, // show autocomplete options as fixed/inline element rather than dropdown
- stopsIndex: PropTypes.object,
- type: PropTypes.string, // replace with locationType?
-
- // callbacks
- onClick: PropTypes.func,
- onLocationSelected: PropTypes.func,
-
- // dispatch
- addLocationSearch: PropTypes.func,
- clearLocation: PropTypes.func,
- setLocation: PropTypes.func,
- setLocationToCurrent: PropTypes.func
- }
-
- static defaultProps = {
- showClearButton: true
- }
-
- constructor (props) {
- super(props)
- this.state = {
- value: props.location && !props.hideExistingValue
- ? props.location.name
- : '',
- menuVisible: false,
- geocodedFeatures: [],
- activeIndex: null
- }
- }
-
- componentDidUpdate (prevProps) {
- // If location is updated externally, replace value and geocoded features
- // in internal state.
- // TODO: This might be considered an anti-pattern. There may be a more
- // effective way to handle this.
- const { location } = this.props
- if (location !== prevProps.location) {
- this.setState({
- value: location !== null ? location.name : '',
- geocodedFeatures: []
- })
- }
- }
-
- _geocodeAutocomplete = throttle(1000, (text) => {
- if (!text) {
- console.warn('No text entry provided for geocode autocomplete search.')
- return
- }
- getGeocoder(this.props.config.geocoder)
- .autocomplete({ text })
- .then((result) => {
- this.setState({ geocodedFeatures: result.features })
- }).catch((err) => {
- console.error(err)
- })
- })
-
- _geocodeSearch (text) {
- if (!text) {
- console.warn('No text entry provided for geocode search.')
- return
- }
- getGeocoder(this.props.config.geocoder)
- .search({ text })
- .then((result) => {
- if (result.features && result.features.length > 0) {
- // Only replace geocode items if results were found
- this.setState({ geocodedFeatures: result.features })
- } else {
- console.warn('No results found for geocode search. Not replacing results.')
- }
- }).catch((err) => {
- console.error(err)
- })
- }
-
- _getFormControlClassname () {
- return this.props.type + '-form-control'
- }
-
- _onClearButtonClick = () => {
- const { type } = this.props
- this.props.clearLocation({ type })
- this.setState({
- value: '',
- geocodedFeatures: []
- })
- ReactDOM.findDOMNode(this.formControl).focus()
- this._onTextInputClick()
- }
-
- _onDropdownToggle = (v, e) => {
- // if clicked on input form control, keep dropdown open; otherwise, toggle
- const targetIsInput =
- e.target.className.indexOf(this._getFormControlClassname()) !== -1
- const menuVisible = targetIsInput ? true : !this.state.menuVisible
- this.setState({ menuVisible })
- }
- /**
- * Only hide menu if the target clicked is not a menu item in the dropdown.
- * Otherwise, the click will not "finish" and the menu will hide without the
- * user having made a selection.
- */
- _onBlurFormGroup = (e) => {
- // IE does not use relatedTarget, so this check handles cross-browser support.
- // see https://stackoverflow.com/a/49325196/915811
- const target = e.relatedTarget !== null ? e.relatedTarget : document.activeElement
- if (!this.props.location && (!target || target.getAttribute('role') !== 'menuitem')) {
- this.setState({ menuVisible: false, value: '', geocodedFeatures: [] })
- }
- }
-
- _onTextInputChange = (evt) => {
- this.setState({ value: evt.target.value, menuVisible: true })
- this._geocodeAutocomplete(evt.target.value)
- }
-
- _onTextInputClick = () => {
- const { config, currentPosition, nearbyStops, onClick } = this.props
- if (typeof onClick === 'function') onClick()
- this.setState({ menuVisible: true })
- if (nearbyStops.length === 0 && currentPosition && currentPosition.coords) {
- this.props.findNearbyStops({
- lat: currentPosition.coords.latitude,
- lon: currentPosition.coords.longitude,
- max: config.geocoder.maxNearbyStops || 4
- })
- }
- }
-
- _onKeyDown = (evt) => {
- const { activeIndex, menuVisible } = this.state
- switch (evt.key) {
- // 'Down' arrow key pressed: move selected menu item down by one position
- case 'ArrowDown':
- // Suppress default 'ArrowDown' behavior which moves cursor to end
- evt.preventDefault()
- if (!menuVisible) {
- // If the menu is not visible, simulate a text input click to show it.
- return this._onTextInputClick()
- }
- if (activeIndex === this.menuItemCount - 1) {
- return this.setState({ activeIndex: null })
- }
- return this.setState({
- activeIndex: activeIndex === null
- ? 0
- : activeIndex + 1
- })
-
- // 'Up' arrow key pressed: move selection up by one position
- case 'ArrowUp':
- // Suppress default 'ArrowUp' behavior which moves cursor to beginning
- evt.preventDefault()
- if (activeIndex === 0) {
- return this.setState({ activeIndex: null })
- }
- return this.setState({
- activeIndex: activeIndex === null
- ? this.menuItemCount - 1
- : activeIndex - 1
- })
-
- // 'Enter' keypress serves two purposes:
- // - If pressed when typing in search string, switch from 'autocomplete'
- // to 'search' geocoding
- // - If pressed when dropdown results menu is active, apply the location
- // associated with current selected menu item
- case 'Enter':
- if (typeof activeIndex === 'number') { // Menu is active
- // Retrieve location selection handler from lookup object and invoke
- const locationSelected = this.locationSelectedLookup[activeIndex]
- if (locationSelected) locationSelected()
-
- // Clear selection & hide the menu
- this.setState({
- menuVisible: false,
- activeIndex: null
- })
- } else { // Menu not active; get geocode 'search' results
- this._geocodeSearch(evt.target.value)
- // Ensure menu is visible.
- this.setState({ menuVisible: true })
- }
-
- // Suppress default 'Enter' behavior which causes page to reload
- evt.preventDefault()
- break
- case 'Escape':
- // Clear selection & hide the menu
- return this.setState({
- menuVisible: false,
- activeIndex: null
- })
- // Any other key pressed: clear active selection
- default:
- return this.setState({ activeIndex: null })
- }
- }
-
- _setLocation (location) {
- const { onLocationSelected, setLocation, type } = this.props
- onLocationSelected && onLocationSelected()
- setLocation({ type, location })
- }
-
- _useCurrentLocation = () => {
- const {
- currentPosition,
- getCurrentPosition,
- onLocationSelected,
- setLocationToCurrent,
- type
- } = this.props
- if (currentPosition.coords) {
- // We already have geolocation coordinates
- setLocationToCurrent({ type })
- onLocationSelected && onLocationSelected()
- } else {
- // Call geolocation.getCurrentPosition and set as from/to type
- this.setState({ fetchingLocation: true })
- getCurrentPosition(type, onLocationSelected)
- }
- }
-
- /**
- * Provide alert to user with reason for geolocation error
- */
- _geolocationAlert = () => {
- window.alert(
- `Geolocation either has been disabled for ${window.location.host} or is not available in your browser.\n\nReason: ${this.props.currentPosition.error.message || 'Unknown reason'}`
- )
- }
-
- render () {
- const {
- currentPosition,
- label,
- location,
- user,
- showClearButton,
- showUserSettings,
- static: isStatic,
- suppressNearby,
- type,
- nearbyStops
- } = this.props
- const locations = [...user.locations, ...user.recentPlaces]
- const { activeIndex } = this.state
- let geocodedFeatures = this.state.geocodedFeatures
- if (geocodedFeatures.length > 5) geocodedFeatures = geocodedFeatures.slice(0, 5)
-
- let sessionSearches = this.props.sessionSearches
- if (sessionSearches.length > 5) sessionSearches = sessionSearches.slice(0, 5)
-
- // Assemble menu contents, to be displayed either as dropdown or static panel.
- // Menu items are created in four phases: (1) the current location, (2) any
- // geocoder search results; (3) nearby transit stops; and (4) saved searches
-
- let menuItems = [] // array of menu items for display (may include non-selectable items e.g. dividers/headings)
- let itemIndex = 0 // the index of the current location-associated menu item (excluding non-selectable items)
- this.locationSelectedLookup = {} // maps itemIndex to a location selection handler (for use by the _onKeyDown method)
-
- /* 1) Process geocode search result option(s) */
- if (geocodedFeatures.length > 0) {
- // Add the menu sub-heading (not a selectable item)
- // menuItems.push(