Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Work on vectors integration.

Browse Source
This commit is contained in:
David Molineus
2015-01-07 17:59:56 +01:00
parent 84d29b07ec
commit d9f12eff2d
14 changed files with 988 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
assets/libs/contao/contao-leaflet.js
View File

@@ -102,9 +102,30 @@ L.Contao = L.Class.extend( {
* @returns {L.Marker}|{*}
*/
pointToLayer: function(feature, latlng) {
var marker = L.marker(latlng, feature.properties.options);
var type = 'marker';
var marker = null;
if (feature.properties) {
if (feature.properties.type) {
type = feature.properties.type;
}
// constructor arguments given, use them.
if (feature.properties.arguments) {
marker = L[type].apply(L[type], feature.properties.arguments);
L.Util.setOptions(marker, feature.properties.options);
}
}
if (marker === null) {
marker = L[type](latlng, feature.properties.options);
}
if (feature.properties) {
if (feature.properties.radius) {
marker.setRadius(feature.properties.radius);
}
if (feature.properties.icon) {
var icon = this.getIcon(feature.properties.icon);
@@ -116,11 +137,21 @@ L.Contao = L.Class.extend( {
this.bindPopupFromFeature(marker, feature);
}
this.fire('marker:created', { marker: marker, feature: feature, latlng: latlng });
this.fire('point:added', { marker: marker, feature: feature, latlng: latlng, type: type });
return marker;
},
onEachFeature: function (feature, layer) {
if (feature.properties) {
L.Util.setOptions(layer, feature.properties.options);
this.bindPopupFromFeature(layer, feature);
this.fire('feature:added', { feature: feature, layer: layer});
}
},
/**
* Bind popup from feature definitions.
*