Merge remote-tracking branch 'upstream/pull/5375'

diff --combined app/controllers/application_controller.rb
index fc90e0be7874652475307a695eefb2aece8990fb,d46a682151badf37fe1e80b749e8683939609fd8..bde7e028765c81b5426a5eed2e8c74957abee4b2
--- 1/app/controllers/application_controller.rb
--- 2/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@@ -21,7 -21,7 +21,7 @@@ class ApplicationController < ActionCon
  
    def self.allow_thirdparty_images(**options)
      content_security_policy(options) do |policy|
 -      policy.img_src("*")
 +      policy.img_src("*", :data)
      end
    end
  
@@@ -253,9 -253,7 +253,7 @@@
    def map_layout
      policy = request.content_security_policy.clone
  
-     policy.child_src(*policy.child_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112")
-     policy.frame_src(*policy.frame_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112")
-     policy.connect_src(*policy.connect_src, Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url)
+     policy.connect_src(*policy.connect_src, "http://127.0.0.1:8111", Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url)
      policy.form_action(*policy.form_action, "render.openstreetmap.org")
      policy.style_src(*policy.style_src, :unsafe_inline)