--- a/map.js	Fri Oct 09 11:27:23 2015 +0200
+++ b/map.js	Fri Oct 23 15:50:00 2015 +0200
@@ -1,8 +1,50 @@
+
+
 //geoserver url
 var url="http://geoserver.mpiwg-berlin.mpg.de/geoserver/China_Monograph_Project/ows";
 
 //"name": "layer name"
 var overlayArray=[
+		{name:"中國1820省界",
+			file:"China_Monograph_Project:AD1820ChinaProfPolgon",
+			preload:false
+		},
+		{name:"中國1820府界",
+			file:"China_Monograph_Project:AD1820ChinaPrefPolygon",
+			preload:false
+		},
+		{name:"中國1820省名",
+			file:"China_Monograph_Project:AD1820ChinaProfPoint",
+			preload:false
+		},
+		{name:"China 1820 Province",
+			file:"China_Monograph_Project:AD1820ChinaProfPoint_PY",
+			preload:false
+		},		
+		{name:"中國1820府名",
+			file:"China_Monograph_Project:AD1820ChinaPrefPoint",
+			preload:false
+		},
+		{name:"China 1820 Prefecture",
+			file:"China_Monograph_Project:AD1820ChinaPrefPoint_PY",
+			preload:false
+		},				
+		{name:"中國1820縣市名",
+			file:"China_Monograph_Project:AD1820ChinaCountyPoints",
+			preload:false
+		},
+		{name:"China 1820 County",
+			file:"China_Monograph_Project:AD1820ChinaCountyPoints_PY",
+			preload:false
+		},															
+		{name:"中國1820鄉鎮名",
+			file:"China_Monograph_Project:AD1820ChinaTownPoint",
+			preload:false
+		},
+		{name:"China 1820 village",
+			file:"China_Monograph_Project:AD1820ChinaTownPoint_PY",
+			preload:false
+		},			
 		{name:"provincial distribution of local monographs",
 			file:"China_Monograph_Project:monograph_distribution_prov_x",
 			preload:false
@@ -18,14 +60,16 @@
 			preload:false
 		}
 		];
-var datasetArray=[{name:"distribution of local monographs",
+var datasetArray=[
+
+		{name:"distribution of local monographs",
 			file:"./datasets/books_coordinates.csv",
 			preload:true
 			
 		},
 		{
-			name:"distribution of local monographs (by province)",
-			file:"./datasets/provincial_capital_coordinates.csv",
+			name:"蝗神廟之分佈",
+			file:"./datasets/locust_temples.csv",
 			preload:false
 		}];
 var backgroundMapArray=[
@@ -36,23 +80,32 @@
                 attribution: "(c) Barrington Roman Empiry, <a href='http://pelagios.dme.ait.ac.at/maps/greco-roman/'>Pelagios</a>"
                },*/
            {
-                name: '中國地形圖',
-        		url: 't/China/${z}/${x}/${y}.png',
+                name: '世界地形圖',
+        		url: 't/world/${z}/${x}/${y}.png',
                 type:'XYZ',
                 attribution: "© mpiwg-berlin, <a href='https://www.mpiwg-berlin.mpg.de'>Max Planck Institute for the History of Science</a>"
-           },
-           {
+           }
+           ,
+        /*,{
+                name: '西元1820年 清朝 行政區',
+        		url: 'http://wmsproxy.appspot.com/map.jsp?l=China1820-png-${z}-${x}-${y}',
+                type:'XYZ',
+                attribution: "© NTU CSIE 303 Lab, <a href='http://archimedes.csie.ntu.edu.tw/lab_web1/'>NTU CSIE 303 Lab</a>"
+        }*/
+        ];
+//mpgiwg layers
+if (client_ip.substring(0,10)=="141.14.238") {
+	backgroundMapArray.push(
+			{
+           
                 name: '陳正祥–蝗神廟之分佈',
         		url: 't/pa-cha/${z}/${x}/${y}.png',
                 type:'XYZ',
                 attribution: "© 中國文化地理 陳正祥, <a href='https://zh.wikipedia.org/wiki/%E9%99%B3%E6%AD%A3%E7%A5%A5'>wikipedia</a>"
-        },{
-                name: '西元1820年 清朝 行政區',
-        		url: 'http://wmsproxy.appspot.com/map.jsp?l=China1820-png-${z}-${x}-${y}',
-                type:'XYZ',
-                attribution: "© NTU CSIE 303 Lab, <a href='http://archimedes.csie.ntu.edu.tw/lab_web1/'>NTU CSIE 303 Lab</a>"
-        }
-        ];
+        	}
+		);
+}
+        
 var colorArray=[{//blue
                 r1 : 0,
                 g1 : 128,
@@ -92,6 +145,7 @@
 var map, table,timeline,pieChart;
 var urlParameter=new Array();
 $(document).ready(function(){
+
 	GeoTemConfig.datasets=[];
 	GeoTemConfig.colors=colorArray;
 	getUrlParameter();
@@ -136,6 +190,7 @@
 	$(".windowWidget").hide();
 	$(".windowWidget .windowWidgetBar .visibilityButton").click();
 	
+	// debug by yao
 	$("#aboutIcon").click();
 });
 function getUrlParameter(){
@@ -263,6 +318,8 @@
 	map=new WidgetWrapper();
 	var mapWidget=new MapWidget(map,mapElem,{
 		mapTitle:"",
+		minimumRadius:2,
+		baseLayer:'世界地形圖', //底圖
 		alternativeMap:backgroundMapArray
 	});