Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add options-property to geojson-element #40

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add options-property to geojson-element #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cb5f6a
Add options-property to geojson-element
Compufreak345 Jul 31, 2015
656ac0a
Fix crash in Safari
Compufreak345 Aug 1, 2015
2cfaa7d
Re-init MutationObserver
Compufreak345 Aug 1, 2015
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
3 changes: 2 additions & 1 deletion leaflet-core.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,8 @@
},

detached: function() {
this._mutationObserver.disconnect();
if(this._mutationObserver)
this._mutationObserver.disconnect();
},

_viewChanged: function(newValue, oldValue) {
Expand Down
13 changes: 11 additions & 2 deletions leaflet-geojson.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,16 @@
lineJoin: {
type: String,
value: null
},
/**
* The attribute `options` sets the options that are passed additonally when the geoJson-Object is created.
* (See http://leafletjs.com/reference.html#geojson)
* @attribute options
* @type Object
*/
options : {
type : Object,
value : null
}

},
Expand All @@ -164,8 +174,7 @@
if (this.feature) {
this.container.removeLayer(this.feature);
}
this.feature = L.geoJson(this.data);

this.feature = L.geoJson(this.data, this.options);
this.feature.addTo(this.container)
.setStyle({
color: this.color,
Expand Down
32 changes: 22 additions & 10 deletions leaflet-layer-group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

##### Example

<leaflet-layer-group>
<leaflet-marker latitude="51.505" longitude="-0.09"> </leaflet-marker>
</leaflet-layer-group>
<leaflet-layer-group>
<leaflet-marker latitude="51.505" longitude="-0.09"> </leaflet-marker>
</leaflet-layer-group>


@element leaflet-layer-group
Expand All @@ -17,7 +17,7 @@
-->

<dom-module id="leaflet-layer-group">
<template>
<template><content></content>
</template>
</dom-module>

Expand All @@ -31,33 +31,45 @@
container: {
type: Object,
observer: '_containerChanged'
}
},
fitMapToBounds : {
type: Boolean,
value: false
}
},

ready: function() {
resetMutationObserver : function() {
this._mutationObserver = new MutationObserver(this.registerContainerOnChildren.bind(this));
this._mutationObserver.observe(this, {childList: true});
},

_containerChanged: function() {
if (this.container) {
var feature = L.layerGroup()
var feature = L.layerGroup();
this.feature = feature;
this.feature.addTo(this.container);
this.registerContaierOnChildren();
this.registerContainerOnChildren();
}
},

registerContaierOnChildren: function() {
registerContainerOnChildren: function() {
this.resetMutationObserver();
for (var i = 0; i < this.children.length; i++) {
this.children[i].container = this.feature;
}
if(this.fitMapToBounds && this.container && this.feature) {
var layers = this.feature.getLayers();
if (layers.length > 0)
this.container.fitBounds(L.featureGroup(layers).getBounds());
}


},

detached: function() {
if (this.container && this.feature) {
this.container.removeLayer(this.feature);
}
if(this._mutationObserver)
this._mutationObserver.disconnect();
}
});
Expand Down