Merge pull request #125 from jdlrobson/pins-119

provide custom markers for map
wikimedia · Aug 14, 2012 · 9b1be5a · 9b1be5a
2 parents f97cfdd + 004fd21
commit 9b1be5a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/assets/www/images/pin-no-photos.png b/assets/www/images/pin-no-photos.png
diff --git a/assets/www/images/pin.png b/assets/www/images/pin.png
diff --git a/assets/www/js/geo.js b/assets/www/js/geo.js
@@ -138,7 +138,18 @@ define(['jquery', '../leaflet/leaflet-src', 'leafclusterer'], function() {
 	}
 
 	function addMonument(monument, onClick) {
-		var marker = new L.Marker(new L.LatLng(monument.lat, monument.lon));
+		var url = 'images/', iconOptions;
+		url += monument.image ? 'pin.png' : 'pin-no-photos.png';
+		if ( L.VERSION === '0.3' ) { // TODO: upgrade leaflet to 4.0
+			 iconOptions = url;
+		} else {
+			iconOptions = {
+				iconUrl: url,
+				iconSize: [ 30, 50 ]
+			};
+		}
+		var markerIcon = new L.Icon( iconOptions );
+		var marker = new L.Marker( new L.LatLng( monument.lat, monument.lon ), { icon: markerIcon } );
 		var popup = "<div><strong>" + monument.name + "</strong></div>";
 		var popupDOM = $(popup).click(function() {
 			onClick(monument);