fixed merge and extended simple path example

fiware-austria · fiware-austria · commit 7d1dac71750e · 2014-03-10T09:20:38.000+01:00
diff --git a/dist/angular-leaflet-directive.js b/dist/angular-leaflet-directive.js
@@ -803,9 +803,14 @@
                 if (!isDefined(leafletPaths[newName])) {
                   var pathData = newPaths[newName];
                   var newPath = createPath(newName, newPaths[newName], defaults);
+                  // bind popup if defined
                   if (isDefined(newPath) && isDefined(pathData.message)) {
                     newPath.bindPopup(pathData.message);
                   }
+                  // Show label if defined
+                  if (leafletHelpers.LabelPlugin.isLoaded() && isDefined(pathData.label) && isDefined(pathData.label.message)) {
+                    newPath.bindLabel(pathData.label.message, pathData.label.options);
+                  }
                   // Listen for changes on the new path
                   if (isDefined(newPath)) {
                     leafletPaths[newName] = newPath;
diff --git a/dist/angular-leaflet-directive.min.js b/dist/angular-leaflet-directive.min.js
diff --git a/examples/paths-simple-example.html b/examples/paths-simple-example.html
@@ -3,8 +3,10 @@
   <head>
     <script src="../bower_components/angular/angular.min.js"></script>
     <script src="../bower_components/leaflet-dist/leaflet.js"></script>
-    <script src="../dist/angular-leaflet-directive.min.js"></script>
+    <script src="../bower_components/Leaflet.label/dist/leaflet.label.js"></script>
+    <script src="../dist/angular-leaflet-directive.js"></script>
     <link rel="stylesheet" href="../bower_components/leaflet-dist/leaflet.css" />
+    <link rel="stylesheet" href="../bower_components/Leaflet.label/dist/leaflet.label.css" />
     <script>
         var app = angular.module("demoapp", ["leaflet-directive"]);
         app.controller("DemoController", [ "$scope", function($scope) {
@@ -23,8 +25,18 @@
                             { lat: 48.83, lng: 2.37 },
                             { lat: 41.91, lng: 12.48 }
                         ],
-                        message: "<h3>Route from London to Rome</h3><p>Distance: 1862km</p>"
+                        message: "<h3>Route from London to Rome</h3><p>Distance: 1862km</p>",
+                    },
+                    p2: {
+                        color: 'green',
+                        weight: 8,
+                        latlngs: [
+                            { lat: 48.2083537, lng: 16.3725042 },
+                            { lat: 48.8534, lng: 2.3485 }
+                        ],
+                        label: {message: "<h3>Route from Vienna to Paris</h3><p>Distance: 1211km</p>"}
                     }
+
                 }
             });
         }]);
@@ -38,6 +50,6 @@
   </head>
   <body ng-controller="DemoController">
     <leaflet center="london" paths="europeanPaths"></leaflet>
-    <p>Click on the route to get more information</p>
+    <p>Click on red route (Popup) or hover over green route (Label) to get more information</p>
   </body>
 </html>
diff --git a/src/directives/paths.js b/src/directives/paths.js
@@ -42,10 +42,16 @@ angular.module("leaflet-directive").directive('paths', function ($log, leafletDa
                             var pathData = newPaths[newName];
                             var newPath = createPath(newName, newPaths[newName], defaults);
 
+                            // bind popup if defined
 							if (isDefined(newPath) && isDefined(pathData.message)) {
                                 newPath.bindPopup(pathData.message);
                             }
 
+                            // Show label if defined
+                            if (leafletHelpers.LabelPlugin.isLoaded() && isDefined(pathData.label) && isDefined(pathData.label.message)) {
+                                newPath.bindLabel(pathData.label.message, pathData.label.options);
+                            }
+
                             // Listen for changes on the new path
                             if (isDefined(newPath)) {
                                 leafletPaths[newName] = newPath;
