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

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 000a05ff7601b725b8dc118dc0f638b17717da71..0fe6e09b458618df123b5aad350833aa20aa80a6 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,24 +1,44 @@
 folder 'vendor/assets' do
 folder 'vendor/assets' do

+  folder 'jquery' do
+    file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
+  end
+

   folder 'leaflet' do
   folder 'leaflet' do

-    from 'https://github.com/jfirebaugh/Leaflet.git', :branch => 'osm' do
-      file 'leaflet.css',    'dist/leaflet.css'
-      file 'leaflet.ie.css', 'dist/leaflet.ie.css'
-      file 'leaflet.js',     'dist/leaflet-src.js'
-      folder 'images', 'dist/images'
+    from 'https://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.1' do
+      file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js'
+      file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css'

     end
 
     end
 

-    from 'https://github.com/jfirebaugh/leaflet-locationfilter.git', :branch => 'osm' do
+    from 'https://github.com/kajic/leaflet-locationfilter.git' do

       file 'leaflet.locationfilter.css', 'src/locationfilter.css'
       file 'leaflet.locationfilter.css', 'src/locationfilter.css'

-      file 'leaflet.locationfilter.js',  'src/locationfilter.js'
+      file 'leaflet.locationfilter.js', 'src/locationfilter.js'

       folder 'img', 'src/img'
     end
 
       folder 'img', 'src/img'
     end
 

-    file 'leaflet.pan.js',  'https://raw.github.com/kartena/Leaflet.Pancontrol/master/src/L.Control.Pan.js'
-    file 'leaflet.zoom.js', 'https://raw.github.com/kartena/Leaflet.zoomslider/master/src/L.Control.Zoomslider.js'
-    # CSS and sprite image are our own
-
-    from 'https://github.com/jfirebaugh/leaflet-osm.git' do
+    from 'https://github.com/openstreetmap/leaflet-osm.git' do

       file 'leaflet.osm.js', 'leaflet-osm.js'
     end
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end

+
+    from 'https://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.9' do
+      file 'leaflet.polyline.js', 'Polyline.encoded.js'
+    end
+  end
+
+  folder 'iD' do
+    from 'https://github.com/openstreetmap/iD', :branch => 'release' do
+      folder 'iD/data', 'dist/data'
+      folder 'iD/img', 'dist/img'
+      folder 'iD/locales', 'dist/locales'
+      folder 'iD/mapillary-js', 'dist/mapillary-js'
+      folder 'iD/pannellum', 'dist/pannellum'
+
+      file 'iD.css.erb', 'dist/iD.css' do |path|
+        rewrite(path) do |content|
+          content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)')
+        end
+      end
+
+      file 'iD.js', 'dist/iD.js'
+    end

   end
 end
   end
 end