]> git.openstreetmap.org Git - rails.git/log
rails.git
10 years agoModernise use of find and update_all in database migrations
Tom Hughes [Thu, 24 Apr 2014 23:41:39 +0000 (00:41 +0100)]
Modernise use of find and update_all in database migrations

10 years agoDon't pass strings to set_fixture_class
Tom Hughes [Thu, 24 Apr 2014 23:22:43 +0000 (00:22 +0100)]
Don't pass strings to set_fixture_class

10 years agoDon't try and route to a note with no ID
Tom Hughes [Fri, 25 Apr 2014 23:13:49 +0000 (00:13 +0100)]
Don't try and route to a note with no ID

Fixes #733

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 21 Apr 2014 09:27:51 +0000 (09:27 +0000)]
Localisation updates from https://translatewiki.net.

10 years agoUpdate to iD v1.3.9
John Firebaugh [Wed, 9 Apr 2014 19:07:54 +0000 (15:07 -0400)]
Update to iD v1.3.9

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sun, 6 Apr 2014 17:12:22 +0000 (17:12 +0000)]
Localisation updates from https://translatewiki.net.

10 years agoAdd support for remote edit over https on port 8112
Tom Hughes [Tue, 1 Apr 2014 18:17:15 +0000 (19:17 +0100)]
Add support for remote edit over https on port 8112

10 years agoMerge pull request #20 from karussell/routing
Richard Fairhurst [Tue, 1 Apr 2014 15:15:17 +0000 (16:15 +0100)]
Merge pull request #20 from karussell/routing

Using GraphHopper new API

10 years agoUsing GraphHopper new API
Peter [Tue, 1 Apr 2014 14:22:06 +0000 (16:22 +0200)]
Using GraphHopper new API

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 31 Mar 2014 21:44:36 +0000 (21:44 +0000)]
Localisation updates from https://translatewiki.net.

10 years agoMerge pull request #19 from apmon/jsroute2
Richard Fairhurst [Mon, 31 Mar 2014 16:51:37 +0000 (17:51 +0100)]
Merge pull request #19 from apmon/jsroute2

Minor fixes to the I18n code of routing

10 years agoMerge pull request #18 from danstowell/jsrouting-durationcalc
Richard Fairhurst [Mon, 31 Mar 2014 16:50:48 +0000 (17:50 +0100)]
Merge pull request #18 from danstowell/jsrouting-durationcalc

Fix hours:minutes duration display for routing

10 years agoIgnore clicks on query results if the mouse has moved
Tom Hughes [Mon, 31 Mar 2014 10:33:27 +0000 (11:33 +0100)]
Ignore clicks on query results if the mouse has moved

10 years agoMerge branch 'master' into overpass
Tom Hughes [Mon, 31 Mar 2014 10:30:57 +0000 (11:30 +0100)]
Merge branch 'master' into overpass

10 years agoIgnore clicks on history entries if the mouse has moved
Tom Hughes [Mon, 31 Mar 2014 10:25:40 +0000 (11:25 +0100)]
Ignore clicks on history entries if the mouse has moved

Ignore click events on history events if the mouse moves so that
drag selection can work. Fixes #581.

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

10 years agoMerge branch 'master' into overpass
Tom Hughes [Fri, 28 Mar 2014 22:48:55 +0000 (22:48 +0000)]
Merge branch 'master' into overpass

10 years agoRemove highlight from map when clicking on a feature
Tom Hughes [Fri, 28 Mar 2014 22:48:22 +0000 (22:48 +0000)]
Remove highlight from map when clicking on a feature

10 years agoStop query button disabling query mode once it is active
Tom Hughes [Fri, 28 Mar 2014 22:44:59 +0000 (22:44 +0000)]
Stop query button disabling query mode once it is active

10 years agoUpdate to iD v1.3.8
John Firebaugh [Fri, 28 Mar 2014 18:58:55 +0000 (11:58 -0700)]
Update to iD v1.3.8

10 years agoAdd https support for overpass
Tom Hughes [Tue, 25 Mar 2014 18:43:58 +0000 (18:43 +0000)]
Add https support for overpass

10 years agoFix hours:minutes duration display for routing
Dan Stowell [Sat, 22 Mar 2014 12:53:08 +0000 (12:53 +0000)]
Fix hours:minutes duration display for routing

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Tue, 18 Mar 2014 12:29:59 +0000 (12:29 +0000)]
Localisation updates from https://translatewiki.net.

10 years agoAdd comment describing the overpass queries we use
Tom Hughes [Mon, 17 Mar 2014 09:19:14 +0000 (09:19 +0000)]
Add comment describing the overpass queries we use

10 years agoSimplify overpass query for nearby objects
Tom Hughes [Mon, 17 Mar 2014 09:14:42 +0000 (09:14 +0000)]
Simplify overpass query for nearby objects

10 years agoAdd an error handler for overpass AJAX calls
Tom Hughes [Mon, 17 Mar 2014 00:24:29 +0000 (00:24 +0000)]
Add an error handler for overpass AJAX calls

10 years agoMake sure the query location is always in view
Tom Hughes [Sun, 16 Mar 2014 16:47:27 +0000 (16:47 +0000)]
Make sure the query location is always in view

10 years agoMerge branch 'master' into overpass
Tom Hughes [Sun, 16 Mar 2014 16:20:39 +0000 (16:20 +0000)]
Merge branch 'master' into overpass

10 years agoPivot areas to the underlying way or relation object
Tom Hughes [Fri, 14 Mar 2014 00:31:24 +0000 (00:31 +0000)]
Pivot areas to the underlying way or relation object

10 years agoAbort any existing requests when starting new ones
Tom Hughes [Thu, 13 Mar 2014 22:59:36 +0000 (22:59 +0000)]
Abort any existing requests when starting new ones

10 years agoMake overpass server URL configurable
Tom Hughes [Thu, 13 Mar 2014 19:28:45 +0000 (19:28 +0000)]
Make overpass server URL configurable

10 years agoUse POST for overpass queries
Tom Hughes [Thu, 13 Mar 2014 19:25:18 +0000 (19:25 +0000)]
Use POST for overpass queries

10 years agoBuild and show partial geometries for relatons
Tom Hughes [Thu, 13 Mar 2014 18:54:39 +0000 (18:54 +0000)]
Build and show partial geometries for relatons

10 years agoConsider addr:housename as a name source for features
Tom Hughes [Sun, 9 Mar 2014 23:02:25 +0000 (23:02 +0000)]
Consider addr:housename as a name source for features

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