From: Tom Hughes Date: Sat, 13 Jan 2018 10:35:42 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/1707' X-Git-Tag: live~4293 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9cf698322ce70e2fdb718be6624b0ac4e8eaf285?hp=ca36cf28266418a5b9fdf97dbe455436857e7f9a Merge remote-tracking branch 'upstream/pull/1707' --- diff --git a/CONFIGURE.md b/CONFIGURE.md index 9b7bb90e8..3cbe31cb9 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -6,7 +6,7 @@ After [installing](INSTALL.md) this software, you may need to carry out some of Your installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract. -After installing but before creating any users or data, import an extract with [Osmosis](http://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task. +After installing but before creating any users or data, import an extract with [Osmosis](https://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task. ``` osmosis --read-pbf greater-london-latest.osm.pbf \ @@ -14,7 +14,7 @@ osmosis --read-pbf greater-london-latest.osm.pbf \ user="openstreetmap" password="" validateSchemaVersion="no" ``` -Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates. +Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates. To be able to edit the data you have loaded, you will need to use this [yet-to-be-written script](https://github.com/openstreetmap/openstreetmap-website/issues/282). @@ -94,7 +94,7 @@ Rails has its own log. To inspect the log, do this: tail -f log/development.log ``` -If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](http://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](http://wiki.openstreetmap.org/wiki/IRC) +If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](https://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](https://wiki.openstreetmap.org/wiki/IRC) ## Maintaining your installation @@ -110,7 +110,7 @@ bundle exec rake db:migrate ## Testing on the osm dev server -For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](http://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). +For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](https://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). # Contributing @@ -124,6 +124,6 @@ If you want to deploy The Rails Port for production use, you'll need to make a f * 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. -* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](http://git.openstreetmap.org/gpx-import.git/). +* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](https://git.openstreetmap.org/gpx-import.git/). * Make sure you precompile the production assets: `RAILS_ENV=production rake assets:precompile` * Make sure the web server user as well as the rails user can read, write and create directories in `tmp/`. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 961377ec8..acb780746 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -* http://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials. +* https://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials. * http://rubyonrails.org/ - The homepage of Rails, also has links and tutorials ## Coding style @@ -94,6 +94,6 @@ If you have forked on GitHub then the best way to submit your patches is to push your changes back to GitHub and then send a "pull request" on GitHub. Otherwise you should either push your changes to a publicly visible git repository -and send the details to the [rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) +and send the details to the [rails-dev](https://lists.openstreetmap.org/listinfo/rails-dev) list or generate patches with `git format-patch` and send them to the -[rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) list. +[rails-dev](https://lists.openstreetmap.org/listinfo/rails-dev) list. diff --git a/INSTALL.md b/INSTALL.md index d8d5206b8..7571cff50 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -69,7 +69,7 @@ For MacOSX, you will need XCode installed from the Mac App Store; OS X 10.7 (Lio Installing PostgreSQL: -* Install Postgres.app from http://postgresapp.com/ +* Install Postgres.app from https://postgresapp.com/ * Add PostgreSQL to your path, by editing your profile: `nano ~/.profile` @@ -80,7 +80,7 @@ and adding: Installing other dependencies: -* Install Homebrew from http://brew.sh/ +* Install Homebrew from https://brew.sh/ * Install the latest version of Ruby: `brew install ruby` * Install ImageMagick: `brew install imagemagick` * Install libxml2: `brew install libxml2 --with-xml2-config` diff --git a/README.md b/README.md index 6b929fef9..9162a38de 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ [![Coverage Status](https://coveralls.io/repos/openstreetmap/openstreetmap-website/badge.svg?branch=master)](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master) This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/) -application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API. +application that powers the [OpenStreetMap](https://www.openstreetmap.org) website and API. The software is also known as "openstreetmap-website". This repository consists of: * The web site, including user accounts, diary entries, user-to-user messaging -* The XML-based editing [API](http://wiki.openstreetmap.org/wiki/API_v0.6) -* The integrated versions of the [Potlatch](http://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](http://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](http://wiki.openstreetmap.org/wiki/ID) editors +* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6) +* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors * The Browse pages - a web front-end to the OpenStreetMap data * The GPX uploads, browsing and API. @@ -21,7 +21,7 @@ uses publicly-available services to help with development and testing. # License -This software is licensed under the [GNU General Public License 2.0](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt), +This software is licensed under the [GNU General Public License 2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt), a copy of which can be found in the [LICENSE](LICENSE) file. # Installation @@ -36,7 +36,7 @@ We're always keen to have more developers! Pull requests are very welcome. * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues). * Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components * Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) -* There is a [rails-dev@openstreetmap.org](http://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. +* There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. * IRC - there is the #osm-dev channel on irc.oftc.net. More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTING.md) file. diff --git a/VAGRANT.md b/VAGRANT.md index 3825ad988..9dea61861 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -8,7 +8,7 @@ sudo apt-get install vagrant Other Linux distributions should have similar installation instructions using `dnf`, `pacman`, or similar. -Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](http://www.vagrantup.com/downloads.html) for more information. +Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](https://www.vagrantup.com/downloads.html) for more information. Note than until there are suitable _xenial64_ [vagrant boxes](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=&q=xenial64) for other providers, the only virtualization provider supported is virtualbox. You might need to install it and specify `--provider virtualbox` when setting up your environment. diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index bb835f2fb..94f9bb1f0 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -76,7 +76,7 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = true; - $.getJSON(document.location.protocol + OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) { + $.getJSON(OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) { endpoint.awaitingGeocode = false; endpoint.hasGeocode = true; if (json.length === 0) { diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js index 2058a4daf..f05f1ab3d 100644 --- a/app/assets/javascripts/index/directions/graphhopper.js +++ b/app/assets/javascripts/index/directions/graphhopper.js @@ -21,7 +21,7 @@ function GraphHopperEngine(id, vehicleType) { // GraphHopper Directions API documentation // https://graphhopper.com/api/1/docs/routing/ return $.ajax({ - url: document.location.protocol + OSM.GRAPHHOPPER_URL, + url: OSM.GRAPHHOPPER_URL, data: { vehicle: vehicleType, locale: I18n.currentLocale(), diff --git a/app/assets/javascripts/index/directions/mapquest.js b/app/assets/javascripts/index/directions/mapquest.js index fcc47f103..739ce6539 100644 --- a/app/assets/javascripts/index/directions/mapquest.js +++ b/app/assets/javascripts/index/directions/mapquest.js @@ -1,6 +1,6 @@ // For docs, see: -// http://developer.mapquest.com/web/products/open/directions-service -// http://open.mapquestapi.com/directions/ +// https://developer.mapquest.com/web/products/open/directions-service +// https://open.mapquestapi.com/directions/ // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153 function MapQuestEngine(id, routeType) { @@ -28,7 +28,7 @@ function MapQuestEngine(id, routeType) { return { id: id, - creditline: 'MapQuest ', + creditline: 'MapQuest ', draggable: false, getRoute: function (points, callback) { @@ -36,7 +36,7 @@ function MapQuestEngine(id, routeType) { var to = points[points.length - 1]; return $.ajax({ - url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL, + url: OSM.MAPQUEST_DIRECTIONS_URL, data: { key: OSM.MAPQUEST_KEY, from: from.lat + "," + from.lng, diff --git a/app/assets/javascripts/index/directions/mapzen.js b/app/assets/javascripts/index/directions/mapzen.js deleted file mode 100644 index 981fc3807..000000000 --- a/app/assets/javascripts/index/directions/mapzen.js +++ /dev/null @@ -1,109 +0,0 @@ -function MapzenEngine(id, costing) { - var MZ_INSTR_MAP = [ - 0, // kNone = 0; - 8, // kStart = 1; - 8, // kStartRight = 2; - 8, // kStartLeft = 3; - 14, // kDestination = 4; - 14, // kDestinationRight = 5; - 14, // kDestinationLeft = 6; - 0, // kBecomes = 7; - 0, // kContinue = 8; - 1, // kSlightRight = 9; - 2, // kRight = 10; - 3, // kSharpRight = 11; - 4, // kUturnRight = 12; - 4, // kUturnLeft = 13; - 7, // kSharpLeft = 14; - 6, // kLeft = 15; - 5, // kSlightLeft = 16; - 0, // kRampStraight = 17; - 24, // kRampRight = 18; - 25, // kRampLeft = 19; - 24, // kExitRight = 20; - 25, // kExitLeft = 21; - 0, // kStayStraight = 22; - 1, // kStayRight = 23; - 5, // kStayLeft = 24; - 20, // kMerge = 25; - 10, // kRoundaboutEnter = 26; - 11, // kRoundaboutExit = 27; - 17, // kFerryEnter = 28; - 0 // kFerryExit = 29; - ]; - - return { - id: id, - creditline: "Mapzen", - draggable: false, - - getRoute: function (points, callback) { - return $.ajax({ - url: document.location.protocol + OSM.MAPZEN_VALHALLA_URL, - data: { - api_key: OSM.MAPZEN_VALHALLA_KEY, - json: JSON.stringify({ - locations: points.map(function (p) { return { lat: p.lat, lon: p.lng }; }), - costing: costing, - directions_options: { - units: "km", - language: I18n.currentLocale() - } - }) - }, - dataType: "json", - success: function (data) { - var trip = data.trip; - - if (trip.status === 0) { - var line = []; - var steps = []; - var distance = 0; - var time = 0; - - trip.legs.forEach(function (leg) { - var legLine = L.PolylineUtil.decode(leg.shape, { - precision: 6 - }); - - line = line.concat(legLine); - - leg.maneuvers.forEach(function (manoeuvre) { - var point = legLine[manoeuvre.begin_shape_index]; - - steps.push([ - { lat: point[0], lng: point[1] }, - MZ_INSTR_MAP[manoeuvre.type], - manoeuvre.instruction, - manoeuvre.length * 1000, - [] - ]); - }); - - distance = distance + leg.summary.length; - time = time + leg.summary.time; - }); - - callback(false, { - line: line, - steps: steps, - distance: distance * 1000, - time: time - }); - } else { - callback(true); - } - }, - error: function () { - callback(true); - } - }); - } - }; -} - -if (OSM.MAPZEN_VALHALLA_KEY) { - OSM.Directions.addEngine(new MapzenEngine("mapzen_car", "auto"), true); - OSM.Directions.addEngine(new MapzenEngine("mapzen_bicycle", "bicycle"), true); - OSM.Directions.addEngine(new MapzenEngine("mapzen_foot", "pedestrian"), true); -} diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index 69191e65a..e7c91e9dc 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -127,7 +127,7 @@ function OSRMEngine() { return p.lng + ',' + p.lat; }).join(';'); - var req_url = document.location.protocol + OSM.OSRM_URL + encoded_coords; + var req_url = OSM.OSRM_URL + encoded_coords; var onResponse = function (data) { if (data.code !== 'Ok') diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js index 1efac1b31..48e950b21 100644 --- a/app/assets/javascripts/index/export.js +++ b/app/assets/javascripts/index/export.js @@ -43,7 +43,7 @@ OSM.Export = function(map) { $("#maxlat").val(bounds.getNorth().toFixed(precision)); $("#export_overpass").attr("href", - "http://overpass-api.de/api/map?bbox=" + + "https://overpass-api.de/api/map?bbox=" + $("#minlon").val() + "," + $("#minlat").val() + "," + $("#maxlon").val() + "," + $("#maxlat").val()); } diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 7ac613d71..c01caba70 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,8 +1,7 @@ //= require jquery.simulate OSM.Query = function(map) { - var protocol = document.location.protocol === "https:" ? "https:" : "http:", - url = protocol + OSM.OVERPASS_URL, + var url = OSM.OVERPASS_URL, queryButton = $(".control-query .control-button"), uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'], marker; diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index e8df0bd61..d952a7376 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -14,7 +14,7 @@ L.OSM.Map = L.Map.extend({ L.Map.prototype.initialize.call(this, id, options); var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); - var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'}); + var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'https://donate.openstreetmap.org'}); this.baseLayers = []; @@ -27,7 +27,7 @@ L.OSM.Map = L.Map.extend({ if (OSM.THUNDERFOREST_KEY) { this.baseLayers.push(new L.OSM.CycleMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", apikey: OSM.THUNDERFOREST_KEY, code: "C", keyid: "cyclemap", @@ -35,7 +35,7 @@ L.OSM.Map = L.Map.extend({ })); this.baseLayers.push(new L.OSM.TransportMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", apikey: OSM.THUNDERFOREST_KEY, code: "T", keyid: "transportmap", @@ -44,7 +44,7 @@ L.OSM.Map = L.Map.extend({ } this.baseLayers.push(new L.OSM.HOT({ - attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", + attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", code: "H", keyid: "hot", name: I18n.t("javascripts.map.base.hot") diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index ee1c6a115..971f80be3 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -14,16 +14,12 @@ OSM = { NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>, GRAPHHOPPER_URL: <%= GRAPHHOPPER_URL.to_json %>, MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>, - MAPZEN_VALHALLA_URL: <%= MAPZEN_VALHALLA_URL.to_json %>, OSRM_URL: <%= OSRM_URL.to_json %>, DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>, <% if defined?(MAPQUEST_KEY) %> MAPQUEST_KEY: <%= MAPQUEST_KEY.to_json %>, <% end %> -<% if defined?(MAPZEN_VALHALLA_KEY) %> - MAPZEN_VALHALLA_KEY: <%= MAPZEN_VALHALLA_KEY.to_json %>, -<% end %> <% if defined?(THUNDERFOREST_KEY) %> THUNDERFOREST_KEY: <%= THUNDERFOREST_KEY.to_json %>, <% end %> diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4a803af72..a51dad875 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -414,7 +414,7 @@ class ApplicationController < ActionController::Base def map_layout append_content_security_policy_directives( :child_src => %w[127.0.0.1:8111], - :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com], + :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] diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 5d7ba9189..b9bde31ab 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -87,7 +87,7 @@ 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? @@ -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"] @@ -217,7 +217,7 @@ 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| diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index 536790dc5..5ef68216b 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -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 diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index c4ce41b06..c2e974e93 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -115,9 +115,9 @@ module BrowseHelper lookup_us = lookup.tr(" ", "_") if page = WIKI_PAGES.dig(locale, type, lookup_us) - url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" + url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" elsif page = WIKI_PAGES.dig("en", type, lookup_us) - url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" + url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" end url @@ -158,7 +158,7 @@ module BrowseHelper end { - :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}", + :url => "https://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}", :title => value + section } end diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 67b86417a..c95ffc322 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -68,7 +68,7 @@ class ClientApplication < ActiveRecord::Base end def oauth_server - @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL) + @oauth_server ||= OAuth::Server.new("https://" + SERVER_URL) end def credentials diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 86d190680..6a3e85680 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -72,6 +72,10 @@ + <% else %> +
+ <%= t('browse.changeset.still_open') %> +
<% end %> <% unless @ways.empty? %> diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder index a3b7a2240..86dd966cc 100644 --- a/app/views/changeset/list.atom.builder +++ b/app/views/changeset/list.atom.builder @@ -9,7 +9,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, feed.logo image_url("mag_map-rss2.0.png") feed.rights :type => "xhtml" do |xhtml| - xhtml.a :href => "http://creativecommons.org/licenses/by-sa/2.0/" do |a| + xhtml.a :href => "https://creativecommons.org/licenses/by-sa/2.0/" do |a| a.img :src => image_url("cc_button.png"), :alt => "CC by-sa 2.0" end end diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 9bed9d274..534ff13c0 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -44,9 +44,9 @@

<%= t 'layouts.intro_text' %>

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.ucl.ac.uk"), - :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"), :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

