Moved index to master, updated readme and version

brendan-ward · brendan-ward · commit cf97e77a23a2 · 2016-08-11T17:51:33.000-07:00
diff --git a/README.md b/README.md
@@ -92,3 +92,8 @@ map.addControl(L.control.basemaps({
 
 ## Credits:
 Developed with support from the [Peninsular Florida Landscape Conservation Cooperative](http://peninsularfloridalcc.org)
+
+
+## Contributors:
+* [Brendan Ward](https://github.com/brendan-ward)
+* [Nik Molnar](https://github.com/nikmolnar)
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Leaflet.Basemaps",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "homepage": "https://github.com/consbio/Leaflet.Basemaps",
   "authors": [
     "Brendan Ward <bcward@consbio.org>"
diff --git a/index.html b/index.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title>Leaflet Basemaps Control</title>
+    <link rel="stylesheet" href="//cdn.leafletjs.com/leaflet/v1.0.0-rc.1/leaflet.css" />
+    <link rel="stylesheet" href="L.Control.Basemaps.css" />
+</head>
+<body>
+    <script src="//cdn.leafletjs.com/leaflet/v1.0.0-rc.1/leaflet.js"></script>
+    <script src="L.Control.Basemaps.js"></script>
+    <div id="map" style="position: absolute; top: 0; left:0; bottom:0; right: 0;"></div>
+
+    <script>
+        var map = L.map('map').setView([44.07, -118.78], 5);
+
+        var basemaps = [
+            L.tileLayer('//{s}.tile.stamen.com/toner-lite/{z}/{x}/{y}.png', {
+                attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                subdomains: 'abcd',
+                maxZoom: 20,
+                minZoom: 0,
+                label: 'Toner Lite'
+            }),
+            L.tileLayer('//{s}.tile.stamen.com/toner/{z}/{x}/{y}.png', {
+                attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                subdomains: 'abcd',
+                maxZoom: 20,
+                minZoom: 0,
+                label: 'Toner'
+            }),
+            L.tileLayer('//{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.png', {
+                attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                subdomains: 'abcd',
+                maxZoom: 16,
+                minZoom: 1,
+                label: 'Watercolor'
+            })
+        ];
+
+        map.addControl(L.control.basemaps({
+            basemaps: basemaps,
+            tileX: 0,
+            tileY: 0,
+            tileZ: 1
+        }));
+
+    </script>
+</body>
+</html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "leaflet-basemaps",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"description": "Basemaps Control for Leaflet",
   	"homepage": "http://github.com/consbio/Leaflet.Basemaps",
   	"author": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Leaflet.Basemaps",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.1.1",`
`4`	`4`	`"homepage": "https://github.com/consbio/Leaflet.Basemaps",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Brendan Ward <bcward@consbio.org>"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "leaflet-basemaps",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.1.1",`
`4`	`4`	`"description": "Basemaps Control for Leaflet",`
`5`	`5`	`"homepage": "http://github.com/consbio/Leaflet.Basemaps",`
`6`	`6`	`"author": {`