X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/05ad0a4f7d91c93ef581e2e6372c06c234dc728f..8df4d8aff07323b7ff62fbde8f661a597d7925ed:/Vendorfile?ds=sidebyside diff --git a/Vendorfile b/Vendorfile index 9a951d586..c25b8a616 100644 --- a/Vendorfile +++ b/Vendorfile @@ -11,13 +11,18 @@ folder 'vendor/assets' do end folder 'leaflet' do - file 'leaflet.js', 'https://unpkg.com/leaflet@1.0.1/dist/leaflet-src.js' - file 'leaflet.css', 'https://unpkg.com/leaflet@1.0.1/dist/leaflet.css' + file 'leaflet.js', 'https://unpkg.com/leaflet@1.3.2/dist/leaflet-src.js' + file 'leaflet.css', 'https://unpkg.com/leaflet@1.3.2/dist/leaflet.css' [ 'layers.png', 'layers-2x.png', 'marker-icon.png', 'marker-icon-2x.png', 'marker-shadow.png' ].each do |image| - file "images/#{image}", "https://unpkg.com/leaflet@1.0.1/dist/images/#{image}" + file "images/#{image}", "https://unpkg.com/leaflet@1.3.2/dist/images/#{image}" + end + + from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.0' do + file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js' + file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css' end from 'git://github.com/kajic/leaflet-locationfilter.git' do @@ -26,7 +31,7 @@ folder 'vendor/assets' do folder 'img', 'src/img' end - from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.54.0' do + from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.62.0' do file 'leaflet.locate.js', 'src/L.Control.Locate.js' end @@ -49,7 +54,8 @@ folder 'vendor/assets' do from 'git://github.com/openstreetmap/iD', :branch => 'release' do folder 'iD/img', 'dist/img' folder 'iD/locales', 'dist/locales' - folder 'iD/traffico', 'dist/traffico' + folder 'iD/mapillary-js', 'dist/mapillary-js' + folder 'iD/pannellum-streetside', 'dist/pannellum-streetside' file 'iD.css.erb', 'dist/iD.css' do |path| rewrite(path) do |content| @@ -57,21 +63,19 @@ folder 'vendor/assets' do end end - file 'iD/traffico/stylesheets/traffico.css.erb', 'dist/traffico/stylesheets/traffico.css' do |path| - rewrite(path) do |content| - content.gsub(/url\("?\.\.\/([^#?")]+)([^"]*)"?\)/, 'url(<%= asset_path("iD/traffico/\1") %>\2)') - end - end - - File.delete('vendor/assets/iD/iD/traffico/stylesheets/traffico.css') - file 'iD.js', 'dist/iD.js' - file 'presets.js', 'dist/presets.js' - file 'imagery.js', 'dist/imagery.js' end end folder 'javascripts' do file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js' + file 'bowser.js', 'https://github.com/lancedikson/bowser/releases/download/1.9.3/bowser.js' + end + + folder 'swfobject' do + from 'git://github.com/swfobject/swfobject.git', :tag => '2.2' do + file 'expressInstall.swf', 'swfobject/expressInstall.swf' + file 'swfobject.js', 'swfobject/src/swfobject.js' + end end end