Merge branch 'release/0.0.13.2'

This commit is contained in:
Jonny Barnes 2016-10-03 14:53:52 +01:00
commit 65ce7b0c01
8 changed files with 37 additions and 34 deletions

View file

@ -308,7 +308,7 @@ class MicropubClientController extends Controller
try {
$query = 'geo:' . $latitude . ',' . $longitude;
if ($request->input('uncertainty') !== null) {
if ($request->input('u') !== null) {
$query .= ';u=' . $request->input('uncertainty');
}
$response = $this->guzzleClient->get($micropubEndpoint, [

View file

@ -1,5 +1,8 @@
# Changelog
## Version 0.0.13.2 (2016-10-03)
- Fix issues with fetch API and places when using micropub client
## Version 0.0.13.1 (2016-10-01)
- Add support for accuracy/uncertainty in geo URIs (issue#20,issue#9)
- Add some places tests

60
composer.lock generated
View file

@ -58,16 +58,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.19.10",
"version": "3.19.12",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "eb9488f671175e708cf68c74cc04bd9115c96761"
"reference": "5d5697c7bc9ab22ce718afb51e5496d0c5cb8778"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb9488f671175e708cf68c74cc04bd9115c96761",
"reference": "eb9488f671175e708cf68c74cc04bd9115c96761",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5d5697c7bc9ab22ce718afb51e5496d0c5cb8778",
"reference": "5d5697c7bc9ab22ce718afb51e5496d0c5cb8778",
"shasum": ""
},
"require": {
@ -134,7 +134,7 @@
"s3",
"sdk"
],
"time": "2016-09-22 19:32:03"
"time": "2016-09-29 21:07:49"
},
{
"name": "barnabywalters/mf-cleaner",
@ -1532,16 +1532,16 @@
},
{
"name": "laravel/framework",
"version": "v5.3.10",
"version": "v5.3.15",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "6febb0ee61999cde3bc7b2963c8903032bb22691"
"reference": "f034a02f38db77d4b0b3e89942394cae456a627f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/6febb0ee61999cde3bc7b2963c8903032bb22691",
"reference": "6febb0ee61999cde3bc7b2963c8903032bb22691",
"url": "https://api.github.com/repos/laravel/framework/zipball/f034a02f38db77d4b0b3e89942394cae456a627f",
"reference": "f034a02f38db77d4b0b3e89942394cae456a627f",
"shasum": ""
},
"require": {
@ -1656,7 +1656,7 @@
"framework",
"laravel"
],
"time": "2016-09-20 13:46:16"
"time": "2016-09-29 22:13:17"
},
{
"name": "lcobucci/jwt",
@ -2724,16 +2724,16 @@
},
{
"name": "ramsey/uuid",
"version": "3.5.0",
"version": "3.5.1",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "a6d15c8618ea3951fd54d34e326b68d3d0bc0786"
"reference": "a07797b986671b0dc823885a81d5e3516b931599"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/a6d15c8618ea3951fd54d34e326b68d3d0bc0786",
"reference": "a6d15c8618ea3951fd54d34e326b68d3d0bc0786",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/a07797b986671b0dc823885a81d5e3516b931599",
"reference": "a07797b986671b0dc823885a81d5e3516b931599",
"shasum": ""
},
"require": {
@ -2800,7 +2800,7 @@
"identifier",
"uuid"
],
"time": "2016-08-02 18:39:32"
"time": "2016-10-02 15:51:17"
},
{
"name": "sensiolabs/security-checker",
@ -4453,16 +4453,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "3.1.0",
"version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
"reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"shasum": ""
},
"require": {
@ -4494,7 +4494,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2016-06-10 09:48:41"
"time": "2016-09-30 07:12:33"
},
{
"name": "phpdocumentor/type-resolver",
@ -4851,16 +4851,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.5.5",
"version": "5.5.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a57126dc681b08289fef6ac96a48e30656f84350"
"reference": "146e0fe0bb7f44d1cefade0c93e86fe0b206dd79"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a57126dc681b08289fef6ac96a48e30656f84350",
"reference": "a57126dc681b08289fef6ac96a48e30656f84350",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/146e0fe0bb7f44d1cefade0c93e86fe0b206dd79",
"reference": "146e0fe0bb7f44d1cefade0c93e86fe0b206dd79",
"shasum": ""
},
"require": {
@ -4930,20 +4930,20 @@
"testing",
"xunit"
],
"time": "2016-09-21 14:40:13"
"time": "2016-10-03 07:48:45"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "3.2.7",
"version": "3.3.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a"
"reference": "7462c19bdb9814f6e6bdeb5cad3eb3ce72c6e0da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/546898a2c0c356ef2891b39dd7d07f5d82c8ed0a",
"reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/7462c19bdb9814f6e6bdeb5cad3eb3ce72c6e0da",
"reference": "7462c19bdb9814f6e6bdeb5cad3eb3ce72c6e0da",
"shasum": ""
},
"require": {
@ -4989,7 +4989,7 @@
"mock",
"xunit"
],
"time": "2016-09-06 16:07:45"
"time": "2016-09-27 03:17:40"
},
{
"name": "sebastian/code-unit-reverse-lookup",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

View file

@ -18,7 +18,7 @@ function getLocation() {
function addPlacesMap(latitude, longitude, uncertainty) {
//get the nearby places
fetch('/places/near/' + latitude + '/' + longitude + '?' + uncertainty, {
fetch('/places/near/' + latitude + '/' + longitude + '?u=' + uncertainty, {
credentials: 'same-origin',
method: 'get'
}).then(function (response) {