Skip to content

Commit 77952d7

Browse files
landonreedlandonreed
authored
Merge pull request #86 from opentripplanner/geocode-refactor
Geocode refactor
2 parents 69aa4f0 + eade813 commit 77952d7

18 files changed

+2357
-575
lines changed

Diff for: ‎__tests__/test-utils/fixtures/geocoding/arcgis/findAddressCandidates-response.json

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
{
2+
"spatialReference": {
3+
"wkid": 4326,
4+
"latestWkid": 4326
5+
},
6+
"candidates": [
7+
{
8+
"address": "Mill End, Clavering, Saffron Walden, Essex, England",
9+
"location": {
10+
"x": 0.12961000000007061,
11+
"y": 51.973520000000065
12+
},
13+
"score": 87.5,
14+
"attributes": {
15+
"Loc_name": "World",
16+
"Status": "T",
17+
"Score": 87.5,
18+
"Match_addr": "Mill End, Clavering, Saffron Walden, Essex, England",
19+
"LongLabel": "Mill End, Clavering, Saffron Walden, Essex, England, GBR",
20+
"ShortLabel": "Mill End",
21+
"Addr_type": "Locality",
22+
"Type": "Village",
23+
"PlaceName": "Mill End",
24+
"Place_addr": "Clavering, Saffron Walden, Essex, England",
25+
"Phone": "",
26+
"URL": "",
27+
"Rank": 15,
28+
"AddBldg": "",
29+
"AddNum": "",
30+
"AddNumFrom": "",
31+
"AddNumTo": "",
32+
"AddRange": "",
33+
"Side": "",
34+
"StPreDir": "",
35+
"StPreType": "",
36+
"StName": "",
37+
"StType": "",
38+
"StDir": "",
39+
"BldgType": "",
40+
"BldgName": "",
41+
"LevelType": "",
42+
"LevelName": "",
43+
"UnitType": "",
44+
"UnitName": "",
45+
"SubAddr": "",
46+
"StAddr": "",
47+
"Block": "",
48+
"Sector": "",
49+
"Nbrhd": "Mill End",
50+
"District": "Clavering",
51+
"City": "Saffron Walden",
52+
"MetroArea": "",
53+
"Subregion": "Essex",
54+
"Region": "England",
55+
"RegionAbbr": "ENG",
56+
"Territory": "",
57+
"Zone": "",
58+
"Postal": "",
59+
"PostalExt": "",
60+
"Country": "GBR",
61+
"LangCode": "ENG",
62+
"Distance": 0,
63+
"X": 0.12961000000007061,
64+
"Y": 51.973520000000065,
65+
"DisplayX": 0.12961000000007061,
66+
"DisplayY": 51.973520000000065,
67+
"Xmin": 0.11961000000007062,
68+
"Xmax": 0.13961000000007062,
69+
"Ymin": 51.963520000000067,
70+
"Ymax": 51.983520000000063,
71+
"ExInfo": ""
72+
},
73+
"extent": {
74+
"xmin": 0.11961000000007062,
75+
"ymin": 51.963520000000067,
76+
"xmax": 0.13961000000007062,
77+
"ymax": 51.983520000000063
78+
}
79+
},
80+
{
81+
"address": "Mill End, Hambleden, Henley-on-Thames, Oxfordshire, England",
82+
"location": {
83+
"x": -0.86689999999993006,
84+
"y": 51.558340000000044
85+
},
86+
"score": 87.5,
87+
"attributes": {
88+
"Loc_name": "World",
89+
"Status": "T",
90+
"Score": 87.5,
91+
"Match_addr": "Mill End, Hambleden, Henley-on-Thames, Oxfordshire, England",
92+
"LongLabel": "Mill End, Hambleden, Henley-on-Thames, Oxfordshire, England, GBR",
93+
"ShortLabel": "Mill End",
94+
"Addr_type": "Locality",
95+
"Type": "Village",
96+
"PlaceName": "Mill End",
97+
"Place_addr": "Hambleden, Henley-on-Thames, Oxfordshire, England",
98+
"Phone": "",
99+
"URL": "",
100+
"Rank": 15,
101+
"AddBldg": "",
102+
"AddNum": "",
103+
"AddNumFrom": "",
104+
"AddNumTo": "",
105+
"AddRange": "",
106+
"Side": "",
107+
"StPreDir": "",
108+
"StPreType": "",
109+
"StName": "",
110+
"StType": "",
111+
"StDir": "",
112+
"BldgType": "",
113+
"BldgName": "",
114+
"LevelType": "",
115+
"LevelName": "",
116+
"UnitType": "",
117+
"UnitName": "",
118+
"SubAddr": "",
119+
"StAddr": "",
120+
"Block": "",
121+
"Sector": "",
122+
"Nbrhd": "Mill End",
123+
"District": "Hambleden",
124+
"City": "Henley-on-Thames",
125+
"MetroArea": "",
126+
"Subregion": "Oxfordshire",
127+
"Region": "England",
128+
"RegionAbbr": "ENG",
129+
"Territory": "",
130+
"Zone": "",
131+
"Postal": "",
132+
"PostalExt": "",
133+
"Country": "GBR",
134+
"LangCode": "ENG",
135+
"Distance": 0,
136+
"X": -0.86689999999993006,
137+
"Y": 51.558340000000044,
138+
"DisplayX": -0.86689999999993006,
139+
"DisplayY": 51.558340000000044,
140+
"Xmin": -0.87689999999993007,
141+
"Xmax": -0.85689999999993005,
142+
"Ymin": 51.548340000000046,
143+
"Ymax": 51.568340000000042,
144+
"ExInfo": ""
145+
},
146+
"extent": {
147+
"xmin": -0.87689999999993007,
148+
"ymin": 51.548340000000046,
149+
"xmax": -0.85689999999993005,
150+
"ymax": 51.568340000000042
151+
}
152+
}
153+
]
154+
}

