From 716262f211a8983a4272eabf3fdba9877b068b65 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 25 Nov 2011 20:07:50 +0000 Subject: [PATCH] Serve OpenLayers through the asset pipeline --- app/assets/javascripts/openlayers.js | 6 ++++++ app/views/browse/_map.html.erb | 3 +-- app/views/changeset/_map.html.erb | 3 +-- app/views/diary_entry/edit.html.erb | 3 +-- app/views/site/index.html.erb | 3 +-- app/views/user/_map.html.erb | 3 +-- {public => vendor/assets}/openlayers/OpenLayers.js | 0 .../assets}/openlayers/OpenStreetMap.js | 0 {public => vendor/assets}/openlayers/img/404.png | Bin {public => vendor/assets}/openlayers/img/blank.gif | Bin .../assets}/openlayers/img/cloud-popup-relative.png | Bin .../assets}/openlayers/img/drag-rectangle-off.png | Bin .../assets}/openlayers/img/drag-rectangle-on.png | Bin .../assets}/openlayers/img/east-mini.png | Bin .../openlayers/img/layer-switcher-maximize.png | Bin .../openlayers/img/layer-switcher-minimize.png | Bin .../assets}/openlayers/img/marker-blue.png | Bin .../assets}/openlayers/img/marker-gold.png | Bin .../assets}/openlayers/img/marker-green.png | Bin {public => vendor/assets}/openlayers/img/marker.png | Bin .../assets}/openlayers/img/measuring-stick-off.png | Bin .../assets}/openlayers/img/measuring-stick-on.png | Bin .../assets}/openlayers/img/north-mini.png | Bin .../assets}/openlayers/img/panning-hand-off.png | Bin .../assets}/openlayers/img/panning-hand-on.png | Bin {public => vendor/assets}/openlayers/img/slider.png | Bin .../assets}/openlayers/img/south-mini.png | Bin .../assets}/openlayers/img/west-mini.png | Bin .../assets}/openlayers/img/zoom-minus-mini.png | Bin .../assets}/openlayers/img/zoom-plus-mini.png | Bin .../assets}/openlayers/img/zoom-world-mini.png | Bin .../assets}/openlayers/img/zoombar.png | Bin .../openlayers/theme/default/framedCloud.css | 0 .../assets}/openlayers/theme/default/google.css | 0 .../openlayers/theme/default/google.tidy.css | 0 .../assets}/openlayers/theme/default/ie6-style.css | 0 .../openlayers/theme/default/ie6-style.tidy.css | 0 .../openlayers/theme/default/img/add_point_off.png | Bin .../openlayers/theme/default/img/add_point_on.png | Bin .../assets}/openlayers/theme/default/img/blank.gif | Bin .../assets}/openlayers/theme/default/img/close.gif | Bin .../theme/default/img/drag-rectangle-off.png | Bin .../theme/default/img/drag-rectangle-on.png | Bin .../openlayers/theme/default/img/draw_line_off.png | Bin .../openlayers/theme/default/img/draw_line_on.png | Bin .../openlayers/theme/default/img/draw_point_off.png | Bin .../openlayers/theme/default/img/draw_point_on.png | Bin .../theme/default/img/draw_polygon_off.png | Bin .../theme/default/img/draw_polygon_on.png | Bin .../theme/default/img/editing_tool_bar.png | Bin .../theme/default/img/move_feature_off.png | Bin .../theme/default/img/move_feature_on.png | Bin .../theme/default/img/navigation_history.png | Bin .../theme/default/img/overview_replacement.gif | Bin .../theme/default/img/pan-panel-NOALPHA.png | Bin .../openlayers/theme/default/img/pan-panel.png | Bin .../openlayers/theme/default/img/pan_off.png | Bin .../assets}/openlayers/theme/default/img/pan_on.png | Bin .../theme/default/img/panning-hand-off.png | Bin .../theme/default/img/panning-hand-on.png | Bin .../theme/default/img/remove_point_off.png | Bin .../theme/default/img/remove_point_on.png | Bin .../assets}/openlayers/theme/default/img/ruler.png | Bin .../theme/default/img/save_features_off.png | Bin .../theme/default/img/save_features_on.png | Bin .../openlayers/theme/default/img/view_next_off.png | Bin .../openlayers/theme/default/img/view_next_on.png | Bin .../theme/default/img/view_previous_off.png | Bin .../theme/default/img/view_previous_on.png | Bin .../theme/default/img/zoom-panel-NOALPHA.png | Bin .../openlayers/theme/default/img/zoom-panel.png | Bin .../assets}/openlayers/theme/default/style.css | 0 .../assets}/openlayers/theme/default/style.tidy.css | 0 73 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 app/assets/javascripts/openlayers.js rename {public => vendor/assets}/openlayers/OpenLayers.js (100%) rename {public => vendor/assets}/openlayers/OpenStreetMap.js (100%) rename {public => vendor/assets}/openlayers/img/404.png (100%) rename {public => vendor/assets}/openlayers/img/blank.gif (100%) rename {public => vendor/assets}/openlayers/img/cloud-popup-relative.png (100%) rename {public => vendor/assets}/openlayers/img/drag-rectangle-off.png (100%) rename {public => vendor/assets}/openlayers/img/drag-rectangle-on.png (100%) rename {public => vendor/assets}/openlayers/img/east-mini.png (100%) rename {public => vendor/assets}/openlayers/img/layer-switcher-maximize.png (100%) rename {public => vendor/assets}/openlayers/img/layer-switcher-minimize.png (100%) rename {public => vendor/assets}/openlayers/img/marker-blue.png (100%) rename {public => vendor/assets}/openlayers/img/marker-gold.png (100%) rename {public => vendor/assets}/openlayers/img/marker-green.png (100%) rename {public => vendor/assets}/openlayers/img/marker.png (100%) rename {public => vendor/assets}/openlayers/img/measuring-stick-off.png (100%) rename {public => vendor/assets}/openlayers/img/measuring-stick-on.png (100%) rename {public => vendor/assets}/openlayers/img/north-mini.png (100%) rename {public => vendor/assets}/openlayers/img/panning-hand-off.png (100%) rename {public => vendor/assets}/openlayers/img/panning-hand-on.png (100%) rename {public => vendor/assets}/openlayers/img/slider.png (100%) rename {public => vendor/assets}/openlayers/img/south-mini.png (100%) rename {public => vendor/assets}/openlayers/img/west-mini.png (100%) rename {public => vendor/assets}/openlayers/img/zoom-minus-mini.png (100%) rename {public => vendor/assets}/openlayers/img/zoom-plus-mini.png (100%) rename {public => vendor/assets}/openlayers/img/zoom-world-mini.png (100%) rename {public => vendor/assets}/openlayers/img/zoombar.png (100%) rename {public => vendor/assets}/openlayers/theme/default/framedCloud.css (100%) rename {public => vendor/assets}/openlayers/theme/default/google.css (100%) rename {public => vendor/assets}/openlayers/theme/default/google.tidy.css (100%) rename {public => vendor/assets}/openlayers/theme/default/ie6-style.css (100%) rename {public => vendor/assets}/openlayers/theme/default/ie6-style.tidy.css (100%) rename {public => vendor/assets}/openlayers/theme/default/img/add_point_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/add_point_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/blank.gif (100%) rename {public => vendor/assets}/openlayers/theme/default/img/close.gif (100%) rename {public => vendor/assets}/openlayers/theme/default/img/drag-rectangle-off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/drag-rectangle-on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/draw_line_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/draw_line_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/draw_point_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/draw_point_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/draw_polygon_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/draw_polygon_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/editing_tool_bar.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/move_feature_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/move_feature_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/navigation_history.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/overview_replacement.gif (100%) rename {public => vendor/assets}/openlayers/theme/default/img/pan-panel-NOALPHA.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/pan-panel.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/pan_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/pan_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/panning-hand-off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/panning-hand-on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/remove_point_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/remove_point_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/ruler.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/save_features_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/save_features_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/view_next_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/view_next_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/view_previous_off.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/view_previous_on.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/zoom-panel-NOALPHA.png (100%) rename {public => vendor/assets}/openlayers/theme/default/img/zoom-panel.png (100%) rename {public => vendor/assets}/openlayers/theme/default/style.css (100%) rename {public => vendor/assets}/openlayers/theme/default/style.tidy.css (100%) 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' %>