Merge branch 'master' of git://github.com/alexreisner/geocoder

7005c7bb · Idris · e35930dc · f197ec52 · 7005c7bb · 7005c7bb
Commit 7005c7bb authored 12 years ago by Idris
--- a/test/fixtures/bing_madison_square_garden.json
+++ b/test/fixtures/bing_madison_square_garden.json
--- a/test/fixtures/bing_no_results.json
+++ b/test/fixtures/bing_no_results.json
--- a/test/fixtures/bing_reverse.json
+++ b/test/fixtures/bing_reverse.json
--- a/test/fixtures/freegeoip_74_200_247_59.json
+++ b/test/fixtures/freegeoip_74_200_247_59.json
--- a/test/fixtures/freegeoip_no_results.json
+++ b/test/fixtures/freegeoip_no_results.json
--- a/test/fixtures/geocoder_ca_madison_square_garden.json
+++ b/test/fixtures/geocoder_ca_madison_square_garden.json
--- a/test/fixtures/geocoder_ca_no_results.json
+++ b/test/fixtures/geocoder_ca_no_results.json
--- a/test/fixtures/geocoder_ca_reverse.json
+++ b/test/fixtures/geocoder_ca_reverse.json
--- a/test/fixtures/google_garbage.json
+++ b/test/fixtures/google_garbage.json
--- a/test/fixtures/google_madison_square_garden.json
+++ b/test/fixtures/google_madison_square_garden.json
--- a/test/fixtures/google_no_city_data.json
+++ b/test/fixtures/google_no_city_data.json
--- a/test/fixtures/google_no_locality.json
+++ b/test/fixtures/google_no_locality.json
--- a/test/fixtures/google_no_results.json
+++ b/test/fixtures/google_no_results.json
--- a/test/fixtures/mapquest_madison_square_garden
+++ b/test/fixtures/mapquest_madison_square_garden
+{
+  "results": [
+    {
+      "locations": [
+        {
+          "latLng": {
+            "lng": -73.994637,
+            "lat": 40.720409
+          },
+          "adminArea4": "New York County",
+          "adminArea5Type": "City",
+          "adminArea4Type": "County",
+          "adminArea5": "New York",
+          "street": "46 West 31st Street",
+          "adminArea1": "US",
+          "adminArea3": "NY",
+          "type": "s",
+          "displayLatLng": {
+            "lng": -73.994637,
+            "lat": 40.720409
+          },
+          "linkId": 0,
+          "postalCode": "10001",
+          "sideOfStreet": "N",
+          "dragPoint": false,
+          "adminArea1Type": "Country",
+          "geocodeQuality": "CITY",
+          "geocodeQualityCode": "A5XAX",
+          "mapUrl": "http://www.mapquestapi.com/staticmap/v3/getmap?type=map&size=225,160&pois=purple-1,40.720409,-73.994637,0,0|&center=40.720409,-73.994637&zoom=9&key=Gmjtd|luua2hu2nd,7x=o5-lz8lg&rand=604519389",
+          "adminArea3Type": "State"
+        }
+      ],
+      "providedLocation": {
+        "location": "Madison Square Garden, New York, NY"
+      }
+    }
+  ],
+  "options": {
+    "ignoreLatLngInput": false,
+    "maxResults": -1,
+    "thumbMaps": true
+  },
+  "info": {
+    "copyright": {
+      "text": "© 2012 MapQuest, Inc.",
+      "imageUrl": "http://api.mqcdn.com/res/mqlogo.gif",
+      "imageAltText": "© 2012 MapQuest, Inc."
+    },
+    "statuscode": 0,
+    "messages": []
+  }
+}
--- a/test/fixtures/mapquest_no_results
+++ b/test/fixtures/mapquest_no_results
+{
+  "results": [
+    {
+    "locations": []
+    }
+  ]
+}
--- a/test/fixtures/maxmind_24_24_24_21
+++ b/test/fixtures/maxmind_24_24_24_21
+US
--- a/test/fixtures/maxmind_24_24_24_22
+++ b/test/fixtures/maxmind_24_24_24_22
+US,NY,Jamaica,40.6915,-73.8057
--- a/test/fixtures/maxmind_24_24_24_23
+++ b/test/fixtures/maxmind_24_24_24_23
+US,NY,Jamaica,,40.6915,-73.8057,501,718,"Road Runner","Road Runner"
--- a/test/fixtures/maxmind_24_24_24_24
+++ b/test/fixtures/maxmind_24_24_24_24
+US,"United States",NY,"New York",Jamaica,40.6915,-73.8057,501,718,America/New_York,NA,,"Road Runner","Road Runner",rr.com,"AS11351 Road Runner HoldCo LLC",Cable/DSL,residential,779,99,37,76,35
--- a/test/fixtures/maxmind_74_200_247_59
+++ b/test/fixtures/maxmind_74_200_247_59
+US,TX,Plano,75093,33.034698,-96.813400,623,972,"Layered Technologies , US","Layered Technologies , US",