--- ump2.html	2016-06-04 04:51:36.100175866 +0200
+++ ump2.html	2016-06-05 01:53:56.922325464 +0200
@@ -20,7 +20,7 @@
     <script src="spr.remonty.js"></script>
     <script src="spr.planowane.js"></script>
     <!-- <script src="spr.lodowiska.js"></script> wymiennie z .kapieliska. -->
-    <script src="spr.windy.js"></script>
+    <script src="spr.ts.js"></script>
     <script src="spr.radary.js"></script>
 <!-- wyszukiwarka -->
     <link rel="stylesheet" href="Control.OSMGeocoder.css" />
@@ -47,7 +47,7 @@
 
 <script type="text/javascript">
 var umpUrl = 'http://tiles.ump.waw.pl/ump_tiles/{z}/{x}/{y}.png',
-    umpAttr = 'Map data by <a href="http://www.ump.waw.pl">UMP-pcPL</a> + <a href="http://www2.jpl.nasa.gov/srtm/">SRTM</a>';
+    umpAttr = 'Map data by <a href="http://www.ump.waw.pl">UMP</a> + <a href="http://www2.jpl.nasa.gov/srtm/">SRTM</a>';
 
 var osmUrl = 'http://{s}.tile.osm.org/{z}/{x}/{y}.png',
     osmAttr = '© <a href="http://www.openstreetmap.org/copyright">autorzy OpenStreetMap</a>';
@@ -127,21 +143,30 @@
 	    w_utrudnienia.addLayer(marker);
 	}
 
-	var w_windy = L.markerClusterGroup({ chunkedLoading: false });
-	for (var i = 0; i < windy.length; i++) {
-	    var a = windy[i];
+	var w_ts = L.markerClusterGroup({ chunkedLoading: false });
+	for (var i = 0; i <  ts.length; i++) {
+	    var a = ts[i];
 	    var title = a[2];
-	    var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
+	    var marker = L.marker(L.latLng(a[0], a[1]), { icon: tsIcon, title: title });
 	    marker.bindPopup(title);
-	    w_windy.addLayer(marker);
+	    w_ts.addLayer(marker);
 	}
 
 
 	var w_radary = L.markerClusterGroup({ chunkedLoading: false });
 	for (var i = 0; i < radary.length; i++) {
 	    var a = radary[i];
-	    var title = a[2];
-	    var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
+		var icno = parseInt(a[3]);
+	    var title = a[2]; // + " (" + icno +")"; 
+		if (icno<12)
+			ic=icno;
+		else
+			ic=0;
+	    var marker = L.marker(L.latLng(a[0], a[1]), {
+//			icon: L.mapbox.marker.icon({'marker-symbol': 'post', 'marker-color': '0044FF'}),
+			icon: fsIcons[ic],
+			title: title
+		});
 	    marker.bindPopup(title);
 	    w_radary.addLayer(marker);
 	}
@@ -188,7 +213,7 @@
     "Remonty": w_remonty,
     "Planowane": w_planowane,
 <!--    "Lodowiska": w_kapieliska, -->
-    "Niepełnosprawni": w_windy,
+    "TS wpts": w_ts,
     "Radary FS": w_radary,
     "punktyadresowe.pl ulice": impaulice,
     "punktyadresowe.pl adresy": impaadresy
@@ -82,6 +82,22 @@
 
 	var tsIcon = L.icon({ iconUrl: 'TS.png', iconAnchor: [12, 12] });
 	var utrIcon = L.icon({ iconUrl: 'b20.inne.png', iconAnchor: [16, 15] });
+	var fsIcon = L.icon({ iconUrl: 'GATSO_FS.png', iconAnchor: [12, 12] });
+	var fsIcons = [
+		L.icon({ iconUrl: 'a29-swiatla.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'GATSO_FS.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'GATSO_FO.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.30.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.40.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.50.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.60.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.70.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.80.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.90.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.100.png', iconAnchor: [12, 12] }),
+		L.icon({ iconUrl: 'b33.110.png', iconAnchor: [12, 12] })
+		] ;
+	var remontIcon = L.icon({ iconUrl: 'Remont.png', iconAnchor: [12, 12] });
 	var w_sprawdz = L.markerClusterGroup({ chunkedLoading: false });
 	for (var i = 0; i < sprawdzie.length; i++) {
 	    var a = sprawdzie[i];