leaflet-js 0.6.beta4 → 0.7.0

data/lib/leaflet/debug/map/canvas.html

@@ -4,10 +4,9 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
-	
+
 	<link rel="stylesheet" href="../css/screen.css" />
-	
+
 	<script type="text/javascript" src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
@@ -18,18 +17,18 @@
 	<script type="text/javascript">
 
 		var tiles = new L.TileLayer.Canvas();
-		
+
 		tiles.drawTile = function(canvas, tile, zoom) {
 			var ctx = canvas.getContext('2d');
-			
+
 			ctx.fillStyle = 'white';
 			ctx.fillRect(0, 0, 255, 255);
-			
-			
+
+
 			ctx.fillStyle = 'black';
 			ctx.fillText('x: ' + tile.x + ', y: ' + tile.y + ', zoom:' + zoom, 20, 20);
-			
-			
+
+
 			ctx.strokeStyle = 'red';
 			ctx.beginPath();
 			ctx.moveTo(0, 0);
@@ -39,9 +38,9 @@
 			ctx.closePath();
 			ctx.stroke();
 		}
-	
+
 		var map = new L.Map('map', {center: new L.LatLng(50.5, 30.51), zoom: 15, layers: [tiles]});
-		
+
 	</script>
 </body>
-</html>
+</html>

data/lib/leaflet/debug/map/controls.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
@@ -25,11 +24,11 @@
 			cloudmade = new L.TileLayer(getCloudMadeUrl(997), {attribution: cloudmadeAttribution}),
 			cloudmade2 = new L.TileLayer(getCloudMadeUrl(998), {attribution: 'Hello world'});
 
-		var map = new L.Map('map').addLayer(cloudmade).setView(new L.LatLng(50.5, 30.51), 15);
+		var map = new L.Map('map').addLayer(cloudmade).setView(new L.LatLng(50.5, 30.512), 15);
 
-		var marker = new L.CircleMarker(new L.LatLng(50.5, 30.505), {color: 'red'});
+		var marker = new L.Marker(new L.LatLng(50.5, 30.505), {color: 'red'});
 		map.addLayer(marker);
-		marker.bindPopup("Hello World").openPopup();
+		marker.bindPopup("Leaflet is designed with simplicity, performance and usability in mind. It works efficiently across all major desktop and mobile platforms out of the box, taking advantage of HTML5 and CSS3 on modern browsers while still being accessible on older ones.").openPopup();
 
 		var marker2 = new L.Marker(new L.LatLng(50.502, 30.515));
 		map.addLayer(marker2);

data/lib/leaflet/debug/map/geolocation.html

@@ -4,7 +4,6 @@
     <title>Leaflet geolocation debug page</title>
 
     <link rel="stylesheet" href="../../dist/leaflet.css" />
-    <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 

data/lib/leaflet/debug/map/iframe.html

@@ -0,0 +1,11 @@
+<style>
+	iframe {
+		position: absolute;
+		top: 50px;
+		left: 50px;
+		width: 500px;
+		height: 500px;
+	}
+</style>
+<iframe src="map.html">
+</iframe>

data/lib/leaflet/debug/map/image-overlay.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 

data/lib/leaflet/debug/map/map-mobile.html

@@ -6,7 +6,6 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 

data/lib/leaflet/debug/map/map.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -22,7 +21,7 @@
 
 		var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/997/256/{z}/{x}/{y}.png', {
 			maxZoom: 18,
-			attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
+			attribution: 'Map data &copy; 2011 <a href="#">OpenStreetMap</a> contributors, Imagery &copy; 2011 <a href="#">CloudMade</a>',
 			key: 'd4fc77ea4a63471cab2423e66626cbb6'
 		});
 

data/lib/leaflet/debug/map/max-bounds.html

@@ -6,7 +6,6 @@
 	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
@@ -31,6 +30,8 @@
 			maxBounds: bounds
 		});
 
+		var latlngs = L.rectangle(bounds).getLatLngs();
+		L.polyline(latlngs.concat([latlngs[0]])).addTo(map);
 
 	</script>
 </body>

