]> git.openstreetmap.org Git - rails.git/log
rails.git
10 years agoStyle feature in query mode to match browse mode
Tom Hughes [Sun, 9 Mar 2014 14:09:34 +0000 (14:09 +0000)]
Style feature in query mode to match browse mode

10 years agoDisable query feature tool below z14
Tom Hughes [Sun, 9 Mar 2014 13:51:43 +0000 (13:51 +0000)]
Disable query feature tool below z14

10 years agoIncrease search radius at lower zooms
Tom Hughes [Sun, 9 Mar 2014 13:47:18 +0000 (13:47 +0000)]
Increase search radius at lower zooms

10 years agoShow a message when no features are found
Tom Hughes [Sun, 9 Mar 2014 13:11:35 +0000 (13:11 +0000)]
Show a message when no features are found

10 years agoImprove styling of feature list
Tom Hughes [Sun, 9 Mar 2014 12:29:28 +0000 (12:29 +0000)]
Improve styling of feature list

10 years agoFilter out nodes which are too far away
Tom Hughes [Sun, 9 Mar 2014 11:46:38 +0000 (11:46 +0000)]
Filter out nodes which are too far away

10 years agoInitial work on overpass based query API
Tom Hughes [Sat, 8 Mar 2014 17:40:27 +0000 (17:40 +0000)]
Initial work on overpass based query API

10 years agoMake sure the hash updates properly on browse pages
Tom Hughes [Sun, 16 Mar 2014 14:11:29 +0000 (14:11 +0000)]
Make sure the hash updates properly on browse pages

Rework the way the move listener is disabled during initial
positiong of pages to avoid accidentally leaving it disabled
for the first user move of the map in some cases.

10 years agoDrop client side parsing of lat/lon parameters
Tom Hughes [Sun, 16 Mar 2014 12:55:43 +0000 (12:55 +0000)]
Drop client side parsing of lat/lon parameters

The server always redirects these to a new style link with the
position in the hash, so we don't need to do it client side

10 years agoUpdate to rails 4.0.4
Tom Hughes [Fri, 14 Mar 2014 18:58:02 +0000 (18:58 +0000)]
Update to rails 4.0.4

10 years agoDon't call updateLayers if the new state has no layer config
Tom Hughes [Thu, 13 Mar 2014 21:36:10 +0000 (21:36 +0000)]
Don't call updateLayers if the new state has no layer config

Fixes #719

10 years agoRemove unused (and bogus) code
Tom Hughes [Thu, 13 Mar 2014 17:33:46 +0000 (17:33 +0000)]
Remove unused (and bogus) code

10 years agoBlock submission of the export form when the area is too large
Tom Hughes [Thu, 13 Mar 2014 17:33:06 +0000 (17:33 +0000)]
Block submission of the export form when the area is too large

10 years agoFix more links to use new style #map links
Tom Hughes [Thu, 13 Mar 2014 16:02:50 +0000 (16:02 +0000)]
Fix more links to use new style #map links

10 years agoRemove unused file
Tom Hughes [Thu, 13 Mar 2014 16:01:17 +0000 (16:01 +0000)]
Remove unused file

10 years agoUpdate map state when following a client side route
Tom Hughes [Thu, 13 Mar 2014 13:37:45 +0000 (13:37 +0000)]
Update map state when following a client side route

10 years agoFix link
Tom Hughes [Thu, 13 Mar 2014 13:37:39 +0000 (13:37 +0000)]
Fix link

10 years agoGenerate a new style links for node locations in the data browser
Tom Hughes [Thu, 13 Mar 2014 13:19:50 +0000 (13:19 +0000)]
Generate a new style links for node locations in the data browser

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 12 Mar 2014 13:01:16 +0000 (13:01 +0000)]
Localisation updates from https://translatewiki.net.

10 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

10 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

10 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)

10 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)

10 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

10 years agoAdd some additional information to help people starting out on the project using...
Shaun McDonald [Sun, 9 Mar 2014 12:16:41 +0000 (12:16 +0000)]
Add some additional information to help people starting out on the project using vagrant, especially if you haven't used vagrant before.

10 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

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

10 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

10 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

10 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

10 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

10 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)

10 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

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

10 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

10 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

10 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 )

10 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

10 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 ;) )

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

10 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

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

10 years agoMigrate the database on `vagrant up`.
Matt Amos [Sat, 8 Mar 2014 11:33:52 +0000 (11:33 +0000)]
Migrate the database on `vagrant up`.

Also fix the provisioning script so that it runs correctly when
the VM is upped, regardless of whether it's a clean install or
an 'up' of a previously halted VM.

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

10 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

10 years agoAdded some docs for Vagrant usage.
Matt Amos [Sat, 8 Mar 2014 10:45:51 +0000 (10:45 +0000)]
Added some docs for Vagrant usage.

It doesn't currently recomment using Vagrant - there are probably
some bugs to work out in the process before we can do that.

10 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

10 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

10 years agoMerge remote-tracking branch 'upstream/master' into vagrant
Matt Amos [Sat, 8 Mar 2014 10:18:24 +0000 (10:18 +0000)]
Merge remote-tracking branch 'upstream/master' into vagrant

10 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

10 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.

10 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

10 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

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

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

10 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

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

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

10 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.

10 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

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

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

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

10 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

10 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

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

10 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

10 years agoMove vagrant provisioning script to a better location.
Matt Amos [Wed, 26 Feb 2014 11:35:43 +0000 (11:35 +0000)]
Move vagrant provisioning script to a better location.

10 years agoAdd vagrant config.
Matt Amos [Wed, 26 Feb 2014 02:09:45 +0000 (02:09 +0000)]
Add vagrant config.

Added Vagrantfile and simple provisioning script. This sets up the
packages, gems and databases so that `rake db:migrate` is ready to
run. This might be too much and perhaps more should be done by the
user themselves, I'm not sure...

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

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

10 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

10 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

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

10 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

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

10 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.

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

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

Fixes #699

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

10 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.

10 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

10 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%

10 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

10 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

10 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.