Skip to content
This repository was archived by the owner on Feb 28, 2022. It is now read-only.

Commit 856e236

Browse files
committed
chore(refactor): rename files to follow style guide
1 parent af73f35 commit 856e236

File tree

6 files changed

+46
-66
lines changed

6 files changed

+46
-66
lines changed

src/index.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
import angular from 'angular';
2-
import {module as service} from './leaflet_service.js';
3-
import {module as component} from './leaflet_component.js';
4-
5-
angular.module('angular-leaflet', [
6-
service.name,
7-
component.name
8-
]);
1+
import service from './leaflet.service';
2+
import provider from './leaflet.provider';
3+
import controller from './leaflet.controller';
94

5+
export default angular.module('angular-leaflet', [
6+
]).component('leaflet', {
7+
template: '<div></div>',
8+
controller: controller,
9+
bindings: {
10+
onMapInitialized: '&'
11+
}
12+
}).provider('leafletService', provider)
13+
.service('leafletService', service);

src/leaflet_controller.js renamed to src/leaflet.controller.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ function leafletCtrl($element, leafletService) {
1212
div.attr('class', $element.attr('class'));
1313
};
1414
this.$postLink = function () {
15-
L.Icon.Default.imagePath = leafletService.settings.imagePath;
15+
if (!L.Icon.Default.imagePath && leafletService.settings.imagePath) {
16+
L.Icon.Default.imagePath = leafletService.settings.imagePath;
17+
}
1618
leafletService.data[$ctrl.mapid] = L.map($ctrl.mapid);
1719
leafletService.updateMapFromSettings(leafletService.data[$ctrl.mapid]);
1820
$ctrl.onMapInitialized({map: leafletService.data[$ctrl.mapid]});

src/leaflet.provider.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import LeafletService from './leaflet.service';
2+
3+
function provider() {
4+
var defaultSettings = {
5+
tiles: {
6+
url: "http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png",
7+
options: {
8+
attribution: "&copy; Openstreetmap France | &copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",
9+
maxZoom: 19
10+
}
11+
},
12+
center: {
13+
lat: 47.21117290969667,
14+
lng: -1.5569686889648438,
15+
zoom: 12
16+
}
17+
};
18+
this.settings = {};
19+
this.$get = function factory($compile) {
20+
'ngInject';
21+
var service = new LeafletService($compile);
22+
service.settings = defaultSettings;
23+
for (var pp in this.settings) {
24+
service.settings[pp] = this.settings[pp];
25+
}
26+
return service;
27+
};
28+
}
29+
30+
export default provider;

src/leaflet_service.js renamed to src/leaflet.service.js

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
var module = angular.module('angular-leaflet.service.leaflet', []);
2-
3-
var factory = module.provider('leafletService', provider);
4-
51
function LeafletService($compile) {
62
'ngInject';
73
this.settings = {};
@@ -45,33 +41,5 @@ function LeafletService($compile) {
4541
};
4642

4743
}
48-
function provider() {
49-
var defaultSettings = {
50-
tiles: {
51-
url: "http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png",
52-
options: {
53-
attribution: "&copy; Openstreetmap France | &copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",
54-
maxZoom: 19
55-
}
56-
},
57-
center: {
58-
lat: 47.21117290969667,
59-
lng: -1.5569686889648438,
60-
zoom: 12
61-
}
62-
};
63-
this.settings = {};
64-
this.$get = function factory($compile) {
65-
'ngInject';
66-
var service = new LeafletService($compile);
67-
service.settings = defaultSettings;
68-
for (var pp in this.settings) {
69-
service.settings[pp] = this.settings[pp];
70-
}
71-
return service;
72-
};
73-
}
7444

75-
export {
76-
module
77-
};
45+
export default LeafletService;

src/leaflet_component.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

webpack.config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ module.exports = {
2020
}
2121
]
2222
},
23-
externals: {
24-
'angular': 'angular',
25-
'leaflet': 'L'
26-
},
2723
devServer: {
2824
contentBase: __dirname,
2925
//hot: true,

0 commit comments

Comments
 (0)