Added the leafletData.getGeoJSON promise

Author: tombatossals

dist/angular-leaflet-directive.js

@@ -496,7 +496,7 @@ angular.module("leaflet-directive").directive('legend', function ($log) {
     };
 });
 
-angular.module("leaflet-directive").directive('geojson', function ($log, $rootScope) {
+angular.module("leaflet-directive").directive('geojson', function ($log, $rootScope, leafletData) {
     return {
         restrict: "A",
         scope: false,
@@ -506,7 +506,7 @@ angular.module("leaflet-directive").directive('geojson', function ($log, $rootSc
 
         link: function($scope, element, attrs, controller) {
             var map = controller.getMap();
-            var leafletGeoJSON;
+            var leafletGeoJSON = {};
 
             controller.getMap().then(function(map) {
                 $scope.$watch("geojson", function(geojson) {
@@ -547,7 +547,9 @@ angular.module("leaflet-directive").directive('geojson', function ($log, $rootSc
                                     }
                                 });
                             }
-                        }).addTo(map);
+                        });
+                        leafletData.setGeoJSON(leafletGeoJSON);
+                        leafletGeoJSON.addTo(map);
                     }
                 });
             });
@@ -1873,7 +1875,7 @@ angular.module("leaflet-directive").directive('maxbounds', function ($log) {
         link: function($scope, element, attrs, controller) {
             var defaults = parseMapDefaults($scope.defaults);
             controller.getMap().then(function(map) {
-            var maxBounds = $scope.maxBounds;
+                var maxBounds = $scope.maxBounds;
                 if (isDefined(maxBounds) && isDefined(maxBounds.southWest) && isDefined(maxBounds.northEast)) {
                     $scope.$watch("maxBounds", function (maxBounds) {
                         if (isDefined(maxBounds.southWest) && isDefined(maxBounds.northEast) && isNumber(maxBounds.southWest.lat) && isNumber(maxBounds.southWest.lng) && isNumber(maxBounds.northEast.lat) && isNumber(maxBounds.northEast.lng)) {
@@ -1909,6 +1911,9 @@ angular.module("leaflet-directive").service('leafletData', function ($log, $q) {
     var markers = {
         main: $q.defer()
     };
+    var geoJSON = {
+        main: $q.defer()
+    };
     var defaults = {};
 
     function getDefer(d, scopeId) {
@@ -1982,6 +1987,16 @@ angular.module("leaflet-directive").service('leafletData', function ($log, $q) {
         var tile = getDefer(tiles, scopeId);
         return tile.promise;
     };
+
+    this.setGeoJSON = function(leafletGeoJSON, scopeId) {
+        var geoJSONLayer = getDefer(geoJSON, scopeId);
+        geoJSONLayer.resolve(leafletGeoJSON);
+    };
+
+    this.getGeoJSON = function(scopeId) {
+        var geoJSONLayer = getDefer(geoJSON, scopeId);
+        return geoJSONLayer.promise;
+    };
 });
 
 }());

dist/angular-leaflet-directive.min.js

@@ -1,4 +1,4 @@
-angular.module("leaflet-directive").directive('geojson', function ($log, $rootScope) {
+angular.module("leaflet-directive").directive('geojson', function ($log, $rootScope, leafletData) {
     return {
         restrict: "A",
         scope: false,
@@ -8,7 +8,7 @@ angular.module("leaflet-directive").directive('geojson', function ($log, $rootSc
 
         link: function($scope, element, attrs, controller) {
             var map = controller.getMap();
-            var leafletGeoJSON;
+            var leafletGeoJSON = {};
 
             controller.getMap().then(function(map) {
                 $scope.$watch("geojson", function(geojson) {
@@ -49,7 +49,9 @@ angular.module("leaflet-directive").directive('geojson', function ($log, $rootSc
                                     }
                                 });
                             }
-                        }).addTo(map);
+                        });
+                        leafletData.setGeoJSON(leafletGeoJSON);
+                        leafletGeoJSON.addTo(map);
                     }
                 });
             });

src/directives/geojson.js

@@ -9,7 +9,7 @@ angular.module("leaflet-directive").directive('maxbounds', function ($log) {
         link: function($scope, element, attrs, controller) {
             var defaults = parseMapDefaults($scope.defaults);
             controller.getMap().then(function(map) {
-            var maxBounds = $scope.maxBounds;
+                var maxBounds = $scope.maxBounds;
                 if (isDefined(maxBounds) && isDefined(maxBounds.southWest) && isDefined(maxBounds.northEast)) {
                     $scope.$watch("maxBounds", function (maxBounds) {
                         if (isDefined(maxBounds.southWest) && isDefined(maxBounds.northEast) && isNumber(maxBounds.southWest.lat) && isNumber(maxBounds.southWest.lng) && isNumber(maxBounds.northEast.lat) && isNumber(maxBounds.northEast.lng)) {

src/directives/maxBounds.js

@@ -14,6 +14,9 @@ angular.module("leaflet-directive").service('leafletData', function ($log, $q) {
     var markers = {
         main: $q.defer()
     };
+    var geoJSON = {
+        main: $q.defer()
+    };
     var defaults = {};
 
     function getDefer(d, scopeId) {
@@ -87,4 +90,14 @@ angular.module("leaflet-directive").service('leafletData', function ($log, $q) {
         var tile = getDefer(tiles, scopeId);
         return tile.promise;
     };
+
+    this.setGeoJSON = function(leafletGeoJSON, scopeId) {
+        var geoJSONLayer = getDefer(geoJSON, scopeId);
+        geoJSONLayer.resolve(leafletGeoJSON);
+    };
+
+    this.getGeoJSON = function(scopeId) {
+        var geoJSONLayer = getDefer(geoJSON, scopeId);
+        return geoJSONLayer.promise;
+    };
 });