ember-leaflet-marker-cluster
Advanced tools
Comparing version 0.0.3 to 0.0.5
@@ -1,21 +0,17 @@ | ||
import Ember from 'ember'; | ||
import BaseLayer from 'ember-leaflet/components/base-layer'; | ||
import ContainerMixin from 'ember-leaflet/mixins/container'; | ||
import { ParentMixin } from 'ember-composability-tools'; | ||
const {get} = Ember; | ||
export default BaseLayer.extend(ContainerMixin,{ | ||
export default BaseLayer.extend(ParentMixin, { | ||
leafletOptions: [ | ||
'showCoverageOnHover', 'zoomToBoundsOnClick', 'spiderfyOnMaxZoom', 'removeOutsideVisibleBounds', | ||
'animate', 'animateAddingMarkers', 'disableClusteringAtZoom', 'maxClusterRadius', 'polygonOptions', | ||
'singleMarkerMode', 'spiderLegPolylineOptions', 'spiderfyDistanceMultiplier', 'iconCreateFunction' | ||
'showCoverageOnHover', 'zoomToBoundsOnClick', 'spiderfyOnMaxZoom', 'removeOutsideVisibleBounds', | ||
'animate', 'animateAddingMarkers', 'disableClusteringAtZoom', 'maxClusterRadius', 'polygonOptions', | ||
'singleMarkerMode', 'spiderLegPolylineOptions', 'spiderfyDistanceMultiplier', 'iconCreateFunction' | ||
], | ||
leafletEvents: [ | ||
// Marker clutster events | ||
'clusterclick', 'clusterdblclick', 'clustermousedown', 'clustermouseover', 'clustermouseout', | ||
'clustercontextmenu', 'clusteradd', 'clusterremove', 'animationend', 'spiderfied', 'unspiderfied', | ||
// Marker events | ||
'click', 'dblclick', 'mousedown', 'mouseover', 'mouseout', | ||
// Marker clutster events | ||
'clusterclick', 'clusterdblclick', 'clustermousedown', 'clustermouseover', 'clustermouseout', | ||
'clustercontextmenu', 'clusteradd', 'clusterremove', 'animationend', 'spiderfied', 'unspiderfied', | ||
// Marker events | ||
'click', 'dblclick', 'mousedown', 'mouseover', 'mouseout', | ||
'contextmenu', 'dragstart', 'drag', 'dragend', 'move', 'remove', 'add', | ||
@@ -25,27 +21,5 @@ 'popupopen', 'popupclose' | ||
createLayer(){ | ||
return this.L.markerClusterGroup(...get(this,'requiredOptions'), get(this,'options')); | ||
}, | ||
didInsertElement() { | ||
this._super(...arguments); | ||
this.layerSetup(); | ||
get(this,'_childLayers').invoke('layerSetup'); | ||
}, | ||
willDestroyLayer() { | ||
get(this,'_childLayers').invoke('layerTeardown'); | ||
get(this,'_childLayers').clear(); | ||
}, | ||
layerSetup() { | ||
if (Ember.isNone(get(this,'_layer'))) { | ||
this._layer = this.createLayer(); | ||
this._addObservers(); | ||
this._addEventListeners(); | ||
this.didCreateLayer(); | ||
} | ||
if (get(this,'containerLayer')) { | ||
if (!Ember.isNone(get(this,'containerLayer')._layer)) { | ||
get(this,'containerLayer')._layer.addLayer(this._layer); | ||
} | ||
} | ||
createLayer() { | ||
return this.L.markerClusterGroup(...this.get('requiredOptions'), this.get('options')); | ||
} | ||
}); |
@@ -19,4 +19,4 @@ /*jshint node:true*/ | ||
afterInstall: function(options) { | ||
return this.addBowerPackageToProject('leaflet.markercluster', '~0.5.0'); | ||
return this.addBowerPackageToProject('leaflet.markercluster', '~1.0.0'); | ||
} | ||
}; |
@@ -6,2 +6,3 @@ /* jshint node: true */ | ||
name: 'ember-leaflet-marker-cluster', | ||
included: function(app){ | ||
@@ -8,0 +9,0 @@ app.import(app.bowerDirectory + '/leaflet.markercluster/dist/leaflet.markercluster.js'); |
{ | ||
"name": "ember-leaflet-marker-cluster", | ||
"version": "0.0.3", | ||
"version": "0.0.5", | ||
"description": "Addon for Ember-Leaflet which adds marker clusters", | ||
@@ -34,7 +34,6 @@ "directories": { | ||
"ember-cli-uglify": "^1.2.0", | ||
"ember-data": "1.13.15", | ||
"ember-disable-prototype-extensions": "^1.0.0", | ||
"ember-disable-proxy-controllers": "^1.0.1", | ||
"ember-export-application-global": "^1.0.4", | ||
"ember-leaflet": "^2.1.1", | ||
"ember-leaflet": "^3.0.2", | ||
"ember-try": "~0.0.8" | ||
@@ -41,0 +40,0 @@ }, |
@@ -17,11 +17,12 @@ # Ember-leaflet-marker-cluster | ||
{{#leaflet-map lat=lat lng=lng zoom=zoom}} | ||
{{tile-layer url="http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png"}} | ||
{{#marker-cluster-layer}} | ||
{{#each markers as |marker|}} | ||
{{#marker-layer location=marker.location}} | ||
<h3>{{marker.title}}</h3> | ||
{{marker.description}} | ||
{{/marker-layer}} | ||
{{/each}} | ||
{{#each markers as |marker|}} | ||
{{#marker-layer location=marker.location}} | ||
{{#popup-layer}} | ||
<h3>{{marker.title}}</h3> | ||
{{marker.description}} | ||
{{/popup-layer}} | ||
{{/marker-layer}} | ||
{{/each}} | ||
{{/marker-cluster-layer}} | ||
@@ -28,0 +29,0 @@ {{/leaflet-map}} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
18
47
9202
105