How do I have points and polygons in the same Leaflet map?
Nigel Waters has it correct. Here are the details. I did this for cities and states. I used points for cities and polygons for states. Here are the steps.

Requirements:


Geofield module
Leaflet module
Leaflet Views module (a submodule of Leaflet)


Steps: 


Create the two content types: City and State.
Create a field of type Geofield, call it "Location"
Choose GeoJSON as the field widget
Add the Location field to both content types
Create a city. For location enter GeoJSON Point data
Create a state. For location enter a GeoJSON Polygon data
Create a view with a Page display
Add the Location field to the view
Filter the view by State and City content types
Set the Format of the view to Leaflet Map
Your view should now look like pic 1
Click on View Page
You should see a map like pic 2