From: Tom Hughes <tom@compton.nu>
Date: Fri, 25 Nov 2011 20:07:50 +0000 (+0000)
Subject: Serve OpenLayers through the asset pipeline
X-Git-Tag: live~6001
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/716262f211a8983a4272eabf3fdba9877b068b65

Serve OpenLayers through the asset pipeline
---

diff --git a/app/assets/javascripts/openlayers.js b/app/assets/javascripts/openlayers.js
new file mode 100644
index 000000000..5cdc4f23a
--- /dev/null
+++ b/app/assets/javascripts/openlayers.js
@@ -0,0 +1,6 @@
+//= require OpenLayers
+//= require OpenStreetMap
+
+OpenLayers._getScriptLocation = function() {
+    return "/assets/";
+};
diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 4b2093e3f..b84f7a483 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,5 +1,4 @@
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <iframe id="linkloader" style="display: none">
diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb
index 34cf7002a..bc1e795b0 100644
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -1,5 +1,4 @@
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <div id="changeset_list_map">
diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index c0a231ab2..8c054bb8b 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -49,8 +49,7 @@
   <% zoom = '12' %>
 <% end %>
 
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 86eed7556..ee95bf791 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -120,8 +120,7 @@ else
 end
 %>
 
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <%= render :partial => 'resize' %>
diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 6ab713995..6f192931f 100644
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -13,8 +13,7 @@ else
 end
 %>
 
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
diff --git a/public/openlayers/OpenLayers.js b/vendor/assets/openlayers/OpenLayers.js
similarity index 100%
rename from public/openlayers/OpenLayers.js
rename to vendor/assets/openlayers/OpenLayers.js
diff --git a/public/openlayers/OpenStreetMap.js b/vendor/assets/openlayers/OpenStreetMap.js
similarity index 100%
rename from public/openlayers/OpenStreetMap.js
rename to vendor/assets/openlayers/OpenStreetMap.js
diff --git a/public/openlayers/img/404.png b/vendor/assets/openlayers/img/404.png
similarity index 100%
rename from public/openlayers/img/404.png
rename to vendor/assets/openlayers/img/404.png
diff --git a/public/openlayers/img/blank.gif b/vendor/assets/openlayers/img/blank.gif
similarity index 100%
rename from public/openlayers/img/blank.gif
rename to vendor/assets/openlayers/img/blank.gif
diff --git a/public/openlayers/img/cloud-popup-relative.png b/vendor/assets/openlayers/img/cloud-popup-relative.png
similarity index 100%
rename from public/openlayers/img/cloud-popup-relative.png
rename to vendor/assets/openlayers/img/cloud-popup-relative.png
diff --git a/public/openlayers/img/drag-rectangle-off.png b/vendor/assets/openlayers/img/drag-rectangle-off.png
similarity index 100%
rename from public/openlayers/img/drag-rectangle-off.png
rename to vendor/assets/openlayers/img/drag-rectangle-off.png
diff --git a/public/openlayers/img/drag-rectangle-on.png b/vendor/assets/openlayers/img/drag-rectangle-on.png
similarity index 100%
rename from public/openlayers/img/drag-rectangle-on.png
rename to vendor/assets/openlayers/img/drag-rectangle-on.png
diff --git a/public/openlayers/img/east-mini.png b/vendor/assets/openlayers/img/east-mini.png
similarity index 100%
rename from public/openlayers/img/east-mini.png
rename to vendor/assets/openlayers/img/east-mini.png
diff --git a/public/openlayers/img/layer-switcher-maximize.png b/vendor/assets/openlayers/img/layer-switcher-maximize.png
similarity index 100%
rename from public/openlayers/img/layer-switcher-maximize.png
rename to vendor/assets/openlayers/img/layer-switcher-maximize.png
diff --git a/public/openlayers/img/layer-switcher-minimize.png b/vendor/assets/openlayers/img/layer-switcher-minimize.png
similarity index 100%
rename from public/openlayers/img/layer-switcher-minimize.png
rename to vendor/assets/openlayers/img/layer-switcher-minimize.png
diff --git a/public/openlayers/img/marker-blue.png b/vendor/assets/openlayers/img/marker-blue.png
similarity index 100%
rename from public/openlayers/img/marker-blue.png
rename to vendor/assets/openlayers/img/marker-blue.png
diff --git a/public/openlayers/img/marker-gold.png b/vendor/assets/openlayers/img/marker-gold.png
similarity index 100%
rename from public/openlayers/img/marker-gold.png
rename to vendor/assets/openlayers/img/marker-gold.png
diff --git a/public/openlayers/img/marker-green.png b/vendor/assets/openlayers/img/marker-green.png
similarity index 100%
rename from public/openlayers/img/marker-green.png
rename to vendor/assets/openlayers/img/marker-green.png
diff --git a/public/openlayers/img/marker.png b/vendor/assets/openlayers/img/marker.png
similarity index 100%
rename from public/openlayers/img/marker.png
rename to vendor/assets/openlayers/img/marker.png
diff --git a/public/openlayers/img/measuring-stick-off.png b/vendor/assets/openlayers/img/measuring-stick-off.png
similarity index 100%
rename from public/openlayers/img/measuring-stick-off.png
rename to vendor/assets/openlayers/img/measuring-stick-off.png
diff --git a/public/openlayers/img/measuring-stick-on.png b/vendor/assets/openlayers/img/measuring-stick-on.png
similarity index 100%
rename from public/openlayers/img/measuring-stick-on.png
rename to vendor/assets/openlayers/img/measuring-stick-on.png
diff --git a/public/openlayers/img/north-mini.png b/vendor/assets/openlayers/img/north-mini.png
similarity index 100%
rename from public/openlayers/img/north-mini.png
rename to vendor/assets/openlayers/img/north-mini.png
diff --git a/public/openlayers/img/panning-hand-off.png b/vendor/assets/openlayers/img/panning-hand-off.png
similarity index 100%
rename from public/openlayers/img/panning-hand-off.png
rename to vendor/assets/openlayers/img/panning-hand-off.png
diff --git a/public/openlayers/img/panning-hand-on.png b/vendor/assets/openlayers/img/panning-hand-on.png
similarity index 100%
rename from public/openlayers/img/panning-hand-on.png
rename to vendor/assets/openlayers/img/panning-hand-on.png
diff --git a/public/openlayers/img/slider.png b/vendor/assets/openlayers/img/slider.png
similarity index 100%
rename from public/openlayers/img/slider.png
rename to vendor/assets/openlayers/img/slider.png
diff --git a/public/openlayers/img/south-mini.png b/vendor/assets/openlayers/img/south-mini.png
similarity index 100%
rename from public/openlayers/img/south-mini.png
rename to vendor/assets/openlayers/img/south-mini.png
diff --git a/public/openlayers/img/west-mini.png b/vendor/assets/openlayers/img/west-mini.png
similarity index 100%
rename from public/openlayers/img/west-mini.png
rename to vendor/assets/openlayers/img/west-mini.png
diff --git a/public/openlayers/img/zoom-minus-mini.png b/vendor/assets/openlayers/img/zoom-minus-mini.png
similarity index 100%
rename from public/openlayers/img/zoom-minus-mini.png
rename to vendor/assets/openlayers/img/zoom-minus-mini.png
diff --git a/public/openlayers/img/zoom-plus-mini.png b/vendor/assets/openlayers/img/zoom-plus-mini.png
similarity index 100%
rename from public/openlayers/img/zoom-plus-mini.png
rename to vendor/assets/openlayers/img/zoom-plus-mini.png
diff --git a/public/openlayers/img/zoom-world-mini.png b/vendor/assets/openlayers/img/zoom-world-mini.png
similarity index 100%
rename from public/openlayers/img/zoom-world-mini.png
rename to vendor/assets/openlayers/img/zoom-world-mini.png
diff --git a/public/openlayers/img/zoombar.png b/vendor/assets/openlayers/img/zoombar.png
similarity index 100%
rename from public/openlayers/img/zoombar.png
rename to vendor/assets/openlayers/img/zoombar.png
diff --git a/public/openlayers/theme/default/framedCloud.css b/vendor/assets/openlayers/theme/default/framedCloud.css
similarity index 100%
rename from public/openlayers/theme/default/framedCloud.css
rename to vendor/assets/openlayers/theme/default/framedCloud.css
diff --git a/public/openlayers/theme/default/google.css b/vendor/assets/openlayers/theme/default/google.css
similarity index 100%
rename from public/openlayers/theme/default/google.css
rename to vendor/assets/openlayers/theme/default/google.css
diff --git a/public/openlayers/theme/default/google.tidy.css b/vendor/assets/openlayers/theme/default/google.tidy.css
similarity index 100%
rename from public/openlayers/theme/default/google.tidy.css
rename to vendor/assets/openlayers/theme/default/google.tidy.css
diff --git a/public/openlayers/theme/default/ie6-style.css b/vendor/assets/openlayers/theme/default/ie6-style.css
similarity index 100%
rename from public/openlayers/theme/default/ie6-style.css
rename to vendor/assets/openlayers/theme/default/ie6-style.css
diff --git a/public/openlayers/theme/default/ie6-style.tidy.css b/vendor/assets/openlayers/theme/default/ie6-style.tidy.css
similarity index 100%
rename from public/openlayers/theme/default/ie6-style.tidy.css
rename to vendor/assets/openlayers/theme/default/ie6-style.tidy.css
diff --git a/public/openlayers/theme/default/img/add_point_off.png b/vendor/assets/openlayers/theme/default/img/add_point_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/add_point_off.png
rename to vendor/assets/openlayers/theme/default/img/add_point_off.png
diff --git a/public/openlayers/theme/default/img/add_point_on.png b/vendor/assets/openlayers/theme/default/img/add_point_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/add_point_on.png
rename to vendor/assets/openlayers/theme/default/img/add_point_on.png
diff --git a/public/openlayers/theme/default/img/blank.gif b/vendor/assets/openlayers/theme/default/img/blank.gif
similarity index 100%
rename from public/openlayers/theme/default/img/blank.gif
rename to vendor/assets/openlayers/theme/default/img/blank.gif
diff --git a/public/openlayers/theme/default/img/close.gif b/vendor/assets/openlayers/theme/default/img/close.gif
similarity index 100%
rename from public/openlayers/theme/default/img/close.gif
rename to vendor/assets/openlayers/theme/default/img/close.gif
diff --git a/public/openlayers/theme/default/img/drag-rectangle-off.png b/vendor/assets/openlayers/theme/default/img/drag-rectangle-off.png
similarity index 100%
rename from public/openlayers/theme/default/img/drag-rectangle-off.png
rename to vendor/assets/openlayers/theme/default/img/drag-rectangle-off.png
diff --git a/public/openlayers/theme/default/img/drag-rectangle-on.png b/vendor/assets/openlayers/theme/default/img/drag-rectangle-on.png
similarity index 100%
rename from public/openlayers/theme/default/img/drag-rectangle-on.png
rename to vendor/assets/openlayers/theme/default/img/drag-rectangle-on.png
diff --git a/public/openlayers/theme/default/img/draw_line_off.png b/vendor/assets/openlayers/theme/default/img/draw_line_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/draw_line_off.png
rename to vendor/assets/openlayers/theme/default/img/draw_line_off.png
diff --git a/public/openlayers/theme/default/img/draw_line_on.png b/vendor/assets/openlayers/theme/default/img/draw_line_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/draw_line_on.png
rename to vendor/assets/openlayers/theme/default/img/draw_line_on.png
diff --git a/public/openlayers/theme/default/img/draw_point_off.png b/vendor/assets/openlayers/theme/default/img/draw_point_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/draw_point_off.png
rename to vendor/assets/openlayers/theme/default/img/draw_point_off.png
diff --git a/public/openlayers/theme/default/img/draw_point_on.png b/vendor/assets/openlayers/theme/default/img/draw_point_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/draw_point_on.png
rename to vendor/assets/openlayers/theme/default/img/draw_point_on.png
diff --git a/public/openlayers/theme/default/img/draw_polygon_off.png b/vendor/assets/openlayers/theme/default/img/draw_polygon_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/draw_polygon_off.png
rename to vendor/assets/openlayers/theme/default/img/draw_polygon_off.png
diff --git a/public/openlayers/theme/default/img/draw_polygon_on.png b/vendor/assets/openlayers/theme/default/img/draw_polygon_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/draw_polygon_on.png
rename to vendor/assets/openlayers/theme/default/img/draw_polygon_on.png
diff --git a/public/openlayers/theme/default/img/editing_tool_bar.png b/vendor/assets/openlayers/theme/default/img/editing_tool_bar.png
similarity index 100%
rename from public/openlayers/theme/default/img/editing_tool_bar.png
rename to vendor/assets/openlayers/theme/default/img/editing_tool_bar.png
diff --git a/public/openlayers/theme/default/img/move_feature_off.png b/vendor/assets/openlayers/theme/default/img/move_feature_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/move_feature_off.png
rename to vendor/assets/openlayers/theme/default/img/move_feature_off.png
diff --git a/public/openlayers/theme/default/img/move_feature_on.png b/vendor/assets/openlayers/theme/default/img/move_feature_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/move_feature_on.png
rename to vendor/assets/openlayers/theme/default/img/move_feature_on.png
diff --git a/public/openlayers/theme/default/img/navigation_history.png b/vendor/assets/openlayers/theme/default/img/navigation_history.png
similarity index 100%
rename from public/openlayers/theme/default/img/navigation_history.png
rename to vendor/assets/openlayers/theme/default/img/navigation_history.png
diff --git a/public/openlayers/theme/default/img/overview_replacement.gif b/vendor/assets/openlayers/theme/default/img/overview_replacement.gif
similarity index 100%
rename from public/openlayers/theme/default/img/overview_replacement.gif
rename to vendor/assets/openlayers/theme/default/img/overview_replacement.gif
diff --git a/public/openlayers/theme/default/img/pan-panel-NOALPHA.png b/vendor/assets/openlayers/theme/default/img/pan-panel-NOALPHA.png
similarity index 100%
rename from public/openlayers/theme/default/img/pan-panel-NOALPHA.png
rename to vendor/assets/openlayers/theme/default/img/pan-panel-NOALPHA.png
diff --git a/public/openlayers/theme/default/img/pan-panel.png b/vendor/assets/openlayers/theme/default/img/pan-panel.png
similarity index 100%
rename from public/openlayers/theme/default/img/pan-panel.png
rename to vendor/assets/openlayers/theme/default/img/pan-panel.png
diff --git a/public/openlayers/theme/default/img/pan_off.png b/vendor/assets/openlayers/theme/default/img/pan_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/pan_off.png
rename to vendor/assets/openlayers/theme/default/img/pan_off.png
diff --git a/public/openlayers/theme/default/img/pan_on.png b/vendor/assets/openlayers/theme/default/img/pan_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/pan_on.png
rename to vendor/assets/openlayers/theme/default/img/pan_on.png
diff --git a/public/openlayers/theme/default/img/panning-hand-off.png b/vendor/assets/openlayers/theme/default/img/panning-hand-off.png
similarity index 100%
rename from public/openlayers/theme/default/img/panning-hand-off.png
rename to vendor/assets/openlayers/theme/default/img/panning-hand-off.png
diff --git a/public/openlayers/theme/default/img/panning-hand-on.png b/vendor/assets/openlayers/theme/default/img/panning-hand-on.png
similarity index 100%
rename from public/openlayers/theme/default/img/panning-hand-on.png
rename to vendor/assets/openlayers/theme/default/img/panning-hand-on.png
diff --git a/public/openlayers/theme/default/img/remove_point_off.png b/vendor/assets/openlayers/theme/default/img/remove_point_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/remove_point_off.png
rename to vendor/assets/openlayers/theme/default/img/remove_point_off.png
diff --git a/public/openlayers/theme/default/img/remove_point_on.png b/vendor/assets/openlayers/theme/default/img/remove_point_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/remove_point_on.png
rename to vendor/assets/openlayers/theme/default/img/remove_point_on.png
diff --git a/public/openlayers/theme/default/img/ruler.png b/vendor/assets/openlayers/theme/default/img/ruler.png
similarity index 100%
rename from public/openlayers/theme/default/img/ruler.png
rename to vendor/assets/openlayers/theme/default/img/ruler.png
diff --git a/public/openlayers/theme/default/img/save_features_off.png b/vendor/assets/openlayers/theme/default/img/save_features_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/save_features_off.png
rename to vendor/assets/openlayers/theme/default/img/save_features_off.png
diff --git a/public/openlayers/theme/default/img/save_features_on.png b/vendor/assets/openlayers/theme/default/img/save_features_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/save_features_on.png
rename to vendor/assets/openlayers/theme/default/img/save_features_on.png
diff --git a/public/openlayers/theme/default/img/view_next_off.png b/vendor/assets/openlayers/theme/default/img/view_next_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/view_next_off.png
rename to vendor/assets/openlayers/theme/default/img/view_next_off.png
diff --git a/public/openlayers/theme/default/img/view_next_on.png b/vendor/assets/openlayers/theme/default/img/view_next_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/view_next_on.png
rename to vendor/assets/openlayers/theme/default/img/view_next_on.png
diff --git a/public/openlayers/theme/default/img/view_previous_off.png b/vendor/assets/openlayers/theme/default/img/view_previous_off.png
similarity index 100%
rename from public/openlayers/theme/default/img/view_previous_off.png
rename to vendor/assets/openlayers/theme/default/img/view_previous_off.png
diff --git a/public/openlayers/theme/default/img/view_previous_on.png b/vendor/assets/openlayers/theme/default/img/view_previous_on.png
similarity index 100%
rename from public/openlayers/theme/default/img/view_previous_on.png
rename to vendor/assets/openlayers/theme/default/img/view_previous_on.png
diff --git a/public/openlayers/theme/default/img/zoom-panel-NOALPHA.png b/vendor/assets/openlayers/theme/default/img/zoom-panel-NOALPHA.png
similarity index 100%
rename from public/openlayers/theme/default/img/zoom-panel-NOALPHA.png
rename to vendor/assets/openlayers/theme/default/img/zoom-panel-NOALPHA.png
diff --git a/public/openlayers/theme/default/img/zoom-panel.png b/vendor/assets/openlayers/theme/default/img/zoom-panel.png
similarity index 100%
rename from public/openlayers/theme/default/img/zoom-panel.png
rename to vendor/assets/openlayers/theme/default/img/zoom-panel.png
diff --git a/public/openlayers/theme/default/style.css b/vendor/assets/openlayers/theme/default/style.css
similarity index 100%
rename from public/openlayers/theme/default/style.css
rename to vendor/assets/openlayers/theme/default/style.css
diff --git a/public/openlayers/theme/default/style.tidy.css b/vendor/assets/openlayers/theme/default/style.tidy.css
similarity index 100%
rename from public/openlayers/theme/default/style.tidy.css
rename to vendor/assets/openlayers/theme/default/style.tidy.css