]>
git.openstreetmap.org Git - rails.git/log
Richard Fairhurst [Sun, 9 Mar 2014 20:27:22 +0000 (20:27 +0000)]
Refer to the id for the distance/time summary
(otherwise it fouls up the welcome message spacing)
Richard Fairhurst [Sun, 9 Mar 2014 17:35:51 +0000 (17:35 +0000)]
Merge pull request #17 from danstowell/jsrouting-clearsearch
jsrouting: clear search boxes on page unload
Dan Stowell [Sun, 9 Mar 2014 15:06:08 +0000 (15:06 +0000)]
jsrouting: clear search boxes on page unload
Richard Fairhurst [Sun, 9 Mar 2014 12:05:37 +0000 (12:05 +0000)]
Resolve conflict
Richard Fairhurst [Sun, 9 Mar 2014 11:44:02 +0000 (11:44 +0000)]
Merge pull request #15 from danstowell/jsrouting-highlightsegments
jsrouting: mouseover an instruction, highlight the route segment
Dan Stowell [Sun, 9 Mar 2014 09:37:42 +0000 (09:37 +0000)]
jsrouting: mouseover an instruction, highlight the route segment
Richard Fairhurst [Sat, 8 Mar 2014 17:47:23 +0000 (17:47 +0000)]
Merge pull request #14 from tomhughes/routing
Routing
Tom Hughes [Sat, 8 Mar 2014 17:44:22 +0000 (17:44 +0000)]
Merge remote-tracking branch 'origin/master' into routing
Conflicts:
app/views/layouts/_search.html.erb
Richard Fairhurst [Sat, 8 Mar 2014 16:39:51 +0000 (16:39 +0000)]
Convert tabs to spaces
(because I'll be lynched otherwise, mutter grumble)
Richard Fairhurst [Sat, 8 Mar 2014 16:31:54 +0000 (16:31 +0000)]
Zoom to fit when submitting form
Richard Fairhurst [Sat, 8 Mar 2014 16:14:14 +0000 (16:14 +0000)]
Add distance/time summary
Richard Fairhurst [Sat, 8 Mar 2014 15:17:22 +0000 (15:17 +0000)]
Put marker at exact position user dragged it to
Richard Fairhurst [Sat, 8 Mar 2014 14:14:43 +0000 (14:14 +0000)]
Pass on routing failures from MapQuest
Richard Fairhurst [Sat, 8 Mar 2014 14:03:08 +0000 (14:03 +0000)]
Add CORS for engines that support it
(Do we need a fix for IE8/9?
- https://github.com/MoonScript/jQuery-ajaxTransport-XDomainRequest
- https://github.com/jaubourg/ajaxHooks/blob/master/src/xdr.js )
Richard Fairhurst [Sat, 8 Mar 2014 13:37:27 +0000 (13:37 +0000)]
Refactor MQ/OSRM engines a la @karussell patch
Richard Fairhurst [Sat, 8 Mar 2014 12:35:00 +0000 (12:35 +0000)]
Remove CloudMade foot engine
(OSM is probably not an "Enterprise Plan" customer ;) )
Richard Fairhurst [Sat, 8 Mar 2014 12:31:06 +0000 (12:31 +0000)]
Use generic GraphHopper engine
Richard Fairhurst [Sat, 8 Mar 2014 12:13:40 +0000 (12:13 +0000)]
Merge pull request #13 from danstowell/jsrouting-ffoxdragok
fix firefox behaviour when dragging pointer from the tray to the map
Richard Fairhurst [Sat, 8 Mar 2014 12:07:54 +0000 (12:07 +0000)]
Improve error-handling
Richard Fairhurst [Sat, 8 Mar 2014 11:14:48 +0000 (11:14 +0000)]
Add spinner while awaiting route
Dan Stowell [Sat, 8 Mar 2014 10:48:01 +0000 (10:48 +0000)]
fix firefox behaviour when dragging pointer from the tray to the map
Richard Fairhurst [Sat, 8 Mar 2014 10:43:29 +0000 (10:43 +0000)]
Reformat string to avoid long line
Richard Fairhurst [Sat, 8 Mar 2014 10:29:54 +0000 (10:29 +0000)]
Merge pull request #12 from danstowell/jsrouting-bboxzoom
jsrouting: zoom to bbox on getting fresh geocoded route, but not on drag etc
Dan Stowell [Sat, 8 Mar 2014 09:39:51 +0000 (09:39 +0000)]
jsrouting: zoom to bbox on getting fresh geocoded route, but not on drag etc
Tom Hughes [Fri, 7 Mar 2014 19:18:24 +0000 (19:18 +0000)]
Make the search form a GET form with no extra fields
We only accept GET requests for the search, and although the form is
never normally submitted directly some browsers offer an option to
create a bookmark from a form, so make that work.
Richard Fairhurst [Fri, 7 Mar 2014 15:58:04 +0000 (15:58 +0000)]
Merge pull request #11 from danstowell/jsrouting-pulldownchange
refresh search if showing and user changes provider
Richard Fairhurst [Fri, 7 Mar 2014 15:57:40 +0000 (15:57 +0000)]
Merge pull request #10 from danstowell/jsrouting-credits
add a credits line for each routing service
Tom Hughes [Wed, 5 Mar 2014 22:54:59 +0000 (22:54 +0000)]
Add more helper tests
Tom Hughes [Wed, 5 Mar 2014 22:54:50 +0000 (22:54 +0000)]
Remove an unused method
Tom Hughes [Tue, 4 Mar 2014 15:53:40 +0000 (15:53 +0000)]
Update to Leaflet 0.7.2
Tom Hughes [Sat, 1 Mar 2014 16:02:06 +0000 (16:02 +0000)]
Add more tests for BrowseHelper
Tom Hughes [Sat, 1 Mar 2014 12:36:30 +0000 (12:36 +0000)]
Update config/wiki_pages.yml
João G. Packer [Fri, 28 Feb 2014 01:30:30 +0000 (22:30 -0300)]
Fixed wikipedia link reference to specific sections
When creating a wikipedia link from a tag, the function
is (correctly) appending "?userlang=#{I18N.lang}" to the URL,
but doing this breaks the reference to a specific section
of a wikipedia article (if there is any).
For example, if the tag is "wikipedia=Article#Section", the function
would create a link to "../Article#Section?uselang=xx", and then the
browser wouldn't be able to correctly find the section. The correct
link result should be "../Article?uselang=xx#Section".
This commit fixes this by verifying if there is a reference to a
specific section of the article, and then putting "?uselang=#{I18N.lang}"
between the article's name and the section name.
Tom Hughes [Sat, 1 Mar 2014 00:25:33 +0000 (00:25 +0000)]
Add tests for BrowseHelper#wikipedia_link
Tom Hughes [Fri, 28 Feb 2014 00:28:26 +0000 (00:28 +0000)]
Add tests for OSM.locationCookie
Tom Hughes [Fri, 28 Feb 2014 00:26:34 +0000 (00:26 +0000)]
Apply zoomPrecision to location cookie
Tom Hughes [Fri, 28 Feb 2014 00:10:55 +0000 (00:10 +0000)]
Move cookieContent to OSM.locationCookie
Tom Hughes [Thu, 27 Feb 2014 19:10:36 +0000 (19:10 +0000)]
Update osm.js tests for changes and add some more
Tom Hughes [Thu, 27 Feb 2014 18:15:54 +0000 (18:15 +0000)]
Move zoomPrecision function to the OSM namespace
John Firebaugh [Tue, 11 Sep 2012 15:54:50 +0000 (08:54 -0700)]
Use Konacha for testing JavaScript
Tom Hughes [Wed, 26 Feb 2014 18:53:25 +0000 (18:53 +0000)]
Remove unused (and non-functioning) code
John Firebaugh [Wed, 26 Feb 2014 00:09:18 +0000 (16:09 -0800)]
Update to iD v1.3.7
Tom Hughes [Wed, 26 Feb 2014 00:33:19 +0000 (00:33 +0000)]
Add some more tests for library code
Tom Hughes [Wed, 26 Feb 2014 00:13:47 +0000 (00:13 +0000)]
Remove unused session model
Tom Hughes [Wed, 26 Feb 2014 00:13:19 +0000 (00:13 +0000)]
Reorganise tests to match modern rails test layout
Dan Stowell [Sun, 23 Feb 2014 21:40:21 +0000 (21:40 +0000)]
refresh search if showing and user changes provider
Dan Stowell [Sun, 23 Feb 2014 21:58:28 +0000 (21:58 +0000)]
remove the todo that I addressed
Dan Stowell [Sun, 23 Feb 2014 21:56:39 +0000 (21:56 +0000)]
add a credits line for each routing service
Tom Hughes [Sun, 23 Feb 2014 00:20:57 +0000 (00:20 +0000)]
Add a test to check that html.dir is sensible in every locale
Tom Hughes [Sun, 23 Feb 2014 00:08:51 +0000 (00:08 +0000)]
Uniqify lists of containing ways/relations
Fixes #707
Tom Hughes [Sun, 23 Feb 2014 00:04:59 +0000 (00:04 +0000)]
The html.dir key should not be translated...
Fixes #709
Tom Hughes [Thu, 20 Feb 2014 09:12:41 +0000 (09:12 +0000)]
Apparently asin now throws Math::DomainError instead of Errno::EDOM
John Firebaugh [Wed, 19 Feb 2014 01:20:52 +0000 (17:20 -0800)]
Fix updateLinks({lat: 0, lon: 0}, ...)
Fixes openstreetmap/iD#2130
Tom Hughes [Tue, 18 Feb 2014 21:38:43 +0000 (21:38 +0000)]
Update to rails 4.0.3
Tom Hughes [Mon, 17 Feb 2014 20:10:29 +0000 (20:10 +0000)]
Fixed missing translation
Tom Hughes [Sun, 16 Feb 2014 16:03:00 +0000 (16:03 +0000)]
Drop the slim layout
The slim layout is not really needed since the redesign as the
pages it was used for in the OAuth flow now have less chrome and
work fine on small screens with the normal layout.
Fixes #689
Tom Hughes [Sat, 15 Feb 2014 12:46:09 +0000 (12:46 +0000)]
Add some more shortlink tests
Tom Hughes [Sat, 15 Feb 2014 12:42:52 +0000 (12:42 +0000)]
Improve redirection of shortlinks
If a shortlink includes an object reference then redirect to a new
style browse URL for that object.
Fixes #702
Tom Hughes [Sat, 15 Feb 2014 12:05:30 +0000 (12:05 +0000)]
Include selected layer in short links
Fixes #703
Tom Hughes [Tue, 11 Feb 2014 08:23:55 +0000 (08:23 +0000)]
Remove https load test
Tom Hughes [Mon, 10 Feb 2014 00:34:23 +0000 (00:34 +0000)]
Update to paperclip 4.x and add content type validation
Tom Hughes [Sun, 9 Feb 2014 15:43:31 +0000 (15:43 +0000)]
Removed bogus translations
Siebrand Mazeland [Sun, 9 Feb 2014 15:35:43 +0000 (15:35 +0000)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 9 Feb 2014 12:53:22 +0000 (12:53 +0000)]
More interpolation fixes
Tom Hughes [Sun, 9 Feb 2014 12:43:42 +0000 (12:43 +0000)]
Fix various broken interpolations
Fixes #699
Tom Hughes [Sat, 8 Feb 2014 17:43:34 +0000 (17:43 +0000)]
Fix some mixed content issues
Richard Fairhurst [Fri, 7 Feb 2014 13:41:25 +0000 (13:41 +0000)]
Make it clear that notes are for map improvements
...and use friendlier-sounding language. Should help avoid
instances like http://www.openstreetmap.org/note/114639 and
http://www.openstreetmap.org/note/114640, though I'm sorely
tempted to add "amenity=brian" and "amenity=george" in response
to these.
Tom Hughes [Thu, 6 Feb 2014 09:14:06 +0000 (09:14 +0000)]
Avoid using one translation as the key for a second
Translation keys need to be fixed, so we can't use the result of
one lookup to derive the key for another...
Fixes #697
Tom Hughes [Wed, 5 Feb 2014 19:43:44 +0000 (19:43 +0000)]
Boost https tile traffic to 20%
John Firebaugh [Wed, 5 Feb 2014 18:17:25 +0000 (10:17 -0800)]
Update to iD v1.3.6
Tom Hughes [Wed, 5 Feb 2014 18:38:36 +0000 (18:38 +0000)]
Send 5% of users tiles over https as a test
Tom Hughes [Tue, 4 Feb 2014 22:31:44 +0000 (22:31 +0000)]
Preserve message details over validation errors
If a validation error occurs while saving a message then make
sure the values are preserved in the new form.
Richard Fairhurst [Mon, 3 Feb 2014 18:08:53 +0000 (18:08 +0000)]
Fiiiix siiiiilly direeeeections
Richard Fairhurst [Mon, 3 Feb 2014 17:35:44 +0000 (09:35 -0800)]
Merge pull request #6 from apmon/jsroute
Make more of the javascript routing functions internationalizable
Tom Hughes [Sun, 2 Feb 2014 15:35:56 +0000 (15:35 +0000)]
Fix broken interpolation variables
Siebrand Mazeland [Sun, 2 Feb 2014 13:13:49 +0000 (13:13 +0000)]
Localisation updates from https://translatewiki.net.
Kai Krueger [Sun, 2 Feb 2014 04:10:54 +0000 (21:10 -0700)]
Make more of the javascript routing functions internationalizable
Tom Hughes [Wed, 29 Jan 2014 22:47:17 +0000 (22:47 +0000)]
Remove version lock on dalli now that ruby-openid is updated
Tom Hughes [Mon, 27 Jan 2014 21:07:34 +0000 (21:07 +0000)]
Pass preferred language to geonames API calls
Tom Hughes [Mon, 27 Jan 2014 21:02:00 +0000 (21:02 +0000)]
Use api.geonames.org for reverse searches
Tom Hughes [Fri, 24 Jan 2014 20:37:29 +0000 (20:37 +0000)]
Fix interpolation variables
Siebrand Mazeland [Fri, 24 Jan 2014 20:15:41 +0000 (20:15 +0000)]
Localisation updates from https://translatewiki.net.
Richard Fairhurst [Thu, 23 Jan 2014 22:53:07 +0000 (22:53 +0000)]
Remove some repeated-query funkiness
Richard Fairhurst [Thu, 23 Jan 2014 22:32:39 +0000 (22:32 +0000)]
Remove a couple of TODOs
Richard Fairhurst [Thu, 23 Jan 2014 22:31:44 +0000 (22:31 +0000)]
Repair Go button
Richard Fairhurst [Thu, 23 Jan 2014 22:29:09 +0000 (22:29 +0000)]
Apparently 'final' is a reserved word in JS...
Richard Fairhurst [Thu, 23 Jan 2014 21:10:11 +0000 (21:10 +0000)]
Integrate marker & geocoding behaviours
Richard Fairhurst [Thu, 23 Jan 2014 20:19:06 +0000 (20:19 +0000)]
Add GraphHopper engine (thanks @karussell!)
Richard Fairhurst [Thu, 23 Jan 2014 11:38:01 +0000 (11:38 +0000)]
More draggable routes work
Richard Fairhurst [Thu, 23 Jan 2014 10:26:04 +0000 (10:26 +0000)]
More work on draggable markers
Richard Fairhurst [Thu, 23 Jan 2014 00:49:00 +0000 (00:49 +0000)]
Start work on drag-and-drop start/end markers
Richard Fairhurst [Wed, 22 Jan 2014 20:31:58 +0000 (20:31 +0000)]
Remove logging
Richard Fairhurst [Wed, 22 Jan 2014 20:29:38 +0000 (20:29 +0000)]
Allow user to click Go before geocode result
Richard Fairhurst [Wed, 22 Jan 2014 18:53:30 +0000 (18:53 +0000)]
Parse CloudMade directions
Richard Fairhurst [Wed, 22 Jan 2014 18:38:07 +0000 (18:38 +0000)]
Parse MapQuest directions
Richard Fairhurst [Wed, 22 Jan 2014 18:20:07 +0000 (18:20 +0000)]
Move more engine-specific stuff out of main .js
Richard Fairhurst [Wed, 22 Jan 2014 15:53:35 +0000 (15:53 +0000)]
Start MapQuest Open support
Richard Fairhurst [Wed, 22 Jan 2014 12:52:51 +0000 (12:52 +0000)]
Simplify usage, fix closures
Richard Fairhurst [Wed, 22 Jan 2014 09:52:01 +0000 (09:52 +0000)]
Move routing engines into their own files
Richard Fairhurst [Tue, 21 Jan 2014 23:47:50 +0000 (23:47 +0000)]
Start work on second engine