From 2c6b9df97afe32b2c7047f5985c10a18bb03236b Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 29 Sep 2016 11:28:31 +0100 Subject: [PATCH] Squashed commit of the following: commit e7f1c4c84579b959fe2997ff4d2315ee53acfe9a Author: Jonny Barnes Date: Thu Sep 29 11:22:44 2016 +0100 Add latest change, fix spelling errors in rest of changelog commit 637b5107b557f1c2a56327a40b3d7b4b7297fa29 Author: Jonny Barnes Date: Wed Sep 28 21:13:06 2016 +0100 Add a test for uncertainty parameter commit 5e7504b323debf9c91e0cca428b4dca7dda0789d Author: Jonny Barnes Date: Wed Sep 28 21:11:12 2016 +0100 Format the ternaty operator correctly commit 19c978a5ac59cd7dfdceee9a8f1aaa6539d8ac66 Author: Jonny Barnes Date: Wed Sep 28 20:46:19 2016 +0100 Fix typo commit d4e5b5fc384d0ccd715ea28a51821f958f6c2caa Author: Jonny Barnes Date: Wed Sep 28 20:41:23 2016 +0100 Add paraphanalia commit a96f104894de6c06dc5e41044482de2355cb4965 Author: Jonny Barnes Date: Wed Sep 28 20:35:17 2016 +0100 Add the geolocation uncertainty to nearby places request commit 0f6d5649e2f3316040d7453f5fcc96ac1f0ac783 Author: Jonny Barnes Date: Wed Sep 28 20:34:38 2016 +0100 Use a query parameter for geolocation uncertainty commit a9147a074315fabb0d76e5991b34a70b2143761c Author: Jonny Barnes Date: Wed Sep 28 19:58:08 2016 +0100 Make use of uncertainty parameter when finding nearby places commit bad384b5d8be3ea8905d8f6ca3c20f448869853d Author: Jonny Barnes Date: Wed Sep 28 19:28:42 2016 +0100 Support sending uncertainty value to micropub endpoint --- .../Controllers/MicropubClientController.php | 6 +++- app/Http/Controllers/MicropubController.php | 12 +++++--- changelog.md | 29 ++++++++++-------- public/assets/js/maps/newnote.js.map | 2 +- public/assets/js/newnote.js | 2 +- public/assets/js/newnote.js.br | Bin 1596 -> 1600 bytes public/assets/js/newnote.js.gz | Bin 1806 -> 1815 bytes resources/assets/js/newnote.js | 6 ++-- tests/MicropubTest.php | 6 ++++ 9 files changed, 39 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/MicropubClientController.php b/app/Http/Controllers/MicropubClientController.php index 9035bae8..39842046 100644 --- a/app/Http/Controllers/MicropubClientController.php +++ b/app/Http/Controllers/MicropubClientController.php @@ -307,9 +307,13 @@ class MicropubClientController extends Controller } try { + $query = 'geo:' . $latitude . ',' . $longitude; + if ($request->input('uncertainty') !== null) { + $query .= ';u=' . $request->input('uncertainty'); + } $response = $this->guzzleClient->get($micropubEndpoint, [ 'headers' => ['Authorization' => 'Bearer ' . $token], - 'query' => ['q' => 'geo:' . $latitude . ',' . $longitude], + 'query' => ['q' => $query], ]); } catch (\GuzzleHttp\Exception\BadResponseException $e) { return response()->json([ diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index a3dd6939..e4f5c60d 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -147,11 +147,13 @@ EOD; } //nope, how about a geo URL? if (substr($request->input('q'), 0, 4) === 'geo:') { - $geo = explode(':', $request->input('q')); - $latlng = explode(',', $geo[1]); - $latitude = $latlng[0]; - $longitude = $latlng[1]; - $places = Place::near($latitude, $longitude, 1000); + preg_match_all( + '/([0-9\.\-]+)/', + $request->input('q'), + $matches + ); + $distance = (count($matches[0]) == 3) ? 100 * $matches[0][2] : 1000; + $places = Place::near($matches[0][0], $matches[0][1], $distance); return response()->json([ 'response' => 'places', diff --git a/changelog.md b/changelog.md index e3f4e4a6..c73cd982 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,12 @@ # Changelog +## Version {next} + - Add support for accuracy/uncertainty in geo URIs (issue#20,issue#9) + ## Version 0.0.13 (2016-09-26) - Better places support, particularly with micropub (issue#9) - - Uglify js for better performance (issue#19) - - Autolink spotify links (issue#18) + - Uglify javascript for better performance (issue#19) + - Auto-link Spotify links (issue#18) ## Version 0.0.12 (2016-09-21) - Better indication of number of replies to a note (issue#17) @@ -32,7 +35,7 @@ - Better handling of webmention reply HTML cache ## Version 0.0.11.2 (2016-09-19) - - Update Typekit’s js sri hash + - Update Typekit’s javascript sri hash ## Version 0.0.11.1 (2016-09-17) - Fix a syntax issue in the download webmention job @@ -40,13 +43,13 @@ ## Version 0.0.11 (2016-09-17) - update linked GPG key (issue#7) - Added `integrity` values to external assets (issue#10) - - Move mapbox links into own sub-view (issue#11) - - Updated mapbox version (issue#12) + - Move Mapbox links into own sub-view (issue#11) + - Updated Mapbox version (issue#12) - Massive refactor of webmention code, allowing for re-parse command (issue#8) - Add license file (issue#13) ## Version 0.0.10 (2016-09-10) - - Add an artisan command for sensiolab’s security check + - Add an artisan command for Sensiolab’s security check - Remove `filp/whoops`, just use Laravel’s error reporting - Better TokenMismatchException handling (issue#5) @@ -59,27 +62,27 @@ - Fix an issue with syndicating notes. ## Version 0.0.9 (2016-09-06) - - Adding jsonb column to store webmentions’ mf2. + - Adding `jsonb` column to store webmentions’ microformats. * As of L5.2 this needs a custom command to drop NOT NULL from content, L5.3 should allow a fix for this - Refactor receiving webmention code - - Refactor sending webmention code to pass webmention.rocks + - Refactor sending webmention code to pass `webmention.rocks` - Update to use Laravel 5.3 ## Version 0.0.8.5 (2016-07-18) - - Set the size of the textarea in a form better + - Set the size of the `textarea` in a form better - Update to latest Guzzle to fix CVE-2016-5385 ## Version 0.0.8.4 (2016-07-18) - Make the revised non-elixir asset links absolute ## Version 0.0.8.3 (2016-07-18) - - Dump laravel-elixir, use gulp natively. Also this means using nginx and etags for cache-busting + - Dump `laravel-elixir`, use gulp natively. Also this means using nginx and etags for cache-busting ## Version 0.0.8.2 (2016-07-15) - Improve syndication parsing to allow better name display on new note form ## Version 0.0.8.1 (2016-07-13) - - Fix anh issue in the syndication target parsing method + - Fix an issue in the syndication target parsing method ## Version 0.0.8 (2016-07-13) - Allow new notes to be made by a JSON request from a micropub client @@ -116,11 +119,11 @@ - Add a stylelint lint-staged hook ## Version 0.0.3 (2013-06-09) - - Better tag normalization code organisation + - Better tag normalisation code organisation - Remove `jonnybarnes/unicode-tools` dependency and clean up relevant code ## Version 0.0.2 (2016-05-25) - - Fix issue#1: tagged notes page needs the tag from the URL normalizing. + - Fix issue#1: tagged notes page needs the tag from the URL normalising. ## Version 0.0.1 (2016-05-25) - Initial release diff --git a/public/assets/js/maps/newnote.js.map b/public/assets/js/maps/newnote.js.map index e2027f6f..23e397b2 100644 --- a/public/assets/js/maps/newnote.js.map +++ b/public/assets/js/maps/newnote.js.map @@ -1 +1 @@ -{"version":3,"sources":["newnote.js"],"names":["getLocation","navigator","geolocation","getCurrentPosition","position","addPlacesMap","coords","latitude","longitude","fetch","credentials","method","then","response","json","j","error","alertify","reset","error_description","length","i","places","latlng","parseLocation","location","name","slug","push","addMap","catch","err","console","arguments","form","button","parentNode","div","document","createElement","setAttribute","appendChild","L","mapbox","accessToken","map","setView","addLayer","tileLayer","detectRetina","marker","draggable","addTo","on","placeFormLatitude","querySelector","value","getLatitudeFromMapboxMarker","getLatLng","placeFormLongitude","getLongitudeFromMapboxMarker","selectEl","noLocation","noLocText","createTextNode","insertBefore","forEach","item","option","text","dataset","placeMarker","icon","marker-size","marker-symbol","marker-color","bindPopup","closeButton","panTo","selectPlace","addEventListener","placeLat","selectedIndex","placeLon","newLocButton","nameLabel","classList","add","nameEl","descLabel","descEl","latLabel","latEl","lonLabel","lonEl","placeSubmit","formData","FormData","append","body","placeJson","Error","urlParts","split","pop","removeChild","labels","querySelectorAll","removeLayer","newOption","newPlaceMarker","newName","placeError","point","re","resultArray","exec","selected","replace","disabled"],"mappings":"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","file":"newnote.js","sourcesContent":["/* global L, alertify */\nif ('geolocation' in navigator) {\n var button = document.querySelector('#locate');\n if (button.addEventListener) {\n //if we have javascript, event listeners and geolocation, make the locate\n //button clickable and add event\n button.disabled = false;\n button.addEventListener('click', getLocation);\n }\n}\n\nfunction getLocation() {\n navigator.geolocation.getCurrentPosition(function (position) {\n //the locate button has been clicked so add the places/map\n addPlacesMap(position.coords.latitude, position.coords.longitude);\n });\n}\n\nfunction addPlacesMap(latitude, longitude) {\n //get the nearby places\n fetch('/places/near/' + latitude + '/' + longitude, {\n credentials: 'same-origin',\n method: 'get'\n }).then(function (response) {\n return response.json();\n }).then(function (j) {\n if (j.error == true) {\n alertify.reset();\n alertify.error(j.error_description);\n }\n if (j.length > 0) {\n var i;\n var places = [];\n for (i = 0; i < j.length; ++i) {\n var latlng = parseLocation(j[i].location);\n var name = j[i].name;\n var slug = j[i].slug;\n places.push([name, slug, latlng[0], latlng[1]]);\n }\n //add a map with the nearby places\n addMap(latitude, longitude, places);\n } else {\n //add a map with just current location\n addMap(latitude, longitude);\n }\n }).catch(function (err) {\n console.error(err);\n });\n}\n\nfunction addMap(latitude, longitude, places) {\n //make places null if not supplied\n if (arguments.length == 2) {\n places = null;\n }\n var form = button.parentNode;\n var div = document.createElement('div');\n div.setAttribute('id', 'map');\n //add the map div\n form.appendChild(div);\n L.mapbox.accessToken = 'pk.eyJ1Ijoiam9ubnliYXJuZXMiLCJhIjoiVlpndW1EYyJ9.aP9fxAqLKh7lj0LpFh5k1w';\n var map = L.mapbox.map('map', 'jonnybarnes.gnoihnim')\n .setView([latitude, longitude], 15)\n .addLayer(L.mapbox.tileLayer('jonnybarnes.gnoihnim', {\n detectRetina: true\n }));\n //add a marker for the current location\n var marker = L.marker([latitude, longitude], {\n draggable: true\n }).addTo(map);\n //when the location marker is dragged, if the new place form elements exist\n //update the lat/lng values\n marker.on('dragend', function () {\n var placeFormLatitude = document.querySelector('#place-latitude');\n if (placeFormLatitude !== null) {\n placeFormLatitude.value = getLatitudeFromMapboxMarker(marker.getLatLng());\n }\n var placeFormLongitude = document.querySelector('#place-longitude');\n if (placeFormLongitude !== null) {\n placeFormLongitude.value = getLongitudeFromMapboxMarker(marker.getLatLng());\n }\n });\n //create the \n places.forEach(function (item) {\n var option = document.createElement('option');\n option.setAttribute('value', item[1]);\n var text = document.createTextNode(item[0]);\n option.appendChild(text);\n option.dataset.latitude = item[2];\n option.dataset.longitude = item[3];\n selectEl.appendChild(option);\n var placeMarker = L.marker([item[2], item[3]], {\n icon: L.mapbox.marker.icon({\n 'marker-size': 'large',\n 'marker-symbol': 'building',\n 'marker-color': '#fa0'\n })\n }).addTo(map);\n var name = 'Name: ' + item[0];\n placeMarker.bindPopup(name, {\n closeButton: true\n });\n placeMarker.on('click', function () {\n map.panTo([item[2], item[3]]);\n selectPlace(item[1]);\n });\n });\n //add an event listener\n selectEl.addEventListener('change', function () {\n if (selectEl.value !== 'no-location') {\n var placeLat = selectEl[selectEl.selectedIndex].dataset.latitude;\n var placeLon = selectEl[selectEl.selectedIndex].dataset.longitude;\n map.panTo([placeLat, placeLon]);\n }\n });\n }\n //add a button to add a new place\n var newLocButton = document.createElement('button');\n newLocButton.setAttribute('type', 'button');\n newLocButton.setAttribute('id', 'create-new-place');\n newLocButton.appendChild(document.createTextNode('Create New Place?'));\n //the event listener\n newLocButton.addEventListener('click', function() {\n //add the form elements\n var nameLabel = document.createElement('label');\n nameLabel.setAttribute('for', 'place-name');\n nameLabel.classList.add('place-label');\n nameLabel.appendChild(document.createTextNode('Place Name:'));\n var nameEl = document.createElement('input');\n nameEl.setAttribute('placeholder', 'Name');\n nameEl.setAttribute('name', 'place-name');\n nameEl.setAttribute('id', 'place-name');\n nameEl.setAttribute('type', 'text');\n var descLabel = document.createElement('label');\n descLabel.setAttribute('for', 'place-description');\n descLabel.classList.add('place-label');\n descLabel.appendChild(document.createTextNode('Place Description:'));\n var descEl = document.createElement('input');\n descEl.setAttribute('placeholder', 'Description');\n descEl.setAttribute('name', 'place-description');\n descEl.setAttribute('id', 'place-description');\n descEl.setAttribute('type', 'text');\n var latLabel = document.createElement('label');\n latLabel.setAttribute('for', 'place-latitude');\n latLabel.classList.add('place-label');\n latLabel.appendChild(document.createTextNode('Place Latitude:'));\n var latEl = document.createElement('input');\n latEl.setAttribute('name', 'place-latitude');\n latEl.setAttribute('id', 'place-latitude');\n latEl.setAttribute('type', 'text');\n latEl.value = getLatitudeFromMapboxMarker(marker.getLatLng());\n var lonLabel = document.createElement('label');\n lonLabel.setAttribute('for', 'place-longitude');\n lonLabel.classList.add('place-label');\n lonLabel.appendChild(document.createTextNode('Place Longitude:'));\n var lonEl = document.createElement('input');\n lonEl.setAttribute('name', 'place-longitude');\n lonEl.setAttribute('id', 'place-longitude');\n lonEl.setAttribute('type', 'text');\n lonEl.value = getLongitudeFromMapboxMarker(marker.getLatLng());\n var placeSubmit = document.createElement('button');\n placeSubmit.setAttribute('id', 'place-submit');\n placeSubmit.setAttribute('value', 'Submit New Place');\n placeSubmit.setAttribute('name', 'place-submit');\n placeSubmit.setAttribute('type', 'button');\n placeSubmit.appendChild(document.createTextNode('Submit New Place'));\n form.appendChild(nameLabel);\n form.appendChild(nameEl);\n form.appendChild(descLabel);\n form.appendChild(descEl);\n form.appendChild(latLabel);\n form.appendChild(latEl);\n form.appendChild(lonLabel);\n form.appendChild(lonEl);\n form.appendChild(placeSubmit);\n //the event listener for the new place form\n placeSubmit.addEventListener('click', function () {\n //create the form data to send\n var formData = new FormData();\n formData.append('place-name', document.querySelector('#place-name').value);\n formData.append('place-description', document.querySelector('#place-description').value);\n formData.append('place-latitude', document.querySelector('#place-latitude').value);\n formData.append('place-longitude', document.querySelector('#place-longitude').value);\n //post the new place\n fetch('/places/new', {\n //send cookies with the request\n credentials: 'same-origin',\n method: 'post',\n body: formData\n })\n .then(function (response) {\n return response.json();\n })\n .then(function (placeJson) {\n if (placeJson.error == true) {\n throw new Error(placeJson.error_description);\n }\n //create the slug from the url\n var urlParts = placeJson.split('/');\n var slug = urlParts.pop();\n //remove un-needed form elements\n form.removeChild(document.querySelector('#place-name'));\n form.removeChild(document.querySelector('#place-description'));\n form.removeChild(document.querySelector('#place-latitude'));\n form.removeChild(document.querySelector('#place-longitude'));\n var labels = document.querySelectorAll('.place-label');\n for (var i = 0; i < labels.length; ++i) {\n form.removeChild(labels[i]);\n }\n form.removeChild(document.querySelector('#place-submit'));\n form.removeChild(document.querySelector('#create-new-place'));\n //remove location marker\n map.removeLayer(marker);\n //add place marker\n var newOption = document.createElement('option');\n newOption.setAttribute('value', slug);\n newOption.appendChild(document.createTextNode(placeJson['name']));\n newOption.dataset.latitude = placeJson['latitude'];\n newOption.dataset.longitude = placeJson['longitude'];\n selectEl.appendChild(newOption);\n var newPlaceMarker = L.marker([placeJson['latitude'], placeJson['longitude']], {\n icon: L.mapbox.marker.icon({\n 'marker-size': 'large',\n 'marker-symbol': 'building',\n 'marker-color': '#fa0'\n })\n }).addTo(map);\n var newName = 'Name: ' + placeJson['name'];\n newPlaceMarker.bindPopup(newName, {\n closeButton: true\n });\n newPlaceMarker.on('click', function () {\n map.panTo([placeJson['latitude'], placeJson['longitude']]);\n selectPlace(slug);\n });\n //make selected\n selectPlace(slug);\n }).catch(function (placeError) {\n alertify.reset();\n alertify.error(placeError);\n });\n });\n });\n form.insertBefore(newLocButton, div);\n}\n\nfunction parseLocation(point) {\n var re = /\\((.*)\\)/;\n var resultArray = re.exec(point);\n var location = resultArray[1].split(' ');\n\n return [location[1], location[0]];\n}\n\nfunction selectPlace(slug) {\n document.querySelector('select [value=' + slug + ']').selected = true;\n}\n\nfunction getLatitudeFromMapboxMarker(latlng) {\n var resultArray = /\\((.*)\\)/.exec(latlng);\n var location = resultArray[1].split(' ');\n\n return location[0].replace(',', '');\n}\n\nfunction getLongitudeFromMapboxMarker(latlng) {\n var resultArray = /\\((.*)\\)/.exec(latlng);\n var location = resultArray[1].split(' ');\n\n return location[1];\n}\n"],"sourceRoot":"/source/"} \ No newline at end of file +{"version":3,"sources":["newnote.js"],"names":["getLocation","navigator","geolocation","getCurrentPosition","position","addPlacesMap","coords","latitude","longitude","accuracy","uncertainty","fetch","credentials","method","then","response","json","j","error","alertify","reset","error_description","length","i","places","latlng","parseLocation","location","name","slug","push","addMap","catch","err","console","arguments","form","button","parentNode","div","document","createElement","setAttribute","appendChild","L","mapbox","accessToken","map","setView","addLayer","tileLayer","detectRetina","marker","draggable","addTo","on","placeFormLatitude","querySelector","value","getLatitudeFromMapboxMarker","getLatLng","placeFormLongitude","getLongitudeFromMapboxMarker","selectEl","noLocation","noLocText","createTextNode","insertBefore","forEach","item","option","text","dataset","placeMarker","icon","marker-size","marker-symbol","marker-color","bindPopup","closeButton","panTo","selectPlace","addEventListener","placeLat","selectedIndex","placeLon","newLocButton","nameLabel","classList","add","nameEl","descLabel","descEl","latLabel","latEl","lonLabel","lonEl","placeSubmit","formData","FormData","append","body","placeJson","Error","urlParts","split","pop","removeChild","labels","querySelectorAll","removeLayer","newOption","newPlaceMarker","newName","placeError","point","re","resultArray","exec","selected","replace","disabled"],"mappings":"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","file":"newnote.js","sourcesContent":["/* global L, alertify */\nif ('geolocation' in navigator) {\n var button = document.querySelector('#locate');\n if (button.addEventListener) {\n //if we have javascript, event listeners and geolocation, make the locate\n //button clickable and add event\n button.disabled = false;\n button.addEventListener('click', getLocation);\n }\n}\n\nfunction getLocation() {\n navigator.geolocation.getCurrentPosition(function (position) {\n //the locate button has been clicked so add the places/map\n addPlacesMap(position.coords.latitude, position.coords.longitude, position.coords.accuracy);\n });\n}\n\nfunction addPlacesMap(latitude, longitude, uncertainty) {\n //get the nearby places\n fetch('/places/near/' + latitude + '/' + longitude + '?' + uncertainty, {\n credentials: 'same-origin',\n method: 'get'\n }).then(function (response) {\n return response.json();\n }).then(function (j) {\n if (j.error == true) {\n alertify.reset();\n alertify.error(j.error_description);\n }\n if (j.length > 0) {\n var i;\n var places = [];\n for (i = 0; i < j.length; ++i) {\n var latlng = parseLocation(j[i].location);\n var name = j[i].name;\n var slug = j[i].slug;\n places.push([name, slug, latlng[0], latlng[1]]);\n }\n //add a map with the nearby places\n addMap(latitude, longitude, places);\n } else {\n //add a map with just current location\n addMap(latitude, longitude);\n }\n }).catch(function (err) {\n console.error(err);\n });\n}\n\nfunction addMap(latitude, longitude, places) {\n //make places null if not supplied\n if (arguments.length == 2) {\n places = null;\n }\n var form = button.parentNode;\n var div = document.createElement('div');\n div.setAttribute('id', 'map');\n //add the map div\n form.appendChild(div);\n L.mapbox.accessToken = 'pk.eyJ1Ijoiam9ubnliYXJuZXMiLCJhIjoiVlpndW1EYyJ9.aP9fxAqLKh7lj0LpFh5k1w';\n var map = L.mapbox.map('map', 'jonnybarnes.gnoihnim')\n .setView([latitude, longitude], 15)\n .addLayer(L.mapbox.tileLayer('jonnybarnes.gnoihnim', {\n detectRetina: true\n }));\n //add a marker for the current location\n var marker = L.marker([latitude, longitude], {\n draggable: true\n }).addTo(map);\n //when the location marker is dragged, if the new place form elements exist\n //update the lat/lng values\n marker.on('dragend', function () {\n var placeFormLatitude = document.querySelector('#place-latitude');\n if (placeFormLatitude !== null) {\n placeFormLatitude.value = getLatitudeFromMapboxMarker(marker.getLatLng());\n }\n var placeFormLongitude = document.querySelector('#place-longitude');\n if (placeFormLongitude !== null) {\n placeFormLongitude.value = getLongitudeFromMapboxMarker(marker.getLatLng());\n }\n });\n //create the \n places.forEach(function (item) {\n var option = document.createElement('option');\n option.setAttribute('value', item[1]);\n var text = document.createTextNode(item[0]);\n option.appendChild(text);\n option.dataset.latitude = item[2];\n option.dataset.longitude = item[3];\n selectEl.appendChild(option);\n var placeMarker = L.marker([item[2], item[3]], {\n icon: L.mapbox.marker.icon({\n 'marker-size': 'large',\n 'marker-symbol': 'building',\n 'marker-color': '#fa0'\n })\n }).addTo(map);\n var name = 'Name: ' + item[0];\n placeMarker.bindPopup(name, {\n closeButton: true\n });\n placeMarker.on('click', function () {\n map.panTo([item[2], item[3]]);\n selectPlace(item[1]);\n });\n });\n //add an event listener\n selectEl.addEventListener('change', function () {\n if (selectEl.value !== 'no-location') {\n var placeLat = selectEl[selectEl.selectedIndex].dataset.latitude;\n var placeLon = selectEl[selectEl.selectedIndex].dataset.longitude;\n map.panTo([placeLat, placeLon]);\n }\n });\n }\n //add a button to add a new place\n var newLocButton = document.createElement('button');\n newLocButton.setAttribute('type', 'button');\n newLocButton.setAttribute('id', 'create-new-place');\n newLocButton.appendChild(document.createTextNode('Create New Place?'));\n //the event listener\n newLocButton.addEventListener('click', function() {\n //add the form elements\n var nameLabel = document.createElement('label');\n nameLabel.setAttribute('for', 'place-name');\n nameLabel.classList.add('place-label');\n nameLabel.appendChild(document.createTextNode('Place Name:'));\n var nameEl = document.createElement('input');\n nameEl.setAttribute('placeholder', 'Name');\n nameEl.setAttribute('name', 'place-name');\n nameEl.setAttribute('id', 'place-name');\n nameEl.setAttribute('type', 'text');\n var descLabel = document.createElement('label');\n descLabel.setAttribute('for', 'place-description');\n descLabel.classList.add('place-label');\n descLabel.appendChild(document.createTextNode('Place Description:'));\n var descEl = document.createElement('input');\n descEl.setAttribute('placeholder', 'Description');\n descEl.setAttribute('name', 'place-description');\n descEl.setAttribute('id', 'place-description');\n descEl.setAttribute('type', 'text');\n var latLabel = document.createElement('label');\n latLabel.setAttribute('for', 'place-latitude');\n latLabel.classList.add('place-label');\n latLabel.appendChild(document.createTextNode('Place Latitude:'));\n var latEl = document.createElement('input');\n latEl.setAttribute('name', 'place-latitude');\n latEl.setAttribute('id', 'place-latitude');\n latEl.setAttribute('type', 'text');\n latEl.value = getLatitudeFromMapboxMarker(marker.getLatLng());\n var lonLabel = document.createElement('label');\n lonLabel.setAttribute('for', 'place-longitude');\n lonLabel.classList.add('place-label');\n lonLabel.appendChild(document.createTextNode('Place Longitude:'));\n var lonEl = document.createElement('input');\n lonEl.setAttribute('name', 'place-longitude');\n lonEl.setAttribute('id', 'place-longitude');\n lonEl.setAttribute('type', 'text');\n lonEl.value = getLongitudeFromMapboxMarker(marker.getLatLng());\n var placeSubmit = document.createElement('button');\n placeSubmit.setAttribute('id', 'place-submit');\n placeSubmit.setAttribute('value', 'Submit New Place');\n placeSubmit.setAttribute('name', 'place-submit');\n placeSubmit.setAttribute('type', 'button');\n placeSubmit.appendChild(document.createTextNode('Submit New Place'));\n form.appendChild(nameLabel);\n form.appendChild(nameEl);\n form.appendChild(descLabel);\n form.appendChild(descEl);\n form.appendChild(latLabel);\n form.appendChild(latEl);\n form.appendChild(lonLabel);\n form.appendChild(lonEl);\n form.appendChild(placeSubmit);\n //the event listener for the new place form\n placeSubmit.addEventListener('click', function () {\n //create the form data to send\n var formData = new FormData();\n formData.append('place-name', document.querySelector('#place-name').value);\n formData.append('place-description', document.querySelector('#place-description').value);\n formData.append('place-latitude', document.querySelector('#place-latitude').value);\n formData.append('place-longitude', document.querySelector('#place-longitude').value);\n //post the new place\n fetch('/places/new', {\n //send cookies with the request\n credentials: 'same-origin',\n method: 'post',\n body: formData\n })\n .then(function (response) {\n return response.json();\n })\n .then(function (placeJson) {\n if (placeJson.error == true) {\n throw new Error(placeJson.error_description);\n }\n //create the slug from the url\n var urlParts = placeJson.split('/');\n var slug = urlParts.pop();\n //remove un-needed form elements\n form.removeChild(document.querySelector('#place-name'));\n form.removeChild(document.querySelector('#place-description'));\n form.removeChild(document.querySelector('#place-latitude'));\n form.removeChild(document.querySelector('#place-longitude'));\n var labels = document.querySelectorAll('.place-label');\n for (var i = 0; i < labels.length; ++i) {\n form.removeChild(labels[i]);\n }\n form.removeChild(document.querySelector('#place-submit'));\n form.removeChild(document.querySelector('#create-new-place'));\n //remove location marker\n map.removeLayer(marker);\n //add place marker\n var newOption = document.createElement('option');\n newOption.setAttribute('value', slug);\n newOption.appendChild(document.createTextNode(placeJson['name']));\n newOption.dataset.latitude = placeJson['latitude'];\n newOption.dataset.longitude = placeJson['longitude'];\n selectEl.appendChild(newOption);\n var newPlaceMarker = L.marker([placeJson['latitude'], placeJson['longitude']], {\n icon: L.mapbox.marker.icon({\n 'marker-size': 'large',\n 'marker-symbol': 'building',\n 'marker-color': '#fa0'\n })\n }).addTo(map);\n var newName = 'Name: ' + placeJson['name'];\n newPlaceMarker.bindPopup(newName, {\n closeButton: true\n });\n newPlaceMarker.on('click', function () {\n map.panTo([placeJson['latitude'], placeJson['longitude']]);\n selectPlace(slug);\n });\n //make selected\n selectPlace(slug);\n }).catch(function (placeError) {\n alertify.reset();\n alertify.error(placeError);\n });\n });\n });\n form.insertBefore(newLocButton, div);\n}\n\nfunction parseLocation(point) {\n var re = /\\((.*)\\)/;\n var resultArray = re.exec(point);\n var location = resultArray[1].split(' ');\n\n return [location[1], location[0]];\n}\n\nfunction selectPlace(slug) {\n document.querySelector('select [value=' + slug + ']').selected = true;\n}\n\nfunction getLatitudeFromMapboxMarker(latlng) {\n var resultArray = /\\((.*)\\)/.exec(latlng);\n var location = resultArray[1].split(' ');\n\n return location[0].replace(',', '');\n}\n\nfunction getLongitudeFromMapboxMarker(latlng) {\n var resultArray = /\\((.*)\\)/.exec(latlng);\n var location = resultArray[1].split(' ');\n\n return location[1];\n}\n"],"sourceRoot":"/source/"} \ No newline at end of file diff --git a/public/assets/js/newnote.js b/public/assets/js/newnote.js index 80ed1088..fe1dec15 100644 --- a/public/assets/js/newnote.js +++ b/public/assets/js/newnote.js @@ -1,2 +1,2 @@ -function getLocation(){navigator.geolocation.getCurrentPosition(function(e){addPlacesMap(e.coords.latitude,e.coords.longitude)})}function addPlacesMap(e,t){fetch("/places/near/"+e+"/"+t,{credentials:"same-origin",method:"get"}).then(function(e){return e.json()}).then(function(a){if(1==a.error&&(alertify.reset(),alertify.error(a.error_description)),a.length>0){var n,r=[];for(n=0;n0){var n,r=[];for(n=0;nJ zL)2B~yINc0`Vglk`Fm@LfQN}O!0wI&%Xv!gCiZj`1vP|=2&4BqB$#&*>5bkWki8O2^SW5PUx2~FUyK!V4w zMRVI`^28FbU+#irw@`S+o1^wElH?4_Hl|OE)6Z-X@wn^6Yb7D1MkLsSLP^86F zCRM~R$*Mi8mlMGV86a1yvoB;yVs0@zNo95C%+uEZE1g_QTo; z7KYRhZ!)CcP3M-b-_>u=V!&aioN^!j{&`pa{rMO^Jb$-%`ZK@!#Qt~v^6&M#9gAOf z=2uVue|W#x>d&eV>D6N6yuO6tiS7sfY*T~zY~d_2U!P)TTH20dSa2AC!GjffgKEgg zq4i5I^#1z5&arcJ|Gpx7x)@+WA|TiYV%tZo z+CPph?k&VcAGlK*5vWPJWJ4iJPVxnzTuXaj{aOhl^BumcT2QF)OCRqdHC9|8Z_uO) z+E#A^|E)kOMfAdDF^W(R5F4)%E_<|4e?3>tY&lToheR1E$)+*7Xy#<%k!d5$Uh=JF^U-a&NfAK=zntC zy(zUrJRn;||CScOgQs(?(rH6+ciXh~fSYFSOxp+~^J>r@3KttWq-F6dGPdcoh^Pu2 zeQTF6O3_zPgD0j;ms2Z)uqi>wre$=risE{DK-wmcLDx4@)ygJ7syM=cE__naj(N;a zWDC&@9YC_NBlHKIcPI#K1&cd2xa$uJUK?u7bEu0RQC7aGY@2u|b=Ka48{_ zE$C>2m(skqr=T3FmtX9V_GNbUaS=Y%R>)m+LEB2Dgi^ku+vZYQDn7}L2zqb5w3d-gp20tNS+-w@?Ye4Sq~Uq+alYQla_A59YUARc9I!XXLC zHucw+CD`7D@qY5A{bs z%*6q^qSnuycG%R}aj*-Hwx_4zO?Bj^N}88=z-J~wC(wA*L?4)h-g9`<^WJ%GTs50H z6ts<>$G&-Va%O~0l@m2-z<>eJUH(6jyXT}%(*x@|irapC01|qoASGjN5355;kARI{ yAM)wZR=oqpgSc^R1r}Sm+r`D29<$k<<2#B@b>qUH-#)kjlgmpuil+jNY+V7-$|K?c literal 1596 zcmV-C2E+Lq-WULk!#EavQKhs|Svr=g|9)Q1bwQ1hl(FepOBub0vrHl#6d##T*<`-P zwQiEhgTZjAa;!k&ai6`Kn)6KlR2Wtn@tkA>5=N}u)$O;UG%2N*)t&C^IjynMkz)Xp zu-fn=@+_2wuq?yrw%_@<(G-c3i7~*2o@A7FD7~xL&{J$SPW^%yecT~Iykkgj^!|*D ze)0n*MYfAE`=uRFf)r1t6#9iPJ9TL%3^lybh~9IOZlR#U&P-HHm@Aml6e^gCx#==_ zVhK1bcVUSm&1jH>M^wj3-GKkSIzCvVllsWPcd#D=2v&C z$7*dMe)cQqiN~n#)_{q9NgqBr?Za%cYY%50vtm~d?*nbyn@;&{G&<2_dK|!(4;K}- zY6n*cgilTP|1ry<^n00|Pj3g)nb_9(M7DAYv^C9;|f&PXV( z@+8!I^>&Pw3-*Zl_W6kuG9sGo@~o!ly_W5ih2ec zSpme0h&`xwCJ_EnKa%oX7<2D!NgJ3+Yz7P^FJ5tu?%h*lFZ}`(MFIrJGwl5^s=g0> zO9u;a%zN&Yh6S3ECRrVbRFP^yDA&~2H@}XQI20UbJ+o)|aq-fZHtJIUF#{pg})}!E(#Be<4s9nu6M%o;YIhN`1-PF6Y}>so)lROZDy}RI<$XnyCWm@ zfz_9_qJ1ke;I`AbPUy6vxW8*Vd-6;(b#B-QB-3ib-Vly8a!5<|D?GORq=={roJs4T zFiO!@P=$MEOcygPgRligDJNxg=859octG6dk3g?)!m5=_FsNvRZd?4UqP6pwpGg;@ z8rq6vJw#{^8t+#SSPLfi(cob`$bkKT@@Rs7qD`Wu%eW1MkA3tI?aAY?!reshuS{Gx ze_GZaE(nc^(hsYE177Qf(n)9Z)|R8^$$3D_@JAU^W9XX1f2+P6XR@@XTb+K^Gk0iA9!8lWzk_wfgL}gY6rB@bZ3dTz{ zTGWi`;wYU5o}=KN@tdTKiLdhu2JFYVnbK;cnslp8!k4R*m4{PiV0&iCa8C>^lR0v7 z(-#mgfiscs@n+&(a{8K2bLmL^U*vc(A!Xl-V1gw|qWzNriroEe1zL1sQ%p(^-@8NZ z6u))2qU_I@uFs?#+brp}ii!E%Kz6yUC&Qq?TGAG-p0J<8N7o3t6HhX?;ShzSo5pHy zakkfE{G<>^Q-kH^*<=L&_^9=ou$N+D57X!;k^C=16sMBnf76U|uCFe#KDq8cHodG) zIQ%R3%04XBR_wzw%{K3ex`p;AqEo;$C*7aM5JgaAypdy}hSejmYbojg diff --git a/public/assets/js/newnote.js.gz b/public/assets/js/newnote.js.gz index ba05c98aebab1c11a9c6baee9c60d6bd05f61b25..a912dd735bb946825b452f8238fbee7b48b958ee 100644 GIT binary patch literal 1815 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'the-bridgewater-pub'); } + public function testMicropubRequestForNearbyPlacesThatExistWithUncertaintyParameter() + { + $this->call('GET', $this->appurl . '/api/post', ['q' => 'geo:53.5,-2.38;u=35'], [], [], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]); + $this->see('the-bridgewater-pub'); + } + public function testMicropubRequestForNearbyPlacesThatDoNotExist() { $this->call('GET', $this->appurl . '/api/post', ['q' => 'geo:1.23,4.56'], [], [], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);