data/lib/leaflet/debug/map/opacity.html

@@ -0,0 +1,223 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Leaflet debug page</title>
+
+	<link rel="stylesheet" href="../../dist/leaflet.css" />
+
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+	<link rel="stylesheet" href="../css/screen.css" />
+
+	<script type="text/javascript" src="../../build/deps.js"></script>
+	<script src="../leaflet-include.js"></script>
+	<style>
+		.mapcontainer {
+		    float:left;
+		    position: relative;
+		    width: 32%;
+		    font-size: 12px;
+		    font-family: sans-serif;
+		    height: 340px;
+		    margin-bottom: 15px;
+		    background-color: #eee;
+		    margin-right: 1%;
+		}
+
+		.map {
+		    position: absolute;
+		    width: 100%;
+		    height: 280px;
+		    bottom: 0px;
+		}
+	</style>
+</head>
+<body>
+	<p>These should all render identically.</p>
+	<div class="mapcontainer">
+		CASE 1: no opacity set on any layers
+		<br />
+		<div id="map1" class="map"></div>
+	</div>
+	<div class="mapcontainer">
+		CASE 2: opacity set to .99 on overlays but not on basemap
+		<br />
+		<div id="map2" class="map"></div>
+	</div>
+	<div class="mapcontainer">
+		CASE 3: opacity set on overlays but not on basemap, zIndex option set to 0 on basemap
+		<br />
+		<div id="map3" class="map"></div>
+	</div>
+	<div class="mapcontainer">
+		CASE 4: opacity set to .99 on overlays but set to 1 on basemap
+		<br />
+		<div id="map4" class="map"></div>
+	</div>
+	<div class="mapcontainer">
+		CASE 5: opacity set to .99 on all layers
+		<br />
+		<div id="map5" class="map"></div>
+	</div>
+	<div class="mapcontainer">
+		CASE 6: opacity set to .99 on 1st and 3rd layers and 1 on middle layer
+		<br />
+		<div id="map6" class="map"></div>
+	</div>
+
+	<script type="text/javascript">
+		var mapopts =  {
+		    center: [35, -122],
+		    zoom : 5
+		};
+
+		var map1 = L.map('map1', mapopts);
+		var map2 = L.map('map2', mapopts);
+		var map3 = L.map('map3', mapopts);
+		var map4 = L.map('map4', mapopts);
+		var map5 = L.map('map5', mapopts);
+		var map6 = L.map('map6', mapopts);
+
+		/**********
+		CASE 1: no opacity set on any layers
+		**********/
+		// OSM Basemap
+		var osm1 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
+		    attribution: '',
+		    key: 'BC9A493B41014CAABB98F0471D759707',
+		    styleId: 97941
+		}).addTo(map1);
+
+		// EEZs / Nations
+		var eez1 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
+		    tms: true
+		}).addTo(map1);
+
+		// Marine Protected Areas overlay
+		var mpa1 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/mpas/{z}/{x}/{y}.png', {
+		    tms: false
+		}).addTo(map1);
+
+
+		/**********
+		CASE 2: opacity set on overlays but not on basemap
+		**********/
+		// OSM Basemap
+		var osm2 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
+		    attribution: '',
+		    key: 'BC9A493B41014CAABB98F0471D759707',
+		    styleId: 97941
+		}).addTo(map2);
+
+		// EEZs / Nations
+		var eez2 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
+		    tms: true,
+		    opacity: 0.99
+		}).addTo(map2);
+
+		// Marine Protected Areas overlay
+		var mpa2 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/mpas/{z}/{x}/{y}.png', {
+		    tms: false,
+		    opacity: 0.99
+		}).addTo(map2);
+
+
+		/**********
+		CASE 3: opacity set on overlays but not on basemap, zIndex option set to 0 on basemap
+		**********/
+		// OSM Basemap
+		var osm3 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
+		    attribution: '',
+		    key: 'BC9A493B41014CAABB98F0471D759707',
+		    styleId: 97941,
+		    zIndex: 0
+		}).addTo(map3);
+
+		// EEZs / Nations
+		var eez3 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
+		    tms: true,
+		    opacity: 0.99
+		}).addTo(map3);
+
+		// Marine Protected Areas overlay
+		var mpa3 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/mpas/{z}/{x}/{y}.png', {
+		    tms: false,
+		    opacity: 0.99
+		}).addTo(map3);
+
+
+		/**********
+		CASE 4: opacity set on overlays but set to 1 on basemap
+		**********/
+		// OSM Basemap
+		var osm4 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
+		    attribution: '',
+		    key: 'BC9A493B41014CAABB98F0471D759707',
+		    styleId: 97941,
+		    opacity: 1
+		}).addTo(map4);
+
+		// EEZs / Nations
+		var eez4 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
+		    tms: true,
+		    opacity: 0.99
+		}).addTo(map4);
+
+		// Marine Protected Areas overlay
+		var mpa4 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/mpas/{z}/{x}/{y}.png', {
+		    tms: false,
+		    opacity: 0.99
+		}).addTo(map4);
+
+
+		/**********
+		CASE 5: opacity set to .5 on all layers
+		**********/
+		// OSM Basemap
+		var osm5 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
+		    attribution: '',
+		    key: 'BC9A493B41014CAABB98F0471D759707',
+		    styleId: 97941,
+		    opacity: 0.99
+		}).addTo(map5);
+
+		// EEZs / Nations
+		var eez5 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
+		    tms: true,
+		    opacity: 0.99
+		}).addTo(map5);
+
+		// Marine Protected Areas overlay
+		var mpa5 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/mpas/{z}/{x}/{y}.png', {
+		    tms: false,
+		    opacity: 0.99
+		}).addTo(map5);
+
+
+		/**********
+		CASE 6: opacity set to .5 on 1st and 3rd layers and 1 on middle layer
+		**********/
+		// OSM Basemap
+		var osm6 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
+		    attribution: '',
+		    key: 'BC9A493B41014CAABB98F0471D759707',
+		    styleId: 97941,
+		    opacity: 0.99
+		}).addTo(map6);
+
+		// EEZs / Nations
+		var eez6 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
+		    tms: true,
+		    opacity: 1
+		}).addTo(map6);
+
+		// Marine Protected Areas overlay
+		var mpa6 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/mpas/{z}/{x}/{y}.png', {
+		    tms: false,
+		    opacity: 0.99
+		}).addTo(map6);
+
+
+	</script>
+</body>
+</html>

