Commit graph

8 commits

Author SHA1 Message Date
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
2012-08-22 20:52:08 +01:00
Sarah Hoffmann
d97d3f76a6 Replace PanZoom control with Zoom control for small maps
In OpenLayers 2.12 the event handling of PanZoom and PanZoomBar clashes
with the result that the zoom level changes by two steps every time one
of the zoom buttons is pressed. Using the Zoom control fixes this issue.
2012-07-16 18:05:02 +01:00
Tom Hughes
b0453833b1 Replace use of Layer.GML with Layer.Vector 2012-06-28 18:18:42 +01:00
Tom Hughes
bad28a6478 Update OpenLayers to 2.12 2012-06-28 10:48:56 +01:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
2012-01-05 20:15:53 +00:00
Tom Hughes
3b20c87893 Allow the export box to be moved and resized
Use the new OpenLayers TransformFeature control to allow any box
drawn by the user to select an export area to be moved or resized
after it is drawn.
2012-01-02 16:34:47 +00:00
Tom Hughes
da78800060 Patch OpenLayers to make URL rewriting easier
This provides a single routine that can be overridden to rewrite
all image URLs to use the asset pipeine.
2011-12-30 18:32:53 +00:00
Tom Hughes
716262f211 Serve OpenLayers through the asset pipeline 2011-11-25 20:07:50 +00:00
Renamed from public/openlayers/OpenLayers.js (Browse further)