Skip to content

Commit e04e9bb

Browse files
nblunblu
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: dist/angular-leaflet-directive.min.js
2 parents 4eef2c9 + 2a70a08 commit e04e9bb

File tree

60 files changed

+251
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+251
-125
lines changed

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Running "karma:unit" (karma) task
9898
INFO [karma]: Karma v0.10.8 server started at http://localhost:9018/
9999
INFO [launcher]: Starting browser PhantomJS
100100
INFO [PhantomJS 1.9.2 (Linux)]: Connected on socket WUeY410y1MZhG5OYnoyc
101-
WARN [web-server]: 404: /base/bower_components/leaflet-dist/images/marker-icon.png
102-
WARN [web-server]: 404: /base/bower_components/leaflet-dist/images/marker-shadow.png
101+
WARN [web-server]: 404: /base/bower_components/leaflet/dist/images/marker-icon.png
102+
WARN [web-server]: 404: /base/bower_components/leaflet/dist/images/marker-shadow.png
103103
WARN [web-server]: 404: /url
104104
PhantomJS 1.9.2 (Linux): Executed 108 of 108 SUCCESS (0.875 secs / 0.625 secs)
105105

‎bower.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
],
1313
"dependencies": {
1414
"angular": "1.2.x",
15-
"leaflet-dist": "0.7.x"
15+
"leaflet": "0.7.x"
1616
},
1717
"devDependencies": {
1818
"jquery": "2.1.x",
1919
"bootstrap": "3.1.x",
2020
"angular-route": "1.2.x",
2121
"angular-animate": "1.2.x",
2222
"angular-mocks": "1.2.x",
23-
"leaflet.markerclusterer": "0.4",
23+
"leaflet.markercluster": "0.4",
2424
"leaflet.draw": "0.2.2",
2525
"Leaflet.label": "0.2.1",
2626
"leaflet-tilelayer-geojson": "*",
@@ -29,7 +29,8 @@
2929
"leaflet-plugins": "1.0.1",
3030
"esri-leaflet": "0.0.1-beta.4",
3131
"proj4": "~2.1.2",
32-
"proj4leaflet": "~0.7.0"
32+
"proj4leaflet": "~0.7.0",
33+
"Leaflet.MakiMarkers": "~1.0.1"
3334
},
3435
"ignore": [
3536
"**/.*",
@@ -42,4 +43,4 @@
4243
"package.json",
4344
"bower.json"
4445
]
45-
}
46+
}

‎dist/angular-leaflet-directive.js‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2359,14 +2359,20 @@
23592359
'leafletHelpers',
23602360
'$log',
23612361
function ($rootScope, leafletHelpers, $log) {
2362-
var isDefined = leafletHelpers.isDefined, MarkerClusterPlugin = leafletHelpers.MarkerClusterPlugin, AwesomeMarkersPlugin = leafletHelpers.AwesomeMarkersPlugin, safeApply = leafletHelpers.safeApply, Helpers = leafletHelpers, isString = leafletHelpers.isString, isNumber = leafletHelpers.isNumber, isObject = leafletHelpers.isObject, groups = {};
2362+
var isDefined = leafletHelpers.isDefined, MarkerClusterPlugin = leafletHelpers.MarkerClusterPlugin, AwesomeMarkersPlugin = leafletHelpers.AwesomeMarkersPlugin, MakiMarkersPlugin = leafletHelpers.MakiMarkersPlugin, safeApply = leafletHelpers.safeApply, Helpers = leafletHelpers, isString = leafletHelpers.isString, isNumber = leafletHelpers.isNumber, isObject = leafletHelpers.isObject, groups = {};
23632363
var createLeafletIcon = function (iconData) {
23642364
if (isDefined(iconData) && isDefined(iconData.type) && iconData.type === 'awesomeMarker') {
23652365
if (!AwesomeMarkersPlugin.isLoaded()) {
23662366
$log.error('[AngularJS - Leaflet] The AwesomeMarkers Plugin is not loaded.');
23672367
}
23682368
return new L.AwesomeMarkers.icon(iconData);
23692369
}
2370+
if (isDefined(iconData) && isDefined(iconData.type) && iconData.type === 'makiMarker') {
2371+
if (!MakiMarkersPlugin.isLoaded()) {
2372+
$log.error('[AngularJS - Leaflet] The MakiMarkers Plugin is not loaded.');
2373+
}
2374+
return new L.MakiMarkers.icon(iconData);
2375+
}
23702376
if (isDefined(iconData) && isDefined(iconData.type) && iconData.type === 'div') {
23712377
return new L.divIcon(iconData);
23722378
}
@@ -2774,6 +2780,32 @@
27742780
}
27752781
}
27762782
},
2783+
MakiMarkersPlugin: {
2784+
isLoaded: function () {
2785+
if (angular.isDefined(L.MakiMarkers) && angular.isDefined(L.MakiMarkers.Icon)) {
2786+
return true;
2787+
} else {
2788+
return false;
2789+
}
2790+
},
2791+
is: function (icon) {
2792+
if (this.isLoaded()) {
2793+
return icon instanceof L.MakiMarkers.Icon;
2794+
} else {
2795+
return false;
2796+
}
2797+
},
2798+
equal: function (iconA, iconB) {
2799+
if (!this.isLoaded()) {
2800+
return false;
2801+
}
2802+
if (this.is(iconA)) {
2803+
return angular.equals(iconA, iconB);
2804+
} else {
2805+
return false;
2806+
}
2807+
}
2808+
},
27772809
LabelPlugin: {
27782810
isLoaded: function () {
27792811
return angular.isDefined(L.Label);

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

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

‎examples/access-leaflet-object-example.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<html ng-app="demoapp">
33
<head>
44
<script src="../bower_components/angular/angular.min.js"></script>
5-
<script src="../bower_components/leaflet-dist/leaflet.js"></script>
5+
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
66
<script src="../dist/angular-leaflet-directive.min.js"></script>
7-
<link rel="stylesheet" href="../bower_components/leaflet-dist/leaflet.css" />
7+
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
88
<script>
99
var app = angular.module("demoapp", ["leaflet-directive"]);
1010
app.controller("DemoController", [ "$scope", "$log", "leafletData", function($scope, $log, leafletData) {

‎examples/add-remove-map-example.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<script src="../bower_components/angular/angular.min.js"></script>
55
<script src="../bower_components/angular-route/angular-route.min.js"></script>
6-
<script src="../bower_components/leaflet-dist/leaflet.js"></script>
6+
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
77
<script src="../dist/angular-leaflet-directive.min.js"></script>
8-
<link rel="stylesheet" href="../bower_components/leaflet-dist/leaflet.css" />
8+
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
99
<style>
1010
.angular-leaflet-map {
1111
width: 480px;

‎examples/bounds-example.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<script src="../bower_components/angular/angular.min.js"></script>
55
<script src="../bower_components/angular-route/angular-route.min.js"></script>
6-
<script src="../bower_components/leaflet-dist/leaflet.js"></script>
6+
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
77
<script src="../dist/angular-leaflet-directive.min.js"></script>
8-
<link rel="stylesheet" href="../bower_components/leaflet-dist/leaflet.css" />
8+
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
99
<script>
1010
var app = angular.module("demoapp", ["leaflet-directive"]);
1111
app.controller("DemoController", [ "$scope", "leafletData", "leafletBoundsHelpers", function($scope, leafletData, leafletBoundsHelpers) {

‎examples/center-autodiscover-example.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<script src="../bower_components/angular/angular.min.js"></script>
55
<script src="../bower_components/angular-route/angular-route.min.js"></script>
6-
<script src="../bower_components/leaflet-dist/leaflet.js"></script>
6+
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
77
<script src="../dist/angular-leaflet-directive.min.js"></script>
8-
<link rel="stylesheet" href="../bower_components/leaflet-dist/leaflet.css" />
8+
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
99
<meta charset="UTF-8">
1010
<script>
1111
var app = angular.module('demoapp', ['leaflet-directive']);

‎examples/center-example.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<html ng-app="demoapp">
33
<head>
44
<script src="../bower_components/angular/angular.min.js"></script>
5-
<script src="../bower_components/leaflet-dist/leaflet.js"></script>
5+
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
66
<script src="../dist/angular-leaflet-directive.min.js"></script>
7-
<link rel="stylesheet" href="../bower_components/leaflet-dist/leaflet.css" />
7+
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
88
<script>
99
var app = angular.module('demoapp', ['leaflet-directive']);
1010
app.controller('DemoController', [ '$scope', function($scope) {

‎examples/control-draw-example.html‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,36 @@
22
<html ng-app="demoapp">
33
<head>
44
<script src="../bower_components/angular/angular.min.js"></script>
5-
<script src="../bower_components/leaflet-dist/leaflet.js"></script>
5+
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
66
<script src="../dist/angular-leaflet-directive.min.js"></script>
77
<script src="../bower_components/leaflet.draw/dist/leaflet.draw.js"></script>
8-
<link rel="stylesheet" href="../bower_components/leaflet-dist/leaflet.css" />
8+
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
99
<link rel="stylesheet" href="../bower_components/leaflet.draw/dist/leaflet.draw.css" />
1010
<script>
1111
var app = angular.module("demoapp", ["leaflet-directive"]);
1212
app.controller("DemoController", [ "$scope", "leafletData", function($scope, leafletData) {
13+
var drawnItems = new L.FeatureGroup(),
14+
options = { edit: { featureGroup: drawnItems } },
15+
drawControl = new L.Control.Draw(options);
16+
1317
angular.extend($scope, {
1418
london: {
1519
lat: 51.505,
1620
lng: -0.09,
1721
zoom: 4
1822
},
1923
controls: {
20-
draw: {
21-
}
24+
custom: [ drawControl ]
2225
}
2326
});
2427
leafletData.getMap().then(function(map) {
25-
map.on('draw:created', function (e) {
26-
var layer = e.layer;
27-
console.log(JSON.stringify(layer.toGeoJSON()));
28-
});
28+
map.addLayer(drawnItems)
29+
30+
map.on('draw:created', function (e) {
31+
var layer = e.layer;
32+
drawnItems.addLayer(layer);
33+
console.log(JSON.stringify(layer.toGeoJSON()));
34+
});
2935
});
3036
}]);
3137
</script>

0 commit comments

Comments
 (0)