cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Serve OpenLayers through the asset pipeline

Browse source
This commit is contained in:
Tom Hughes 2011-11-25 20:07:50 +00:00
parent afc3a4380c
commit 716262f211
73 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/openlayers.js Normal file
View file

@ -0,0 +1,6 @@
//= require OpenLayers
//= require OpenStreetMap
OpenLayers._getScriptLocation = function() {
return "/assets/";
};

3
app/views/browse/_map.html.erb
View file

@ -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">

3
app/views/changeset/_map.html.erb
View file

@ -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">

3
app/views/diary_entry/edit.html.erb
View file

@ -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">

3
app/views/site/index.html.erb
View file

@ -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' %>

3
app/views/user/_map.html.erb
View file

@ -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">

0
public/openlayers/OpenLayers.js → vendor/assets/openlayers/OpenLayers.js vendored
View file

0
public/openlayers/OpenStreetMap.js → vendor/assets/openlayers/OpenStreetMap.js vendored
View file

0
public/openlayers/img/404.png → vendor/assets/openlayers/img/404.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

0
public/openlayers/img/blank.gif → vendor/assets/openlayers/img/blank.gif vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 B

After

Width:  |  Height:  |  Size: 42 B

Before After
Before After

0
public/openlayers/img/cloud-popup-relative.png → vendor/assets/openlayers/img/cloud-popup-relative.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

Before After
Before After

0
public/openlayers/img/drag-rectangle-off.png → vendor/assets/openlayers/img/drag-rectangle-off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Before After
Before After

0
public/openlayers/img/drag-rectangle-on.png → vendor/assets/openlayers/img/drag-rectangle-on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Before After
Before After

0
public/openlayers/img/east-mini.png → vendor/assets/openlayers/img/east-mini.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 342 B

Before After
Before After

0
public/openlayers/img/layer-switcher-maximize.png → vendor/assets/openlayers/img/layer-switcher-maximize.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 405 B

After

Width:  |  Height:  |  Size: 405 B

Before After
Before After

0
public/openlayers/img/layer-switcher-minimize.png → vendor/assets/openlayers/img/layer-switcher-minimize.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 220 B

Before After
Before After

0
public/openlayers/img/marker-blue.png → vendor/assets/openlayers/img/marker-blue.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 758 B

After

Width:  |  Height:  |  Size: 758 B

Before After
Before After

0
public/openlayers/img/marker-gold.png → vendor/assets/openlayers/img/marker-gold.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 703 B

After

Width:  |  Height:  |  Size: 703 B

Before After
Before After

0
public/openlayers/img/marker-green.png → vendor/assets/openlayers/img/marker-green.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 753 B

After

Width:  |  Height:  |  Size: 753 B

Before After
Before After

0
public/openlayers/img/marker.png → vendor/assets/openlayers/img/marker.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 601 B

After

Width:  |  Height:  |  Size: 601 B

Before After
Before After

0
public/openlayers/img/measuring-stick-off.png → vendor/assets/openlayers/img/measuring-stick-off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Before After
Before After

0
public/openlayers/img/measuring-stick-on.png → vendor/assets/openlayers/img/measuring-stick-on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

0
public/openlayers/img/north-mini.png → vendor/assets/openlayers/img/north-mini.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

Before After
Before After

0
public/openlayers/img/panning-hand-off.png → vendor/assets/openlayers/img/panning-hand-off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Before After
Before After

0
public/openlayers/img/panning-hand-on.png → vendor/assets/openlayers/img/panning-hand-on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before After
Before After

0
public/openlayers/img/slider.png → vendor/assets/openlayers/img/slider.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 247 B

Before After
Before After

0
public/openlayers/img/south-mini.png → vendor/assets/openlayers/img/south-mini.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 373 B

Before After
Before After

0
public/openlayers/img/west-mini.png → vendor/assets/openlayers/img/west-mini.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 B

After

Width:  |  Height:  |  Size: 360 B

Before After
Before After

0
public/openlayers/img/zoom-minus-mini.png → vendor/assets/openlayers/img/zoom-minus-mini.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 291 B

Before After
Before After

0
public/openlayers/img/zoom-plus-mini.png → vendor/assets/openlayers/img/zoom-plus-mini.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 386 B

Before After
Before After

0
public/openlayers/img/zoom-world-mini.png → vendor/assets/openlayers/img/zoom-world-mini.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 882 B

After

Width:  |  Height:  |  Size: 882 B

Before After
Before After

0
public/openlayers/img/zoombar.png → vendor/assets/openlayers/img/zoombar.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 350 B

After

Width:  |  Height:  |  Size: 350 B

Before After
Before After

0
public/openlayers/theme/default/framedCloud.css → vendor/assets/openlayers/theme/default/framedCloud.css vendored
View file

0
public/openlayers/theme/default/google.css → vendor/assets/openlayers/theme/default/google.css vendored
View file

0
public/openlayers/theme/default/google.tidy.css → vendor/assets/openlayers/theme/default/google.tidy.css vendored
View file

0
public/openlayers/theme/default/ie6-style.css → vendor/assets/openlayers/theme/default/ie6-style.css vendored
View file

0
public/openlayers/theme/default/ie6-style.tidy.css → vendor/assets/openlayers/theme/default/ie6-style.tidy.css vendored
View file

