merge origin

_posts/2012-07-30-leaflet-0-4-released.md

@@ -59,7 +59,7 @@ In the previous Leaflet version, pinch-zoom only worked on iOS devices, but now
 
 #### Scale Control
 
-A simple, lightweight control that indicates the scale of the current map view in metric and/or imerial systems. As usual, you can customize its appearance with CSS. Take a look at the bottom left corner of the map above!
+A simple, lightweight control that indicates the scale of the current map view in metric and/or imperial systems. As usual, you can customize its appearance with CSS. Take a look at the bottom left corner of the map above!
 
 	L.control.scale().addTo(map);
 

plugins.md

@@ -69,6 +69,13 @@ While Leaflet is meant to be as lightweight as possible, and focuses on a core s
 			Simple heatmap api based on HTML5 canvas.
 		</td><td>
 			<a href="https://github.com/sunng87">Sun Ning</a>
+	<tr>
+		<td>
+			<a href="http://moonlite.github.com/Leaflet.MultiTileLayer/">Leaflet.MultiTileLayer</a>
+		</td><td>
+			Allows to compose a TileLayer from several tile sources. Each source is active only on a defined set of zoomlevels.
+		</td><td>
+			<a href="https://github.com/moonlite">Mattias Bengtsson</a>
 		</td>
 	</tr>
 </table>
@@ -154,6 +161,15 @@ While Leaflet is meant to be as lightweight as possible, and focuses on a core s
 			<a href="https://github.com/sa3m">Samuel Piquet</a>
 		</td>
 	</tr>
+	<tr>
+		<td>
+			<a href="https://github.com/jieter/Leaflet.encoded">Leaflet.encoded</a>
+		</td><td>
+			Use encoded polylines in Leaflet.
+		</td><td>
+			<a href="https://github.com/jieter">Jieter</a>
+		</td>
+	</tr>
 </table>
 
 

reference.html

@@ -524,6 +524,11 @@ var map = L.map('map', {
 		<td><code><a href="#layer-event">LayerEvent</a></code>
 		<td>Fired when some layer is removed from the map.</td>
 	</tr>
+	<tr>
+		<td><code><b>baselayerchange</b></code></td>
+		<td><code><a href="#layer-event">LayerEvent</a></code>
+		<td>Fired when the base layer is changed through the layer control.</td>
+	</tr>
 	<tr>
 		<td><code><b>locationfound</b></code></td>
 		<td><code><a href="#location-event">LocationEvent</a></code>
@@ -1169,6 +1174,16 @@ var map = L.map('map', {
 		<td><code><a href="#event">Event</a></code>
 		<td>Fired when the user stops dragging the marker.</td>
 	</tr>
+	<tr>
+		<td><code><b>move</b></code></td>
+		<td><code><a href="#event">Event</a></code>
+		<td>Fired when the marker is moved via setLatLng. New coordinate include in event arguments.</td>
+	</tr>
+	<tr>
+		<td><code><b>remove</b></code></td>
+		<td><code><a href="#event">Event</a></code>
+		<td>Fired when the marker is removed from the map.</td>
+	</tr>
 </table>
 
 <h3>Methods</h3>
@@ -2012,6 +2027,11 @@ L.imageOverlay(imageUrl, imageBounds).addTo(map);</code></pre>
 		<td><code><a href="#mouse-event">MouseEvent</a></code>
 		<td>Fired when the user pushes the right mouse button on the object, prevents default browser context menu from showing if there are listeners on this event.</td>
 	</tr>
+	<tr>
+		<td><code><b>remove</b></code></td>
+		<td><code><a href="#event">Event</a></code>
+		<td>Fired when the path is removed from the map.</td>
+	</tr>
 </table>
 
 <h3 id="path-methods">Methods</h3>
@@ -2038,6 +2058,11 @@ L.imageOverlay(imageUrl, imageBounds).addTo(map);</code></pre>
 		<td><code><span class="keyword">this</span></code></td>
 		<td>Binds a popup with a particular HTML content to a click on this path.</td>
 	</tr>
+	<tr id="path-unbindpopup">
+		<td><code><b>unbindPopup</b>()</code></td>
+		<td><code><span class="keyword">this</span></code></td>
+		<td>Unbinds the popup previously bound to the path with <code>bindPopup</code>.</td>
+	</tr>
 	<tr id="path-openpopup">
 		<td><code><b>openPopup</b>(
 			<nobr>&lt;<a href="#latlng">LatLng</a>&gt; <i>latlng?</i> )</nobr>
@@ -3097,6 +3122,13 @@ map.panTo(new L.LatLng(50, 30));</code></pre>
 		<td><code><a href="#latlngbounds">LatLngBounds</a></code></td>
 		<td>Returns bigger bounds created by extending the current bounds by a given percentage in each direction.</td>
 	</tr>
+	<tr>
+		<td><code><b>isValid</b>()</nobr>
+		</code></td>
+
+		<td><code>Boolean</code></td>
+		<td>Returns <code><span class="literal">true</span></code> if the bounds are properly initialized.</td>
+	</tr>
 </table>
 
 
@@ -3337,6 +3369,13 @@ map.panBy(new L.Point(200, 300));</code></pre>
 		<td><code>Boolean</code></td>
 		<td>Returns <code><span class="literal">true</span></code> if the rectangle intersects the given bounds.</td>
 	</tr>
+	<tr>
+		<td><code><b>isValid</b>()</nobr>
+		</code></td>
+
+		<td><code>Boolean</code></td>
+		<td>Returns <code><span class="literal">true</span></code> if the bounds are properly initialized.</td>
+	</tr>
 </table>
 
 
@@ -3346,10 +3385,12 @@ map.panBy(new L.Point(200, 300));</code></pre>
 
 <pre><code class="javascript">var myIcon = L.icon({
 	iconUrl: 'my-icon.png',
+	iconRetinaUrl: 'my-icon@2x.png',
 	iconSize: [38, 95],
 	iconAnchor: [22, 94],
 	popupAnchor: [-3, -76],
 	shadowUrl: 'my-icon-shadow.png',
+	shadowRetinaUrl: 'my-icon-shadow@2x.png',
 	shadowSize: [68, 95],
 	shadowAnchor: [22, 94]
 });
@@ -3393,6 +3434,11 @@ L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);</code></pre>
 		<td><code>String</code>
 		<td>(required) The URL to the icon image (absolute or relative to your script path).</td>
 	</tr>
+	<tr>
+		<td><code><b>iconRetinaUrl</b></code></td>
+		<td><code>String</code>
+		<td>The URL to a retina sized version of the icon image (absolute or relative to your script path). Used for Retina screen devices.</td>
+	</tr>
 	<tr>
 		<td><code><b>iconSize</b></code></td>
 		<td><code><a href="#point">Point</a></code>
@@ -3408,6 +3454,11 @@ L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);</code></pre>
 		<td><code>String</code>
 		<td>The URL to the icon shadow image. If not specified, no shadow image will be created.</td>
 	</tr>
+	<tr>
+		<td><code><b>shadowRetinaUrl</b></code></td>
+		<td><code>String</code>
+		<td>The URL to the retina sized version of the icon shadow image. If not specified, no shadow image will be created. Used for Retina screen devices.</td>
+	</tr>
 	<tr>
 		<td><code><b>shadowSize</b></code></td>
 		<td><code><a href="#point">Point</a></code>
@@ -3841,7 +3892,7 @@ L.control.layers(baseLayers, overlays).addTo(map);</code></pre>
 
 <h2 id="control-scale">L.Control.Scale</h2>
 
-<p>A simple scale control that shows the scale of the current center of screen in metric (m/km) and imerial (mi/ft) systems. Implements <a href="#icontrol">IControl</a> interface.</p>
+<p>A simple scale control that shows the scale of the current center of screen in metric (m/km) and imperial (mi/ft) systems. Implements <a href="#icontrol">IControl</a> interface.</p>
 
 <pre><code>L.control.scale().addTo(map);</code></pre>
 
@@ -3897,7 +3948,7 @@ L.control.layers(baseLayers, overlays).addTo(map);</code></pre>
 		<td><code><b>imperial</b></code></td>
 		<td><code>Boolean</code></td>
 		<td><code><span class="literal">true</span></code></td>
-		<td>Whether to show the imerial scale line (mi/ft).</td>
+		<td>Whether to show the imperial scale line (mi/ft).</td>
 	</tr>
 	<tr>
 		<td><code><b>updateWhenIdle</b></code></td>