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

1149 commits

Author SHA1 Message Date
Tom Hughes
62ba6b50ba Replace OSM markers with recolured versions of the Leaflet marker 2012-11-21 18:43:20 +00:00
Tom Hughes
bc1b4d53e3 Use the OSM map marker icons on the home page 2012-11-20 21:52:40 +00:00
Tom Hughes
a0c9cc7d0a Use the OSM map marker icons when adding a new diary entry 2012-11-20 21:48:50 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
John Firebaugh
9bd48640ad Move popup anchor definition to icon 2012-11-09 15:57:31 -08:00
John Firebaugh
f913b7d8a5 Use nicer markers 2012-11-09 13:31:29 -08:00
John Firebaugh
5b42c683f5 Don't zoom map when enabling location filter 2012-11-09 13:13:44 -08:00
John Firebaugh
ed84516db2 Fix user popup styles 2012-11-09 12:59:31 -08:00
John Firebaugh
1927bc6ca8 Fix user map icon and offset 2012-11-09 12:59:31 -08:00
John Firebaugh
648f232596 Inline map.js marker functions 2012-11-09 12:59:31 -08:00
John Firebaugh
66f0a4da04 Fix L.Icon.Default.imagePath in production 2012-11-09 12:59:30 -08:00
John Firebaugh
eefc0b5a0d Fix bbox params on browse area links 2012-11-09 12:59:30 -08:00
John Firebaugh
378d08f2c9 Update leaflet.locationfilter 2012-11-09 12:59:29 -08:00
John Firebaugh
6f793e1b21 Pan/zoom controls that look like the OL ones 2012-11-09 12:59:28 -08:00
John Firebaugh
f8b0b861d4 Restore maxFeatures check 2012-11-09 12:59:28 -08:00
John Firebaugh
fe6e837cfe Replace leaflet.draw with leaflet-locationfilter 2012-11-09 12:59:28 -08:00
John Firebaugh
babefbba6c IE compatibility 2012-11-09 12:59:28 -08:00
John Firebaugh
deff87a577 Reduce flicker in data browser 2012-11-09 12:59:28 -08:00
John Firebaugh
64eec2a5d0 Use L.OSM tile classes 2012-11-09 12:59:28 -08:00
John Firebaugh
030b7c4052 Update leaflet-osm 2012-11-09 12:59:28 -08:00
John Firebaugh
d5841403c4 Calculate scale in export 2012-11-09 12:59:27 -08:00
John Firebaugh
800f014486 Remove calls to map.setCenter 2012-11-09 12:59:27 -08:00
John Firebaugh
19bac47e5f Don't show map controls on browse pages 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
John Firebaugh
e316f0e425 Use jQuery's toggle binding 
The old code never unbound the existing binding, so they
piled up.
 2012-11-09 12:59:27 -08:00
John Firebaugh
379cb35832 Support semicolon as parameter delimiter 
http://lists.openstreetmap.org/pipermail/rails-dev/2012-November/001259.html
 2012-11-05 08:57:05 +00:00
Tom Hughes
6b86b716d1 Tweak Potlatch maximisation a bit more 2012-11-01 17:02:11 +00:00
Tom Hughes
5e7b7a420a Make full screen mode in Potlatch work properly again 2012-11-01 16:56:36 +00:00
Tom Hughes
c0ee3f65bb Disable buttons while form submission is in progress 2012-10-16 12:23:27 +01:00
Tom Hughes
e6c400bd14 Correct field name 2012-10-14 16:27:21 +01:00
Tom Hughes
c6be5f3a6f Fix up issues with notes in the data browser 2012-10-14 16:01:37 +01:00
Tom Hughes
352d9365e4 Improve styling of notes popups 2012-10-14 16:01:36 +01:00
Tom Hughes
513bec8044 Set attributes on newly created notes 2012-10-14 16:01:36 +01:00
Tom Hughes
89fc5a7fdc Refactor note add/update code 2012-10-14 16:01:35 +01:00
Tom Hughes
d57755b737 Allow commenting on, and closing of, notes from the web site 2012-10-14 16:01:35 +01:00
Tom Hughes
361906af9e Localise notes interface 2012-10-14 13:52:54 +01:00
Tom Hughes
73b59c5859 Use EJS templates for notes 2012-10-14 10:17:17 +01:00
Tom Hughes
e3d5e3da52 Refactor notes code to work with recent site changes 2012-10-13 17:16:07 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2012-10-13 15:55:34 +01:00
John Firebaugh
14bc538681 Use ejs templates in browse JS 2012-10-13 13:01:00 +01:00
John Firebaugh
24c0bb1c88 Use proj/unproj consistently 2012-10-13 12:58:18 +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
John Firebaugh
8d13c39400 Clean up diary_entry.js 2012-10-06 00:07:50 +01:00
John Firebaugh
7f6320ed10 Move diary entry JS to page-specific script file 2012-10-06 00:03:24 +01:00
John Firebaugh
237d2ad60d Simplify further by using OSM.home 2012-10-05 22:37:21 +01:00
John Firebaugh
97eee60c99 Remove unnecessary call to closeMapPopup() 
In the 'set_location' case no popups are ever opened.
 2012-10-05 22:32:05 +01:00
John Firebaugh
330ddc1666 Use jQuery 2012-10-05 22:31:17 +01:00