Skip to content
This repository was archived by the owner on Apr 7, 2020. It is now read-only.

Commit fb19b4c

Browse files
nmccreadynmccready
committed
fix(really fix annotations): :)
1 parent b055a3a commit fb19b4c

File tree

2 files changed

+123
-118
lines changed

2 files changed

+123
-118
lines changed

‎dist/ui-leaflet-draw.js‎

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/**
22
* ui-leaflet-draw
33
*
4-
* @version: 0.0.3
4+
* @version: 0.0.4
55
* @author: Nicholas McCready
6-
* @date: Sat Mar 18 2017 13:32:12 GMT-0400 (EDT)
6+
* @date: Sat Mar 18 2017 16:04:33 GMT-0400 (EDT)
77
* @license: MIT
88
*/
99

@@ -57,81 +57,83 @@
5757
}
5858
return $delegate;
5959
}]);
60-
}]).directive(directiveName, function(leafletLogger, leafletData, leafletHelpers, leafletIterators, leafletDrawEvents, $timeout, $q) {
61-
var $log, errorHeader, isDefined;
62-
$log = leafletLogger;
63-
isDefined = leafletHelpers.isDefined;
64-
errorHeader = leafletHelpers.errorHeader;
65-
return {
66-
restrict: 'A',
67-
scope: false,
68-
replace: false,
69-
require: ['leaflet'],
70-
controller: function($scope) {
71-
this._deferredDrawTool = $q.defer();
72-
this.getDrawTool = function() {
73-
return this._deferredDrawTool.promise;
74-
};
75-
return this.getScope = function() {
76-
return $scope;
77-
};
78-
},
79-
link: function(scope, element, attrs, controller) {
80-
var _deferred, _featureGroup, _optionsEditedInDirective, leafletScope, mapController;
81-
mapController = controller[0];
82-
leafletScope = mapController.getLeafletScope();
83-
_featureGroup = void 0;
84-
_optionsEditedInDirective = false;
85-
_deferred = void 0;
86-
return leafletScope.$watchCollection(directiveName, function() {
87-
var options, ref;
88-
if (!_deferred || _deferred.resolvedDefer) {
89-
_deferred = $q.defer();
90-
}
91-
if (_optionsEditedInDirective) {
92-
return;
93-
}
94-
options = leafletScope[directiveName] || {};
95-
if (((ref = options.control) != null ? ref.promises : void 0) != null) {
96-
options.control.promised(_deferred.promise);
97-
}
98-
return mapController.getMap().then(function(map) {
99-
var drawControl, layerName, name;
100-
if (_featureGroup) {
101-
map.removeLayer(_featureGroup);
60+
}]).directive(directiveName, [
61+
'leafletLogger', 'leafletData', 'leafletHelpers', 'leafletIterators', 'leafletDrawEvents', '$timeout', '$q', function(leafletLogger, leafletData, leafletHelpers, leafletIterators, leafletDrawEvents, $timeout, $q) {
62+
var $log, errorHeader, isDefined;
63+
$log = leafletLogger;
64+
isDefined = leafletHelpers.isDefined;
65+
errorHeader = leafletHelpers.errorHeader;
66+
return {
67+
restrict: 'A',
68+
scope: false,
69+
replace: false,
70+
require: ['leaflet'],
71+
controller: function($scope) {
72+
this._deferredDrawTool = $q.defer();
73+
this.getDrawTool = function() {
74+
return this._deferredDrawTool.promise;
75+
};
76+
return this.getScope = function() {
77+
return $scope;
78+
};
79+
},
80+
link: function(scope, element, attrs, controller) {
81+
var _deferred, _featureGroup, _optionsEditedInDirective, leafletScope, mapController;
82+
mapController = controller[0];
83+
leafletScope = mapController.getLeafletScope();
84+
_featureGroup = void 0;
85+
_optionsEditedInDirective = false;
86+
_deferred = void 0;
87+
return leafletScope.$watchCollection(directiveName, function() {
88+
var options, ref;
89+
if (!_deferred || _deferred.resolvedDefer) {
90+
_deferred = $q.defer();
10291
}
103-
if (!isDefined(L.Control.Draw)) {
104-
$log.error(errorHeader + " Leaflet.Draw is not loaded as a plugin.");
92+
if (_optionsEditedInDirective) {
10593
return;
10694
}
107-
if (!isDefined(options.edit) || !isDefined(options.edit.featureGroup)) {
108-
_optionsEditedInDirective = true;
109-
angular.extend(options, {
110-
edit: {
111-
featureGroup: new L.FeatureGroup()
112-
}
95+
options = leafletScope[directiveName] || {};
96+
if (((ref = options.control) != null ? ref.promises : void 0) != null) {
97+
options.control.promised(_deferred.promise);
98+
}
99+
return mapController.getMap().then(function(map) {
100+
var drawControl, layerName, name;
101+
if (_featureGroup) {
102+
map.removeLayer(_featureGroup);
103+
}
104+
if (!isDefined(L.Control.Draw)) {
105+
$log.error(errorHeader + " Leaflet.Draw is not loaded as a plugin.");
106+
return;
107+
}
108+
if (!isDefined(options.edit) || !isDefined(options.edit.featureGroup)) {
109+
_optionsEditedInDirective = true;
110+
angular.extend(options, {
111+
edit: {
112+
featureGroup: new L.FeatureGroup()
113+
}
114+
});
115+
$timeout(function() {
116+
return _optionsEditedInDirective = false;
117+
});
118+
}
119+
_featureGroup = options.edit.featureGroup;
120+
map.addLayer(_featureGroup);
121+
drawControl = new L.Control.Draw(options);
122+
map.addControl(drawControl);
123+
_deferred.resolvedDefer = true;
124+
_deferred.resolve({
125+
control: drawControl,
126+
map: map
113127
});
114-
$timeout(function() {
115-
return _optionsEditedInDirective = false;
128+
return leafletDrawEvents.bindEvents(attrs.id, map, name = null, options, leafletScope, layerName = null, {
129+
mapId: attrs.id
116130
});
117-
}
118-
_featureGroup = options.edit.featureGroup;
119-
map.addLayer(_featureGroup);
120-
drawControl = new L.Control.Draw(options);
121-
map.addControl(drawControl);
122-
_deferred.resolvedDefer = true;
123-
_deferred.resolve({
124-
control: drawControl,
125-
map: map
126-
});
127-
return leafletDrawEvents.bindEvents(attrs.id, map, name = null, options, leafletScope, layerName = null, {
128-
mapId: attrs.id
129131
});
130132
});
131-
});
132-
}
133-
};
134-
});
133+
}
134+
};
135+
}
136+
]);
135137

136138
}).call(this);
137139

‎src/drawDirective.coffee‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,63 +14,66 @@ angular.module('ui-leaflet')
1414

1515
$delegate
1616

17-
.directive directiveName, (leafletLogger, leafletData, leafletHelpers, leafletIterators, leafletDrawEvents, $timeout, $q) ->
18-
$log = leafletLogger
19-
isDefined = leafletHelpers.isDefined
20-
errorHeader = leafletHelpers.errorHeader
17+
.directive directiveName, [
18+
'leafletLogger', 'leafletData', 'leafletHelpers', 'leafletIterators', 'leafletDrawEvents', '$timeout', '$q',
19+
(leafletLogger, leafletData, leafletHelpers, leafletIterators, leafletDrawEvents, $timeout, $q) ->
20+
$log = leafletLogger
21+
isDefined = leafletHelpers.isDefined
22+
errorHeader = leafletHelpers.errorHeader
2123

22-
restrict: 'A'
23-
scope: false
24-
replace: false
25-
require: ['leaflet']
26-
controller: ($scope) ->
27-
@_deferredDrawTool = $q.defer()
28-
@getDrawTool = ->
29-
@_deferredDrawTool.promise
30-
@getScope = ->
31-
$scope
24+
restrict: 'A'
25+
scope: false
26+
replace: false
27+
require: ['leaflet']
28+
controller: ($scope) ->
29+
@_deferredDrawTool = $q.defer()
30+
@getDrawTool = ->
31+
@_deferredDrawTool.promise
32+
@getScope = ->
33+
$scope
3234

33-
link: (scope, element, attrs, controller) ->
34-
mapController = controller[0]
35-
leafletScope = mapController.getLeafletScope()
36-
_featureGroup = undefined
37-
_optionsEditedInDirective = false
38-
_deferred = undefined
35+
link: (scope, element, attrs, controller) ->
36+
mapController = controller[0]
37+
leafletScope = mapController.getLeafletScope()
38+
_featureGroup = undefined
39+
_optionsEditedInDirective = false
40+
_deferred = undefined
3941

40-
leafletScope.$watchCollection directiveName, ->
41-
if !_deferred || _deferred.resolvedDefer
42-
_deferred = $q.defer()#temp hack until directiveControls is more flexible
43-
return if _optionsEditedInDirective
42+
leafletScope.$watchCollection directiveName, ->
43+
if !_deferred || _deferred.resolvedDefer
44+
_deferred = $q.defer()#temp hack until directiveControls is more flexible
45+
return if _optionsEditedInDirective
4446

45-
options = leafletScope[directiveName] or {}
47+
options = leafletScope[directiveName] or {}
4648

47-
if options.control?.promises?
48-
options.control.promised _deferred.promise
49+
if options.control?.promises?
50+
options.control.promised _deferred.promise
4951

50-
mapController.getMap().then (map) ->
51-
if _featureGroup
52-
map.removeLayer _featureGroup
52+
mapController.getMap().then (map) ->
53+
if _featureGroup
54+
map.removeLayer _featureGroup
5355

54-
if !isDefined L.Control.Draw
55-
$log.error "#{errorHeader} Leaflet.Draw is not loaded as a plugin."
56-
return
56+
if !isDefined L.Control.Draw
57+
$log.error "#{errorHeader} Leaflet.Draw is not loaded as a plugin."
58+
return
5759

58-
if !isDefined(options.edit) or !isDefined(options.edit.featureGroup)
59-
_optionsEditedInDirective = true
60-
angular.extend options,
61-
edit:
62-
featureGroup: new L.FeatureGroup()
60+
if !isDefined(options.edit) or !isDefined(options.edit.featureGroup)
61+
_optionsEditedInDirective = true
62+
angular.extend options,
63+
edit:
64+
featureGroup: new L.FeatureGroup()
6365

64-
$timeout -> _optionsEditedInDirective = false #skip extra digest due to above mod
66+
$timeout -> _optionsEditedInDirective = false #skip extra digest due to above mod
6567

66-
_featureGroup = options.edit.featureGroup
67-
map.addLayer(_featureGroup)
68-
drawControl = new L.Control.Draw options
68+
_featureGroup = options.edit.featureGroup
69+
map.addLayer(_featureGroup)
70+
drawControl = new L.Control.Draw options
6971

70-
map.addControl drawControl
71-
_deferred.resolvedDefer = true
72-
_deferred.resolve
73-
control: drawControl
74-
map:map
72+
map.addControl drawControl
73+
_deferred.resolvedDefer = true
74+
_deferred.resolve
75+
control: drawControl
76+
map:map
7577

76-
leafletDrawEvents.bindEvents(attrs.id, map, name = null, options, leafletScope, layerName = null, {mapId: attrs.id})
78+
leafletDrawEvents.bindEvents(attrs.id, map, name = null, options, leafletScope, layerName = null, {mapId: attrs.id})
79+
]

0 commit comments

Comments
 (0)