Port to Leaflet #121

Merged
merged 40 commits into from Nov 23, 2012

Projects

None yet
@jfirebaugh
Member

I got so fed up with the poor two-finger zoom behavior of OpenLayers that I started to work on this. I have to say, it feels much nicer.

I don't have a full port completed ("Browse Map Data" is the major missing piece), but I wanted to gauge interest and figure out what the requirements would be to cut over.

@systemed
Contributor
systemed commented Oct 9, 2012

Wow.

@tomhughes
Member

I haven't looked at any of the details, but I don't have a problem with this in general terms, if it can be made to support everything that OL currently does.

One concern is that I think it only has SVG and Canvas renderers, which presumably means no vector overlays in IE before version 9 which may be a bit of a problem.

Something I did notice is that you have removed vendor/assets/openlayers but we will probably need to keep that for now even if we're not using it, as there are third party sites that load OpenLayers from us I believe - certainly there are many which load the OpenStreetMap,js file and I think some load the whole thing.

@Jonobennett

Could the choice of viewer library be a user-configurable option? I have no objection to Leaflet being the default.

@tomhughes
Member

Well of course it could but it would create a massive amount of work to maintain it - any new features that used the map at all would need to be written (in part at least) twice.

@tmcw
Member
tmcw commented Oct 9, 2012

One concern is that I think it only has SVG and Canvas renderers, which presumably means no vector overlays in IE before version 9 which may be a bit of a problem.

No, there's a VML renderer

@jfirebaugh
Member

While I was writing this I see that others chimed in, but anyway:

Leaflet also has a VML renderer, and it supports IE 7-9 and even IE 6 partially.

I have no problem leaving the OL assets around for third party sites, but it would be a lot of work to support two slippy map implementations simultaneously, and it strikes me as overconfigurability to offer that option. We should compare the two on their merits and make a decision.

To state what I see as the case for Leaflet in the most general terms: it offers a better user experience (smoother zoom and pan, faster rendering performance), has a smaller download footprint, and is easier to learn for developers without prior OL or Leaflet experience.

@tomhughes
Member

Excellent. I was misled by something I saw in the docs, and didn't find the actual list of renderers for some reason.

@mourner
mourner commented Oct 12, 2012

Hi, I'm Leaflet maintainer — let me know if you need any help or have any questions regarding the library and this work, I'm at your service!

Regarding features and browser support, they're outlined on this page: http://leaflet.cloudmade.com/features.html (BTW, touch support in IE10 and tablet Metro apps is almost finished too). In particular, vector layers work perfectly in all browsers, including IE6, with great rendering performance due to algorithmic optimizations such as real-time simplification and clipping.

@jfirebaugh
Member

Thanks @mourner, I appreciate the help.

I do have a question about the vector performance on IE. Due to performance concerns, we currently limit the number of features displayed in OSM's browse mode to 100 for IE <= 7, 500 for IE 8, and 2000 for other browsers. Do you have any guidance as to what would be reasonable limits (if any) for Leaflet?

To update everyone on the status here, I ported the data browser yesterday. The remaining pieces that are missing are:

  • Feature limits in data browser (see above).
  • A resizable crop control in export. I use Leaflet.draw for dragging the initial rectangle, but in the existing export you can adjust the result via draggable handles, and I haven't implemented that.
  • Image scale control in export. I need to figure out how to calculate the map scale with Leaflet; it isn't a built in function like it is with OpenLayers.
  • Fix a few bugs relating to base layer changes. I'm hoping Leaflet will add a baselayerchange event to make this easier.
  • Convert embed.html to Leaflet.

And there is one blocking bug in Leaflet that I'm waiting on a fix for.

I've updated my branch. Is it possible to get it deployed on a dev server so people can test this out?

@tomhughes
Member

I've setup http://leaflet.apis.dev.openstreetmap.org/ which is shadowing your branch, but it's failing at the moment because it's in production mode and leaflet.css is not being precompiled.

@jfirebaugh
Member

Thanks Tom. Will it update with new changes to this branch automatically?

@tomhughes
Member

Yes - it gets updated every time chef runs, which is every half hour.

@jfirebaugh
Member

It's still 500'ing. Any idea what the issue is?

@tomhughes
Member

I think you got unlucky and got caught by me mucking about with the chef config so it didn't update properly - it's working now.

@mourner
mourner commented Oct 12, 2012