<%= t('layouts.learn_more') %> diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index 80dbc6079..f88d9316c 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -24,7 +24,7 @@ <% end %>

<%= t'oauth_clients.index.my_apps' %>

<% if @client_applications.empty? %> -

<%= raw(t('oauth_clients.index.no_apps', :oauth => "OAuth")) %>

+

<%= raw(t('oauth_clients.index.no_apps', :oauth => "OAuth")) %>

<% else %>

<%= t'oauth_clients.index.registered_apps' %>

<% @client_applications.each do |client|%> @@ -33,4 +33,4 @@ <% end %> <% end %> <% end %> -

<%= link_to t('oauth_clients.index.register_new'), :action => :new %>

\ No newline at end of file +

<%= link_to t('oauth_clients.index.register_new'), :action => :new %>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index ebc1877f3..0c8075c6e 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -33,9 +33,9 @@

<%= t "about_page.partners_title" %>

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.ucl.ac.uk"), - :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"), :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index 128db5992..bf5376fb5 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -38,19 +38,16 @@
-
<%= t'export.start.too_large.overpass.title' %>
+
<%= t'export.start.too_large.overpass.title' %>
<%= t'export.start.too_large.overpass.description' %>
-
<%= t'export.start.too_large.planet.title' %>
+
<%= t'export.start.too_large.planet.title' %>
<%= t'export.start.too_large.planet.description' %>
-
<%= t'export.start.too_large.geofabrik.title' %>
+
<%= t'export.start.too_large.geofabrik.title' %>
<%= t'export.start.too_large.geofabrik.description' %>
-
<%= t'export.start.too_large.metro.title' %>
-
<%= t'export.start.too_large.metro.description' %>
- -
<%= t'export.start.too_large.other.title' %>
+
<%= t'export.start.too_large.other.title' %>
<%= t'export.start.too_large.other.description' %>
<% end %> diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 3d8cb22f7..13fad8840 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -46,8 +46,8 @@

