Skip to content

Commit 473d069

Browse files
rbrundrittrbrundritt
committed
Code clean up
1 parent a3021da commit 473d069

File tree

4 files changed

+87
-77
lines changed

4 files changed

+87
-77
lines changed

‎dist/azure-maps-selection-control.js

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30111,10 +30111,12 @@ MIT License
3011130111
}
3011230112
var self = this;
3011330113
self._map = map;
30114-
self._marker.setOptions({ visible: self._options.isVisible });
30115-
map.markers.add(self._marker);
30116-
map.events.add('dragstart', self._marker, self._onMarkerDargStart);
30117-
map.events.add('dragend', self._marker, self._onMarkerDragged);
30114+
var marker = self._marker;
30115+
marker.setOptions({ visible: self._options.isVisible });
30116+
map.markers.add(marker);
30117+
var mapEvents = map.events;
30118+
mapEvents.add('dragstart', marker, self._onMarkerDargStart);
30119+
mapEvents.add('dragend', marker, self._onMarkerDragged);
3011830120
//Get the resource file for the maps language.
3011930121
var resx = Localization.getResource(map.getStyle().language);
3012030122
self._resx = resx;
@@ -30133,20 +30135,24 @@ MIT License
3013330135
*/
3013430136
RouteRangeControl.prototype.onRemove = function () {
3013530137
var self = this;
30136-
if (self._container) {
30137-
self._container.removeEventListener('keydown', this._onContainerKeyDown);
30138-
self._container.remove();
30138+
var container = self._container;
30139+
if (container) {
30140+
container.removeEventListener('keydown', this._onContainerKeyDown);
30141+
container.remove();
3013930142
self._container = null;
3014030143
}
3014130144
if (self._binding) {
3014230145
self._binding.dispose();
3014330146
self._binding = null;
3014430147
}
3014530148
self._styler.updateMap(null);
30146-
self._map.events.remove('resize', self._mapResized);
30147-
self._map.events.remove('dragstart', self._marker, self._onMarkerDargStart);
30148-
self._map.events.remove('dragend', self._marker, self._onMarkerDragged);
30149-
self._map.markers.remove(self._marker);
30149+
var map = self._map;
30150+
var mapEvents = map.events;
30151+
var marker = self._marker;
30152+
mapEvents.remove('resize', self._mapResized);
30153+
mapEvents.remove('dragstart', marker, self._onMarkerDargStart);
30154+
mapEvents.remove('dragend', marker, self._onMarkerDragged);
30155+
map.markers.remove(marker);
3015030156
self._map = null;
3015130157
};
3015230158
/**
@@ -30354,23 +30360,17 @@ MIT License
3035430360
self.clear();
3035530361
var source = self._options.source;
3035630362
if (source && searchArea) {
30357-
var shapes = void 0;
30358-
if (self._options.shapeSelectionMode === 'point') {
30359-
shapes = MapMath.shapePointsWithinPolygon(source.getShapes(), searchArea);
30360-
}
30361-
else {
30362-
shapes = MapMath.shapesIntersectPolygon(source.getShapes(), searchArea);
30363-
}
30364-
self._invokeEvent('dataselected', shapes);
30363+
self._invokeEvent('dataselected', MapMath.shapesIntersectPolygon(source.getShapes(), searchArea));
3036530364
}
3036630365
//Allow a bit of a delay before removing the drawn area.
3036730366
self._drawingManager.setOptions({ mode: 'idle' });
3036830367
};
3036930368
/** Event handler for when the map resizes. */
3037030369
_this._mapResized = function () {
30371-
var minSize = _this._options.routeRangeMinMapSize;
30372-
var mapSize = _this._map.getMapContainer().getBoundingClientRect();
30373-
_this._routeRangeBtn.style.display = (mapSize.width >= minSize[0] && mapSize.height >= minSize[1]) ? '' : 'none';
30370+
var self = _this;
30371+
var minSize = self._options.routeRangeMinMapSize;
30372+
var mapSize = self._map.getMapContainer().getBoundingClientRect();
30373+
self._routeRangeBtn.style.display = (mapSize.width >= minSize[0] && mapSize.height >= minSize[1]) ? '' : 'none';
3037430374
};
3037530375
_this._options = Object.assign(_this._options, options || {});
3037630376
_this._rangeDataSource = new azmaps.source.DataSource(null, {
@@ -30466,24 +30466,27 @@ MIT License
3046630466
*/
3046730467
SelectionControl.prototype.onRemove = function () {
3046830468
var self = this;
30469+
var map = self._map;
3046930470
self.clear();
3047030471
if (self._container) {
3047130472
self._container.remove();
3047230473
self._container = null;
3047330474
}
30474-
if (self._map) {
30475-
if (self._rangeControl) {
30476-
self._map.events.remove('showrange', self._rangeControl, self._displayRangePolygon);
30477-
self._map.events.remove('rangecalculated', self._rangeControl, self._searchArea);
30478-
self._map.controls.remove(self._rangeControl);
30475+
if (map) {
30476+
var mapEvents = map.events;
30477+
var rangeControl = self._rangeControl;
30478+
if (rangeControl) {
30479+
mapEvents.remove('showrange', rangeControl, self._displayRangePolygon);
30480+
mapEvents.remove('rangecalculated', rangeControl, self._searchArea);
30481+
map.controls.remove(rangeControl);
3047930482
self._rangeControl = null;
3048030483
}
30481-
self._map.events.remove('resize', self._mapResized);
30482-
self._map.sources.remove(self._rangeDataSource);
30484+
mapEvents.remove('resize', self._mapResized);
30485+
map.sources.remove(self._rangeDataSource);
3048330486
//TODO: WORKAROUND: Remove the following event when the drawing tools properly support polygon preview.
30484-
self._map.events.remove('drawingchanged', self._drawingManager, self._copyDrawnShape);
30487+
mapEvents.remove('drawingchanged', self._drawingManager, self._copyDrawnShape);
3048530488
if (self._rangeLayers) {
30486-
self._map.layers.remove(self._rangeLayers);
30489+
map.layers.remove(self._rangeLayers);
3048730490
}
3048830491
}
3048930492
self._styler.updateMap(null);
@@ -30572,7 +30575,7 @@ MIT License
3057230575
var rangeOptions = {
3057330576
isVisible: false,
3057430577
markerOptions: {
30575-
color: self._options.fillColor
30578+
color: opts.fillColor
3057630579
},
3057730580
style: opts.style || azmaps.ControlStyle.light,
3057830581
collapsible: true,
@@ -30585,12 +30588,13 @@ MIT License
3058530588
Object.assign(rangeOptions, opts.routeRangeOptions);
3058630589
}
3058730590
var routeRangeControl = new RouteRangeControl(rangeOptions);
30588-
self._map.controls.add(routeRangeControl);
30591+
var map = self._map;
30592+
map.controls.add(routeRangeControl);
3058930593
self._rangeControl = routeRangeControl;
30590-
self._map.events.add('resize', self._mapResized);
30594+
map.events.add('resize', self._mapResized);
3059130595
self._mapResized();
30592-
self._map.events.add('rangecalculated', self._rangeControl, self._searchArea);
30593-
self._map.events.add('showrange', self._rangeControl, self._displayRangePolygon);
30596+
map.events.add('rangecalculated', routeRangeControl, self._searchArea);
30597+
map.events.add('showrange', routeRangeControl, self._displayRangePolygon);
3059430598
};
3059530599
/**
3059630600
* Creates selection mode buttons.
@@ -30599,7 +30603,6 @@ MIT License
3059930603
* @param resx Resources.
3060030604
*/
3060130605
SelectionControl.prototype._buildSelectModeBtn = function (name, btnClass, resx) {
30602-
var _this = this;
3060330606
var btn = Utils.createElm('button', {
3060430607
attr: {
3060530608
type: 'button'
@@ -30611,7 +30614,7 @@ MIT License
3061130614
btn.onclick = function () {
3061230615
self.clear();
3061330616
if (name === 'routeRange') {
30614-
_this._rangeControl.setVisible(true);
30617+
self._rangeControl.setVisible(true);
3061530618
}
3061630619
else {
3061730620
self._drawingManager.setOptions({

‎dist/azure-maps-selection-control.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/control/RouteRangeControl.ts

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,13 @@ export class RouteRangeControl extends azmaps.internal.EventEmitter<RouteRangeCo
282282
const self = this;
283283
self._map = map;
284284

285-
self._marker.setOptions({ visible: self._options.isVisible });
286-
map.markers.add(self._marker);
287-
map.events.add('dragstart', self._marker, self._onMarkerDargStart);
288-
map.events.add('dragend', self._marker, self._onMarkerDragged);
285+
const marker = self._marker;
286+
marker.setOptions({ visible: self._options.isVisible });
287+
map.markers.add(marker);
288+
289+
const mapEvents = map.events;
290+
mapEvents.add('dragstart', marker, self._onMarkerDargStart);
291+
mapEvents.add('dragend', marker, self._onMarkerDragged);
289292

290293
//Get the resource file for the maps language.
291294
const resx = Localization.getResource(map.getStyle().language);
@@ -308,10 +311,11 @@ export class RouteRangeControl extends azmaps.internal.EventEmitter<RouteRangeCo
308311
*/
309312
public onRemove(): void {
310313
const self = this;
314+
const container = self._container;
311315

312-
if (self._container) {
313-
self._container.removeEventListener('keydown', this._onContainerKeyDown);
314-
self._container.remove();
316+
if (container) {
317+
container.removeEventListener('keydown', this._onContainerKeyDown);
318+
container.remove();
315319
self._container = null;
316320
}
317321

@@ -321,10 +325,15 @@ export class RouteRangeControl extends azmaps.internal.EventEmitter<RouteRangeCo
321325
}
322326

323327
self._styler.updateMap(null);
324-
self._map.events.remove('resize', self._mapResized);
325-
self._map.events.remove('dragstart', self._marker, self._onMarkerDargStart);
326-
self._map.events.remove('dragend', self._marker, self._onMarkerDragged);
327-
self._map.markers.remove(self._marker);
328+
329+
const map = self._map;
330+
const mapEvents = map.events;
331+
const marker = self._marker;
332+
333+
mapEvents.remove('resize', self._mapResized);
334+
mapEvents.remove('dragstart', marker, self._onMarkerDargStart);
335+
mapEvents.remove('dragend', marker, self._onMarkerDragged);
336+
map.markers.remove(marker);
328337
self._map = null;
329338
}
330339

‎src/control/SelectionControl.ts

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export class SelectionControl extends azmaps.internal.EventEmitter<SelectionCont
184184
*/
185185
public onRemove(): void {
186186
const self = this;
187+
const map = self._map;
187188

188189
self.clear();
189190

@@ -192,22 +193,25 @@ export class SelectionControl extends azmaps.internal.EventEmitter<SelectionCont
192193
self._container = null;
193194
}
194195

195-
if(self._map){
196-
if(self._rangeControl){
197-
self._map.events.remove('showrange', self._rangeControl, self._displayRangePolygon);
198-
self._map.events.remove('rangecalculated', self._rangeControl, self._searchArea);
199-
self._map.controls.remove(self._rangeControl);
196+
if(map){
197+
const mapEvents = map.events;
198+
const rangeControl = self._rangeControl;
199+
200+
if(rangeControl){
201+
mapEvents.remove('showrange', rangeControl, self._displayRangePolygon);
202+
mapEvents.remove('rangecalculated', rangeControl, self._searchArea);
203+
map.controls.remove(rangeControl);
200204
self._rangeControl = null;
201205
}
202206

203-
self._map.events.remove('resize', self._mapResized);
204-
self._map.sources.remove(self._rangeDataSource);
207+
mapEvents.remove('resize', self._mapResized);
208+
map.sources.remove(self._rangeDataSource);
205209

206210
//TODO: WORKAROUND: Remove the following event when the drawing tools properly support polygon preview.
207-
self._map.events.remove('drawingchanged', self._drawingManager, self._copyDrawnShape);
211+
mapEvents.remove('drawingchanged', self._drawingManager, self._copyDrawnShape);
208212

209213
if(self._rangeLayers){
210-
self._map.layers.remove(self._rangeLayers);
214+
map.layers.remove(self._rangeLayers);
211215
}
212216
}
213217

@@ -325,7 +329,7 @@ export class SelectionControl extends azmaps.internal.EventEmitter<SelectionCont
325329
const rangeOptions: RouteRangeControlOptions = {
326330
isVisible: false,
327331
markerOptions: {
328-
color: self._options.fillColor
332+
color: opts.fillColor
329333
},
330334
style: opts.style || azmaps.ControlStyle.light,
331335
collapsible: true,
@@ -342,15 +346,16 @@ export class SelectionControl extends azmaps.internal.EventEmitter<SelectionCont
342346

343347
const routeRangeControl = new RouteRangeControl(rangeOptions);
344348

345-
self._map.controls.add(routeRangeControl);
349+
const map = self._map;
350+
map.controls.add(routeRangeControl);
346351

347352
self._rangeControl = routeRangeControl;
348353

349-
self._map.events.add('resize', self._mapResized);
354+
map.events.add('resize', self._mapResized);
350355
self._mapResized();
351356

352-
self._map.events.add('rangecalculated', self._rangeControl, self._searchArea);
353-
self._map.events.add('showrange', self._rangeControl, self._displayRangePolygon);
357+
map.events.add('rangecalculated', routeRangeControl, self._searchArea);
358+
map.events.add('showrange', routeRangeControl, self._displayRangePolygon);
354359
}
355360

356361
/**
@@ -370,15 +375,7 @@ export class SelectionControl extends azmaps.internal.EventEmitter<SelectionCont
370375
const source = self._options.source;
371376

372377
if(source && searchArea){
373-
let shapes: azmaps.Shape[];
374-
375-
if(self._options.shapeSelectionMode === 'point'){
376-
shapes = MapMath.shapePointsWithinPolygon(source.getShapes(), searchArea);
377-
} else {
378-
shapes = MapMath.shapesIntersectPolygon(source.getShapes(), searchArea);
379-
}
380-
381-
self._invokeEvent('dataselected', shapes);
378+
self._invokeEvent('dataselected', MapMath.shapesIntersectPolygon(source.getShapes(), searchArea));
382379
}
383380

384381
//Allow a bit of a delay before removing the drawn area.
@@ -406,7 +403,7 @@ export class SelectionControl extends azmaps.internal.EventEmitter<SelectionCont
406403
self.clear();
407404

408405
if(name === 'routeRange') {
409-
this._rangeControl.setVisible(true);
406+
self._rangeControl.setVisible(true);
410407
} else {
411408
self._drawingManager.setOptions({
412409
mode: <azmdraw.drawing.DrawingMode>('draw-' + name)
@@ -419,9 +416,10 @@ export class SelectionControl extends azmaps.internal.EventEmitter<SelectionCont
419416

420417
/** Event handler for when the map resizes. */
421418
private _mapResized = () => {
422-
const minSize = this._options.routeRangeMinMapSize;
423-
const mapSize = this._map.getMapContainer().getBoundingClientRect();
419+
const self = this;
420+
const minSize = self._options.routeRangeMinMapSize;
421+
const mapSize = self._map.getMapContainer().getBoundingClientRect();
424422

425-
this._routeRangeBtn.style.display = (mapSize.width >= minSize[0] && mapSize.height >= minSize[1])? '': 'none';
423+
self._routeRangeBtn.style.display = (mapSize.width >= minSize[0] && mapSize.height >= minSize[1])? '': 'none';
426424
};
427425
}

0 commit comments

Comments
 (0)