Tom Hughes
78f608b114
Merge branch 'master' into notes
...
Conflicts:
app/assets/javascripts/browse.js
app/assets/javascripts/map.js.erb
app/assets/stylesheets/common.css.scss
app/views/site/index.html.erb
2012-12-01 18:22:30 +00:00
John Firebaugh
05eba79008
Move "Browse Map Data" to layers control
...
Fixes https://trac.openstreetmap.org/ticket/4680
2012-11-29 18:23:41 +00:00
Tom Hughes
f6ac8ffbab
Tidy up
2012-11-22 12:35:49 +00:00
Tom Hughes
bc1b4d53e3
Use the OSM map marker icons on the home page
2012-11-20 21:52:40 +00:00
John Firebaugh
f913b7d8a5
Use nicer markers
2012-11-09 13:31:29 -08:00
John Firebaugh
648f232596
Inline map.js marker functions
2012-11-09 12:59:31 -08:00
John Firebaugh
800f014486
Remove calls to map.setCenter
2012-11-09 12:59:27 -08:00
John Firebaugh
411748a48c
Use baselayerchange event
2012-11-09 12:59:27 -08:00
John Firebaugh
1ae4483c69
Update Leaflet
2012-11-09 12:59:27 -08:00
John Firebaugh
30ad58c01f
Port to Leaflet
2012-11-09 12:59:27 -08:00
Tom Hughes
e3d5e3da52
Refactor notes code to work with recent site changes
2012-10-13 17:16:07 +01:00
John Firebaugh
b95f9115d7
Move browse-related JS to browse.js
2012-10-13 12:57:59 +01:00
John Firebaugh
52daf1dbc4
Move export-related JS to export.js
2012-10-13 12:57:09 +01:00
Tom Hughes
824a474d93
Refactor updatelinks to avoid exceptions in updateLocation
2012-10-05 16:02:26 +01:00
John Firebaugh
3cf3d888b2
Refactor mapParams to compose better with apiUrl
2012-10-05 15:36:07 +01:00
John Firebaugh
e4ef507c5c
Extract OSM.apiUrl
2012-10-05 15:26:54 +01:00
John Firebaugh
6ef19d7e18
Remove unnecessary $(window).load() callbacks
...
All this is already inside a $(document).ready() callback.
2012-10-02 18:22:36 +01:00
John Firebaugh
f3afd43076
Avoid a JS error on (e.g.) ?way=nnnnn
...
When showing an object, the map location is not set
until the vector layer has finished loading. Thus
map.getCenter() returns null.
Registering the events earlier avoids the need to call
updateLocation manually at all.
2012-10-02 18:22:17 +01:00
John Firebaugh
605c700895
Clean up search JS
...
Move it to index.js/edit.js and eliminate the global doSearch
function. Not enough code is shared to justify it.
2012-09-30 12:05:24 +01:00
John Firebaugh
87e8cf3b58
Require index-only JS in index.js
2012-09-30 11:58:14 +01:00
John Firebaugh
c4d9f902d0
Wrap index JS in a single $(document).ready()
2012-09-29 18:00:04 +01:00
John Firebaugh
352f2a1671
Move index JS to page-specific script file
2012-09-29 18:00:04 +01:00
