]> git.openstreetmap.org Git - rails.git/log
rails.git
16 years agoupdate routes: everything lives in browse/ now
Christopher Schmidt [Sun, 20 Apr 2008 16:05:48 +0000 (16:05 +0000)]
update routes: everything lives in browse/ now

16 years agodon't abuse link_to: do it right
Christopher Schmidt [Sun, 20 Apr 2008 16:05:15 +0000 (16:05 +0000)]
don't abuse link_to: do it right

16 years agofor items which don't actually have a geometry, just zoomToMaxExtent.
Christopher Schmidt [Sun, 20 Apr 2008 15:36:37 +0000 (15:36 +0000)]
for items which don't actually have a geometry, just zoomToMaxExtent.

16 years agoAdd support for relation history.
Christopher Schmidt [Sun, 20 Apr 2008 15:32:25 +0000 (15:32 +0000)]
Add support for relation history.

16 years agoAdd history for ways and nodes, split 'last edited by' into a seperate template to...
Christopher Schmidt [Sun, 20 Apr 2008 15:14:20 +0000 (15:14 +0000)]
Add history for ways and nodes, split 'last edited by' into a seperate template to be used in multiple places, add to routes.

16 years agoAdd tags_as_hash to old_nodes
Christopher Schmidt [Sun, 20 Apr 2008 15:12:56 +0000 (15:12 +0000)]
Add tags_as_hash to old_nodes

16 years agoHandle deleted items better.
Christopher Schmidt [Sun, 20 Apr 2008 14:34:45 +0000 (14:34 +0000)]
Handle deleted items better.

16 years agolink from member object to the member page
Christopher Schmidt [Sun, 20 Apr 2008 14:29:49 +0000 (14:29 +0000)]
link from member object to the member page

16 years agoAdd relation browsing:
Christopher Schmidt [Sun, 20 Apr 2008 14:24:42 +0000 (14:24 +0000)]
Add relation browsing:
 * Improve map to also work for relations
 * Add display of relations (view)
 * Add relation members display
 * add new view to browse_controller

16 years agoFix offset when laying in vectors on top of the OSM tiles.
Christopher Schmidt [Sun, 20 Apr 2008 13:16:29 +0000 (13:16 +0000)]
Fix offset when laying in vectors on top of the OSM tiles.

16 years agoTidy up a few details.
Tom Hughes [Sun, 20 Apr 2008 12:29:50 +0000 (12:29 +0000)]
Tidy up a few details.

16 years agoAdd a stub helper for the browse controller.
Tom Hughes [Sun, 20 Apr 2008 12:21:07 +0000 (12:21 +0000)]
Add a stub helper for the browse controller.

16 years agoCommit crschmdt's data browser patch.
Tom Hughes [Sun, 20 Apr 2008 12:20:23 +0000 (12:20 +0000)]
Commit crschmdt's data browser patch.

16 years agoMake a branch of the rails code for crschmidt's data browser.
Tom Hughes [Sun, 20 Apr 2008 12:10:26 +0000 (12:10 +0000)]
Make a branch of the rails code for crschmidt's data browser.

16 years agoMake sure the export button is enabled if we switch away from mapnik
Tom Hughes [Sun, 20 Apr 2008 10:31:03 +0000 (10:31 +0000)]
Make sure the export button is enabled if we switch away from mapnik
export, and that the mapnik image size is updated correctly.

16 years agoClose down export properly when the sidebar is closed.
Tom Hughes [Sun, 20 Apr 2008 08:38:47 +0000 (08:38 +0000)]
Close down export properly when the sidebar is closed.

16 years agoSuppress the PanZoomBar control from printed output.
Tom Hughes [Sun, 20 Apr 2008 08:24:04 +0000 (08:24 +0000)]
Suppress the PanZoomBar control from printed output.

16 years agoRework export to not rely on ctrl+drag to select an area.
Tom Hughes [Sat, 19 Apr 2008 16:58:03 +0000 (16:58 +0000)]
Rework export to not rely on ctrl+drag to select an area.

16 years agoDo the transform the right way round.
Tom Hughes [Sat, 19 Apr 2008 14:32:40 +0000 (14:32 +0000)]
Do the transform the right way round.

