Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index f4cdd33cf9612eab01222e6533d26e4439143e51..361f2c84361173bc6948a7c3e661a6a10e44bc8b 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,22 +1,23 @@
 folder 'vendor/assets' do
   folder 'jquery' do
 folder 'vendor/assets' do
   folder 'jquery' do

-    file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
-    file 'jquery.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.js'
+    file 'jquery.cookie.js', 'https://raw.githubusercontent.com/carhartl/jquery-cookie/master/src/jquery.cookie.js'
+    file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
+    file 'jquery.simulate.js', 'https://raw.githubusercontent.com/jquery/jquery-simulate/1.0.0/jquery.simulate.js'

   end
 
   folder 'bootstrap' do
   end
 
   folder 'bootstrap' do

-    file 'bootstrap.tooltip.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js'
-    file 'bootstrap.dropdown.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.js'
+    file 'bootstrap.tooltip.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v3.3.2/js/tooltip.js'
+    file 'bootstrap.dropdown.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v3.3.2/js/dropdown.js'

   end
 
   folder 'leaflet' do
   end
 
   folder 'leaflet' do

-    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.1/leaflet-src.js'
-    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.1/leaflet.css'
+    file 'leaflet.js', 'https://unpkg.com/leaflet@1.0.3/dist/leaflet-src.js'
+    file 'leaflet.css', 'https://unpkg.com/leaflet@1.0.3/dist/leaflet.css'

 
     [ 'layers.png', 'layers-2x.png',
       'marker-icon.png', 'marker-icon-2x.png',
       'marker-shadow.png' ].each do |image|
 
     [ 'layers.png', 'layers-2x.png',
       'marker-icon.png', 'marker-icon-2x.png',
       'marker-shadow.png' ].each do |image|

-      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.1/images/#{image}"
+      file "images/#{image}", "https://unpkg.com/leaflet@1.0.3/dist/images/#{image}"

     end
 
     from 'git://github.com/kajic/leaflet-locationfilter.git' do
     end
 
     from 'git://github.com/kajic/leaflet-locationfilter.git' do


@@ -25,13 +26,17 @@ folder 'vendor/assets' do
       folder 'img', 'src/img'
     end
 
       folder 'img', 'src/img'
     end
 

-    from 'git://github.com/domoritz/leaflet-locatecontrol.git' do
+    from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.54.0' do

       file 'leaflet.locate.js', 'src/L.Control.Locate.js'
     end
 
     from 'git://github.com/jfirebaugh/leaflet-osm.git' do
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end
       file 'leaflet.locate.js', 'src/L.Control.Locate.js'
     end
 
     from 'git://github.com/jfirebaugh/leaflet-osm.git' do
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end

+
+    from 'git://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.8' do
+      file 'leaflet.polyline.js', 'Polyline.encoded.js'
+    end

   end
 
   folder 'ohauth' do
   end
 
   folder 'ohauth' do


@@ -41,17 +46,31 @@ folder 'vendor/assets' do
   end
 
   folder 'iD' do
   end
 
   folder 'iD' do

-    from 'git://github.com/systemed/iD', :branch => 'release' do
+    from 'git://github.com/openstreetmap/iD', :branch => 'release' do

       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'

+      folder 'iD/traffico', 'dist/traffico'
+      folder 'iD/mapillary-js', 'dist/mapillary-js'
+

       file 'iD.css.erb', 'dist/iD.css' do |path|
       file 'iD.css.erb', 'dist/iD.css' do |path|

-        rewrite(path) { |content| content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') }
+        rewrite(path) do |content|
+          content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)')
+        end

       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'
     end
   end
 
   folder 'javascripts' do
       file 'iD.js', 'dist/iD.js'
     end
   end
 
   folder 'javascripts' do

-    file 'html5shiv.js', 'https://raw.github.com/aFarkas/html5shiv/master/src/html5shiv.js'
+    file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js'

   end
 end
   end
 end