Skip to content

Commit 15323bc

Browse files
tombatossalstombatossals
committed
fix(markers): Solved a critical bug not rendering any markers. Thanks to @juanmanavarro for reporting here:
#1017
1 parent 24b9cdb commit 15323bc

9 files changed

+30
-30
lines changed

‎dist/angular-leaflet-directive.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ angular.module('leaflet-directive').service('leafletData', ["$log", "$q", "leafl
492492
'geoJSON',
493493
'UTFGrid', //odd ball on naming convention keeping to not break
494494
'decorations',
495-
'directiveControls', ];
495+
'directiveControls',];
496496

497497
//init
498498
_privateItems.forEach(function(itemName) {
@@ -5147,7 +5147,7 @@ angular.module('leaflet-directive').directive('tiles', ["$log", "leafletData", "
51475147
});
51485148
},
51495149
};
5150-
}, ]);
5150+
},]);
51515151
});
51525152

51535153
angular.module('leaflet-directive')
@@ -5160,7 +5160,7 @@ angular.module('leaflet-directive')
51605160

51615161
var EventsHelper = function(rootBroadcastName, lObjectType) {
51625162
this.rootBroadcastName = rootBroadcastName;
5163-
$log.debug('leafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
5163+
$log.debug('LeafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
51645164

51655165
//used to path/key out certain properties based on the type , "markers", "geojson"
51665166
this.lObjectType = lObjectType;
@@ -5317,10 +5317,10 @@ angular.module('leaflet-directive')
53175317
}]);
53185318

53195319
angular.module('leaflet-directive')
5320-
.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
5321-
leafletEventsHelpersFactory, leafletData) {
5320+
.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
5321+
LeafletEventsHelpersFactory, leafletData) {
53225322
var safeApply = leafletHelpers.safeApply;
5323-
var EventsHelper = leafletEventsHelpersFactory;
5323+
var EventsHelper = LeafletEventsHelpersFactory;
53245324

53255325
var GeoJsonEvents = function() {
53265326
EventsHelper.call(this, 'leafletDirectiveGeoJson', 'geojson');
@@ -5365,9 +5365,9 @@ angular.module('leaflet-directive')
53655365
}]);
53665366

53675367
angular.module('leaflet-directive')
5368-
.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory) {
5368+
.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory) {
53695369
var Helpers = leafletHelpers;
5370-
var EventsHelper = leafletEventsHelpersFactory;
5370+
var EventsHelper = LeafletEventsHelpersFactory;
53715371

53725372
var LabelEvents = function() {
53735373
EventsHelper.call(this, 'leafletDirectiveLabel', 'markers');
@@ -5509,12 +5509,12 @@ angular.module('leaflet-directive')
55095509
}]);
55105510

55115511
angular.module('leaflet-directive')
5512-
.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory, leafletLabelEvents) {
5512+
.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory, leafletLabelEvents) {
55135513
var safeApply = leafletHelpers.safeApply;
55145514
var isDefined = leafletHelpers.isDefined;
55155515
var Helpers = leafletHelpers;
55165516
var lblHelp = leafletLabelEvents;
5517-
var EventsHelper = leafletEventsHelpersFactory;
5517+
var EventsHelper = LeafletEventsHelpersFactory;
55185518

55195519
var MarkerEvents = function() {
55205520
EventsHelper.call(this, 'leafletDirectiveMarker', 'markers');

‎dist/angular-leaflet-directive.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-leaflet-directive.no-header.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ angular.module('leaflet-directive').service('leafletData', ["$log", "$q", "leafl
463463
'geoJSON',
464464
'UTFGrid', //odd ball on naming convention keeping to not break
465465
'decorations',
466-
'directiveControls', ];
466+
'directiveControls',];
467467

468468
//init
469469
_privateItems.forEach(function(itemName) {
@@ -5118,7 +5118,7 @@ angular.module('leaflet-directive').directive('tiles', ["$log", "leafletData", "
51185118
});
51195119
},
51205120
};
5121-
}, ]);
5121+
},]);
51225122
});
51235123

51245124
angular.module('leaflet-directive')
@@ -5131,7 +5131,7 @@ angular.module('leaflet-directive')
51315131

51325132
var EventsHelper = function(rootBroadcastName, lObjectType) {
51335133
this.rootBroadcastName = rootBroadcastName;
5134-
$log.debug('leafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
5134+
$log.debug('LeafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
51355135

51365136
//used to path/key out certain properties based on the type , "markers", "geojson"
51375137
this.lObjectType = lObjectType;
@@ -5288,10 +5288,10 @@ angular.module('leaflet-directive')
52885288
}]);
52895289

