Skip to content
This repository was archived by the owner on Sep 20, 2019. It is now read-only.

Commit 2eea5a8

Browse files
elesdoarelesdoar
committed
refactor(layers): drop support for layers in ui-leaflet-layers
1 parent 47b9d84 commit 2eea5a8

File tree

7 files changed

+23
-781
lines changed

7 files changed

+23
-781
lines changed

‎dist/ui-leaflet.js‎

Lines changed: 7 additions & 259 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* ui-leaflet 1.0.0 2016-08-22
2+
* ui-leaflet 1.0.0 2016-09-27
33
* ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
44
* git: https://github.com/angular-ui/ui-leaflet
55
*/
@@ -1109,114 +1109,6 @@ angular.module('ui-leaflet').service('leafletHelpers', ["$q", "$log", "$timeout"
11091109
}
11101110
}
11111111
},
1112-
LeafletProviderPlugin: {
1113-
isLoaded: function isLoaded() {
1114-
return angular.isDefined(L.TileLayer.Provider);
1115-
},
1116-
is: function is(layer) {
1117-
if (this.isLoaded()) {
1118-
return layer instanceof L.TileLayer.Provider;
1119-
} else {
1120-
return false;
1121-
}
1122-
}
1123-
},
1124-
AGSBaseLayerPlugin: {
1125-
isLoaded: function isLoaded() {
1126-
return L.esri !== undefined && L.esri.basemapLayer !== undefined;
1127-
},
1128-
is: function is(layer) {
1129-
if (this.isLoaded()) {
1130-
return layer instanceof L.esri.basemapLayer;
1131-
} else {
1132-
return false;
1133-
}
1134-
}
1135-
},
1136-
AGSLayerPlugin: {
1137-
isLoaded: function isLoaded() {
1138-
return lvector !== undefined && lvector.AGS !== undefined;
1139-
},
1140-
is: function is(layer) {
1141-
if (this.isLoaded()) {
1142-
return layer instanceof lvector.AGS;
1143-
} else {
1144-
return false;
1145-
}
1146-
}
1147-
},
1148-
AGSFeatureLayerPlugin: {
1149-
isLoaded: function isLoaded() {
1150-
return L.esri !== undefined && L.esri.featureLayer !== undefined;
1151-
},
1152-
is: function is(layer) {
1153-
if (this.isLoaded()) {
1154-
return layer instanceof L.esri.featureLayer;
1155-
} else {
1156-
return false;
1157-
}
1158-
}
1159-
},
1160-
AGSTiledMapLayerPlugin: {
1161-
isLoaded: function isLoaded() {
1162-
return L.esri !== undefined && L.esri.tiledMapLayer !== undefined;
1163-
},
1164-
is: function is(layer) {
1165-
if (this.isLoaded()) {
1166-
return layer instanceof L.esri.tiledMapLayer;
1167-
} else {
1168-
return false;
1169-
}
1170-
}
1171-
},
1172-
AGSDynamicMapLayerPlugin: {
1173-
isLoaded: function isLoaded() {
1174-
return L.esri !== undefined && L.esri.dynamicMapLayer !== undefined;
1175-
},
1176-
is: function is(layer) {
1177-
if (this.isLoaded()) {
1178-
return layer instanceof L.esri.dynamicMapLayer;
1179-
} else {
1180-
return false;
1181-
}
1182-
}
1183-
},
1184-
AGSImageMapLayerPlugin: {
1185-
isLoaded: function isLoaded() {
1186-
return L.esri !== undefined && L.esri.imageMapLayer !== undefined;
1187-
},
1188-
is: function is(layer) {
1189-
if (this.isLoaded()) {
1190-
return layer instanceof L.esri.imageMapLayer;
1191-
} else {
1192-
return false;
1193-
}
1194-
}
1195-
},
1196-
AGSClusteredLayerPlugin: {
1197-
isLoaded: function isLoaded() {
1198-
return L.esri !== undefined && L.esri.clusteredFeatureLayer !== undefined;
1199-
},
1200-
is: function is(layer) {
1201-
if (this.isLoaded()) {
1202-
return layer instanceof L.esri.clusteredFeatureLayer;
1203-
} else {
1204-
return false;
1205-
}
1206-
}
1207-
},
1208-
AGSHeatmapLayerPlugin: {
1209-
isLoaded: function isLoaded() {
1210-
return L.esri !== undefined && L.esri.heatmapFeatureLayer !== undefined;
1211-
},
1212-
is: function is(layer) {
1213-
if (this.isLoaded()) {
1214-
return layer instanceof L.esri.heatmapFeatureLayer;
1215-
} else {
1216-
return false;
1217-
}
1218-
}
1219-
},
12201112
GeoJSONPlugin: {
12211113
isLoaded: function isLoaded() {
12221114
return angular.isDefined(L.TileLayer.GeoJSON);
@@ -1531,17 +1423,6 @@ angular.module('ui-leaflet').factory('leafletLayerHelpers', ["$rootScope", "$q",
15311423
return L.tileLayer(params.url, params.options);
15321424
}
15331425
},
1534-
mapbox: {
1535-
mustHaveKey: true,
1536-
createLayer: function createLayer(params) {
1537-
var version = 3;
1538-
if (isDefined(params.options.version) && params.options.version === 4) {
1539-
version = params.options.version;
1540-
}
1541-
var url = version === 3 ? '//{s}.tiles.mapbox.com/v3/' + params.key + '/{z}/{x}/{y}.png' : '//api.tiles.mapbox.com/v4/' + params.key + '/{z}/{x}/{y}.png?access_token=' + params.apiKey;
1542-
return L.tileLayer(url, params.options);
1543-
}
1544-
},
15451426
geoJSON: {
15461427
mustHaveUrl: true,
15471428
createLayer: function createLayer(params) {
@@ -1659,139 +1540,6 @@ angular.module('ui-leaflet').factory('leafletLayerHelpers', ["$rootScope", "$q",
16591540
return L.featureGroup();
16601541
}
16611542
},
1662-
here: {
1663-
mustHaveUrl: false,
1664-
createLayer: function createLayer(params) {
1665-
var provider = params.provider || 'HERE.terrainDay';
1666-
if (!Helpers.LeafletProviderPlugin.isLoaded()) {
1667-
return;
1668-
}
1669-
return new L.TileLayer.Provider(provider, params.options);
1670-
}
1671-
},
1672-
agsBase: {
1673-
mustHaveLayer: true,
1674-
createLayer: function createLayer(params) {
1675-
if (!Helpers.AGSBaseLayerPlugin.isLoaded()) {
1676-
return;
1677-
}
1678-
return L.esri.basemapLayer(params.layer, params.options);
1679-
}
1680-
},
1681-
ags: {
1682-
mustHaveUrl: true,
1683-
createLayer: function createLayer(params) {
1684-
if (!Helpers.AGSLayerPlugin.isLoaded()) {
1685-
return;
1686-
}
1687-
1688-
var options = angular.copy(params.options);
1689-
angular.extend(options, {
1690-
url: params.url
1691-
});
1692-
var layer = new lvector.AGS(options);
1693-
layer.onAdd = function (map) {
1694-
this.setMap(map);
1695-
};
1696-
layer.onRemove = function () {
1697-
this.setMap(null);
1698-
};
1699-
return layer;
1700-
}
1701-
},
1702-
agsFeature: {
1703-
mustHaveUrl: true,
1704-
createLayer: function createLayer(params) {
1705-
if (!Helpers.AGSFeatureLayerPlugin.isLoaded()) {
1706-
$log.warn(errorHeader + ' The esri plugin is not loaded.');
1707-
return;
1708-
}
1709-
1710-
params.options.url = params.url;
1711-
1712-
var layer = L.esri.featureLayer(params.options);
1713-
var load = function load() {
1714-
if (isDefined(params.options.loadedDefer)) {
1715-
params.options.loadedDefer.resolve();
1716-
}
1717-
};
1718-
layer.on('loading', function () {
1719-
params.options.loadedDefer = $q.defer();
1720-
layer.off('load', load);
1721-
layer.on('load', load);
1722-
});
1723-
1724-
return layer;
1725-
}
1726-
},
1727-
agsTiled: {
1728-
mustHaveUrl: true,
1729-
createLayer: function createLayer(params) {
1730-
if (!Helpers.AGSTiledMapLayerPlugin.isLoaded()) {
1731-
$log.warn(errorHeader + ' The esri plugin is not loaded.');
1732-
return;
1733-
}
1734-
1735-
params.options.url = params.url;
1736-
1737-
return L.esri.tiledMapLayer(params.options);
1738-
}
1739-
},
1740-
agsDynamic: {
1741-
mustHaveUrl: true,
1742-
createLayer: function createLayer(params) {
1743-
if (!Helpers.AGSDynamicMapLayerPlugin.isLoaded()) {
1744-
$log.warn(errorHeader + ' The esri plugin is not loaded.');
1745-
return;
1746-
}
1747-
1748-
params.options.url = params.url;
1749-
1750-
return L.esri.dynamicMapLayer(params.options);
1751-
}
1752-
},
1753-
agsImage: {
1754-
mustHaveUrl: true,
1755-
createLayer: function createLayer(params) {
1756-
if (!Helpers.AGSImageMapLayerPlugin.isLoaded()) {
1757-
$log.warn(errorHeader + ' The esri plugin is not loaded.');
1758-
return;
1759-
}
1760-
params.options.url = params.url;
1761-
1762-
return L.esri.imageMapLayer(params.options);
1763-
}
1764-
},
1765-
agsClustered: {
1766-
mustHaveUrl: true,
1767-
createLayer: function createLayer(params) {
1768-
if (!Helpers.AGSClusteredLayerPlugin.isLoaded()) {
1769-
$log.warn(errorHeader + ' The esri clustered layer plugin is not loaded.');
1770-
return;
1771-
}
1772-
1773-
if (!Helpers.MarkerClusterPlugin.isLoaded()) {
1774-
$log.warn(errorHeader + ' The markercluster plugin is not loaded.');
1775-
return;
1776-
}
1777-
return L.esri.clusteredFeatureLayer(params.url, params.options);
1778-
}
1779-
},
1780-
agsHeatmap: {
1781-
mustHaveUrl: true,
1782-
createLayer: function createLayer(params) {
1783-
if (!Helpers.AGSHeatmapLayerPlugin.isLoaded()) {
1784-
$log.warn(errorHeader + ' The esri heatmap layer plugin is not loaded.');
1785-
return;
1786-
}
1787-
1788-
if (!Helpers.HeatLayerPlugin.isLoaded()) {
1789-
$log.warn(errorHeader + ' The heatlayer plugin is not loaded.');
1790-
return;
1791-
}
1792-
return L.esri.heatmapFeatureLayer(params.url, params.options);
1793-
}
1794-
},
17951543
markercluster: {
17961544
mustHaveUrl: false,
17971545
createLayer: function createLayer(params) {
@@ -4489,12 +4237,12 @@ angular.module('ui-leaflet').directive('markers', ["leafletLogger", "$rootScope"
44894237
var pass = _maybeAddMarkerToLayer(layerName, layers, model, marker, watchOptions.individual.type, map);
44904238
if (!pass) return; //something went wrong move on in the loop
44914239
} else if (!isDefined(model.group)) {
4492-
// We do not have a layer attr, so the marker goes to the map layer
4493-
map.addLayer(marker);
4494-
if (watchOptions.individual.type === null && model.focus === true) {
4495-
marker.openPopup();
4496-
}
4240+
// We do not have a layer attr, so the marker goes to the map layer
4241+
map.addLayer(marker);
4242+
if (watchOptions.individual.type === null && model.focus === true) {
4243+
marker.openPopup();
44974244
}
4245+
}
44984246

44994247
if (watchOptions.individual.type !== null) {
45004248
addMarkerWatcher(marker, pathToMarker, leafletScope, layers, map, watchOptions.individual);
@@ -5301,7 +5049,7 @@ angular.module('ui-leaflet').factory('leafletMarkerEvents', ["$rootScope", "$q",
53015049

53025050
'use strict';
53035051

5304-
function _typeof(obj) { return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj; }
5052+
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
53055053

53065054
angular.module('ui-leaflet').factory('leafletPathEvents', ["$rootScope", "$q", "leafletLogger", "leafletHelpers", "leafletLabelEvents", "leafletEventsHelpers", function ($rootScope, $q, leafletLogger, leafletHelpers, leafletLabelEvents, leafletEventsHelpers) {
53075055
var isDefined = leafletHelpers.isDefined,

‎dist/ui-leaflet.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/ui-leaflet.min.no-header.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)