Diff for: ‎__tests__/test-utils/fixtures/geocoding/arcgis/reverseGeocode-response.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"address": {
3+
"Match_addr": "SW Naito Pkwy, Portland, Oregon, 97204",
4+
"LongLabel": "SW Naito Pkwy, Portland, OR, 97204, USA",
5+
"ShortLabel": "SW Naito Pkwy",
6+
"Addr_type": "StreetName",
7+
"Type": "",
8+
"PlaceName": "",
9+
"AddNum": "",
10+
"Address": "SW Naito Pkwy",
11+
"Block": "",
12+
"Sector": "",
13+
"Neighborhood": "Downtown",
14+
"District": "",
15+
"City": "Portland",
16+
"MetroArea": "Portland-Vancouver Metro Area",
17+
"Subregion": "Multnomah County",
18+
"Region": "Oregon",
19+
"Territory": "",
20+
"Postal": "97204",
21+
"PostalExt": "",
22+
"CountryCode": "USA"
23+
},
24+
"location": {
25+
"x": -122.67320084756255,
26+
"y": 45.516175523600715,
27+
"spatialReference": {
28+
"wkid": 4326,
29+
"latestWkid": 4326
30+
}
31+
}
32+
}

Diff for: ‎__tests__/test-utils/fixtures/geocoding/arcgis/suggest-response.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"suggestions": [
3+
{
4+
"text": "Mill Ends City Park, Portland, OR, USA",
5+
"magicKey": "dHA9MCNsb2M9ODU3OTE0NyNsbmc9MzMjcGw9MzI4OTA3MSNsYnM9MTQ6MjAwNTI3NTc=",
6+
"isCollection": false
7+
},
8+
{
9+
"text": "Mill End Sports & Social, Penn Road, Mill End, Rickmansworth, Hertfordshire, England, WD3 8, GBR",
10+
"magicKey": "dHA9MCNsb2M9OTY5Mzc0MiNsbmc9MzMjcGw9NTA4NTQ2NiNsYnM9MTQ6MjAwNTI3NTI=",
11+
"isCollection": false
12+
}
13+
]
14+
}

Diff for: ‎__tests__/test-utils/fixtures/geocoding/pelias/autocomplete-response.json

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"geocoding": {
3+
"version": "0.2",
4+
"attribution": "http://lb-st-mapgeo.tri-met.org:4000/attribution",
5+
"query": {
6+
"text": "Mill Ends",
7+
"parser": "addressit",
8+
"parsed_text": {},
9+
"tokens": [
10+
"Mill",
11+
"Ends"
12+
],
13+
"size": 10,
14+
"sources": [
15+
"geonames",
16+
"openaddresses",
17+
"openstreetmap",
18+
"whosonfirst"
19+
],
20+
"private": false,
21+
"focus.point.lat": 45.52,
22+
"focus.point.lon": -122.67,
23+
"lang": {
24+
"name": "English",
25+
"iso6391": "en",
26+
"iso6393": "eng",
27+
"defaulted": true
28+
}
29+
},
30+
"warnings": [
31+
"Invalid Parameter: api_key"
32+
],
33+
"engine": {
34+
"name": "Pelias",
35+
"author": "Mapzen",
36+
"version": "1.0"
37+
},
38+
"timestamp": 1563948844191
39+
},
40+
"type": "FeatureCollection",
41+
"features": [{
42+
"type": "Feature",
43+
"geometry": {
44+
"type": "Point",
45+
"coordinates": [
46+
-122.673377,
47+
45.516278
48+
]
49+
},
50+
"properties": {
51+
"id": "node/4243944023",
52+
"gid": "openstreetmap:venue:node/4243944023",
53+
"layer": "venue",
54+
"source": "openstreetmap",
55+
"source_id": "node/4243944023",
56+
"name": "Mill Ends Park",
57+
"distance": 0.491,
58+
"accuracy": "point",
59+
"country": "United States",
60+
"country_gid": "whosonfirst:country:85633793",
61+
"country_a": "USA",
62+
"region": "Oregon",
63+
"region_gid": "whosonfirst:region:85688513",
64+
"region_a": "OR",
65+
"county": "Multnomah County",
66+
"county_gid": "whosonfirst:county:102081631",
67+
"county_a": "MU",
68+
"locality": "Portland",
69+
"locality_gid": "whosonfirst:locality:101715829",
70+
"neighbourhood": "Downtown",
71+
"neighbourhood_gid": "whosonfirst:neighbourhood:85867131",
72+
"continent": "North America",
73+
"continent_gid": "whosonfirst:continent:102191575",
74+
"label": "Mill Ends Park, Portland, OR, USA"
75+
}
76+
}],
77+
"bbox": [
78+
-122.673377,
79+
45.516278,
80+
-122.673377,
81+
45.516278
82+
]
83+
}

0 commit comments

Comments
 (0)