52905290
angular.module('leaflet-directive')
5291-
.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
5292-
leafletEventsHelpersFactory, leafletData) {
5291+
.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
5292+
LeafletEventsHelpersFactory, leafletData) {
52935293
var safeApply = leafletHelpers.safeApply;
5294-
var EventsHelper = leafletEventsHelpersFactory;
5294+
var EventsHelper = LeafletEventsHelpersFactory;
52955295

52965296
var GeoJsonEvents = function() {
52975297
EventsHelper.call(this, 'leafletDirectiveGeoJson', 'geojson');
@@ -5336,9 +5336,9 @@ angular.module('leaflet-directive')
53365336
}]);
53375337

53385338
angular.module('leaflet-directive')
5339-
.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory) {
5339+
.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory) {
53405340
var Helpers = leafletHelpers;
5341-
var EventsHelper = leafletEventsHelpersFactory;
5341+
var EventsHelper = LeafletEventsHelpersFactory;
53425342

53435343
var LabelEvents = function() {
53445344
EventsHelper.call(this, 'leafletDirectiveLabel', 'markers');
@@ -5480,12 +5480,12 @@ angular.module('leaflet-directive')
54805480
}]);
54815481

54825482
angular.module('leaflet-directive')
5483-
.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory, leafletLabelEvents) {
5483+
.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory, leafletLabelEvents) {
54845484
var safeApply = leafletHelpers.safeApply;
54855485
var isDefined = leafletHelpers.isDefined;
54865486
var Helpers = leafletHelpers;
54875487
var lblHelp = leafletLabelEvents;
5488-
var EventsHelper = leafletEventsHelpersFactory;
5488+
var EventsHelper = LeafletEventsHelpersFactory;
54895489

54905490
var MarkerEvents = function() {
54915491
EventsHelper.call(this, 'leafletDirectiveMarker', 'markers');

‎src/directives/watchOptions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
});
3535
},
3636
};
37-
}, ]);
37+
},]);
3838
});

‎src/services/events/leafletEventsHelpers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ angular.module('leaflet-directive')
88

99
var EventsHelper = function(rootBroadcastName, lObjectType) {
1010
this.rootBroadcastName = rootBroadcastName;
11-
$log.debug('leafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
11+
$log.debug('LeafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
1212

1313
//used to path/key out certain properties based on the type , "markers", "geojson"
1414
this.lObjectType = lObjectType;

‎src/services/events/leafletGeoJsonEvents.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
angular.module('leaflet-directive')
22
.factory('leafletGeoJsonEvents', function($rootScope, $q, $log, leafletHelpers,
3-
leafletEventsHelpersFactory, leafletData) {
3+
LeafletEventsHelpersFactory, leafletData) {
44
var safeApply = leafletHelpers.safeApply;
5-
var EventsHelper = leafletEventsHelpersFactory;
5+
var EventsHelper = LeafletEventsHelpersFactory;
66

77
var GeoJsonEvents = function() {
88
EventsHelper.call(this, 'leafletDirectiveGeoJson', 'geojson');

‎src/services/events/leafletLabelEvents.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
angular.module('leaflet-directive')
2-
.factory('leafletLabelEvents', function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory) {
2+
.factory('leafletLabelEvents', function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory) {
33
var Helpers = leafletHelpers;
4-
var EventsHelper = leafletEventsHelpersFactory;
4+
var EventsHelper = LeafletEventsHelpersFactory;
55

66
var LabelEvents = function() {
77
EventsHelper.call(this, 'leafletDirectiveLabel', 'markers');

‎src/services/events/leafletMarkerEvents.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
angular.module('leaflet-directive')
2-
.factory('leafletMarkerEvents', function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory, leafletLabelEvents) {
2+
.factory('leafletMarkerEvents', function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory, leafletLabelEvents) {
33
var safeApply = leafletHelpers.safeApply;
44
var isDefined = leafletHelpers.isDefined;
55
var Helpers = leafletHelpers;
66
var lblHelp = leafletLabelEvents;
7-
var EventsHelper = leafletEventsHelpersFactory;
7+
var EventsHelper = LeafletEventsHelpersFactory;
88

99
var MarkerEvents = function() {
1010
EventsHelper.call(this, 'leafletDirectiveMarker', 'markers');

‎src/services/leafletData.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ angular.module('leaflet-directive').service('leafletData', function($log, $q, le
1919
'geoJSON',
2020
'UTFGrid', //odd ball on naming convention keeping to not break
2121
'decorations',
22-
'directiveControls', ];
22+
'directiveControls',];
2323

2424
//init
2525
_privateItems.forEach(function(itemName) {

0 commit comments

Comments
 (0)