rails.git
6 years agoMinor fixes to the I18n code of routing
Kai Krueger [Sat, 29 Mar 2014 22:47:42 +0000 (16:47 -0600)]
Minor fixes to the I18n code of routing

MapQuest instructions still don't translate, as that backend doesn't accept
simple language locals but require country codes as well.

6 years agoDon't show http-only routers to users on https
Richard Fairhurst [Mon, 10 Mar 2014 18:02:28 +0000 (18:02 +0000)]
Don't show http-only routers to users on https

6 years agoFrom->To->Go order as per @samanpwbb's comment
Richard Fairhurst [Mon, 10 Mar 2014 16:55:01 +0000 (16:55 +0000)]
From->To->Go order as per @samanpwbb's comment

6 years agoFirefox-friendly calculation of dragstart offset
Richard Fairhurst [Sun, 9 Mar 2014 21:29:48 +0000 (21:29 +0000)]
Firefox-friendly calculation of dragstart offset
(personally I am not feeling very Firefox-friendly right now)

6 years agoRefer to the id for the distance/time summary
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)

6 years agoMerge pull request #17 from danstowell/jsrouting-clearsearch
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

6 years agojsrouting: 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

6 years agoResolve conflict
Richard Fairhurst [Sun, 9 Mar 2014 12:05:37 +0000 (12:05 +0000)]
Resolve conflict

6 years agoMerge pull request #15 from danstowell/jsrouting-highlightsegments
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

6 years agojsrouting: 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

6 years agoMerge pull request #14 from tomhughes/routing
Richard Fairhurst [Sat, 8 Mar 2014 17:47:23 +0000 (17:47 +0000)]
Merge pull request #14 from tomhughes/routing

Routing

6 years agoMerge remote-tracking branch 'origin/master' into 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

6 years agoConvert tabs to spaces
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)

6 years agoZoom to fit when submitting form
Richard Fairhurst [Sat, 8 Mar 2014 16:31:54 +0000 (16:31 +0000)]
Zoom to fit when submitting form

6 years agoAdd distance/time summary
Richard Fairhurst [Sat, 8 Mar 2014 16:14:14 +0000 (16:14 +0000)]
Add distance/time summary

6 years agoPut marker at exact position user dragged it to
Richard Fairhurst [Sat, 8 Mar 2014 15:17:22 +0000 (15:17 +0000)]
Put marker at exact position user dragged it to

6 years agoPass on routing failures from MapQuest
Richard Fairhurst [Sat, 8 Mar 2014 14:14:43 +0000 (14:14 +0000)]
Pass on routing failures from MapQuest

6 years agoAdd CORS for engines that support it
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 )

6 years agoRefactor MQ/OSRM engines a la @karussell patch
Richard Fairhurst [Sat, 8 Mar 2014 13:37:27 +0000 (13:37 +0000)]
Refactor MQ/OSRM engines a la @karussell patch

6 years agoRemove CloudMade foot engine
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 ;) )

6 years agoUse generic GraphHopper engine
Richard Fairhurst [Sat, 8 Mar 2014 12:31:06 +0000 (12:31 +0000)]
Use generic GraphHopper engine

6 years agoMerge pull request #13 from danstowell/jsrouting-ffoxdragok
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

6 years agoImprove error-handling
Richard Fairhurst [Sat, 8 Mar 2014 12:07:54 +0000 (12:07 +0000)]
Improve error-handling

6 years agoAdd spinner while awaiting route
Richard Fairhurst [Sat, 8 Mar 2014 11:14:48 +0000 (11:14 +0000)]
Add spinner while awaiting route

6 years agofix firefox behaviour when dragging pointer from the tray to the map
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

6 years agoReformat string to avoid long line
Richard Fairhurst [Sat, 8 Mar 2014 10:43:29 +0000 (10:43 +0000)]
Reformat string to avoid long line

6 years agoMerge pull request #12 from danstowell/jsrouting-bboxzoom
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

6 years agojsrouting: 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

6 years agoMake the search form a GET form with no extra fields
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.

6 years agoMerge pull request #11 from danstowell/jsrouting-pulldownchange
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

