More refactoring

sllvn · Dec 25, 2014 · 52c341f · 52c341f
1 parent 836aa66
commit 52c341f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/dist/angular-mapbox.js b/dist/angular-mapbox.js
@@ -28,7 +28,8 @@
       addMapInstance: addMapInstance,
       getMarkers: getMarkers,
       addMarker: addMarker,
-      fitMapToMarkers: fitMapToMarkers
+      fitMapToMarkers: fitMapToMarkers,
+      getOptionsForMap: getOptionsForMap
     };
     return service;
 
@@ -155,9 +156,6 @@
           scope.map.setView([attrs.lat, attrs.lng], zoom);
         }
 
-        // TODO: refactor this option into mapService
-        scope.isClusteringMarkers = attrs.clusterMarkers !== undefined;
-
         if(attrs.onReposition) {
           scope.map.on('dragend', function() {
             scope[attrs.onReposition](scope.map.getBounds());
@@ -254,7 +252,7 @@
             marker.bindPopup(popupContent);
           }
 
-          if(controller.$scope.isClusteringMarkers && opts.excludeFromClustering !== true) {
+          if(mapboxService.getOptionsForMap(map).clusterMarkers && opts.excludeFromClustering !== true) {
             controller.$scope.clusterGroup.addLayer(marker);
           } else {
             marker.addTo(map);
@@ -267,7 +265,6 @@
           }
 
           mapboxService.addMarker(marker);
-          //mapboxService.fitMapToMarkers(map); // TODO: debounce this
 
           return marker;
         };
@@ -324,7 +321,7 @@
               }
 
               element.bind('$destroy', function() {
-                if(controller.$scope.isClusteringMarkers) {
+                if(mapboxService.getOptionsForMap(map).clusterMarkers) {
                   controller.$scope.clusterGroup.removeLayer(marker);
                 } else {
                   map.removeLayer(marker);

diff --git a/dist/angular-mapbox.min.js b/dist/angular-mapbox.min.js
diff --git a/examples/index.html b/examples/index.html
@@ -10,7 +10,7 @@
 <body ng-app="angular-mapbox-example" ng-controller="demoController">
   <input type="text" ng-model="status">
   {{ status }}
-  <mapbox map-id="licyeus.XXXi9pkgkg8"
+  <mapbox map-id="licyeus.i9pkgkg8"
           lat="47.643569"
           lng="-122.329453"
           on-reposition="mapMovedCallback"

diff --git a/src/directives/mapbox.directive.js b/src/directives/mapbox.directive.js
@@ -28,9 +28,6 @@
           scope.map.setView([attrs.lat, attrs.lng], zoom);
         }
 
-        // TODO: refactor this option into mapService
-        scope.isClusteringMarkers = attrs.clusterMarkers !== undefined;
-
         if(attrs.onReposition) {
           scope.map.on('dragend', function() {
             scope[attrs.onReposition](scope.map.getBounds());

diff --git a/src/directives/marker.directive.js b/src/directives/marker.directive.js
@@ -58,7 +58,7 @@
             marker.bindPopup(popupContent);
           }
 
-          if(controller.$scope.isClusteringMarkers && opts.excludeFromClustering !== true) {
+          if(mapboxService.getOptionsForMap(map).clusterMarkers && opts.excludeFromClustering !== true) {
             controller.$scope.clusterGroup.addLayer(marker);
           } else {
             marker.addTo(map);
@@ -71,7 +71,6 @@
           }
 
           mapboxService.addMarker(marker);
-          //mapboxService.fitMapToMarkers(map); // TODO: debounce this
 
           return marker;
         };
@@ -128,7 +127,7 @@
               }
 
               element.bind('$destroy', function() {
-                if(controller.$scope.isClusteringMarkers) {
+                if(mapboxService.getOptionsForMap(map).clusterMarkers) {
                   controller.$scope.clusterGroup.removeLayer(marker);
                 } else {
                   map.removeLayer(marker);

diff --git a/src/mapbox.service.js b/src/mapbox.service.js
@@ -21,7 +21,8 @@
       addMapInstance: addMapInstance,
       getMarkers: getMarkers,
       addMarker: addMarker,
-      fitMapToMarkers: fitMapToMarkers
+      fitMapToMarkers: fitMapToMarkers,
+      getOptionsForMap: getOptionsForMap
     };
     return service;