Merge pull request #129 from heiglandreas/feature/labelsInMap

Feature/labels in map

Author: heiglandreas

Diff for: bower.json

@@ -28,6 +28,7 @@
     "fullcalendar": "~2.2.5",
     "jbox": "~0.3.2",
     "html5shiv": "~3.7.2",
-    "jquery-cookie": "~1.4.1"
+    "jquery-cookie": "~1.4.1",
+    "Leaflet.label": "~0.2.1"
   }
 }

Diff for: src/module/Phpug/public/js/phpug.js

@@ -125,6 +125,7 @@ var cfp = L.layerJSON({
     },
     onEachMarker : function(e, marker) {
         oms.addMarker(marker);
+        marker.bindLabel(e.name, {opacity:0.9});
         return;
     }
 });
@@ -170,6 +171,7 @@ var joindin = L.layerJSON({
     },
     onEachMarker : function(e, marker) {
         oms.addMarker(marker);
+        marker.bindLabel(e.name, {opacity:0.9});
         return;
     }
 });
@@ -248,6 +250,7 @@ var phpug = L.layerJSON({
     },
     onEachMarker  : function(e, marker){
         oms.addMarker(marker);
+        marker.bindLabel(e.name, {opacity:0.9});
         return;
     }
 });
@@ -310,6 +313,7 @@ var mentoring = L.layerJSON({
     },
     onEachMarker : function(e,marker){
         oms.addMarker(marker);
+        marker.bindLabel(e.name, {opacity:0.9});
         return;
     },
     buildIcon : function(data, title){

Diff for: src/module/Phpug/view/phpug/index/index.phtml

@@ -5,9 +5,11 @@ $this->headLink()->appendStylesheet('lib/leaflet/dist/leaflet.css','text/css',
     array('conditional' => 'lte IE8',)
 );
 $this->headLink()->appendStylesheet('lib/leaflet-search/dist/leaflet-search.min.css');
+$this->headLink()->appendStylesheet('lib/Leaflet.label/dist/leaflet.label.css');
 
 $this->headScript()->prependFile('js/phpug/phpug.js');
 //$this->headScript()->prependFile('lib/leaflet-search/dist/leaflet-searchl.geosearch.provider.openstreetmap.js');
+$this->headScript()->prependFile('lib/Leaflet.label/dist/leaflet.label.js');
 $this->headScript()->prependFile('lib/leaflet-search/dist/leaflet-search.min.js');
 $this->headScript()->prependFile('lib/leaflet-layerjson/dist/leaflet-layerjson.min.js');
 $this->headScript()->prependFile('lib/overlapping_marker_spiderfier-leaflet/dist/oms.min.js');