6 years agoMerge pull request #10 from danstowell/jsrouting-credits
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

6 years agoAdd more helper tests
Tom Hughes [Wed, 5 Mar 2014 22:54:59 +0000 (22:54 +0000)]
Add more helper tests

6 years agoRemove an unused method
Tom Hughes [Wed, 5 Mar 2014 22:54:50 +0000 (22:54 +0000)]
Remove an unused method

6 years agoUpdate to Leaflet 0.7.2
Tom Hughes [Tue, 4 Mar 2014 15:53:40 +0000 (15:53 +0000)]
Update to Leaflet 0.7.2

6 years agoAdd more tests for BrowseHelper
Tom Hughes [Sat, 1 Mar 2014 16:02:06 +0000 (16:02 +0000)]
Add more tests for BrowseHelper

6 years agoUpdate config/wiki_pages.yml
Tom Hughes [Sat, 1 Mar 2014 12:36:30 +0000 (12:36 +0000)]
Update config/wiki_pages.yml

6 years agoFixed wikipedia link reference to specific sections
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.

6 years agoAdd tests for BrowseHelper#wikipedia_link
Tom Hughes [Sat, 1 Mar 2014 00:25:33 +0000 (00:25 +0000)]
Add tests for BrowseHelper#wikipedia_link

6 years agoAdd tests for OSM.locationCookie
Tom Hughes [Fri, 28 Feb 2014 00:28:26 +0000 (00:28 +0000)]
Add tests for OSM.locationCookie

6 years agoApply zoomPrecision to location cookie
Tom Hughes [Fri, 28 Feb 2014 00:26:34 +0000 (00:26 +0000)]
Apply zoomPrecision to location cookie

6 years agoMove cookieContent to OSM.locationCookie
Tom Hughes [Fri, 28 Feb 2014 00:10:55 +0000 (00:10 +0000)]
Move cookieContent to OSM.locationCookie

6 years agoUpdate osm.js tests for changes and add some more
Tom Hughes [Thu, 27 Feb 2014 19:10:36 +0000 (19:10 +0000)]
Update osm.js tests for changes and add some more

6 years agoMove zoomPrecision function to the OSM namespace
Tom Hughes [Thu, 27 Feb 2014 18:15:54 +0000 (18:15 +0000)]
Move zoomPrecision function to the OSM namespace

6 years agoUse Konacha for testing JavaScript
John Firebaugh [Tue, 11 Sep 2012 15:54:50 +0000 (08:54 -0700)]
Use Konacha for testing JavaScript

6 years agoRemove unused (and non-functioning) code
Tom Hughes [Wed, 26 Feb 2014 18:53:25 +0000 (18:53 +0000)]
Remove unused (and non-functioning) code

6 years agoUpdate to iD v1.3.7
John Firebaugh [Wed, 26 Feb 2014 00:09:18 +0000 (16:09 -0800)]
Update to iD v1.3.7

6 years agoAdd some more tests for library code
Tom Hughes [Wed, 26 Feb 2014 00:33:19 +0000 (00:33 +0000)]
Add some more tests for library code

6 years agoRemove unused session model
Tom Hughes [Wed, 26 Feb 2014 00:13:47 +0000 (00:13 +0000)]
Remove unused session model

6 years agoReorganise tests to match modern rails test layout
Tom Hughes [Wed, 26 Feb 2014 00:13:19 +0000 (00:13 +0000)]
Reorganise tests to match modern rails test layout

6 years agorefresh search if showing and user changes provider
Dan Stowell [Sun, 23 Feb 2014 21:40:21 +0000 (21:40 +0000)]
refresh search if showing and user changes provider

6 years agoremove the todo that I addressed
Dan Stowell [Sun, 23 Feb 2014 21:58:28 +0000 (21:58 +0000)]
remove the todo that I addressed

6 years agoadd a credits line for each routing service
Dan Stowell [Sun, 23 Feb 2014 21:56:39 +0000 (21:56 +0000)]
add a credits line for each routing service

6 years agoAdd a test to check that html.dir is sensible in every locale
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