16 years agoUse the right variable for the marker position.
Tom Hughes [Sat, 19 Apr 2008 14:29:18 +0000 (14:29 +0000)]
Use the right variable for the marker position.

16 years agoUse the right variable for the event.
Tom Hughes [Sat, 19 Apr 2008 14:27:57 +0000 (14:27 +0000)]
Use the right variable for the event.

16 years agoAdd numZoomLevels to the map.
Tom Hughes [Sat, 19 Apr 2008 14:00:11 +0000 (14:00 +0000)]
Add numZoomLevels to the map.

16 years agoMake openSidebar() work with no argument.
Tom Hughes [Sat, 19 Apr 2008 13:52:31 +0000 (13:52 +0000)]
Make openSidebar() work with no argument.

16 years agoMark map responses as attachments.
Tom Hughes [Sat, 19 Apr 2008 13:35:02 +0000 (13:35 +0000)]
Mark map responses as attachments.

16 years agoMake export tab work from non-view pages.
Tom Hughes [Sat, 19 Apr 2008 13:29:24 +0000 (13:29 +0000)]
Make export tab work from non-view pages.

16 years agoHeaders is an array not a function...
Tom Hughes [Sat, 19 Apr 2008 13:29:10 +0000 (13:29 +0000)]
Headers is an array not a function...

16 years agoMerge 7296:7427 from export branch to trunk.
Tom Hughes [Sat, 19 Apr 2008 13:14:30 +0000 (13:14 +0000)]
Merge 7296:7427 from export branch to trunk.

16 years agoRevert accidental commit.
Tom Hughes [Sat, 19 Apr 2008 10:49:54 +0000 (10:49 +0000)]
Revert accidental commit.

16 years agoDon't call formatChanged() when disabling XML output as it has side effects.
Tom Hughes [Sat, 19 Apr 2008 10:48:48 +0000 (10:48 +0000)]
Don't call formatChanged() when disabling XML output as it has side effects.

16 years agoValidate the mapnik scale on a zoom change.
Tom Hughes [Sat, 19 Apr 2008 10:45:28 +0000 (10:45 +0000)]
Validate the mapnik scale on a zoom change.

16 years agoDisplay the size of the image mapnik will produce.
Tom Hughes [Sat, 19 Apr 2008 10:40:37 +0000 (10:40 +0000)]
Display the size of the image mapnik will produce.

16 years agoOnly add a border to text input fields.
Tom Hughes [Sat, 19 Apr 2008 10:14:52 +0000 (10:14 +0000)]
Only add a border to text input fields.

16 years agoAdd export helper.
Tom Hughes [Fri, 18 Apr 2008 22:56:52 +0000 (22:56 +0000)]
Add export helper.

16 years agoRework AJAX stuff to work on IE.
Tom Hughes [Fri, 18 Apr 2008 22:12:50 +0000 (22:12 +0000)]
Rework AJAX stuff to work on IE.

16 years agoRemove spurious comma that was breaking Safari.
Tom Hughes [Fri, 18 Apr 2008 17:33:09 +0000 (17:33 +0000)]
Remove spurious comma that was breaking Safari.

16 years agoFix broken close tag that was breaking Opera.
Tom Hughes [Fri, 18 Apr 2008 17:32:47 +0000 (17:32 +0000)]
Fix broken close tag that was breaking Opera.

16 years agoMove user diaries link to the tab bar as it changes what is displayed
Tom Hughes [Thu, 17 Apr 2008 23:30:30 +0000 (23:30 +0000)]
Move user diaries link to the tab bar as it changes what is displayed
in the main frame, and everything else which does that is on the tab bar.

16 years agoDefault export format based on selected base layer.
Tom Hughes [Thu, 17 Apr 2008 23:10:35 +0000 (23:10 +0000)]
Default export format based on selected base layer.

16 years agoFill in license details.
Tom Hughes [Thu, 17 Apr 2008 23:05:57 +0000 (23:05 +0000)]
Fill in license details.

16 years agoRemove unused method.
Tom Hughes [Thu, 17 Apr 2008 17:47:35 +0000 (17:47 +0000)]
Remove unused method.

16 years agoMake the /export URL work.
Tom Hughes [Thu, 17 Apr 2008 17:47:15 +0000 (17:47 +0000)]
Make the /export URL work.

