update mapbbcode to latest 1.2-dev and leaflet.draw to #242

MapBBCode · Dec 17, 2013 · 6101dc7 · 6101dc7
1 parent 64a16fa
commit 6101dc7
Show file tree

Hide file tree

Showing 30 changed files with 712 additions and 706 deletions.
diff --git a/_includes/mapdemo.html b/_includes/mapdemo.html
@@ -1,9 +1,5 @@
 <link rel="stylesheet" href="/lib/leaflet.css" />
 <link rel="stylesheet" href="/lib/leaflet.draw.css" />
-<!--[if lte IE 8]>
-    <link rel="stylesheet" href="/lib/leaflet.ie.css" />
-    <link rel="stylesheet" href="/lib/leaflet.draw.ie.css" />
-<![endif]-->
 <script src="/lib/leaflet.js"></script>
 <script src="/lib/leaflet.draw.js"></script>
 <script src="/lib/mapbbcode.js"></script>

diff --git a/_includes/plugins-demo.html b/_includes/plugins-demo.html
@@ -20,7 +20,7 @@
 
 // L.FunctionButtons
 var mapfb = createMap('mapfb');
-var fb = L.functionButtons(['Saint-Petersburg', 'Hide buttons'], { position: 'topleft' });
+var fb = L.functionButtons([{ content: 'Saint-Petersburg' }, { content: 'Hide buttons'}], { position: 'topleft' });
 var fbspb = false;
 fb.on('clicked', function(data) {
 	if( data.idx == 0 ) {

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -6,9 +6,6 @@
 <link rel="stylesheet" href="/style.css">
 {% if page.needmap %}
 <link rel="stylesheet" href="/lib/leaflet.css" />
-<!--[if lte IE 8]>
-    <link rel="stylesheet" href="/lib/leaflet.ie.css" />
-<![endif]-->
 <script src="/lib/leaflet.js"></script>
 <script src="/lib/mapbbcode.js"></script>
 <script>

diff --git a/_layouts/guide.html b/_layouts/guide.html
@@ -6,16 +6,12 @@
 <link rel="stylesheet" href="/style.css">
 <link rel="stylesheet" href="/lib/leaflet.css" />
 <link rel="stylesheet" href="/lib/leaflet.draw.css" />
-<!--[if lte IE 8]>
-    <link rel="stylesheet" href="/lib/leaflet.ie.css" />
-    <link rel="stylesheet" href="/lib/leaflet.draw.ie.css" />
-<![endif]-->
 <script src="/lib/leaflet.js"></script>
 <script src="/lib/leaflet.draw.js"></script>
 <script src="/lib/mapbbcode.js"></script>
 <script src="/lib/mapbbcode-config.js"></script>
 <script src="/lib/lang/{{ page.maplang }}.js"></script>
-<script src="/lib/lang/{{ page.maplang }}.Config.js"></script>
+<script src="/lib/lang/{{ page.maplang }}.config.js"></script>
 </head>
 <body>
 {% include langbar.html %}

diff --git a/admin.md b/admin.md
@@ -1,7 +1,7 @@
 ---
 layout: guide
 title: Administrator's Guide
-maplang: English
+maplang: en
 ---
 
 ## Configuration Panel

diff --git a/dist/mapbbcode-latest.zip b/dist/mapbbcode-latest.zip
diff --git a/guide.md b/guide.md
@@ -1,7 +1,7 @@
 ---
 layout: guide
 title: User's Guide
-maplang: English
+maplang: en
 ---
 
 This is a map. It behaves like any other map on the web: you can drag it, click "+" and "-" buttons to zoom in and out, change map layers with a button in top right corner. There are markers which sometimes open a popup when you click on them, and there are other geometrical figures that do nothing.

diff --git a/index.html b/index.html
@@ -1,6 +1,6 @@
 ---
 layout: index
-maplang: English
+maplang: en
 ---
 <h1>[map] BBCode</h1>
 

diff --git a/leaflet.md b/leaflet.md
@@ -48,7 +48,7 @@ When clicked, the control emits a Leaflet event `clicked` with a single data pro
 [Download](https://raw.github.com/MapBBCode/mapbbcode/master/src/FunctionButton.js)
 
 ```javascript
-var btn = L.functionButtons(['Saint-Petersburg', 'Hide buttons']);
+var btn = L.functionButtons([{ content: 'Saint-Petersburg' }, { content: 'Hide buttons'}]);
 btn.on('clicked', function(data) {
 	if( data.idx == 0 ) {
 		map.setView([59.939, 30.315], 13);

diff --git a/lib/LayerList.js b/lib/LayerList.js
@@ -8,6 +8,7 @@ window.layerList = {
 	list: {
 		"OpenStreetMap": "L.tileLayer('http://tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: 'Map &copy; <a href=\"http://openstreetmap.org\">OpenStreetMap</a>', minZoom: 0, maxZoom: 19 })",
 		"OpenStreetMap DE": "L.tileLayer('http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', { attribution: 'Map &copy; <a href=\"http://openstreetmap.org\">OpenStreetMap</a>', minZoom: 0, maxZoom: 18 })",
+		"OpenStreetMap FR": "L.tileLayer('http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', { subdomains: 'abc', attribution: 'Map &copy; <a href=\"http://openstreetmap.org\">OpenStreetMap</a> | Tiles &copy <a href=\"http://tile.openstreetmap.fr/\">OSM France</a>', minZoom: 0, maxZoom: 20 })",
 		"Hike & Bike": "L.layerGroup([ L.tileLayer('http://toolserver.org/tiles/hikebike/{z}/{x}/{y}.png', { attribution: 'Map &copy; <a href=\"http://openstreetmap.org\">OSM</a> | Tiles &copy; <a href=\"http://hikebikemap.de/\">Colin Marquardt</a>' } ), L.tileLayer('http://toolserver.org/~cmarqu/hill/{z}/{x}/{y}.png', { minZoom: 0, maxZoom: 17 }) ])",
 		"CycleMap": "L.tileLayer('http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png', { attribution: 'Map &copy; <a href=\"http://openstreetmap.org\">OSM</a> | Tiles &copy; <a href=\"http://www.opencyclemap.org\">Andy Allan</a>', minZoom: 0, maxZoom: 18 })",
 		"OpenMapSurfer": "L.tileLayer('http://openmapsurfer.uni-hd.de/tiles/roads/x={x}&y={y}&z={z}', { attribution: 'Map &copy; <a href=\"http://openstreetmap.org\">OSM</a> | Tiles &copy; <a href=\"http://giscience.uni-hd.de/\">GIScience Heidelberg</a>', minZoom: 0, maxZoom: 19 })",
@@ -93,14 +94,14 @@ window.layerList = {
 			if( layer ) {
 				result.push(layer);
 				if( osmidx < 0 && this.isOpenStreetMapLayer(layer) )
-					osmidx = i;
+					osmidx = result.length - 1;
 			}
 		}
 
 		if( osmidx > 0 ) {
-			var tmp = l[i];
-			l[i] = l[0];
-			l[0] = tmp;
+			var tmp = result[osmidx];
+			result[osmidx] = result[0];
+			result[0] = tmp;
 		} else if( osmidx < 0 && result.length > 0 ) {
 			result.unshift(this.getLeafletLayer('OpenStreetMap', LL));
 		}

diff --git a/lib/images/spritesheet-2x.png b/lib/images/spritesheet-2x.png
diff --git a/lib/images/spritesheet.png b/lib/images/spritesheet.png
diff --git a/lib/lang/English.Config.js b/lib/lang/English.Config.js
diff --git a/lib/lang/English.js b/lib/lang/English.js
diff --git a/lib/lang/Russian.Config.js b/lib/lang/Russian.Config.js
diff --git a/lib/lang/Russian.js b/lib/lang/Russian.js