6 years agoUniqify lists of containing ways/relations
Tom Hughes [Sun, 23 Feb 2014 00:08:51 +0000 (00:08 +0000)]
Uniqify lists of containing ways/relations

Fixes #707

6 years agoThe html.dir key should not be translated...
Tom Hughes [Sun, 23 Feb 2014 00:04:59 +0000 (00:04 +0000)]
The html.dir key should not be translated...

Fixes #709

6 years agoApparently asin now throws Math::DomainError instead of Errno::EDOM
Tom Hughes [Thu, 20 Feb 2014 09:12:41 +0000 (09:12 +0000)]
Apparently asin now throws Math::DomainError instead of Errno::EDOM

6 years agoFix updateLinks({lat: 0, lon: 0}, ...)
John Firebaugh [Wed, 19 Feb 2014 01:20:52 +0000 (17:20 -0800)]
Fix updateLinks({lat: 0, lon: 0}, ...)

Fixes openstreetmap/iD#2130

6 years agoUpdate to rails 4.0.3
Tom Hughes [Tue, 18 Feb 2014 21:38:43 +0000 (21:38 +0000)]
Update to rails 4.0.3

6 years agoFixed missing translation
Tom Hughes [Mon, 17 Feb 2014 20:10:29 +0000 (20:10 +0000)]
Fixed missing translation

6 years agoDrop the slim layout
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

6 years agoAdd some more shortlink tests
Tom Hughes [Sat, 15 Feb 2014 12:46:09 +0000 (12:46 +0000)]
Add some more shortlink tests

6 years agoImprove redirection of shortlinks
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

6 years agoInclude selected layer in short links
Tom Hughes [Sat, 15 Feb 2014 12:05:30 +0000 (12:05 +0000)]
Include selected layer in short links

Fixes #703

6 years agoRemove https load test
Tom Hughes [Tue, 11 Feb 2014 08:23:55 +0000 (08:23 +0000)]
Remove https load test

6 years agoUpdate to paperclip 4.x and add content type validation
Tom Hughes [Mon, 10 Feb 2014 00:34:23 +0000 (00:34 +0000)]
Update to paperclip 4.x and add content type validation

6 years agoRemoved bogus translations
Tom Hughes [Sun, 9 Feb 2014 15:43:31 +0000 (15:43 +0000)]
Removed bogus translations

6 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sun, 9 Feb 2014 15:35:43 +0000 (15:35 +0000)]
Localisation updates from https://translatewiki.net.

6 years agoMore interpolation fixes
Tom Hughes [Sun, 9 Feb 2014 12:53:22 +0000 (12:53 +0000)]
More interpolation fixes

6 years agoFix various broken interpolations
Tom Hughes [Sun, 9 Feb 2014 12:43:42 +0000 (12:43 +0000)]
Fix various broken interpolations

Fixes #699

6 years agoFix some mixed content issues
Tom Hughes [Sat, 8 Feb 2014 17:43:34 +0000 (17:43 +0000)]
Fix some mixed content issues

6 years agoMake it clear that notes are for map improvements
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.

6 years agoAvoid using one translation as the key for a second
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

6 years agoBoost https tile traffic to 20%
Tom Hughes [Wed, 5 Feb 2014 19:43:44 +0000 (19:43 +0000)]
Boost https tile traffic to 20%

6 years agoUpdate to iD v1.3.6
John Firebaugh [Wed, 5 Feb 2014 18:17:25 +0000 (10:17 -0800)]
Update to iD v1.3.6

6 years agoSend 5% of users tiles over https as a test
Tom Hughes [Wed, 5 Feb 2014 18:38:36 +0000 (18:38 +0000)]
Send 5% of users tiles over https as a test

6 years agoPreserve message details over validation errors
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.

6 years agoFiiiix siiiiilly direeeeections
Richard Fairhurst [Mon, 3 Feb 2014 18:08:53 +0000 (18:08 +0000)]
Fiiiix siiiiilly direeeeections

6 years agoMerge pull request #6 from apmon/jsroute
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