<%= raw t 'user.terms.guidance', - :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', - :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %> + :summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', + :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>

diff --git a/config/example.application.yml b/config/example.application.yml index 5c60ccd16..1e78084cc 100644 --- a/config/example.application.yml +++ b/config/example.application.yml @@ -74,7 +74,7 @@ defaults: &defaults # Enable legacy OAuth 1.0 support oauth_10_support: true # URL of Nominatim instance to use for geocoding - nominatim_url: "//nominatim.openstreetmap.org/" + nominatim_url: "https://nominatim.openstreetmap.org/" # Default editor default_editor: "id" # OAuth consumer key for Potlatch 2 @@ -97,12 +97,11 @@ defaults: &defaults # Blacklist here - ".*\\.here\\.com[/:].*" # URL of Overpass instance to use for feature queries - overpass_url: "//overpass-api.de/api/interpreter" + overpass_url: "https://overpass-api.de/api/interpreter" # Routing endpoints - graphhopper_url: "//graphhopper.com/api/1/route" - mapquest_directions_url: "//open.mapquestapi.com/directions/v2/route" - mapzen_valhalla_url: "//valhalla.mapzen.com/route" - osrm_url: "//router.project-osrm.org/route/v1/driving/" + graphhopper_url: "https://graphhopper.com/api/1/route" + mapquest_directions_url: "https://open.mapquestapi.com/directions/v2/route" + osrm_url: "https://router.project-osrm.org/route/v1/driving/" # External authentication credentials #google_auth_id: "" #google_auth_secret: "" @@ -117,8 +116,6 @@ defaults: &defaults #wikipedia_auth_secret: "" # MapQuest authentication details #mapquest_key: "" - # Mapzen authentication details - #mapzen_valhalla_key: "" # Thunderforest authentication details #thunderforest_key: "" # Key for generating TOTP tokens diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index 3b4f06a2e..421ca2bf9 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -47,6 +47,25 @@ module OpenStreetMap end end end + + module OAuthFilter + def oauth1_verify(request, options = {}, &block) + signature = OAuth::Signature.build(request, options, &block) + return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp) + value = signature.verify + if request.ssl? && !value + http_request = request.dup + http_request.define_singleton_method(:scheme) { "http" } + http_request.define_singleton_method(:port) { 80 } + signature = OAuth::Signature.build(http_request, options, &block) + value = signature.verify + end + value + rescue OAuth::Signature::UnknownSignatureMethod + false + end + end end OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController) +OAuth::Rack::OAuthFilter.prepend(OpenStreetMap::OAuthFilter) diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb index f30a4b86c..b0b45aa13 100644 --- a/config/initializers/secure_headers.rb +++ b/config/initializers/secure_headers.rb @@ -27,7 +27,7 @@ cookie_policy = { } SecureHeaders::Configuration.default do |config| - config.hsts = "max-age=0" + config.hsts = SecureHeaders::OPT_OUT config.csp = SecureHeaders::OPT_OUT config.csp_report_only = csp_policy config.cookies = cookie_policy diff --git a/config/locales/af.yml b/config/locales/af.yml index c0989fcfc..c5ab546a3 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -1599,8 +1599,6 @@ af: mapquest_bicycle: Fiets (MapQuest) mapquest_car: Kar (MapQuest) osrm_car: Kar (OSRM) - mapzen_bicycle: Fiets (Mapzen) - mapzen_car: Motor (Mapzen) time: Tyd query: node: Knooppunt diff --git a/config/locales/ar.yml b/config/locales/ar.yml index f0a611527..0a01084cc 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -2134,9 +2134,6 @@ ar: mapquest_car: سيارة (MapQuest) mapquest_foot: قدم (MapQuest) osrm_car: سيارة (OSRM) - mapzen_bicycle: دراجة (Mapzen) - mapzen_car: سيارة (Mapzen) - mapzen_foot: قدم (Mapzen) directions: الاتجاهات distance: المسافات errors: diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 24e334d08..e6fdc0037 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -129,6 +129,8 @@ ast: title_comment: Conxuntu de cambeos %{id} - %{comment} join_discussion: Anicia sesión pa xunite al alderique discussion: Alderique + still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en + zarrando'l conxuntu de cambios. node: title: 'Nuedu: %{name}' history_title: 'Historial del nuedu: %{name}' @@ -1008,9 +1010,8 @@ ast: title: Exemplu de reconocimientu more_title_html: Pa saber más more_1_html: |- - Llei más tocante a cómo utilizar los nuesos datos, y cómo acreditanos, na páxina de la Llicencia OSMF y nes Entrugues y rempuestes llegales (n'inglés) de la comunidá. + Llei más tocante a cómo utilizar los nuesos datos, y cómo danos créditu, na páxina de Llicencia de la OSMF. more_2_html: |- Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros. Llei la nuesa Política d'usu de la API (n'inglés), @@ -1197,11 +1198,12 @@ ast: qu'OSM ye precisu y ta anováu. community_driven_title: Dirixíu pola comunidá community_driven_html: |- - La comunidá d'OpenStreetMap ye diversa, apasionada, y medra caldía. + La comunidá d'OpenStreetMap ye variada, apasionada, y medra caldía. Ente los collaboradores hai cartógrafos entusiastes, profesionales de GIS, inxenieros que xestionen los sirvidores d'OSM, voluntarios que faen mapes de les zones afeutaes por desastres, y muncho más. - Pa saber más tocante a la comunidá, ver los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. + Pa saber más tocante a la comunidá, ver el + Blog d'OpenStreetMap, los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. open_data_title: Datos abiertos open_data_html: |- OpenStreetMap son datos abiertos: tienes la llibertá d'usalos pa cualquier @@ -1441,7 +1443,7 @@ ast: get_directions_title: Alcuentra indicaciones ente dos puntos from: Dende to: A - where_am_i: ¿Ú toi? + where_am_i: ¿Ú esto? where_am_i_title: Describi el to allugamientu actual usando el motor de gueta submit_text: Dir key: @@ -2109,6 +2111,8 @@ ast: not_a_role: La cadena «%{role}» nun ye un rol válidu. already_has_role: L'usuariu yá tien el rol %{role}. doesnt_have_role: L'usuariu nun tien el rol %{role}. + not_revoke_admin_current_user: Nun pudo quitase'l rol d'alministrador al usuariu + actual. grant: title: Confirmar dar rol heading: Confirmar dar rol @@ -2329,8 +2333,10 @@ ast: new: intro: ¿Alcontrasti un error o falta daqué? Informa a otros mapeadores pa que podamos igualo. Mueve'l marcador a la posición correuta y escribi una - nota pa esplicar el problema. (Por favor, nun escribas información personal - o información de mapes con drechos d'autor o de llistes de teléfonos). + nota pa esplicar el problema. + advice: La nota ye pública y puede usase p'anovar el mapa, de mou que nun + escribas información personal, o información de mapes con drechos d'autor + o llistes de teléfonos). add: Amestar nota show: anonymous_warning: Esta nota incluye comentarios d'usuarios anónimos que tendríen @@ -2351,9 +2357,6 @@ ast: mapquest_car: Coche (MapQuest) mapquest_foot: A pie (MapQuest) osrm_car: En coche (OSRM) - mapzen_bicycle: En bicicleta (Mapzen) - mapzen_car: En coche (Mapzen) - mapzen_foot: A pie (Mapzen) descend: Descender directions: Indicaciones distance: Distancia diff --git a/config/locales/be.yml b/config/locales/be.yml index a60883a64..e78338ad0 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -2363,9 +2363,6 @@ be: mapquest_car: Аўтамабіль (MapQuest) mapquest_foot: Пешшу (MapQuest) osrm_car: Аўтамабіль (OSRM) - mapzen_bicycle: Веласіпед (Mapzen) - mapzen_car: Аўтамабіль (Mapzen) - mapzen_foot: Пешшу (Mapzen) descend: Уніз directions: Маршрут distance: Адлегласць diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 33ff7002a..1b29d774c 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1294,9 +1294,6 @@ bg: mapquest_car: Кола (MapQuest) mapquest_foot: Пеша (MapQuest) osrm_car: Кола (OSRM) - mapzen_bicycle: Велосипед (Mapzen) - mapzen_car: Кола (Mapzen) - mapzen_foot: Пеша (Mapzen) directions: Насоки distance: Разстояние instructions: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index e23d829af..12c66adb0 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -555,7 +555,7 @@ bn: street_lamp: রাস্তার বাতি tertiary: প্রশাখা সড়ক tertiary_link: প্রশাখা সড়ক - track: রাস্তা + track: নির্ধারিত পথ traffic_signals: ট্রাফিক সংকেত trunk: মূল সড়ক trunk_link: মূল সড়ক diff --git a/config/locales/br.yml b/config/locales/br.yml index d1218b530..ff8c3b1a8 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -1,6 +1,7 @@ # Messages for Breton (brezhoneg) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Dishual # Author: Fohanno # Author: Fulup # Author: Gwenn-Ael @@ -393,7 +394,7 @@ br: osm_nominatim: Disoc'hoù diwar OpenStreetMap Nominatim geonames: Disoc'hoù diwar GeoNames - osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap + osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap Nominatim geonames_reverse: Disoc'hoù diwar GeoNames search_osm_nominatim: @@ -1887,6 +1888,7 @@ br: terms declined: Un druez eo deomp gwelet hoc'h eus nac'het degemer Termenoù ar berzhidi nevez. Evit muioc'h a ditouroù, sellit ouzh ar bajenn wiki-mañ. + terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: Diferadennoù ar c'henlabourer heading: Diferadennoù ar c'henlabourer @@ -2385,9 +2387,6 @@ br: mapquest_car: Karr (MapQuest) mapquest_foot: Troad (MapQuest) osrm_car: Karr(OSRM) - mapzen_bicycle: Marc'h-houarn (Mapzen) - mapzen_car: Karr (Mapzen) - mapzen_foot: War droad (Mapzen) descend: Diskenn directions: Tuioù distance: Hed diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 106f2c060..6bed0129e 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1277,6 +1277,7 @@ ca: footer_html: També podeu llegir el missatge a %{readurl} i podeu respondre'l a %{replyurl} friend_notification: + hi: Hola %{to_user}, subject: '[OpenStreetMap] %{user} us ha afegit a la llista d''amics' had_added_you: '%{user} us ha afegit com a amic a l''OpenStreetMap.' see_their_profile: Podeu veure el seu perfil a %{userurl}. @@ -1494,7 +1495,7 @@ ca: get_directions_title: Trobeu indicacions entre dos punts from: De to: A - where_am_i: On sóc? + where_am_i: On és això? where_am_i_title: Descriu la localització actual fent servir el motor de cerca submit_text: Vés-hi key: @@ -2382,9 +2383,10 @@ ca: new: intro: Heu trobat un error o bé hi falta res? Informeu-ne a d'altres col·laboradors per tal que puguin solucionar-ho. Moveu el marcador a la posició correcta - i escriviu-hi una anotació per tal de descriure el problema. (No introduïu - cap mena d'informació personal o informació d'altres mapes o llistats de - directoris que es trobin sota copyright.) + i escriviu-hi una anotació per tal de descriure el problema. + advice: La vostra nota és pública i pot utilitzar-se per actualitzar el mapa, + per tant, no hi introduïu cap informació personal, o informació de mapes + amb copyright o bé llistats de directori. add: Afegeix una nota show: anonymous_warning: Aquesta nota inclou comentaris d'usuaris anònims que haurien @@ -2404,9 +2406,6 @@ ca: mapquest_car: Cotxe (MapQuest) mapquest_foot: A peu (MapQuest) osrm_car: Cotxe (OSRM) - mapzen_bicycle: Bicicleta (Mapzen) - mapzen_car: Cotxe (Mapzen) - mapzen_foot: A peu (Mapzen) directions: Indicacions distance: Distància errors: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f5da185a8..b8efc16eb 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1210,7 +1210,7 @@ cs: community_driven_title: Řízeno komunitou community_driven_html: |- Komunita OpenStreetMap je různorodá, vášnivá a každý den se rozrůstá. Mezi naÅ¡imi přispěvateli najdete amatérské kreslíře map, profesionály z oblasti GIS, techniky spravující servery OSM, humanitární pracovníky mapující oblasti zasažené neÅ¡těstím a mnohé další. - Pokud se chcete o komunitě dozvědět více, prohlédněte si uživatelské deníčky, komunitní blogy a webovou stránku nadace OSM Foundation. + Pokud se chcete o komunitě dozvědět více, prohlédněte si blog OpenStreetMap, uživatelské deníčky, komunitní blogy a webovou stránku nadace OSM Foundation. open_data_title: Otevřená data open_data_html: 'OpenStreetMap tvoří otevřená data: smíte je užívat pro libovolný účel, pokud uvádíte autorství OpenStreetMap a jeho přispěvatelů. Pokud @@ -1458,7 +1458,7 @@ cs: get_directions_title: Najít trasu mezi dvěma body from: Odkud to: Kam - where_am_i: Kde se nacházím? + where_am_i: Kde je toto? where_am_i_title: Popsat právě zobrazované místo pomocí vyhledávače submit_text: Hledat key: @@ -2343,8 +2343,9 @@ cs: new: intro: Zahlédli jste chybu nebo prázdné místo? Dejte vědět ostatním uživatelům, aby to mohli napravit. Posuňte značku na správné místo a napiÅ¡te poznámku - vysvětlující problém. (Prosíme, nevkládejte žádné osobní údaje ani informace - z autorskoprávně chráněných map či adresářů.) + vysvětlující problém. + advice: VaÅ¡e poznámka je veřejná a může sloužit k úpravám mapy, proto nevkládejte + žádné osobní údaje ani informace z autorskoprávně chráněných map či adresářů. add: Přidat poznámku show: anonymous_warning: Tato poznámka zahrnuje komentáře anonymních uživatelů, @@ -2366,9 +2367,6 @@ cs: mapquest_car: Autem (MapQuest) mapquest_foot: Pěšky (MapQuest) osrm_car: Autem (OSRM) - mapzen_bicycle: Na kole (Mapzen) - mapzen_car: Autem (Mapzen) - mapzen_foot: Pěšky (Mapzen) descend: Sestupte directions: Pokyny distance: Vzdálenost diff --git a/config/locales/da.yml b/config/locales/da.yml index 9ed1cb54d..4d8e80b9d 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -151,6 +151,8 @@ da: title_comment: Ændringssæt %{id} - %{comment} join_discussion: Log pÃ¥ for at deltage i diskussionen discussion: Diskussion + still_open: Ændringssæt er stadig Ã¥ben - diskussion vil Ã¥bne nÃ¥r ændringssættet + lukkes. node: title: 'Punkt: %{name}' history_title: 'Punkthistorik: %{name}' @@ -2146,6 +2148,8 @@ da: not_a_role: Strengen "%{role}" er ikke en gyldig rolle. already_has_role: Brugeren har allerede rollen %{role}. doesnt_have_role: Brugeren har ikke rollen %{role}. + not_revoke_admin_current_user: Kan ikke trække administratorrollen tilbage fra + nuværende bruger. grant: title: Bekræft rolletildeling heading: Bekræft rolletildeling @@ -2368,8 +2372,10 @@ da: new: intro: Opdaget en fejl eller noget der mangler? Lad andre kortlæggere vide det, sÃ¥ vi kan ordne det. Flyt markøren til den korrekte position, og skriv - en bemærkning for at forklare problemet. (Vær venlig ikke at indtaste personlige - oplysninger eller oplysninger fra ophavsretligt beskyttede kort eller kataloger.) + en bemærkning for at forklare problemet. + advice: Dine oplysninger er offentlige og vil mÃ¥ske blive brugt til at opdatere + kortet, sÃ¥ indtast ikke personlige oplysninger eller oplysninger fra kort + beskyttet af ophavsret eller mappeoversigter. add: Tilføj bemærkning show: anonymous_warning: Denne bemærkning indeholder kommentarer fra anonyme brugere @@ -2390,9 +2396,6 @@ da: mapquest_car: Bil (MapQuest) mapquest_foot: Til fods (MapQuest) osrm_car: Bil (OSRM) - mapzen_bicycle: Cykel (Mapzen) - mapzen_car: Bil (Mapzen) - mapzen_foot: Fod (Mapzen) descend: Fald directions: Rutevejledning distance: Afstand diff --git a/config/locales/de.yml b/config/locales/de.yml index 58cbbcf36..d45b5770e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -180,6 +180,8 @@ de: title_comment: Änderungssatz %{id} - %{comment} join_discussion: Anmelden, um mitzudiskutieren discussion: Diskussion + still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet, + sobald der Änderungssatz geschlossen ist. node: title: 'Knoten: %{name}' history_title: 'Chronik des Knotens: %{name}' @@ -390,7 +392,7 @@ de: embeddable_html: HTML zum Einbinden licence: Lizenz export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter - der Open Data Commons + der Open Data Commons Open Database Lizenz (ODbL) lizenziert. too_large: advice: 'Falls der obenstehende Export fehlschlägt, erwäge bitte, eine der @@ -430,14 +432,14 @@ de: geocoder: search: title: - latlon: Suchergebnisse von Internal + latlon: Suchergebnisse von Internal uk_postcode: Suchergebnisse von NPEMap / FreeThe Postcode - ca_postcode: Suchergebnisse von Geocoder.CA - osm_nominatim: Ergebnisse von OpenStreetMap + ca_postcode: Suchergebnisse von Geocoder.CA + osm_nominatim: Ergebnisse von OpenStreetMap Nominatim geonames: Suchergebnisse von GeoNames - osm_nominatim_reverse: Ergebnisse von OpenStreetMap + osm_nominatim_reverse: Ergebnisse von OpenStreetMap Nominatim geonames_reverse: Ergebnisse von GeoNames search_osm_nominatim: @@ -960,7 +962,7 @@ de: level10: Nachbarschaftsgrenze description: title: - osm_nominatim: Lage von OpenStreetMap + osm_nominatim: Lage von OpenStreetMap Nominatim geonames: Lage von GeoNames types: @@ -1041,8 +1043,8 @@ de: title_html: Urheberrecht und Lizenz intro_1_html: |- OpenStreetMap® sind „Open Data“, die gemäß der - Open Data Commons Open Database Lizenz - (ODbL) durch die OpenStreetMap Foundation (OSMF) verfügbar sind. + Open Data Commons Open Database Lizenz + (ODbL) durch die OpenStreetMap Foundation (OSMF) verfügbar sind. intro_2_html: |- Es steht dir frei unsere Daten zu kopieren, weiterzugeben, zu übermitteln sowie anzupassen, sofern du OpenStreetMap @@ -1051,10 +1053,10 @@ de: als Grundlage für weitere Bearbeitungen verwendest, kannst du das Ergebnis auch nur gemäß der selben Lizenz weitergeben. Der vollständige Lizenztext ist unter - Lizenz + Lizenz einsehbar und erläutert deine Rechte und Pflichten. intro_3_html: Die Kartografie in unseren Kartenkacheln und unsere Dokumentation - sind unter der ''Creative-Commons''-Lizenz „Namensnennung + sind unter der ''Creative-Commons''-Lizenz „Namensnennung – Weitergabe unter gleichen Bedingungen“ 2.0 (CC BY-SA) verfügbar. credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen ist credit_1_html: Wir verlangen die Verwendung des Hinweises „© OpenStreetMap-Mitwirkende“. @@ -1062,7 +1064,7 @@ de: Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz verfügbar sind, und, sofern du unsere Kartenkacheln verwendest, dass die Kartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf - www.openstreetmap.org/copyright verlinkst. + www.openstreetmap.org/copyright verlinkst. Ersatzweise, und als Erfordernis, falls du OSM in Datenform weitergibst, kannst du die Lizenz(en) direkt verlinken und benennen. In Medien, in denen keine Links möglich sind (z.B. gedruckten Werken), empfehlen wir dir, @@ -1078,7 +1080,7 @@ de: more_title_html: Weitere Informationen more_1_html: |- Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist, - kann man auf unserer OSMF-Lizenzseite nachlesen. + kann man auf unserer OSMF-Lizenzseite nachlesen. more_2_html: |- Obwohl OpenStreetMap „Open Data“ ist, können wir keine unentgeltliche Karten-API für Drittparteien bereitstellen. @@ -1089,10 +1091,10 @@ de: contributors_intro_html: 'Unsere Mitwirkenden sind tausende einzelne Menschen. Wir beziehen auch offen lizenzierte Daten von nationalen Kartenagenturen und anderen Quellen ein, darunter:' - contributors_at_html: 'Österreich: Enthält Daten der Stadt - Wien (lizenziert gemäß CC - BY AT), des Landes - Vorarlberg und des Landes Tirol (lizenziert + contributors_at_html: 'Österreich: Enthält Daten der Stadt + Wien (lizenziert gemäß CC + BY AT), des Landes + Vorarlberg und des Landes Tirol (lizenziert gemäß CC BY AT samt Erweiterungen zur Lizenz).' contributors_ca_html: 'Kanada: Enthält Daten von GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© @@ -1102,11 +1104,11 @@ de: Finnland: Enthält Daten von der topografischen Datenbank der National Land Survey of Finland und andere Datensätze, unter der - NLSFI-Lizenz. + NLSFI-Lizenz. contributors_fr_html: 'Frankreich: Enthält Daten der Direction Générale des Impôts.' contributors_nl_html: 'Niederlande: Enthält, © AND-Daten, - 2007 (www.and.com)' + 2007 (www.and.com)' contributors_nz_html: 'Neuseeland: Enthält Daten aus Land Information New Zealand. Urheberrecht vorbehalten.' contributors_si_html: |- @@ -1120,7 +1122,7 @@ de: contributors_gb_html: 'Vereinigtes Königreich: Enthält Daten des Ordnance Survey © Urheber- und Datenbankrecht 2010-12.' contributors_footer_1_html: Weitere Informationen sowie andere Datenquellen, - die zur Verbesserung von OpenStreetMap genutzt wurden, sind auf der + die zur Verbesserung von OpenStreetMap genutzt wurden, sind auf der Seite über die Mitwirkenden im Wiki von OpenStreetMap zu finden. contributors_footer_2_html: Die Einbeziehung von Daten bei OpenStreetMap bedeutet nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt, Gewährleistung @@ -1133,13 +1135,13 @@ de: infringement_2_html: |- Sofern du denkst, dass urheberrechtlich geschütztes Material unerlaubterweise zur OpenStreetMap-Datenbank oder auf dieser Website hinzugefügt wurde, informiere dich - bitte über unser Verfahren + bitte über unser Verfahren zum Entfernen von Inhalten oder melde dies direkt mit unserem Onlineformular. trademarks_title_html: Markenzeichen trademarks_1_html: OpenStreetMap, das Lupenlogo und „State of the Map“ sind eingetragene Warenzeichen der OpenStreetMap Foundation. Falls du Fragen über - deine Verwendung der Marken hast, sende deine Fragen bitte an die Lizenz-Arbeitsgruppe. + deine Verwendung der Marken hast, sende deine Fragen bitte an die Lizenz-Arbeitsgruppe. welcome_page: title: Willkommen! introduction_html: |- @@ -1173,8 +1175,8 @@ de: paragraph_1_html: "OpenStreetMap hat nur wenige formale Regeln, aber wir erwarten, dass alle Teilnehmer\nmit der Gemeinschaft zusammenarbeiten und kommunizieren. Falls du andere Aktivitäten erwägst\nals per Hand zu bearbeiten, lies und - folge bitte den Richtlinien zu\nImporten - und \nautomatischen + folge bitte den Richtlinien zu\nImporten + und \nautomatischen Bearbeitungen." questions: title: Fragen? @@ -1211,7 +1213,7 @@ de: explanation_html: |- Falls du Bedenken über die Verwendung unserer Daten oder über die Inhalte hast, lies bitte unsere Copyright-Seite für mehr rechtliche Informationen oder kontaktiere die entsprechende - OSMF-Arbeitsgruppe. + OSMF-Arbeitsgruppe. help_page: title: Hilfe erhalten introduction: |- @@ -1223,7 +1225,7 @@ de: description: Beginne mit dieser Schnellanleitung, die die OpenStreetMap-Grundlagen abdeckt. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/DE:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/DE:Beginners%27_guide title: Anleitung für Anfänger description: Eine durch die Gemeinschaft gewartete Anleitung für Anfänger. help: @@ -1247,7 +1249,7 @@ de: description: Hilfe für auf Karten und anderen Diensten gegründeten Unternehmen und Organisationen, die zu OpenStreetMap wechseln. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Durchsuche das Wiki für eine ausführliche OSM-Dokumentation. about_page: @@ -1271,8 +1273,8 @@ de: Um mehr über die Gemeinschaft zu erfahren, lies unseren OpenStreetMap-Blog, die Benutzertagebücher, - Community-Blogs und die Website der - OSM-Foundation. + Community-Blogs und die Website der + OSM-Foundation. open_data_title: Open Data open_data_html: |- OpenStreetMap ist „Open Data“: Du kannst es für jeden Zweck verwenden, @@ -1283,13 +1285,13 @@ de: legal_title: Rechtliche Hinweise legal_html: |- Diese Website und viele damit in Zusammenhang stehende Dienste werden - von der OpenStreetMap Foundation (OSMF) + von der OpenStreetMap Foundation (OSMF) für die OSM-Gemeinschaft betrieben. Die Verwendung aller OSMF-betriebenen Dienste ist Thema unserer - „Acceptable Use Policies“ - und unserer Datenschutzrichtlinie. + „Acceptable Use Policies“ + und unserer Datenschutzrichtlinie.
- Bitte kontaktiere die OSMF, + Bitte kontaktiere die OSMF, falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen und Probleme hast. partners_title: Partner notifier: @@ -1510,15 +1512,15 @@ de: user_page_link: Einstellungsseite anon_edits_link_text: Hier findest du mehr Infos dazu. flash_player_required: Du benötigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor, - zu benutzen. Lade - den Flash Player von Adobe.com herunter. Einige + zu benutzen. Lade den Flash Player + von Adobe.com herunter. Einige andere Möglichkeiten, um OpenStreetMap zu editieren, sind hier beschrieben. potlatch_unsaved_changes: Du hast deine Arbeit noch nicht gespeichert. (Um sie in Potlach zu speichern, klicke auf eine leere Fläche bzw. deselektiere die Linie oder den Knoten, wenn du im Live-Modus editierst oder klicke auf Speichern, wenn ein Speicherbutton vorhanden ist.) potlatch2_not_configured: Potlatch 2 wurde nicht konfiguriert - Bitte besuche - http://wiki.openstreetmap.org/wiki/The_Rails_Port + https://wiki.openstreetmap.org/wiki/The_Rails_Port potlatch2_unsaved_changes: Es gibt ungesicherte Änderungen. (Du solltest in Potlatch 2 „speichern“ klicken.) id_not_configured: iD wurde nicht konfiguriert @@ -1610,7 +1612,7 @@ de: edit: Bearbeiten preview: Vorschau markdown_help: - title_html: Interpretiert mit Markdown + title_html: Interpretiert mit Markdown headings: Überschriften heading: Überschrift subheading: Zwischenüberschrift @@ -1722,7 +1724,7 @@ de: description: Letzte GPS-Track-Uploads durchsuchen tagged_with: ' gekennzeichnet mit %{tags}' empty_html: Noch keine GPS-Tracks vorhanden. Lade einen - neuen Track hoch oder informiere dich auf folgender Wikiseite + neuen Track hoch oder informiere dich auf folgender Wikiseite über das Aufzeichnen von GPS-Tracks. delete: scheduled_for_deletion: Für die Löschung vorgesehener Track @@ -1938,12 +1940,12 @@ de: Jeder kann sie verbessern, aktualisieren und erweitern, sowie für jeden Zweck verwenden.