16 years agoSimplify URLs a bit.
Tom Hughes [Thu, 17 Apr 2008 17:38:48 +0000 (17:38 +0000)]
Simplify URLs a bit.

16 years agoMerged 7296:7388 from rails_port trunk.
Tom Hughes [Wed, 16 Apr 2008 23:52:32 +0000 (23:52 +0000)]
Merged 7296:7388 from rails_port trunk.

16 years agoAjaxify the export tab.
Tom Hughes [Wed, 16 Apr 2008 23:45:16 +0000 (23:45 +0000)]
Ajaxify the export tab.

16 years agoFix setPosition().
Tom Hughes [Wed, 16 Apr 2008 17:59:05 +0000 (17:59 +0000)]
Fix setPosition().

16 years agoGet rid of our reprojection code and use OpenLayers reprojection instead.
Tom Hughes [Wed, 16 Apr 2008 17:18:45 +0000 (17:18 +0000)]
Get rid of our reprojection code and use OpenLayers reprojection instead.

16 years agoAdd missing OpenLayers 2.6 images.
Tom Hughes [Wed, 16 Apr 2008 17:17:39 +0000 (17:17 +0000)]
Add missing OpenLayers 2.6 images.

16 years agoUse OL 2.6 auto sizing for popups instead of doing it ourselves.
Tom Hughes [Wed, 16 Apr 2008 08:49:55 +0000 (08:49 +0000)]
Use OL 2.6 auto sizing for popups instead of doing it ourselves.

16 years agoAdd a scale control to the map. Closes #51.
Tom Hughes [Wed, 16 Apr 2008 08:04:44 +0000 (08:04 +0000)]
Add a scale control to the map. Closes #51.

16 years agoUpdate OpenLayers to 2.6 release.
Tom Hughes [Wed, 16 Apr 2008 07:27:29 +0000 (07:27 +0000)]
Update OpenLayers to 2.6 release.

16 years agoMore work on export tab.
Tom Hughes [Mon, 14 Apr 2008 23:46:10 +0000 (23:46 +0000)]
More work on export tab.

16 years agoReally remove it this time...
Tom Hughes [Fri, 11 Apr 2008 19:56:56 +0000 (19:56 +0000)]
Really remove it this time...

16 years agoRemove accidental commit of my local mapnik layer.
Tom Hughes [Fri, 11 Apr 2008 19:56:29 +0000 (19:56 +0000)]
Remove accidental commit of my local mapnik layer.

16 years agoFix IE breakage.
Tom Hughes [Fri, 11 Apr 2008 19:40:32 +0000 (19:40 +0000)]
Fix IE breakage.

16 years agoTurn on wrapDateLine for all layers.
Tom Hughes [Fri, 11 Apr 2008 17:54:51 +0000 (17:54 +0000)]
Turn on wrapDateLine for all layers.
Also correct the declared projection for the markers layer.

16 years agoTweak the namefinder results a bit more.
Tom Hughes [Thu, 10 Apr 2008 08:07:09 +0000 (08:07 +0000)]
Tweak the namefinder results a bit more.

16 years agoProvide extra context for namefinder results where the nearest place
Tom Hughes [Wed, 9 Apr 2008 23:43:38 +0000 (23:43 +0000)]
Provide extra context for namefinder results where the nearest place
is small (a hamlet, village or suburb). Closes #794.

16 years agoReflect any changes made to the bounds in the map.
Tom Hughes [Wed, 9 Apr 2008 18:14:30 +0000 (18:14 +0000)]
Reflect any changes made to the bounds in the map.

16 years agoDisable OSM export when the area is too large.
Tom Hughes [Tue, 8 Apr 2008 18:38:43 +0000 (18:38 +0000)]
Disable OSM export when the area is too large.

16 years agoSwitch export branch to use OpenLayers 2.6-rc1 as we need irregular polygons.
Tom Hughes [Tue, 8 Apr 2008 17:09:15 +0000 (17:09 +0000)]
Switch export branch to use OpenLayers 2.6-rc1 as we need irregular polygons.

16 years agoCommit initial work on export tab.
Tom Hughes [Mon, 7 Apr 2008 23:23:15 +0000 (23:23 +0000)]
Commit initial work on export tab.

16 years agoRemove export controller from branches where it isn't needed yet.
Tom Hughes [Mon, 7 Apr 2008 23:11:25 +0000 (23:11 +0000)]
Remove export controller from branches where it isn't needed yet.

16 years agoMake a copy of the rails code for the node tag splitting project, and remove
Tom Hughes [Mon, 7 Apr 2008 23:09:56 +0000 (23:09 +0000)]
Make a copy of the rails code for the node tag splitting project, and remove
the associated migrations from the other branches.

16 years agoMake a copy of the rails code for the node tag splitting project, and remove
Tom Hughes [Mon, 7 Apr 2008 23:09:56 +0000 (23:09 +0000)]
Make a copy of the rails code for the node tag splitting project, and remove
the associated migrations from the other branches.

16 years agoCreate a directory for branches of the main web site, and make a branch
Tom Hughes [Mon, 7 Apr 2008 23:05:52 +0000 (23:05 +0000)]
Create a directory for branches of the main web site, and make a branch
for working on the export tab.

16 years agoSet a transitionEffect of resize on the OSM layers, ready for OL 2.6.
Tom Hughes [Mon, 31 Mar 2008 17:10:20 +0000 (17:10 +0000)]
Set a transitionEffect of resize on the OSM layers, ready for OL 2.6.

16 years agopermit uninserted tracks to be edited
Richard Fairhurst [Sun, 30 Mar 2008 00:27:29 +0000 (00:27 +0000)]
permit uninserted tracks to be edited

16 years ago0.8a
Richard Fairhurst [Sun, 30 Mar 2008 00:17:24 +0000 (00:17 +0000)]
0.8a

16 years agofix disappearing welcome panel
Richard Fairhurst [Wed, 26 Mar 2008 10:06:53 +0000 (10:06 +0000)]
fix disappearing welcome panel

16 years agoEnable the namefinder again.
Tom Hughes [Tue, 25 Mar 2008 18:01:10 +0000 (18:01 +0000)]
Enable the namefinder again.

16 years agonew versions of keys to mapnik z8-z13
Steve Chilton [Sun, 23 Mar 2008 16:15:48 +0000 (16:15 +0000)]
new versions of keys to mapnik z8-z13

16 years agotone colours down very slightly so you can still see the points
Richard Fairhurst [Fri, 21 Mar 2008 23:50:52 +0000 (23:50 +0000)]
tone colours down very slightly so you can still see the points

16 years agoEdgemaster's patch to colour routes depending on network
Richard Fairhurst [Fri, 21 Mar 2008 21:33:38 +0000 (21:33 +0000)]
Edgemaster's patch to colour routes depending on network

16 years agonicer fix I think for nil / [] issue
Steve Coast [Fri, 21 Mar 2008 20:30:16 +0000 (20:30 +0000)]
nicer fix I think for nil / [] issue

16 years agomore madness
Steve Coast [Fri, 21 Mar 2008 20:21:49 +0000 (20:21 +0000)]
more madness

16 years agofix problem with blank areas throwing a 500
Richard Fairhurst [Fri, 21 Mar 2008 20:17:56 +0000 (20:17 +0000)]
fix problem with blank areas throwing a 500

16 years agofix problem with blank areas throwing a 500
Richard Fairhurst [Fri, 21 Mar 2008 19:49:09 +0000 (19:49 +0000)]
fix problem with blank areas throwing a 500

16 years agofixes #766
Richard Fairhurst [Fri, 21 Mar 2008 19:10:57 +0000 (19:10 +0000)]
fixes #766

16 years agovarious relations fixes
Richard Fairhurst [Fri, 21 Mar 2008 19:00:39 +0000 (19:00 +0000)]
various relations fixes

16 years agocolon2bar no longer needed
Richard Fairhurst [Wed, 19 Mar 2008 10:50:33 +0000 (10:50 +0000)]
colon2bar no longer needed

16 years agorestore Steve's deleteway stuff
Richard Fairhurst [Wed, 19 Mar 2008 10:39:50 +0000 (10:39 +0000)]
restore Steve's deleteway stuff

16 years agoPotlatch 0.8 - be afraid, be very, very afraid
Richard Fairhurst [Wed, 19 Mar 2008 01:03:51 +0000 (01:03 +0000)]
Potlatch 0.8 - be afraid, be very, very afraid

16 years ago- add old_relation_controller and stuff so that relation history works. fixes #557.
Frederik Ramm [Sun, 16 Mar 2008 23:16:18 +0000 (23:16 +0000)]
- add old_relation_controller and stuff so that relation history works. fixes #557.
- minor testing fixes.

16 years agoResize the map div when the page load is complete (via onload) in case the
Tom Hughes [Fri, 7 Mar 2008 00:26:57 +0000 (00:26 +0000)]
Resize the map div when the page load is complete (via onload) in case the
page layout has changed since the initial sizing by the deferred script.

16 years agoWork round ruby's half assed Tempfile class which, because for some
Tom Hughes [Thu, 6 Mar 2008 12:43:10 +0000 (12:43 +0000)]
Work round ruby's half assed Tempfile class which, because for some
reason it is implemented by delegating to File (by inheriting from
DelegateClass(File)) rather than by inheriting from it, does not
actually look like a File, and hence does not look like an IO (in
that it does not respond to kind_of? IO calls).

In ruby 1.8.5 this doesn't matter as REXML checks that the source
it has been given responds to the methods it wants (using respond_to?
which is handled properly by DelegateClass) but in 1.8.4 which we
are running on rails2 REXML uses kind_of? to see if the source is
one it can use.

16 years agoFix typo.
Tom Hughes [Tue, 4 Mar 2008 21:24:14 +0000 (21:24 +0000)]
Fix typo.

16 years agoUse defer="defer" rather than onload to try and speed up page loading.
Tom Hughes [Tue, 4 Mar 2008 18:18:59 +0000 (18:18 +0000)]
Use defer="defer" rather than onload to try and speed up page loading.

16 years agoYet more escaping.
Tom Hughes [Tue, 4 Mar 2008 17:57:51 +0000 (17:57 +0000)]
Yet more escaping.

16 years agoMore escaping.
Tom Hughes [Tue, 4 Mar 2008 17:53:36 +0000 (17:53 +0000)]
More escaping.

16 years agoEscape page title.
Tom Hughes [Tue, 4 Mar 2008 17:51:42 +0000 (17:51 +0000)]
Escape page title.

16 years agoMore display name escaping.
Tom Hughes [Tue, 4 Mar 2008 16:53:08 +0000 (16:53 +0000)]
More display name escaping.

16 years agoEscape user display names.
Tom Hughes [Tue, 4 Mar 2008 16:51:13 +0000 (16:51 +0000)]
Escape user display names.

16 years agoEscape user names in diary views.
Tom Hughes [Tue, 4 Mar 2008 16:49:12 +0000 (16:49 +0000)]
Escape user names in diary views.

16 years agoDisable the NameFinder and fix cut'n'paste error.
Tom Hughes [Tue, 26 Feb 2008 21:50:53 +0000 (21:50 +0000)]
Disable the NameFinder and fix cut'n'paste error.

16 years agoGet the user image right this time...
Tom Hughes [Mon, 25 Feb 2008 18:55:25 +0000 (18:55 +0000)]
Get the user image right this time...

16 years agoClose tag properly.
Tom Hughes [Sun, 24 Feb 2008 17:39:55 +0000 (17:39 +0000)]
Close tag properly.

16 years agoDisplay the image of the user who made the diary entry, not that of
Tom Hughes [Sun, 24 Feb 2008 17:38:50 +0000 (17:38 +0000)]
Display the image of the user who made the diary entry, not that of
the currently logged in user...

16 years agoFix stupid breakage. Closes #708.
Tom Hughes [Sun, 24 Feb 2008 13:43:42 +0000 (13:43 +0000)]
Fix stupid breakage. Closes #708.

16 years agoencourage people to set location
Steve Coast [Sat, 23 Feb 2008 16:49:08 +0000 (16:49 +0000)]
encourage people to set location

16 years agoremove deleteway logic from amf_controller (yay!) TomH: check with RichardF this...
Steve Coast [Sat, 23 Feb 2008 16:05:45 +0000 (16:05 +0000)]
remove deleteway logic from amf_controller (yay!) TomH: check with RichardF this is sane before deploying. worksforme.