Skip to content

Commit 94c6a83

Browse files
committed
Merge pull request #432 from nitso/master
Use https transport in Yandex provider
2 parents a0d8159 + 8ecea45 commit 94c6a83

11 files changed

+20
-11
lines changed

src/Geocoder/Provider/Yandex.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ class Yandex extends AbstractHttpProvider implements LocaleAwareProvider
2424
/**
2525
* @var string
2626
*/
27-
const GEOCODE_ENDPOINT_URL = 'http://geocode-maps.yandex.ru/1.x/?format=json&geocode=%s';
27+
const GEOCODE_ENDPOINT_URL = 'https://geocode-maps.yandex.ru/1.x/?format=json&geocode=%s';
2828

2929
/**
3030
* @var string
3131
*/
32-
const REVERSE_ENDPOINT_URL = 'http://geocode-maps.yandex.ru/1.x/?format=json&geocode=%F,%F';
32+
const REVERSE_ENDPOINT_URL = 'https://geocode-maps.yandex.ru/1.x/?format=json&geocode=%F,%F';
3333

3434
/**
3535
* @var string
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:4485:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Copenhagen, Denmark","found":"13","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Данія, Столичная область, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген"}}}}}}},"description":"Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.45295 55.614999","upperCorner":"12.65075 55.732585"}},"Point":{"pos":"12.567593 55.675676"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Данія, область Южная Дания, Миддельфарт, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"область Южная Дания, Миддельфарт, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"область Южная Дания","SubAdministrativeArea":{"SubAdministrativeAreaName":"Миддельфарт","Locality":{"LocalityName":"Копенгаген"}}}}}}},"description":"Миддельфарт, область Южная Дания, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"9.971219 55.454366","upperCorner":"9.974965 55.457398"}},"Point":{"pos":"9.972854 55.455739"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.518464 55.703961","upperCorner":"12.551396 55.722553"}},"Point":{"pos":"12.534930 55.713258"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.561736 55.689578","upperCorner":"12.594668 55.708176"}},"Point":{"pos":"12.578202 55.698878"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.538361 55.681077","upperCorner":"12.571294 55.69968"}},"Point":{"pos":"12.554827 55.690380"}}}]}}}";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:4108:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"1600 Pennsylvania Ave, Washington","found":"33","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"United States, District of Columbia, Washington, Pennsylvania Ave NW, 1600","precision":"exact","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Ave NW, 1600","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave NW","Premise":{"PremiseNumber":"1600"}}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Ave NW, 1600","boundedBy":{"Envelope":{"lowerCorner":"-77.046921 38.891265","upperCorner":"-77.030464 38.904125"}},"Point":{"pos":"-77.038692 38.897695"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, District of Columbia, Washington, Pennsylvania Ave SE","precision":"street","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Ave SE","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave SE"}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Ave SE","boundedBy":{"Envelope":{"lowerCorner":"-77.003532 38.863739","upperCorner":"-76.946777 38.887825"}},"Point":{"pos":"-76.975235 38.875565"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, Maryland, Washington, Pennsylvania Ave","precision":"street","AddressDetails":{"Country":{"AddressLine":"Maryland, Washington, Pennsylvania Ave","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"Maryland","SubAdministrativeArea":{"SubAdministrativeAreaName":"Washington","Locality":{"Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave"}}}}}}}},"description":"Washington, Maryland, United States","name":"Pennsylvania Ave","boundedBy":{"Envelope":{"lowerCorner":"-77.724152 39.649717","upperCorner":"-77.717513 39.721407"}},"Point":{"pos":"-77.720774 39.685568"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, Pennsylvania, Washington, Pennsylvania Ave","precision":"street","AddressDetails":{"Country":{"AddressLine":"Pennsylvania, Washington, Pennsylvania Ave","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"Pennsylvania","Locality":{"DependentLocality":{"DependentLocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave"}}}}}}}},"description":"Washington, Pennsylvania, United States","name":"Pennsylvania Ave","boundedBy":{"Envelope":{"lowerCorner":"-79.890044 40.118144","upperCorner":"-79.867263 40.131418"}},"Point":{"pos":"-79.878914 40.124233"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, District of Columbia, Washington, Pennsylvania Avenue Rear SE","precision":"street","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Avenue Rear SE","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Avenue Rear SE"}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Avenue Rear SE","boundedBy":{"Envelope":{"lowerCorner":"-76.98341 38.879315","upperCorner":"-76.981649 38.881175"}},"Point":{"pos":"-76.982790 38.879891"}}}]}}}";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:3825:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"2.388772,48.863216","found":"8","results":"5","Point":{"pos":"2.388772 48.863216"}}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"Франция, Иль-Де-Франс, Париж, XX округ, Avenue Gambetta","precision":"street","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ, Avenue Gambetta","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ","Thoroughfare":{"ThoroughfareName":"Avenue Gambetta"}}}}}}}}},"description":"XX округ, Париж, Иль-Де-Франс, Франция","name":"Avenue Gambetta","boundedBy":{"Envelope":{"lowerCorner":"2.387497 48.86294","upperCorner":"2.406587 48.877067"}},"Point":{"pos":"2.388773 48.863212"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Франция, Иль-Де-Франс, Париж, XX округ","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ"}}}}}}}},"description":"Париж, Иль-Де-Франс, Франция","name":"XX округ","boundedBy":{"Envelope":{"lowerCorner":"2.377939 48.846697","upperCorner":"2.416217 48.878252"}},"Point":{"pos":"2.399355 48.864848"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж"}}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.251232 48.815727","upperCorner":"2.416235 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"area","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж"}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.223824 48.815727","upperCorner":"2.469792 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"area","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Париж","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж"}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.223824 48.815727","upperCorner":"2.469792 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}}]}}}";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:152:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"foobar","found":"0","results":"5"}},"featureMember":[]}}}";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:6208:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"22.256784,60.453947","found":"70","results":"5","boundedBy":{"Envelope":{"lowerCorner":"22.254288 60.451449","upperCorner":"22.259283 60.456445"}},"Point":{"pos":"22.256784 60.453947"},"kind":"house"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Bangårdsgatan, 36","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Bangårdsgatan, 36","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Bangårdsgatan","Premise":{"PremiseNumber":"36"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Bangårdsgatan, 36","boundedBy":{"Envelope":{"lowerCorner":"22.248557 60.450242","upperCorner":"22.265014 60.458371"}},"Point":{"pos":"22.256785 60.454307"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Ratapihankatu, 36","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Ratapihankatu, 36","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Ratapihankatu","Premise":{"PremiseNumber":"36"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Ratapihankatu, 36","boundedBy":{"Envelope":{"lowerCorner":"22.248557 60.450242","upperCorner":"22.265014 60.458371"}},"Point":{"pos":"22.256785 60.454307"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15b","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15b","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humalistonkatu","Premise":{"PremiseNumber":"15b"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humalistonkatu, 15b","boundedBy":{"Envelope":{"lowerCorner":"22.248125 60.449332","upperCorner":"22.264583 60.457461"}},"Point":{"pos":"22.256354 60.453397"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15b","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15b","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humlegårdsgatan","Premise":{"PremiseNumber":"15b"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humlegårdsgatan, 15b","boundedBy":{"Envelope":{"lowerCorner":"22.248125 60.449332","upperCorner":"22.264583 60.457461"}},"Point":{"pos":"22.256354 60.453397"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15a","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15a","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humalistonkatu","Premise":{"PremiseNumber":"15a"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humalistonkatu, 15a","boundedBy":{"Envelope":{"lowerCorner":"22.248889 60.449235","upperCorner":"22.265346 60.457364"}},"Point":{"pos":"22.257118 60.453299"}}}]}}}";

0 commit comments

Comments
 (0)