Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Include simplestyle.style in API #607

Merged
merged 3 commits into from
Dec 19, 2013
Merged

Include simplestyle.style in API #607

merged 3 commits into from
Dec 19, 2013

Conversation

tmcw
Copy link
Contributor

@tmcw tmcw commented Dec 18, 2013

@jfirebaugh could you review this?

Behavior of map constructor is:

  • If markerLayer is provided, it pre-empts featureLayer, otherwise featureLayer is the default.
  • map.markerLayer and map.featureLayer point to the same thing
  • Add a deprecation notice to the API

@@ -0,0 +1,159 @@
describe('L.mapbox.markerLayer', function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the content of this file and test/spec/marker_layer.js are swapped.

@jfirebaugh
Copy link
Contributor

Looks good.

Behavior of map constructor is...

Let's add a test for this.

Anything we need to consider from marker.js, like making createPopup feature-generic?

@tmcw
Copy link
Contributor Author

tmcw commented Dec 19, 2013

Anything we need to consider from marker.js, like making createPopup feature-generic?

I can't think of anything, but will test polygon-popups before shipping.

Fixed up the test comment, renamed, and tested the options aliasing.

@jfirebaugh
Copy link
Contributor

:shipit:

tmcw added a commit that referenced this pull request Dec 19, 2013
Include simplestyle.style in API
@tmcw tmcw merged commit 36a530d into master Dec 19, 2013
@jfirebaugh jfirebaugh deleted the shape branch December 23, 2013 20:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants