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

5 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

5 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

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

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

5 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

5 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

5 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

5 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

5 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

5 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

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

5 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

5 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

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

5 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

5 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

5 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

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

5 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

5 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

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

5 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

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

5 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

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

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

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

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

5 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

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

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

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

5 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

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

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

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

5 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

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

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

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

5 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

5 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

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

5 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

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

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

5 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

5 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

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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

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

5 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

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

5 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

5 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

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

5 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

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

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

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

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

Fixes #699

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

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

5 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

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

5 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

5 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

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

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

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

5 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

5 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

5 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

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

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

5 years agoCompile the fixthemap javascript
Tom Hughes [Sun, 19 Jan 2014 20:19:33 +0000 (20:19 +0000)]
Compile the fixthemap javascript

5 years agoReserve enough space for the buttons at the bottom of the message list
Marco Antonio Frias Butrón [Thu, 16 Jan 2014 04:13:26 +0000 (00:13 -0400)]
Reserve enough space for the buttons at the bottom of the message list

5 years agoAdd a tests for the fixthemap page
Tom Hughes [Sun, 19 Jan 2014 13:52:17 +0000 (13:52 +0000)]
Add a tests for the fixthemap page

5 years agoAdd a landing page for "fix the map / report a problem" links
Simon Poole [Sun, 19 Jan 2014 13:48:27 +0000 (13:48 +0000)]
Add a landing page for "fix the map / report a problem" links

5 years agoChanging the note search limit from 9999 to 10000
Toby Murray [Thu, 16 Jan 2014 08:28:34 +0000 (02:28 -0600)]
Changing the note search limit from 9999 to 10000

The documentation says the limit is 10000 which seems like a
nicer round number anyway.

5 years agoStick with dalli 2.6.x for now until ruby-openid is updated
Tom Hughes [Sat, 18 Jan 2014 16:54:20 +0000 (16:54 +0000)]
Stick with dalli 2.6.x for now until ruby-openid is updated

https://github.com/openid/ruby-openid/pull/67
https://github.com/mperham/dalli/issues/424

5 years agoRemove code to populate countries table
Tom Hughes [Fri, 17 Jan 2014 19:57:58 +0000 (19:57 +0000)]
Remove code to populate countries table

5 years agoLoad soap4r so IP geolocation works
Tom Hughes [Fri, 17 Jan 2014 19:57:20 +0000 (19:57 +0000)]
Load soap4r so IP geolocation works

5 years agoReplace the country table with a static XML countries file
Tom Hughes [Fri, 17 Jan 2014 19:25:58 +0000 (19:25 +0000)]
Replace the country table with a static XML countries file

Storing the countries in the database is overkill, so just use a
copy of the geonames countryInfo data that is loaded into a hash
the first time it is used.

5 years agoHighlight erroneous fields by adding a class to them
Tom Hughes [Wed, 15 Jan 2014 21:09:54 +0000 (21:09 +0000)]
Highlight erroneous fields by adding a class to them

The default rails scheme for highlighting errors is to wrap the
field in a div, but that changes the structure of the page and can
change the meaning of CSS rules applied to the fields.

As an alternative we now apply a class to the fields, and use that
in the CSS to apply a highlight.

5 years agoChange attribute names for diary/message titles to match UI labels
Tom Hughes [Wed, 15 Jan 2014 20:26:22 +0000 (20:26 +0000)]
Change attribute names for diary/message titles to match UI labels

5 years agoReenable the note search API
Tom Hughes [Wed, 15 Jan 2014 19:58:58 +0000 (19:58 +0000)]
Reenable the note search API

Add a postgress freetext index on the note comments, and enable
note searching using freetext matching.

5 years agoPreserve aspect ratio when scaling a user thumbnail
Tom Hughes [Sun, 12 Jan 2014 20:32:33 +0000 (20:32 +0000)]
Preserve aspect ratio when scaling a user thumbnail

Fixes #675

5 years agoSet empty alt text on user images
Tom Hughes [Sun, 12 Jan 2014 19:28:01 +0000 (19:28 +0000)]
Set empty alt text on user images

This stops a stupidly long URL being shown if something goes wrong
with the gravatar redirect back to the default image.

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 11 Jan 2014 17:02:33 +0000 (17:02 +0000)]
Localisation updates from https://translatewiki.net.

5 years agoUpdate to iD v1.3.5
John Firebaugh [Thu, 9 Jan 2014 02:06:33 +0000 (18:06 -0800)]
Update to iD v1.3.5

5 years agoDisable notes search until it can be made scalable
Tom Hughes [Thu, 9 Jan 2014 08:41:59 +0000 (08:41 +0000)]
Disable notes search until it can be made scalable

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 6 Jan 2014 11:21:23 +0000 (11:21 +0000)]
Localisation updates from https://translatewiki.net.