6 years agoFix broken interpolation variables
Tom Hughes [Sun, 2 Feb 2014 15:35:56 +0000 (15:35 +0000)]
Fix broken interpolation variables

6 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sun, 2 Feb 2014 13:13:49 +0000 (13:13 +0000)]
Localisation updates from https://translatewiki.net.

6 years agoMake more of the javascript routing functions internationalizable
Kai Krueger [Sun, 2 Feb 2014 04:10:54 +0000 (21:10 -0700)]
Make more of the javascript routing functions internationalizable

6 years agoRemove version lock on dalli now that ruby-openid is updated
Tom Hughes [Wed, 29 Jan 2014 22:47:17 +0000 (22:47 +0000)]
Remove version lock on dalli now that ruby-openid is updated

6 years agoPass preferred language to geonames API calls
Tom Hughes [Mon, 27 Jan 2014 21:07:34 +0000 (21:07 +0000)]
Pass preferred language to geonames API calls

6 years agoUse api.geonames.org for reverse searches
Tom Hughes [Mon, 27 Jan 2014 21:02:00 +0000 (21:02 +0000)]
Use api.geonames.org for reverse searches

6 years agoFix interpolation variables
Tom Hughes [Fri, 24 Jan 2014 20:37:29 +0000 (20:37 +0000)]
Fix interpolation variables

6 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 24 Jan 2014 20:15:41 +0000 (20:15 +0000)]
Localisation updates from https://translatewiki.net.

6 years agoRemove some repeated-query funkiness
Richard Fairhurst [Thu, 23 Jan 2014 22:53:07 +0000 (22:53 +0000)]
Remove some repeated-query funkiness

6 years agoRemove a couple of TODOs
Richard Fairhurst [Thu, 23 Jan 2014 22:32:39 +0000 (22:32 +0000)]
Remove a couple of TODOs

6 years agoRepair Go button
Richard Fairhurst [Thu, 23 Jan 2014 22:31:44 +0000 (22:31 +0000)]
Repair Go button

6 years agoApparently 'final' is a reserved word in JS...
Richard Fairhurst [Thu, 23 Jan 2014 22:29:09 +0000 (22:29 +0000)]
Apparently 'final' is a reserved word in JS...

6 years agoIntegrate marker & geocoding behaviours
Richard Fairhurst [Thu, 23 Jan 2014 21:10:11 +0000 (21:10 +0000)]
Integrate marker & geocoding behaviours

6 years agoAdd GraphHopper engine (thanks @karussell!)
Richard Fairhurst [Thu, 23 Jan 2014 20:19:06 +0000 (20:19 +0000)]
Add GraphHopper engine (thanks @karussell!)

6 years agoMore draggable routes work
Richard Fairhurst [Thu, 23 Jan 2014 11:38:01 +0000 (11:38 +0000)]
More draggable routes work

6 years agoMore work on draggable markers
Richard Fairhurst [Thu, 23 Jan 2014 10:26:04 +0000 (10:26 +0000)]
More work on draggable markers

6 years agoStart work on drag-and-drop start/end markers
Richard Fairhurst [Thu, 23 Jan 2014 00:49:00 +0000 (00:49 +0000)]
Start work on drag-and-drop start/end markers

6 years agoRemove logging
Richard Fairhurst [Wed, 22 Jan 2014 20:31:58 +0000 (20:31 +0000)]
Remove logging

6 years agoAllow user to click Go before geocode result
Richard Fairhurst [Wed, 22 Jan 2014 20:29:38 +0000 (20:29 +0000)]
Allow user to click Go before geocode result

6 years agoParse CloudMade directions
Richard Fairhurst [Wed, 22 Jan 2014 18:53:30 +0000 (18:53 +0000)]
Parse CloudMade directions

6 years agoParse MapQuest directions
Richard Fairhurst [Wed, 22 Jan 2014 18:38:07 +0000 (18:38 +0000)]
Parse MapQuest directions

6 years agoMove more engine-specific stuff out of main .js
Richard Fairhurst [Wed, 22 Jan 2014 18:20:07 +0000 (18:20 +0000)]
Move more engine-specific stuff out of main .js