Melde dich an und mache mit. Zur Bestätigung wird eine E-Mail an die angegebene Adresse geschickt werden, bitte gehe wie darin beschrieben vor.

license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den - Bedingungen + Bedingungen für Mitwirkende zustimmen. email address: 'E-Mail-Adresse:' confirm email address: 'Bitte wiederhole die E-Mail-Adresse:' not displayed publicly: Deine Anrede wird nicht öffentlich angezeigt, siehe - unsere Datenschutzrichtlinie für weitere Informationen. display name: 'Benutzername:' @@ -2067,12 +2069,12 @@ de: email never displayed publicly: (nicht öffentlich sichtbar) external auth: 'Externe Authentifikation:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: Was ist das? public editing: heading: 'Karte bearbeiten (public editing):' enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Was bedeutet das? disabled: Deaktiviert. Das Bearbeiten von Kartendaten NICHT möglich, alle bisherigen Bearbeitungen sind anonym. @@ -2083,7 +2085,7 @@ de: senden noch deinen Wohnort sehen. Um sichtbar zu machen, welche Arbeit von dir stammt, und um kontaktierbar zu werden, klicke auf den Button unten. Seit Version 0.6 der API aktiv ist, können unangemeldete Benutzer die - Karte nicht mehr bearbeiten (Warum?).