0
public/openlayers/theme/default/img/add_point_off.png → vendor/assets/openlayers/theme/default/img/add_point_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

0
public/openlayers/theme/default/img/add_point_on.png → vendor/assets/openlayers/theme/default/img/add_point_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

0
public/openlayers/theme/default/img/blank.gif → vendor/assets/openlayers/theme/default/img/blank.gif vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 B

After

Width:  |  Height:  |  Size: 42 B

Before After
Before After

0
public/openlayers/theme/default/img/close.gif → vendor/assets/openlayers/theme/default/img/close.gif vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

0
public/openlayers/theme/default/img/drag-rectangle-off.png → vendor/assets/openlayers/theme/default/img/drag-rectangle-off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Before After
Before After

0
public/openlayers/theme/default/img/drag-rectangle-on.png → vendor/assets/openlayers/theme/default/img/drag-rectangle-on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Before After
Before After

0
public/openlayers/theme/default/img/draw_line_off.png → vendor/assets/openlayers/theme/default/img/draw_line_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

0
public/openlayers/theme/default/img/draw_line_on.png → vendor/assets/openlayers/theme/default/img/draw_line_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

0
public/openlayers/theme/default/img/draw_point_off.png → vendor/assets/openlayers/theme/default/img/draw_point_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

0
public/openlayers/theme/default/img/draw_point_on.png → vendor/assets/openlayers/theme/default/img/draw_point_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

0
public/openlayers/theme/default/img/draw_polygon_off.png → vendor/assets/openlayers/theme/default/img/draw_polygon_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

0
public/openlayers/theme/default/img/draw_polygon_on.png → vendor/assets/openlayers/theme/default/img/draw_polygon_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

0
public/openlayers/theme/default/img/editing_tool_bar.png → vendor/assets/openlayers/theme/default/img/editing_tool_bar.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

0
public/openlayers/theme/default/img/move_feature_off.png → vendor/assets/openlayers/theme/default/img/move_feature_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

0
public/openlayers/theme/default/img/move_feature_on.png → vendor/assets/openlayers/theme/default/img/move_feature_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before After
Before After

0
public/openlayers/theme/default/img/navigation_history.png → vendor/assets/openlayers/theme/default/img/navigation_history.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Before After
Before After

0
public/openlayers/theme/default/img/overview_replacement.gif → vendor/assets/openlayers/theme/default/img/overview_replacement.gif vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 B

After

Width:  |  Height:  |  Size: 79 B

Before After
Before After

0
public/openlayers/theme/default/img/pan-panel-NOALPHA.png → vendor/assets/openlayers/theme/default/img/pan-panel-NOALPHA.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 564 B

After

Width:  |  Height:  |  Size: 564 B

Before After
Before After

0
public/openlayers/theme/default/img/pan-panel.png → vendor/assets/openlayers/theme/default/img/pan-panel.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 814 B

After

Width:  |  Height:  |  Size: 814 B

Before After
Before After

0
public/openlayers/theme/default/img/pan_off.png → vendor/assets/openlayers/theme/default/img/pan_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before After
Before After

0
public/openlayers/theme/default/img/pan_on.png → vendor/assets/openlayers/theme/default/img/pan_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

0
public/openlayers/theme/default/img/panning-hand-off.png → vendor/assets/openlayers/theme/default/img/panning-hand-off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Before After
Before After

0
public/openlayers/theme/default/img/panning-hand-on.png → vendor/assets/openlayers/theme/default/img/panning-hand-on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before After
Before After

0
public/openlayers/theme/default/img/remove_point_off.png → vendor/assets/openlayers/theme/default/img/remove_point_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

0
public/openlayers/theme/default/img/remove_point_on.png → vendor/assets/openlayers/theme/default/img/remove_point_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

0
public/openlayers/theme/default/img/ruler.png → vendor/assets/openlayers/theme/default/img/ruler.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before After
Before After

0
public/openlayers/theme/default/img/save_features_off.png → vendor/assets/openlayers/theme/default/img/save_features_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 354 B

After

Width:  |  Height:  |  Size: 354 B

Before After
Before After

0
public/openlayers/theme/default/img/save_features_on.png → vendor/assets/openlayers/theme/default/img/save_features_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 361 B

Before After
Before After

0
public/openlayers/theme/default/img/view_next_off.png → vendor/assets/openlayers/theme/default/img/view_next_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

0
public/openlayers/theme/default/img/view_next_on.png → vendor/assets/openlayers/theme/default/img/view_next_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

0
public/openlayers/theme/default/img/view_previous_off.png → vendor/assets/openlayers/theme/default/img/view_previous_off.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

0
public/openlayers/theme/default/img/view_previous_on.png → vendor/assets/openlayers/theme/default/img/view_previous_on.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

0
public/openlayers/theme/default/img/zoom-panel-NOALPHA.png → vendor/assets/openlayers/theme/default/img/zoom-panel-NOALPHA.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

0
public/openlayers/theme/default/img/zoom-panel.png → vendor/assets/openlayers/theme/default/img/zoom-panel.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before After
Before After

0
public/openlayers/theme/default/style.css → vendor/assets/openlayers/theme/default/style.css vendored
View file

0
public/openlayers/theme/default/style.tidy.css → vendor/assets/openlayers/theme/default/style.tidy.css vendored
View file