cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into moderation

Browse source
This commit is contained in:
Andy Allan 2018-01-21 11:20:19 +00:00
commit ae44879213
139 changed files with 6377 additions and 1766 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/amf_controller.rb
View file

@ -375,7 +375,7 @@ class AmfController < ApplicationController
else
begin
# revert
timestamp = Time.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S")
timestamp = Time.zone.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S")
old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
unless old_way.nil?
if old_way.visible

4
app/controllers/application_controller.rb
View file

@ -413,8 +413,8 @@ class ApplicationController < ActionController::Base
def map_layout
append_content_security_policy_directives(
:child_src => %w[127.0.0.1:8111 127.0.0.1:8112],
:connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com],
:child_src => %w[127.0.0.1:8111],
:connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org],
:form_action => %w[render.openstreetmap.org],
:script_src => %w[graphhopper.com open.mapquestapi.com],
:img_src => %w[developer.mapquest.com]

6
app/controllers/changeset_controller.rb
View file

@ -216,6 +216,12 @@ class ChangesetController < ApplicationController
changesets = conditions_closed(changesets, params["closed"])
changesets = conditions_ids(changesets, params["changesets"])
# sort and limit the changesets
changesets = changesets.order("created_at DESC").limit(100)
# preload users, tags and comments
changesets = changesets.preload(:user, :changeset_tags, :comments)
# create the results document
results = OSM::API.new.get_xml_doc

42
app/controllers/geocoder_controller.rb
View file

@ -87,12 +87,12 @@ class GeocoderController < ApplicationController
@results = []
# ask geocoder.ca (note - they have a per-day limit)
response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")
response = fetch_xml("https://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")
# parse the response
if response.get_elements("geodata/error").empty?
@results.push(:lat => response.get_text("geodata/latt").to_s,
:lon => response.get_text("geodata/longt").to_s,
@results.push(:lat => response.text("geodata/latt"),
:lon => response.text("geodata/longt"),
:zoom => POSTCODE_ZOOM,
:name => query.upcase)
end
@ -120,7 +120,7 @@ class GeocoderController < ApplicationController
exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude]
# ask nominatim
response = fetch_xml("http:#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
response = fetch_xml("#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
# extract the results from the response
results = response.elements["searchresults"]
@ -138,12 +138,12 @@ class GeocoderController < ApplicationController
# parse the response
results.elements.each("place") do |place|
lat = place.attributes["lat"].to_s
lon = place.attributes["lon"].to_s
klass = place.attributes["class"].to_s
type = place.attributes["type"].to_s
name = place.attributes["display_name"].to_s
min_lat, max_lat, min_lon, max_lon = place.attributes["boundingbox"].to_s.split(",")
lat = place.attributes["lat"]
lon = place.attributes["lon"]
klass = place.attributes["class"]
type = place.attributes["type"]
name = place.attributes["display_name"]
min_lat, max_lat, min_lon, max_lon = place.attributes["boundingbox"].split(",")
prefix_name = if type.empty?
""
else
@ -190,10 +190,11 @@ class GeocoderController < ApplicationController
# parse the response
response.elements.each("geonames/geoname") do |geoname|
lat = geoname.get_text("lat").to_s
lon = geoname.get_text("lng").to_s
name = geoname.get_text("name").to_s
country = geoname.get_text("countryName").to_s
lat = geoname.text("lat")
lon = geoname.text("lng")
name = geoname.text("name")
country = geoname.text("countryName")
@results.push(:lat => lat, :lon => lon,
:zoom => GEONAMES_ZOOM,
:name => name,
@ -216,15 +217,15 @@ class GeocoderController < ApplicationController
@results = []
# ask nominatim
response = fetch_xml("http:#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
# parse the response
response.elements.each("reversegeocode/result") do |result|
lat = result.attributes["lat"].to_s
lon = result.attributes["lon"].to_s
lat = result.attributes["lat"]
lon = result.attributes["lon"]
object_type = result.attributes["osm_type"]
object_id = result.attributes["osm_id"]
description = result.get_text.to_s
description = result.text
@results.push(:lat => lat, :lon => lon,
:zoom => zoom,
@ -254,8 +255,9 @@ class GeocoderController < ApplicationController
# parse the response
response.elements.each("geonames/countrySubdivision") do |geoname|
name = geoname.get_text("adminName1").to_s
country = geoname.get_text("countryName").to_s
name = geoname.text("adminName1")
country = geoname.text("countryName")
@results.push(:lat => lat, :lon => lon,
:zoom => GEONAMES_ZOOM,
:name => name,

7
app/controllers/user_roles_controller.rb
View file

@ -15,7 +15,12 @@ class UserRolesController < ApplicationController
end
def revoke
UserRole.where(:user_id => @this_user.id, :role => @role).delete_all
# checks that administrator role is not revoked from current user
if current_user == @this_user && @role == "administrator"
flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
else
UserRole.where(:user_id => @this_user.id, :role => @role).delete_all
end
redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
end