data/lib/leaflet/debug/map/scroll.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
@@ -30,7 +29,13 @@
 
 		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
 
+		var s = '';
+		for (var i = 0; i < 100; i++) s += 'Test<br>';
 
+		var popup = L.popup({maxHeight: 100})
+			.setContent(s)
+			.setLatLng(latlng)
+			.openOn(map);
 	</script>
 </body>
 </html>

data/lib/leaflet/debug/map/simple-proj.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 

data/lib/leaflet/debug/map/wms-marble.html

@@ -4,10 +4,9 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
-	
+
 	<link rel="stylesheet" href="../css/screen.css" />
-	
+
 	<script type="text/javascript" src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
@@ -17,7 +16,7 @@
 
 	<script type="text/javascript">
 		var map = new L.Map('map', {crs: L.CRS.EPSG4326});
-	
+
 		var bluemarble = new L.TileLayer.WMS("http://maps.opengeo.org/geowebcache/service/wms", {
 			layers: 'bluemarble',
 			attribution: "Data &copy; NASA Blue Marble, image service by OpenGeo",
@@ -28,4 +27,4 @@
 		map.addLayer(bluemarble).fitWorld();
 	</script>
 </body>
-</html>
+</html>

data/lib/leaflet/debug/map/wms.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<link rel="stylesheet" href="../css/screen.css" />
 

data/lib/leaflet/debug/map/zoomlevels.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<link rel="stylesheet" href="../css/screen.css" />