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

6437 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Fairhurst
73eb8a5336 Merge pull request #18 from danstowell/jsrouting-durationcalc 
Fix hours:minutes duration display for routing
 2014-03-31 17:50:48 +01:00
Dan Stowell
52054e6b23 Fix hours:minutes duration display for routing 2014-03-22 12:53:08 +00:00
Richard Fairhurst
23ffdadb56 Don't show http-only routers to users on https 2014-03-10 18:02:28 +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
Richard Fairhurst
608ec07b1f Refer to the id for the distance/time summary 
(otherwise it fouls up the welcome message spacing)
 2014-03-09 20:27:22 +00:00
Richard Fairhurst
373b932717 Merge pull request #17 from danstowell/jsrouting-clearsearch 
jsrouting: clear search boxes on page unload
 2014-03-09 17:35:51 +00:00
Dan Stowell
bc67479bcc jsrouting: clear search boxes on page unload 2014-03-09 15:06:08 +00:00
Richard Fairhurst
42c1dec8f0 Resolve conflict 2014-03-09 12:05:37 +00:00
Richard Fairhurst
5853f81ee8 Merge pull request #15 from danstowell/jsrouting-highlightsegments 
jsrouting: mouseover an instruction, highlight the route segment
 2014-03-09 11:44:02 +00:00
Dan Stowell
15f0367e7f jsrouting: mouseover an instruction, highlight the route segment 2014-03-09 09:37:42 +00:00
Richard Fairhurst
eab2eeaa47 Merge pull request #14 from tomhughes/routing 
Routing
 2014-03-08 17:47:23 +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
5c0e96e0e0 Convert tabs to spaces 
(because I'll be lynched otherwise, mutter grumble)
 2014-03-08 16:39:51 +00:00
Richard Fairhurst
926c7b56a8 Zoom to fit when submitting form 2014-03-08 16:31:54 +00:00
Richard Fairhurst
3ef8024b1d Add distance/time summary 2014-03-08 16:14:14 +00:00
Richard Fairhurst
9a05a7ba49 Put marker at exact position user dragged it to 2014-03-08 15:17:22 +00:00
Richard Fairhurst
15904542a6 Pass on routing failures from MapQuest 2014-03-08 14:14:43 +00:00
Richard Fairhurst
2f0794738c Add CORS for engines that support it 
(Do we need a fix for IE8/9?
- https://github.com/MoonScript/jQuery-ajaxTransport-XDomainRequest
- https://github.com/jaubourg/ajaxHooks/blob/master/src/xdr.js )
 2014-03-08 14:03:08 +00:00
Richard Fairhurst
a997690897 Refactor MQ/OSRM engines a la @karussell patch 2014-03-08 13:37:27 +00:00
Richard Fairhurst
dd4406ed41 Remove CloudMade foot engine 
(OSM is probably not an "Enterprise Plan" customer ;) )
 2014-03-08 12:35:00 +00:00
Richard Fairhurst
7915a22caf Use generic GraphHopper engine 2014-03-08 12:31:06 +00:00
Richard Fairhurst
3ddda7319c Merge pull request #13 from danstowell/jsrouting-ffoxdragok 
fix firefox behaviour when dragging pointer from the tray to the map
 2014-03-08 12:13:40 +00:00
Richard Fairhurst
5b6558c0f2 Improve error-handling 2014-03-08 12:07:54 +00:00
Richard Fairhurst
902f1b0887 Add spinner while awaiting route 2014-03-08 11:14:48 +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
Richard Fairhurst
bf895a0332 Reformat string to avoid long line 2014-03-08 10:43:29 +00:00
Richard Fairhurst
19513826c5 Merge pull request #12 from danstowell/jsrouting-bboxzoom 
jsrouting: zoom to bbox on getting fresh geocoded route, but not on drag etc
 2014-03-08 10:29:54 +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
8c82be0537 Make the search form a GET form with no extra fields 
We only accept GET requests for the search, and although the form is
never normally submitted directly some browsers offer an option to
create a bookmark from a form, so make that work.
 2014-03-07 19:18:24 +00:00
Richard Fairhurst
565f661f20 Merge pull request #11 from danstowell/jsrouting-pulldownchange 
refresh search if showing and user changes provider
 2014-03-07 15:58:04 +00:00
Richard Fairhurst
44c3e1d66a Merge pull request #10 from danstowell/jsrouting-credits 
add a credits line for each routing service
 2014-03-07 15:57:40 +00:00
Tom Hughes
d65e019823 Add more helper tests 2014-03-05 22:54:59 +00:00
Tom Hughes
0c80a486b4 Remove an unused method 2014-03-05 22:54:50 +00:00
Tom Hughes
1e45b8f521 Update to Leaflet 0.7.2 2014-03-04 15:53:40 +00:00
Tom Hughes
0de7fdb4df Add more tests for BrowseHelper 2014-03-01 16:02:06 +00:00
Tom Hughes
733108588c Update config/wiki_pages.yml 2014-03-01 12:36:30 +00:00
João G. Packer
18734786a1 Fixed wikipedia link reference to specific sections 
When creating  a wikipedia link from a tag, the function
is (correctly) appending "?userlang=#{I18N.lang}" to the URL,
but doing this breaks the reference to a specific section
of a wikipedia article (if there is any).

For example, if the tag is "wikipedia=Article#Section", the function
would create a link to "../Article#Section?uselang=xx", and then the
browser wouldn't be able to correctly find the section. The correct
link result should be "../Article?uselang=xx#Section".

This commit fixes this by verifying if there is a reference to a
specific section of the article, and then putting "?uselang=#{I18N.lang}"
between the article's name and the section name.
 2014-03-01 00:26:37 +00:00
Tom Hughes
109dcfff19 Add tests for BrowseHelper#wikipedia_link 2014-03-01 00:25:33 +00:00
Tom Hughes
42b7c5802d Add tests for OSM.locationCookie 2014-02-28 00:28:26 +00:00
Tom Hughes
8c9992f695 Apply zoomPrecision to location cookie 2014-02-28 00:26:34 +00:00
Tom Hughes
1f22b625a0 Move cookieContent to OSM.locationCookie 2014-02-28 00:10:55 +00:00
Tom Hughes
bf797f4380 Update osm.js tests for changes and add some more 2014-02-27 19:10:36 +00:00
Tom Hughes
66039dedb0 Move zoomPrecision function to the OSM namespace 2014-02-27 18:15:54 +00:00
John Firebaugh
665abc501c Use Konacha for testing JavaScript 2014-02-27 16:03:22 +00:00
Tom Hughes
28b8863627 Remove unused (and non-functioning) code 2014-02-26 18:53:25 +00:00
John Firebaugh
e50229c0bc Update to iD v1.3.7 2014-02-26 00:33:48 +00:00
Tom Hughes
e83fdf09e2 Add some more tests for library code 2014-02-26 00:33:19 +00:00
Tom Hughes
1c46fb5891 Remove unused session model 2014-02-26 00:13:47 +00:00
Tom Hughes
98184dfb9c Reorganise tests to match modern rails test layout 2014-02-26 00:13:19 +00:00