@jfirebaugh data browser is not working for me on that link (it doesn't load anything but no error too).

@jfirebaugh
Member

Yeah, it's running against an empty database, so you won't be able to test any vector-based functionality.

@tomhughes
Member

Not quite - there's a couple of roads at http://leaflet.apis.dev.openstreetmap.org/?lat=51.76486&lon=-0.00762&zoom=16&layers=M that I added.

@mourner
mourner commented Oct 12, 2012

Ah, I see. :) It's quite hard to suggest feature limits without testing as I was mostly looking at performance of several features with lots of points (say 50k-point route, like the debug/vector/vector.html example), not sure how it will behave with OSM-type data (but certainly not worse than OL :)

@mourner
mourner commented Oct 12, 2012

@jfirebaugh btw, maybe data should be cleared on new data load, not on moveend, so that there's no flickering.

@mourner
mourner commented Oct 12, 2012

Also, there are errors about setCenter in console on resize.

@mourner
mourner commented Oct 12, 2012

One more missing piece would be zoom slider. Some people say that it is very useful for UI because it indicates current zoom in relation to min/max visually, and because you can zoom out more quickly. On other hand, many people never use the control (preferring mouse wheel), including me, so it only takes screen space. I'm sure that the panning buttons are unnecessary now though.

@jfirebaugh If you do include the slider, I guess the current style for it (by @tmcw AFAIR) should be ported too.

@wboykinm

The touch performance is super-pleasant as well. I don't mean to be an OL hater, but this seems like an overdue porting. Thanks for diving in.

@mourner mourner referenced this pull request in Leaflet/Leaflet Oct 15, 2012
Closed

Circle getBounds doesn't work if not added to a map #1068

@jfirebaugh
Member

Thanks to @mourner and @danzel for being responsive with the leaflet fixes. It looks like we have a lead on a workaround for the FF grid artifact.

Remaining TODO items:

  • Test performance of data browser, see if we can simply remove the feature limit. Leaflet should be better performing as it does line simplification and IIRC OpenLayers does not.
  • Port the custom Pan/Zoom control and layer switcher. @tmcw mentioned he thought he could do this fairly quickly. I think we should keep existing controls unchanged for now. Discussions about dropping the pan control or using the default layer switcher can happen separately. (Interesting aside: at SOTMUS one of the speakers related an anecdote of a user who did not know how to pan the map by dragging, but did figure out how to do so using the pan control.)

Anything else?

@mourner
mourner commented Oct 17, 2012

