From: Tom Hughes Date: Fri, 7 Nov 2014 08:40:18 +0000 (+0000) Subject: Merge branch 'overpass' X-Git-Tag: live~4334 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e11d734f9f965464510dd109970501861001ee5c?hp=758e6da9a80e2e53a171ebc3119f813f8ff4141c Merge branch 'overpass' --- diff --git a/CONFIGURE.md b/CONFIGURE.md index 36c5586d8..9b7bb90e8 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -120,7 +120,7 @@ For information on contributing changes to the codes, see [CONTRIBUTING.md](CONT If you want to deploy The Rails Port for production use, you'll need to make a few changes. -* It's not recommended to use `rails server` in production. Our recommended approach is to use [Phusion Passenger](https://www.phusionpassenger.com/). +* It's not recommended to use `rails server` in production. Our recommended approach is to use [Phusion Passenger](https://www.phusionpassenger.com/). Instructions are available for [setting it up with most web servers](https://www.phusionpassenger.com/documentation_and_support#documentation). * Passenger will, by design, use the Production environment and therefore the production database - make sure it contains the appropriate data and user accounts. * Your production database will also need the extensions and functions installed - see [INSTALL.md](INSTALL.md) * The included version of the map call is quite slow and eats a lot of memory. You should consider using [CGIMap](https://github.com/zerebubuth/openstreetmap-cgimap) instead. diff --git a/app/assets/images/browse/path.20.png b/app/assets/images/browse/path.20.png new file mode 100644 index 000000000..13a090e89 Binary files /dev/null and b/app/assets/images/browse/path.20.png differ diff --git a/app/assets/images/browse/tertiary.20.png b/app/assets/images/browse/tertiary.20.png new file mode 100644 index 000000000..3dd7528c1 Binary files /dev/null and b/app/assets/images/browse/tertiary.20.png differ diff --git a/app/assets/images/browse/track.20.png b/app/assets/images/browse/track.20.png new file mode 100644 index 000000000..36e579e20 Binary files /dev/null and b/app/assets/images/browse/track.20.png differ diff --git a/app/assets/images/browse/wall.20.png b/app/assets/images/browse/wall.20.png new file mode 100644 index 000000000..12dffce4e Binary files /dev/null and b/app/assets/images/browse/wall.20.png differ diff --git a/app/assets/stylesheets/browse.css.scss b/app/assets/stylesheets/browse.css.scss index 0aa762a12..d30f5a8a1 100644 --- a/app/assets/stylesheets/browse.css.scss +++ b/app/assets/stylesheets/browse.css.scss @@ -110,6 +110,8 @@ .aeroway.runway::before { content: image-url('browse/runway.20.png'); } .aeroway.taxiway::before { content: image-url('browse/taxiway.20.png'); } +.barrier.wall::before { content: image-url('browse/wall.20.png'); } + .building::before { content: image-url('browse/building.png'); } .highway.bridleway::before { content: image-url('browse/bridleway.20.png'); } @@ -118,6 +120,7 @@ .highway.footway::before { content: image-url('browse/footway.20.png'); } .highway.motorway::before { content: image-url('browse/motorway.20.png'); } .highway.motorway_link::before { content: image-url('browse/motorway.20.png'); } +.highway.path::before { content: image-url('browse/path.20.png'); } .highway.pedestrian::before { content: image-url('browse/service.20.png'); } .highway.primary::before { content: image-url('browse/primary.20.png'); } .highway.primary_link::before { content: image-url('browse/primary.20.png'); } @@ -125,6 +128,8 @@ .highway.secondary::before { content: image-url('browse/secondary.20.png'); } .highway.secondary_link::before { content: image-url('browse/secondary.20.png'); } .highway.service::before { content: image-url('browse/service.20.png'); } +.highway.tertiary::before { content: image-url('browse/tertiary.20.png'); } +.highway.track::before { content: image-url('browse/track.20.png'); } .highway.trunk::before { content: image-url('browse/trunk.20.png'); } .highway.trunk_link::before { content: image-url('browse/trunk.20.png'); } .highway.unclassified::before { content: image-url('browse/unclassified.20.png'); } diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 646ba2fa3..adda8c20c 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -5,18 +5,18 @@ class ChangesetController < ApplicationController require 'xml/libxml' skip_before_filter :verify_authenticity_token, :except => [:list] - before_filter :authorize_web, :only => [:list, :feed] - before_filter :set_locale, :only => [:list, :feed] + before_filter :authorize_web, :only => [:list, :feed, :comments_feed] + before_filter :set_locale, :only => [:list, :feed, :comments_feed] before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] before_filter :require_moderator, :only => [:hide_comment, :unhide_comment] before_filter :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] before_filter :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe] before_filter :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] before_filter :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] - before_filter(:only => [:list, :feed]) { |c| c.check_database_readable(true) } + before_filter(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) } after_filter :compress_output - around_filter :api_call_handle_error, :except => [:list, :feed] - around_filter :web_timeout, :only => [:list, :feed] + around_filter :api_call_handle_error, :except => [:list, :feed, :comments_feed] + around_filter :web_timeout, :only => [:list, :feed, :comments_feed] # Helper methods for checking consistency include ConsistencyValidations diff --git a/config/example.database.yml b/config/example.database.yml index 7e1ffc07d..4c77998da 100644 --- a/config/example.database.yml +++ b/config/example.database.yml @@ -1,4 +1,4 @@ -# Using a recent release (8.3 or higher) of PostgreSQL (http://postgresql.org/) is recommended. +# Using a recent release (9.1 or higher) of PostgreSQL (http://postgresql.org/) is recommended. # See https://github.com/openstreetmap/openstreetmap-website/blob/master/INSTALL.md#database-setup for detailed setup instructions. # development: