angular-leaflet-rails 0.1.0.3 → 0.1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dbd98dbdb5bd6d2f60c447e83171a961fbcaaa0
-  data.tar.gz: 48d8a8dea0ca7ce2fd8ac50615c9082724417cc4
+  metadata.gz: 822a1aa810952f40ab06b6d6ed9325afabb926a6
+  data.tar.gz: 102855448f080283587c21ae53b3522a5ea236f8
 SHA512:
-  metadata.gz: 0cb868ebfb1000e9ad8a117c3ef571f01d642a2891d8cbc7db202892913762cfee4c1c8907249c723e091d2f4b15a003de063e3913a2e19d08ffe51ea40be3fe
-  data.tar.gz: 0dcc291e9ff174086bb3096df6a4866b7aa9717cb4e2e541d74335b4000064852aaacd27344aa033d02050a64741bdff58b4ea00998b136a31e4c6979d7c06c6
+  metadata.gz: 492cb5313f007fdcad609641ffcb8070319a05bf52ee1fbfec5b235678899c191a135c92bfc870346f15dc7e9332d179fa1ef096f7144c2664f2c4dd83663af5
+  data.tar.gz: 34c034f153e69a1162c0aa0b3d4f0af646db84b75185280263dea8e4e108bb06c2f471182a7f1dd0faf27db73fc3364a15af7147f6e4cfbf293d7f8e52f61196

data/lib/angular-leaflet-rails/version.rb

@@ -1,5 +1,5 @@
 module AngularLeaflet
   module Rails
-    VERSION = "0.1.0.3"
+    VERSION = "0.1.0.4"
   end
 end

data/vendor/assets/javascripts/angular-leaflet-directive.js

@@ -9,6 +9,7 @@ leafletDirective.directive("leaflet", ["$http", "$log", function ($http, $log) {
             center: "=center",
             tilelayer: "=tilelayer",
             markers: "=markers",
+            leafletMarkers: "=leafletMarkers",
             path: "=path",
             maxZoom: "@maxzoom"
         },
@@ -39,7 +40,7 @@ leafletDirective.directive("leaflet", ["$http", "$log", function ($http, $log) {
             if (attrs.center && scope.center) {
 
                 if (scope.center.lat && scope.center.lng && scope.center.zoom) {
-                    map.setView(new L.LatLng(scope.center.lat, scope.center.lng), scope.center.zoom);
+                    map.setView([scope.center.lat, scope.center.lng], scope.center.zoom);
                 } else if (scope.center.autoDiscover === true) {
                     map.locate({ setView: true, maxZoom: maxZoom });
                 }
@@ -52,9 +53,11 @@ leafletDirective.directive("leaflet", ["$http", "$log", function ($http, $log) {
                 });
 
                 map.on("zoomend", function(e) {
-                    scope.$apply(function (s) {
-                        s.center.zoom = map.getZoom();
-                    });
+                    if (scope.center.zoom !== map.getZoom()){
+                        scope.$apply(function (s) {
+                            s.center.zoom = map.getZoom();
+                        });
+                    }
                 });
 
                 scope.$watch("center", function (center, oldValue) {
@@ -65,8 +68,6 @@ leafletDirective.directive("leaflet", ["$http", "$log", function ($http, $log) {
             }
 
             if (attrs.markers && scope.markers) {
-                var markers = {};
-
                 var createAndLinkMarker = function(key, scope) {
                     var data = scope.markers[key];
                     var marker = new L.marker(
@@ -89,7 +90,10 @@ leafletDirective.directive("leaflet", ["$http", "$log", function ($http, $log) {
                     scope.$watch('markers.' + key, function(newval, oldval) {
                         if (!newval) {
                             map.removeLayer(markers[key]);
-                            delete markers[key];
+                            delete leafletMarkers[key];
+                            if (attrs.leafletMarkers) {
+                                delete scope.leafletMarkers[key];
+                            }
                             return;
                         }
 
@@ -113,13 +117,33 @@ leafletDirective.directive("leaflet", ["$http", "$log", function ($http, $log) {
                     return marker;
                 }; // end of create and link marker
 
+                var leafletMarkers = {}
+
+                // Expose the map object, for testing purposes
+                if (attrs.leafletMarkers) {
+                    scope.leafletMarkers = {};
+                }
+
+                // Create the initial objects
+                for (var key in scope.markers) {
+                    var marker = createAndLinkMarker(key, scope);
+                    map.addLayer(marker);
+                    leafletMarkers[key] = marker;
+                    if (attrs.leafletMarkers) {
+                        scope.leafletMarkers[key] = marker;
+                    }
+                }
+
                 scope.$watch("markers", function(newMarkerList) {
                     // add new markers
-                    for (var key in scope.markers) {
-                        if (markers[key] === undefined) {
+                    for (var key in newMarkerList) {
+                        if (leafletMarkers[key] === undefined) {
                             var marker = createAndLinkMarker(key, scope);
                             map.addLayer(marker);
-                            markers[key] = marker;
+                            leafletMarkers[key] = marker;
+                            if (attrs.leafletMarkers) {
+                                scope.leafletMarkers[key] = marker;
+                            }
                         }
                     }
                 }, true);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular-leaflet-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3
+  version: 0.1.0.4
 platform: ruby
 authors:
 - Tymon Tobolski