Regarding vector performance testing, I'm not sure if vector simplification will improve things much as the type of data on close zoom (mostly lots of buildings) doesn't provide a lot of room for simplification. But try tweaking it like this:

  1. L.Path.CLIP_PADDING = <number> — sets the padding around screen view for vectors (it's 0.5 — half of the screen — for modern browsers), you can try setting lower values to improve performance (less features to render).
  2. L_PREFER_CANVAS = true global switch before including Leaflet makes it prefer Canvas over SVG for rendering in modern browsers, it may increase performance in case of lots of features.

Looking forward to see the testing results!

@mourner
mourner commented Oct 17, 2012

By the way, just discovered https://github.com/tripbirds/leaflet-locationfilter/ — which I guess can be used in place of Leaflet.draw for the export feature.

@jfirebaugh jfirebaugh referenced this pull request in kajic/leaflet-locationfilter Oct 19, 2012
Merged

Remove L.LatLngBounds.prototype.toBoxString #1

@jfirebaugh
Member

That locationfilter plugin is great -- now using it in export and browse modes.

I've also restored the maxFeatures check -- IE just can't cope.

Pan/Zoom control is the last remaining item, working on that now.

@openstreetmap-website

Wow, I didn't realize that the data view was already ported as well. That's
awesome work.
If you want to try it out, I have created some features in the dev api DB
around
http://leaflet.apis.dev.openstreetmap.org/?lat=40.759521&lon=-111.886708&zoom=18&layers=M

Martijn

On Fri, Oct 19, 2012 at 12:09 PM, John Firebaugh
notifications@github.comwrote:

That locationfilter plugin is great -- now using it in export and browse
modes.

I've also restored the maxFeatures check -- IE just can't cope.

Pan/Zoom control is the last remaining item, working on that now.


Reply to this email directly or view it on GitHubhttps://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-9610434.


rails-dev mailing list
rails-dev@openstreetmap.org
http://lists.openstreetmap.org/listinfo/rails-dev

martijn van exel
http://oegeo.wordpress.com

@mourner
mourner commented Oct 22, 2012

Wow, looks awesome!

@jfirebaugh
Member

Open items:

  • Need to decide whether to stick with leaflet's default layer switcher, or port SimpleLayerSwitcher. I could go either way. Opinions?
  • Need to debug and fix tripbirds/leaflet-locationfilter#6.
  • Need to test RTL layout.

@tomhughes, anything else that needs to happen before this can be merged?

@ppawel
Contributor
ppawel commented Oct 25, 2012

IMHO the default layer switcher is cool. Also it will be useful when there are overlays (like notes/bugs layer).

@tomhughes
Member

I'm fine with the default layer switcher I think - guess the only question is whether it doesn't quite match with the new panzom control style wise?

Other than that I'll have to have a look through the code and see if there is anything that stands out.

@ajashton

the only question is whether it doesn't quite match with the new panzom control style wise?

Some minor adjustments to the CSS on .leaflet-control-layers that get it quite close:

  • box-shadow: 0 0px 3px #666
  • background: #fff;
  • border-radius: 3px;

Where ever is best to stick such overrides from the default.

@jfirebaugh
Member

RTL is an issue: CloudMade/Leaflet#1095.

@jfirebaugh
Member

RTL support is looking good thanks to @danzel. Just one small rendering issue with the pan control.

Also, I've rebased on top of the recent layout changes and the map controls are now getting hidden behind the tab bar. @samanpwbb, do you think you'll have time to look at this?

@samanpwbb
Member

@jfirebaugh Sure,I will take a look tomorrow morning and see what's up with the controls

@mourner
mourner commented Nov 2, 2012

Seems like all set! Really looking forward to see this up and running on the website.

@jfirebaugh
Member

Yeah, as far as I know this is now good to go. Thanks everyone for the help!

@tomhughes
Member

I haven't looked at the code yet, but a few comments based on a reviewing the site in action:

  • Activating the "manually select an area" option in the export tab is very visually jarring because it triggers a zoom out in order to be able to highlight the whole of the current view as the selected area. I suspect it would be better to start with a smaller area selected that didn't trigger the zoom out.
  • The user settings page doesn't show the location marker on the map - probably related to the Couldn't autodetect L.Icon.Default.imagePath, set it manually error that I see in the javascript console.
  • Layout of popups on the map on the user page has changed - is this deliberate?
  • The bbox parameter has vanished from the "view area on larger map" links on the data browser pages for ways etc, which means the box doesn't appear on the map when you follow it.
  • The node view in the data browser reports e is undefined and the map never appears.
@tomhughes tomhughes and 2 others commented on an outdated diff Nov 3, 2012
Vendorfile
@@ -0,0 +1,24 @@
+folder 'vendor/assets' do
+ folder 'leaflet' do
+ from 'https://github.com/jfirebaugh/Leaflet.git', :branch => 'osm' do
@tomhughes
tomhughes Nov 3, 2012 Member

Does this mean you're using a patched version of Leaflet? What's the schedule for a new upstream with the patches?

@jfirebaugh
jfirebaugh Nov 3, 2012 Member

This branch currently has no diffs to upstream. We could point at CloudMade/Leaflet master instead.

@tomhughes
tomhughes Nov 3, 2012 Member

Well ideally I would like to be pointing at a released version, and in a way that means update only gets released versions but I'm not sure that vendorer is actually able to that? At least not without help from upstream in the form of a fixed tag that points at the latest release?

@jfirebaugh
jfirebaugh Nov 3, 2012 Member

Yes, you are correct. Leaflet does have a stable branch, but I don't know how closely that tracks official releases. I also don't know what Leaflet's schedule is as far as getting a release that includes for example the RTL fixes. @mourner?

@mourner
mourner Nov 4, 2012

The stable branch is always updated with released stable versions. I'm not sure when 0.5 will be released — it's pretty stable at the moment but I would like to finish some in-progress work for it (see the blog post) before releasing it as a new major version.

@tomhughes tomhughes commented on the diff Nov 3, 2012
Vendorfile
@@ -0,0 +1,24 @@
+folder 'vendor/assets' do
+ folder 'leaflet' do
+ from 'https://github.com/jfirebaugh/Leaflet.git', :branch => 'osm' do
+ file 'leaflet.css', 'dist/leaflet.css'
+ file 'leaflet.ie.css', 'dist/leaflet.ie.css'
+ file 'leaflet.js', 'dist/leaflet-src.js'
+ folder 'images', 'dist/images'
+ end
+
+ from 'https://github.com/jfirebaugh/leaflet-locationfilter.git', :branch => 'osm' do
@tomhughes
tomhughes Nov 3, 2012 Member

Again, does this mean it's a patched version, and if it is are upstream planning to take the patches?

@jfirebaugh
jfirebaugh Nov 3, 2012 Member

Ditto here. All my patches have been merged upstream.

@tomhughes tomhughes commented on the diff Nov 3, 2012
app/assets/javascripts/map.js.erb
@@ -1,265 +1,204 @@
-var epsg4326 = new OpenLayers.Projection("EPSG:4326");
+// Leaflet extensions
+L.LatLngBounds.include({
@tomhughes
tomhughes Nov 3, 2012 Member

I have to say I'm not a big fan of injecting code into existing Leaflet classes like this - is there any interest in taking any of these upstream @mourner?

Obviously things like toBBOX are probably a bit too specialised for that, but maybe they should just be separate functions?

@mourner
mourner Nov 4, 2012

I'll consider including some of the methods, but actually I don't see anything wrong with extending classes like this. It's a very common practice in JavaScript and Ruby (unlike some other languages). E.g. all those thousands of jQuery plugins are done as jQuery object prototype extensions.

@jfirebaugh
jfirebaugh Nov 4, 2012 Member

Yeah, I actually submitted CloudMade/Leaflet#1042 which Vladimir declined and I think that was reasonable.

@tomhughes
tomhughes Nov 5, 2012 Member

I'm not sure the jQuery example is comparable given then it's effectively explicitly documented as an extension point for creating plugins.

To me (and this may be my old school C programmer self speaking) it's just rude to barge into somebody else's namespace, not to mention the potential for future conflict caused by grabbing names for ourselves in a namespace that has been deliberately created to act as a private space for another project.

Anyway, if you say it's OK then I guess that's fine.

@mourner
mourner Nov 5, 2012

jQuery is comparable, because this "documented extension point" is just a shortcut to jQuery.prototype, extending which adds methods to instances of jQuery class (with an infinite potential for conflicts).

Sure, these things could be rewritten as functions to prevent possible collisions in future, but this also removes some convenience and readability of code, so one should compromise. Given the nature of introduced methods, I doubt they could ever cause any conflicts.

Once again, I can see how rude it might look in a static language environment, but this approach is very common for dynamic languages.

@tomhughes tomhughes commented on an outdated diff Nov 3, 2012
vendor/assets/leaflet/leaflet.pan.scss
@@ -0,0 +1,41 @@
+.leaflet-control-pan-up,
@tomhughes
tomhughes Nov 3, 2012 Member

This (and leaflet.zoom.scss) shouldn't really be here should it? It's a local asset with no upstream vendor... Also shouldn't it be .css.scss rather than just .scss?

@jfirebaugh
Member
  • Activating the "manually select an area" option in the export tab is very visually jarring because it triggers a zoom out in order to be able to highlight the whole of the current view as the selected area. I suspect it would be better to start with a smaller area selected that didn't trigger the zoom out.

I agree. I think this should be an optional behavior of LocationFilter, so I'll work on an upstream patch.

  • The user settings page doesn't show the location marker on the map - probably related to the Couldn't autodetect L.Icon.Default.imagePath, set it manually error that I see in the javascript console.

Fixed. Missed this one because it only appears in production.

  • Layout of popups on the map on the user page has changed - is this deliberate?

Nope, looks like an explicit width needs to be applied somewhere. I'll look into it.

  • The bbox parameter has vanished from the "view area on larger map" links on the data browser pages for ways etc, which means the box doesn't appear on the map when you follow it.

Fixed.

  • The node view in the data browser reports e is undefined and the map never appears.

I can't reproduce this; can you be more specific?

Also I've noticed that the map doesn't print correctly. Not sure if this is a Leaflet or OSM issue yet.

@mourner
mourner commented Nov 5, 2012

Also I've noticed that the map doesn't print correctly. Not sure if this is a Leaflet or OSM issue yet.

Include print media when linking Leaflet CSS.

Nope, looks like an explicit width needs to be applied somewhere. I'll look into it.

Leaflet has popup autosizing with max width. Could you point out a link where I can see this?

@tomhughes
Member

Include print media when linking Leaflet CSS.

Adding a require of the leaflet CSS to the top of print.css should achieve this.

@tomhughes
Member
  • The user settings page doesn't show the location marker on the map - probably related to the Couldn't autodetect L.Icon.Default.imagePath, set it manually error that I see in the javascript console.

Fixed. Missed this one because it only appears in production.

Looks good, except that it is using standard leaflet markers while the main user page uses the old OL markers.

  • Layout of popups on the map on the user page has changed - is this deliberate?

Nope, looks like an explicit width needs to be applied somewhere. I'll look into it.

Hmmm. Looked like more than that to me as it looked like it was using the larger user image now?

  • The node view in the data browser reports e is undefined and the map never appears.

I can't reproduce this; can you be more specific?

See http://leaflet.apis.dev.openstreetmap.org/browse/node/3 for example.

@jfirebaugh
Member

Looked like more than that to me as it looked like it was using the larger user image now?

Yes, due to this bit in leaflet.css. This overrides the max-width we set for the image in the popup. @mourner, can this have a more specific selector?

@jfirebaugh
Member

This bit is also causing trouble.

@mourner
mourner commented Nov 8, 2012

I don't know how to change those selectors in leaflet.css, but they are very easy to override in OSM website CSS with more specific selectors.

@danzel
danzel commented Nov 8, 2012

Is the firefox fix css even required? https://github.com/CloudMade/Leaflet/blob/master/dist/leaflet.css#L41-L44
It doesn't seem to be overriding anything to me.
I've removed it locally and everything I've tested seems fine in firefox

@jfirebaugh
Member
  • Include print media when linking Leaflet CSS.
  • Looks good, except that it is using standard leaflet markers while the main user page uses the old OL markers.
  • The node view in the data browser reports e is undefined and the map never appears.

These are all fixed.

@mourner
mourner commented Nov 8, 2012

Is the firefox fix css even required? https://github.com/CloudMade/Leaflet/blob/master/dist/leaflet.css#L41-L44
It doesn't seem to be overriding anything to me.
I've removed it locally and everything I've tested seems fine in firefox

It is required, because modern responsive frameworks like to put img { max-width: 100%; } in the CSS globally, and this breaks the map in FF.

I don't recommend removing it locally, since you can easily forget to remove it again when updating Leaflet to a newer version. Just add .leaflet-popup-content img { max-width: <needed value> !important; } in website CSS.

@danzel
danzel commented Nov 8, 2012

Ah, that is rather dumb :(

@tomhughes
Member

Just noticed that the map on the "new diary entry" page is also using the leaflet markers.

On a related point, was there a good reason for staying with the OL markers rather than just switching to the leaflet ones, which seem to be much nicer?

@tomhughes
Member

Oh, and setting a marker on the main view with mlat/mlon uses leaflet markers as well.

@jfirebaugh
Member

As far as I know leaflet only has the one color. There's some nice ones in various colors in map_sprite.png but I haven't figured out how to use them in leaflet and I figured we can switch in a separate step anyway.

@mourner
mourner commented Nov 9, 2012

You can make markers of different colors using any image editor and "colorize" function. Also, there's a vector render of the marker here: https://github.com/CloudMade/Leaflet/issues/1048

Leaflet doesn't use sprites for marker icons because background images can't be printed usually. You can use them using DivIcon instead of normal Icon though.

@jfirebaugh
Member

I don't recommend removing it locally, since you can easily forget to remove it again when updating Leaflet to a newer version. Just add .leaflet-popup-content img { max-width: !important; } in website CSS.

I try to avoid using !important. Can't you just make the selector a bit more specific? Like .leaflet-container .leaflet-tile-pane img or something?

@mourner
mourner commented Nov 9, 2012

I do too. But this is one specific case where using important is unavoidable. A single id in a selector will override another selector with lots of classes... And I'm not sure about making a more specific selector because it can break not only core images like tiles and markers but also custom layers with images. I'll think about this, but I think that using impotant once when you surely know what you're doing and comment this is pretty acceptable.

jfirebaugh and others added some commits Aug 25, 2012
@jfirebaugh jfirebaugh Port to Leaflet 30ad58c
@jfirebaugh jfirebaugh Use jQuery's toggle binding
The old code never unbound the existing binding, so they
piled up.
e316f0e
@jfirebaugh jfirebaugh Precompile leaflet CSS 1caf40a
@jfirebaugh jfirebaugh Update Leaflet 1ae4483
@jfirebaugh jfirebaugh Use baselayerchange event 411748a
@jfirebaugh jfirebaugh Don't show map controls on browse pages 19bac47
@jfirebaugh jfirebaugh Remove calls to map.setCenter 800f014
@jfirebaugh jfirebaugh Calculate scale in export d584140
@jfirebaugh jfirebaugh Update Leaflet 4d19c68
@jfirebaugh jfirebaugh Update leaflet-osm 030b7c4
@jfirebaugh jfirebaugh Use L.OSM tile classes 64eec2a
@jfirebaugh jfirebaugh Port embed.html to leaflet 1120eb7
@jfirebaugh jfirebaugh Reduce flicker in data browser deff87a
@jfirebaugh jfirebaugh IE compatibility babefbb
@jfirebaugh jfirebaugh Replace leaflet.draw with leaflet-locationfilter fe6e837
@jfirebaugh jfirebaugh Restore maxFeatures check f8b0b86
@jfirebaugh jfirebaugh Pan/zoom controls that look like the OL ones 6f793e1
@jfirebaugh jfirebaugh Add Vendorfile 915fca8
@jfirebaugh jfirebaugh Bundle leaflet css in a single asset 6054eea
@jfirebaugh jfirebaugh Update leaflet.locationfilter 378d08f
@jfirebaugh jfirebaugh Match pan/zoom control style better
Thanks @ajashton
cd28b8d
@jfirebaugh jfirebaugh Update Leaflet e6afda8
@jfirebaugh jfirebaugh Fix zoom control positioning 3e2e62b
@samanpwbb @jfirebaugh samanpwbb properly positioned leaflet controls and removed old open layers styl…
…e rules.
5f80479
@jfirebaugh jfirebaugh Fix left pan button position in RTL 39006ba
@jfirebaugh jfirebaugh Remove OL SimpleLayerSwitcher
Consensus was to use the default Leaflet layer switcher
and rather than port SimpleLayerSwitcher to Leaflet.
8435b1b
@jfirebaugh jfirebaugh Move non-vendor leaflet assets into app cc77538
@jfirebaugh jfirebaugh Fix bbox params on browse area links eefc0b5
@jfirebaugh jfirebaugh Fix L.Icon.Default.imagePath in production 66f0a4d
@jfirebaugh jfirebaugh Update some print styles for Leaflet 753c179
@jfirebaugh jfirebaugh Use leaflet css for print 43bfebd
@jfirebaugh jfirebaugh Update leaflet.osm.js a457189
@jfirebaugh jfirebaugh Inline map.js marker functions 648f232
@jfirebaugh jfirebaugh Fix user map icon and offset 1927bc6
@jfirebaugh jfirebaugh Fix user popup styles ed84516
@jfirebaugh jfirebaugh Don't zoom map when enabling location filter 5b42c68
@jfirebaugh jfirebaugh Update leaflet.locationfilter f4c6408
@jfirebaugh jfirebaugh Use nicer markers f913b7d
@jfirebaugh
Member

Ok, I believe all outstanding issues are fixed. And I made nice leaflet-ish markers.

@mourner

It's better to set popupAnchor on the icon that set offset explicitly. See http://leafletjs.com/reference.html#icon-options

Owner

Nice, will do.

@mourner

Here important is not necessary I guess :)

Owner

It is actually, to override this.

Nope, just a more specific selector will do (another class or id), or placing it after the Leaflet stylesheet.

@mourner
mourner commented Nov 9, 2012

Great! BTW, you can update Leaflet master as well, there are some nice panning inertia improvements, a bit better zoom animation and better dragging cursors. :)

@jfirebaugh
Member

@tomhughes Anything else that needs to happen here?

@apmon
Member
apmon commented Nov 20, 2012

It looks like the layer chooser is not in sync after initial load. The layer chooser always shows the "standard" layer is selected when the page is loaded even if the layer shown (due to the cookie) is a different one.

@tomhughes
Member

I've fixed the problem @amon found locally (upstream pull is https://github.com/CloudMade/Leaflet/pull/1169) and a few other minor things and I have pushed that version at http://tomh.apis.dev.openstreetmap.org/ and if there are no more problems found I plan to merge it to master tomorrow.

@openstreetmap-mirror openstreetmap-mirror merged commit 078da13 into openstreetmap:master Nov 23, 2012
@MattHeard

Per issue #1191, this value does not wrap around.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment