cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6762 commits 4 branches 1 tag 499 MiB
Commit graph

194 commits

Author SHA1 Message Date
Matt Amos
321218f9b1 Make close button on route dialogue return to index. 2015-01-26 15:02:55 +00:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge 
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
 2014-11-10 16:14:06 +00:00
Tom Hughes
f0ecc6312b Revert "Add SOTM advert" 
This reverts commit 15a7276a9f.
 2014-11-09 23:03:04 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing 
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
 2014-11-03 11:08:13 +00:00
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
Łukasz Gurdek
14ac1babc2 Changeset discussions 
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
 2014-10-23 21:24:51 +01:00
Tom Hughes
69893849ca Don't pass the hash when routing an empty search query 
Fixes #793
 2014-10-13 14:04:19 +01:00
Tom Hughes
15a7276a9f Add SOTM advert 2014-09-04 15:25:56 +01:00
Tom Hughes
a70b61315c Merge branch 'master' into overpass 2014-06-15 14:54:39 +01:00
Tom Hughes
6e45410103 Force coordinates into range for "Where am I" queries 
Fixes #753
 2014-06-15 11:08:25 +01:00
John Firebaugh
f2bf38606e Permalinks for directions 2014-05-14 15:52:25 -07:00
John Firebaugh
2b252e8337 Refactor 2014-05-13 10:16:53 -07:00
John Firebaugh
be79156f43 OSM.Routing -> OSM.Directions 
Too close of a name collision to OSM.Router.
 2014-05-12 12:46:09 -07:00
Tom Hughes
203ba58bab Merge branch 'master' into overpass 2014-03-16 16:20:39 +00:00
Tom Hughes
078059b76b Initial work on overpass based query API 2014-03-16 16:18:12 +00:00
Tom Hughes
4cad1970fb Make sure the hash updates properly on browse pages 
Rework the way the move listener is disabled during initial
positiong of pages to avoid accidentally leaving it disabled
for the first user move of the map in some cases.
 2014-03-16 14:11:29 +00:00
Richard Fairhurst
9d8ab7dbd1 From->To->Go order as per @samanpwbb's comment 2014-03-10 16:55:01 +00:00
Richard Fairhurst
888db7a3b4 Firefox-friendly calculation of dragstart offset 
(personally I am not feeling very Firefox-friendly right now)
 2014-03-09 21:29:48 +00:00
Tom Hughes
b095b59d5e Merge remote-tracking branch 'origin/master' into routing 
Conflicts:
	app/views/layouts/_search.html.erb
 2014-03-08 17:44:22 +00:00
Richard Fairhurst
926c7b56a8 Zoom to fit when submitting form 2014-03-08 16:31:54 +00:00
Richard Fairhurst
9a05a7ba49 Put marker at exact position user dragged it to 2014-03-08 15:17:22 +00:00
Dan Stowell
f28676c07d fix firefox behaviour when dragging pointer from the tray to the map 2014-03-08 10:48:01 +00:00
Dan Stowell
628eea2b97 jsrouting: zoom to bbox on getting fresh geocoded route, but not on drag etc 2014-03-08 10:09:30 +00:00
Tom Hughes
1f22b625a0 Move cookieContent to OSM.locationCookie 2014-02-28 00:10:55 +00:00
Tom Hughes
66039dedb0 Move zoomPrecision function to the OSM namespace 2014-02-27 18:15:54 +00:00
Kai Krueger
3eaf58c151 Make more of the javascript routing functions internationalizable 2014-02-01 21:10:54 -07:00
Richard Fairhurst
0e6a41c1c9 Repair Go button 2014-01-23 22:31:44 +00:00
Richard Fairhurst
edd6235b45 More work on draggable markers 2014-01-23 10:26:04 +00:00
Richard Fairhurst
08837b2f8b Start work on drag-and-drop start/end markers 2014-01-23 00:49:00 +00:00
Richard Fairhurst
7834c628e9 Simplify usage, fix closures 2014-01-22 12:52:51 +00:00
Richard Fairhurst
3bd5ae2399 Move routing engines into their own files 2014-01-22 09:52:01 +00:00
Richard Fairhurst
fd991a0201 Close directions 2014-01-21 21:15:49 +00:00
Richard Fairhurst
ad01a61b6d Query options presentation 2014-01-21 20:57:55 +00:00
Richard Fairhurst
69437cf0ad Presentation work 2014-01-21 19:22:50 +00:00
Richard Fairhurst
2198b6ebbf Beginning of JavaScript-only routing UI 2014-01-21 13:29:05 +00:00
Tom Hughes
dd12e1de63 Restore the duplicate search form in the header 
It turns out the duplicate form is used, for the the mobile view.
 2013-12-16 09:39:54 +00:00
Tom Hughes
19c77c3d24 Issue all _osm_location cookies against the root path 
To ensure that any old cookies issued against other paths are
removed we make sure to do a removeCookie call first without a
path being specified so that any cookie for the current page is
removed before we add a new one against the root.

Fixes #652
 2013-12-11 00:19:49 +00:00
Tom Hughes
9cc9a00988 Restore autofocusing of the search field 
Use the HTML5 autofocus attribute, and focus on load for browsers
which don't support it.

Also change the removal of the "Where am I?" prompt to happen on
input rather than when the field is focused, so that it is properly
removed and restored when the field has been autofocused.

Fixes https://trac.openstreetmap.org/ticket/5065
 2013-12-10 19:45:28 +00:00
Aaron Lidman
a796c41881 Refine zooming and panning for note and data layers 
Fixes #629
Fixes #643
 2013-12-09 23:05:38 +00:00
Tom Hughes
24893c0936 Update page title when switching to the front page view 
Fixes https://trac.openstreetmap.org/ticket/5063
 2013-12-09 09:28:13 +00:00
Tom Hughes
66aac9ca87 Pass details of any selected object to remote editors 2013-12-06 00:19:35 +00:00
Tom Hughes
6670de16a1 Make remote edit work when /edit is loaded 
Change detection of the edit request to use the URL as the class
will not be set on the body now, and force the router to think we
actually loaded the normal view.
 2013-12-05 10:40:21 +00:00
John Firebaugh
10c8be0cb9 Restore correct link behavior with modifier keys 
Fixes #562
 2013-12-02 14:25:45 -08:00
Tom Hughes
d5a765588f Fix URL updating in Potlatch 1 
Potlatch 1 has hard coded calls to updatelinks, so rename the
updatelinks function to updateLinks and add an updatelinks function
using the old style argument list for Potlatch 1 to call.
 2013-12-01 22:37:04 +00:00
Richard Fairhurst
640ff57465 Add 'x' to close welcome box; remember preference 2013-12-01 21:36:25 +00:00
Tom Hughes
248d0b863c Force the X-Page-Title value to be treated as UTF-8 
This is basically a black magic hack to get javascript to treat
a string as UTF-8 and decode it to the correct form.

http://monsur.hossa.in/2012/07/20/utf-8-in-javascript.html
 2013-12-01 20:31:48 +00:00
Tom Hughes
37baed28b1 Pass the correct ID when switching to a node/way/relation view 2013-11-29 09:53:16 +00:00
Tom Hughes
223d5fd132 Stop browse routes matching user URLs 2013-11-29 00:05:25 +00:00
Tom Hughes
3cd5f45e08 Simplify browse routes and make routes more consistent 
This gets rid of the /browse/ prefix and uses /history consistently
for all routes that show a list of changesets.
 2013-11-28 00:14:07 +00:00
John Firebaugh
6b236ec95b Fix feed link for pushState loaded history page 2013-11-25 15:47:42 -08:00