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

fix(Markers): fix marker icon broken with latest Leaflet version (1.0) #299

Merged
merged 1 commit into from
Sep 29, 2016
Merged

fix(Markers): fix marker icon broken with latest Leaflet version (1.0) #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions dist/ui-leaflet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* ui-leaflet 1.0.0 2016-09-27
* ui-leaflet 1.0.0 2016-09-28
* ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
* git: https://github.com/angular-ui/ui-leaflet
*/
Expand Down Expand Up @@ -2093,6 +2093,7 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', ["$rootScope", "$t
return new L.Icon.Default({
iconUrl: base64icon,
shadowUrl: base64shadow,
imagePath: ' ',
iconSize: [25, 41],
iconAnchor: [12, 41],
popupAnchor: [1, -34],
Expand Down Expand Up @@ -4252,12 +4253,12 @@ angular.module('ui-leaflet').directive('markers', ["leafletLogger", "$rootScope"
var pass = _maybeAddMarkerToLayer(layerName, layers, model, marker, watchOptions.individual.type, map);
if (!pass) return; //something went wrong move on in the loop
} else if (!isDefined(model.group)) {
// We do not have a layer attr, so the marker goes to the map layer
map.addLayer(marker);
if (watchOptions.individual.type === null && model.focus === true) {
marker.openPopup();
// We do not have a layer attr, so the marker goes to the map layer
map.addLayer(marker);
if (watchOptions.individual.type === null && model.focus === true) {
marker.openPopup();
}
}
}

if (watchOptions.individual.type !== null) {
addMarkerWatcher(marker, pathToMarker, leafletScope, layers, map, watchOptions.individual);
Expand Down Expand Up @@ -5067,7 +5068,7 @@ angular.module('ui-leaflet').factory('leafletMarkerEvents', ["$rootScope", "$q",

'use strict';

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; };
function _typeof(obj) { return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj; }

angular.module('ui-leaflet').factory('leafletPathEvents', ["$rootScope", "$q", "leafletLogger", "leafletHelpers", "leafletLabelEvents", "leafletEventsHelpers", function ($rootScope, $q, leafletLogger, leafletHelpers, leafletLabelEvents, leafletEventsHelpers) {
var isDefined = leafletHelpers.isDefined,
Expand Down
8 changes: 4 additions & 4 deletions dist/ui-leaflet.min.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/ui-leaflet.min.no-header.js
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions dist/ui-leaflet_dev_mapped.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/ui-leaflet_dev_mapped.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/services/leafletMarkersHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', function ($rootSco
return new L.Icon.Default({
iconUrl: base64icon,
shadowUrl: base64shadow,
imagePath: ' ',
iconSize: [25, 41],
iconAnchor: [12, 41],
popupAnchor: [1, -34],
Expand Down