From 6e2c0458ac81d25eb69cf1ff5d4a7adfc61689f7 Mon Sep 17 00:00:00 2001 From: Timothy Ruhle Date: Mon, 8 Feb 2016 09:21:50 +1000 Subject: [PATCH] Bumping to v0.11.5 --- RELEASE.md | 2 +- bower.json | 2 +- dist/angular/angular-dc.js | 4 ++-- dist/angular/angular-dc.min.js | 4 ++-- dist/bubble-cloud/dc-bubble-cloud.js | 4 ++-- dist/bubble-cloud/dc-bubble-cloud.min.js | 4 ++-- dist/crossfilter-server/crossfilter-server.js | 4 ++-- dist/crossfilter-server/crossfilter-server.min.js | 4 ++-- dist/dc-addons.js | 11 ++++++----- dist/dc-addons.min.js | 8 ++++---- dist/elastic-search/elastic-search.js | 4 ++-- dist/elastic-search/elastic-search.min.js | 4 ++-- dist/google-map/dc-google.js | 11 ++++++----- dist/google-map/dc-google.min.js | 8 ++++---- dist/leaflet-map/dc-leaflet.js | 4 ++-- dist/leaflet-map/dc-leaflet.min.js | 4 ++-- dist/pagination/dc-pagination-mixin.js | 4 ++-- dist/pagination/dc-pagination-mixin.min.js | 4 ++-- dist/paired-row/dc-paired-row-chart.js | 4 ++-- dist/paired-row/dc-paired-row-chart.min.js | 4 ++-- dist/server/dc-server-chart-with-animations.js | 4 ++-- dist/server/dc-server-chart-with-animations.min.js | 4 ++-- dist/server/dc-server-chart.js | 4 ++-- dist/server/dc-server-chart.min.js | 4 ++-- dist/server/dc-server.js | 4 ++-- dist/server/dc-server.min.js | 4 ++-- dist/server/server-config.js | 4 ++-- dist/server/server-config.min.js | 4 ++-- dist/tooltip/dc-tooltip-mixin.js | 4 ++-- dist/tooltip/dc-tooltip-mixin.min.js | 4 ++-- dist/utils/utils.js | 4 ++-- dist/utils/utils.min.js | 4 ++-- package.json | 2 +- src/scripts/google-marker-chart.js | 1 - 34 files changed, 75 insertions(+), 74 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 54900783..23282084 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -11,7 +11,7 @@ The build steps to releasing a new version. Before you can do this you need to t * Commit and push with the message "Bumping to v\*.\*.\*" * [Create a new release](https://github.com/intellipharm/dc-addons/releases/new) * Tag version is v\*.\*.\* - * Release title is "Angular CakePHP v\*.\*.\*" + * Release title is "dc-addons v\*.\*.\*" * The comment section should be a list of commits and the changes the commit made. See below for an example * If it is under v1.0.0 then mark "This is a pre-release" as true diff --git a/bower.json b/bower.json index f35d3deb..32a49901 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "dc-addons", "description": "These are additional charts that extend dc.js", - "version": "0.11.4", + "version": "0.11.5", "homepage": "https://github.com/intellipharm/dc-addons", "repository": { "type": "git", diff --git a/dist/angular/angular-dc.js b/dist/angular/angular-dc.js index b5049a04..2cfddb92 100644 --- a/dist/angular/angular-dc.js +++ b/dist/angular/angular-dc.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/angular/angular-dc.min.js b/dist/angular/angular-dc.min.js index 8d473d83..1fc7a253 100644 --- a/dist/angular/angular-dc.min.js +++ b/dist/angular/angular-dc.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";angular.module("AngularDc",[])}(),function(){"use strict";var a=function(a,b){return{restrict:"E",scope:{chart:"=",type:"=",group:"=",options:"=",filters:"=",reset:"="},link:function(c,d){c.drawChart=function(){var a;if("string"==typeof c.type&&"object"==typeof c.options){if(c.cleanup(),c.reset&&(c.resetChart=function(){c.chart.filterAll(),dc.redrawAll()},d.append(''),d.append(b('')(c))),c.chart=dc[c.type](d[0],c.group||void 0),"compositeChart"===c.type)for(a=0;aOpenStreetMap contributors'}).addTo(a)},i=function(b){return a.title()(b)};return a._doRender=function(){},a._postRender=function(){},a.toLocArray=function(){},a.mapOptions=function(b){return arguments.length?(d=b,a):d},a.center=function(b){return arguments.length?(e=b,a):e},a.zoom=function(b){return arguments.length?(f=b,a):f},a.tiles=function(b){return arguments.length?(h=b,a):h},a.map=function(a){return arguments.length?b=a:b},a.popup=function(b){return arguments.length?(i=b,a):i},a.renderPopup=function(b){return arguments.length?(c=b,a):c},a.brushOn=function(b){return arguments.length?(g=b,a):g},a})}(),function(){"use strict";return dc.baseLeafletChart?!1:void(dc.baseLeafletChart=function(a){return a=dc.baseMapChart(a),a._doRender=function(){var b=L.map(a.root().node(),a.mapOptions());return a.center()&&a.zoom()&&b.setView(a.toLocArray(a.center()),a.zoom()),a.tiles()(b),a.map(b),a._postRender(),a._doRedraw()},a.toLocArray=function(a){return"string"==typeof a&&(a=a.split(",")),a},a})}(),function(){"use strict";return dc.leafletChoroplethChart?!1:void(dc.leafletChoroplethChart=function(a,b){var c=dc.colorChart(dc.baseLeafletChart({})),d=!1,e=[],f=!1,g={fillColor:"black",color:"gray",opacity:.4,fillOpacity:.6,weight:1},h=function(a){return a.key},i=function(a){var b=c.featureOptions();b instanceof Function&&(b=b(a)),b=JSON.parse(JSON.stringify(b));var d=e[c.featureKeyAccessor()(a)];return d&&d.d&&(b.fillColor=c.getColor(d.d,d.i),-1!==c.filters().indexOf(d.d.key)&&(b.opacity=.8,b.fillOpacity=1)),b};c._postRender=function(){d=L.geoJson(c.geojson(),{style:c.featureStyle(),onEachFeature:j}),c.map().addLayer(d)},c._doRedraw=function(){d.clearLayers(),e=[],c._computeOrderedGroups(c.data()).forEach(function(a,b){e[c.keyAccessor()(a)]={d:a,i:b}}),d.addData(c.geojson())},c.geojson=function(a){return arguments.length?(f=a,c):f},c.featureOptions=function(a){return arguments.length?(g=a,c):g},c.featureKeyAccessor=function(a){return arguments.length?(h=a,c):h},c.featureStyle=function(a){return arguments.length?(i=a,c):i};var j=function(a,b){var d=e[c.featureKeyAccessor()(a)];d&&d.d&&(b.key=d.d.key,c.renderPopup()&&b.bindPopup(c.popup()(d.d,a)),c.brushOn()&&b.on("click",k))},k=function(a){if(a.target){var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.leafletMarkerChart?!1:void(dc.leafletMarkerChart=function(a,b){var c=dc.baseLeafletChart({}),d=!0,e=!1,f=!1,g=!1,h=!0,i=!1,j=!1,k=!1,l=!1,m={},n=!1,o=!0,p=!1,q=!1;c.renderTitle(!0);var r=function(a){return c.keyAccessor()(a)},s=function(a,b){var d=new L.Marker(c.toLocArray(c.locationAccessor()(a)),{title:c.renderTitle()?c.title()(a):"",alt:c.renderTitle()?c.title()(a):"",icon:t(),clickable:c.renderPopup()||c.brushOn()&&!i,draggable:!1});return d},t=function(a,b){return new L.Icon.Default},u=function(a,b){return c.title()(a)};c._postRender=function(){c.brushOn()&&(i&&c.filterHandler(y),c.map().on("zoomend moveend",x,this),i||c.map().on("click",x,this),c.map().on("zoomstart",w,this)),l=e?new L.MarkerClusterGroup(f?f:null):new L.LayerGroup,c.map().addLayer(l)},c._doRedraw=function(){var a=c._computeOrderedGroups(c.data()).filter(function(a){return 0!==c.valueAccessor()(a)});if(!n||n.toString()!==a.toString()){n=a,g&&(m={}),l.clearLayers();var b=[];if(a.forEach(function(a,d){var e=c.keyAccessor()(a),f=null;f=!g&&e in m?m[e]:v(a,e),c.cluster()?b.push(f):l.addLayer(f)}),c.cluster()&&b.length>0&&l.addLayers(b),b.length>0&&(o||p&&!q)){var d=new L.featureGroup(b);c.map().fitBounds(d.getBounds())}q=!1,o=!1}},c.locationAccessor=function(a){return arguments.length?(r=a,c):r},c.marker=function(a){return arguments.length?(s=a,c):s},c.icon=function(a){return arguments.length?(t=a,c):t},c.popup=function(a){return arguments.length?(u=a,c):u},c.renderPopup=function(a){return arguments.length?(d=a,c):d},c.cluster=function(a){return arguments.length?(e=a,c):e},c.clusterOptions=function(a){return arguments.length?(f=a,c):f},c.rebuildMarkers=function(a){return arguments.length?(g=a,c):g},c.brushOn=function(a){return arguments.length?(h=a,c):h},c.filterByArea=function(a){return arguments.length?(i=a,c):i},c.fitOnRender=function(a){return arguments.length?(o=a,c):o},c.fitOnRedraw=function(a){return arguments.length?(p=a,c):p},c.markerGroup=function(){return l};var v=function(a,b){var d=s(a);return d.key=b,c.renderPopup()&&d.bindPopup(c.popup()(a,d)),c.brushOn()&&!i&&d.on("click",z),m[b]=d,d},w=function(a){k=!0},x=function(a){if("moveend"!==a.type||!k&&!a.hard)if(k=!1,q=!0,i){var b;b=c.map().getCenter().equals(c.center())&&c.map().getZoom()===c.zoom()?null:c.map().getBounds(),dc.events.trigger(function(){c.filter(null),b&&(j=!0,c.filter(b),j=!1),dc.redrawAll(c.chartGroup())})}else c.filter()&&("click"===a.type||-1!==m.indexOf(c.filter())&&!c.map().getBounds().contains(m[c.filter()].getLatLng()))&&dc.events.trigger(function(){c.filter(null),d&&c.map().closePopup(),dc.redrawAll(c.chartGroup())})},y=function(a,b){q=!0,c.dimension().filter(null),b&&b.length>0&&(c.dimension().filterFunction(function(a){if(!(a in m))return!1;var c=m[a].getLatLng();return c&&b[0].contains(c)}),j||c.map().getBounds().toString===b[0].toString()||c.map().fitBounds(b[0]))},z=function(a){if(a.target){q=!0;var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(), @@ -18,11 +18,11 @@ if(!d){ // fetch the legend class creator, invoke it var a=c.LegendClass()(); // and constuct that class -d=new a,d.addTo(b.map())}return c.redraw()},c.redraw=function(){return d._update(),c},c.leafletLegend=function(){return d},c.position=function(a){return arguments.length?(e=a,c):e},c},function(){"use strict";return dc.baseGoogleChart?!1:void(dc.baseGoogleChart=function(a){return a=dc.baseMapChart(a),a._doRender=function(){var b=new google.maps.Map(a.root().node(),a.mapOptions());return a.center()&&a.zoom()&&(b.setCenter(a.toLocArray(a.center())),b.setZoom(a.zoom())),a.map(b),a._postRender(),a._doRedraw()},a.toLocArray=function(a){return"string"==typeof a&&(a=a.split(",")),new google.maps.LatLng(a[0],a[1])},a})}(),function(){"use strict";return dc.googleChoroplethChart?!1:void(dc.googleChoroplethChart=function(a,b){var c=dc.colorChart(dc.baseGoogleChart({})),d=[],e=!1,f=!1,g={fillColor:"black",color:"gray",opacity:.4,fillOpacity:.6,weight:1},h=null,i=function(a){return a.key},j=function(a){var b=c.featureOptions();b instanceof Function&&(b=b(a)),b=JSON.parse(JSON.stringify(b));var e=d[c.featureKeyAccessor()(a)];return e&&e.d&&(b.fillColor=c.getColor(e.d,e.i),-1!==c.filters().indexOf(e.d.key)&&(b.opacity=.8,b.fillOpacity=1)),b};c._postRender=function(){f="string"==typeof e?c.map().data.loadGeoJson(e):c.map().data.addGeoJson(e),c.map().data.setStyle(c.featureStyle()),k()},c._doRedraw=function(){d=[],c._computeOrderedGroups(c.data()).forEach(function(a,b){d[c.keyAccessor()(a)]={d:a,i:b}}),c.map().data.setStyle(c.featureStyle())},c.geojson=function(a){return arguments.length?(e=a,c):e},c.featureOptions=function(a){return arguments.length?(g=a,c):g},c.featureKeyAccessor=function(a){return arguments.length?(i=a,c):i},c.featureStyle=function(a){return arguments.length?(j=a,c):j};var k=function(a,b){c.renderPopup()&&c.map().data.addListener("click",function(a){var b=new google.maps.MVCObject,e=d[c.featureKeyAccessor()(a.feature)];h&&h.close(),e||(e={}),e.d||(e.d={}),h=new google.maps.InfoWindow({content:c.popup()(e.d,a.feature)}),b.set("position",a.latLng),h.open(c.map(),b)}),c.brushOn()&&c.map().data.addListener("click",l)},l=function(a){if(a.feature){var b=c.featureKeyAccessor()(a.feature);dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.googleMarkerChart?!1:void(dc.googleMarkerChart=function(a,b){var c=dc.baseGoogleChart({}),d=!1,e=!1,f=!1,g=!0,h=!1,i=!0,j=!1,k=!1,l=!1,m=!1,n={},o=[],p=!1,q=!1,r=null,s=null;c.renderTitle(!0);var t=function(a){return c.keyAccessor()(a)},u=function(a){var b=new google.maps.Marker({position:c.toLocArray(c.locationAccessor()(a)),map:c.map(),title:c.renderTitle()?c.title()(a):"",clickable:c.renderPopup()||c.brushOn()&&!h,draggable:!1});return b};c._postRender=function(){c.brushOn()&&(h&&c.filterHandler(x),google.maps.event.addListener(c.map(),"zoom_changed",function(){c.map().getZoom()!==s&&(s=c.map().getZoom(),w("zoom"))},this),google.maps.event.addListener(c.map(),"dragend",function(){w("drag")},this),h||google.maps.event.addListener(c.map(),"click",function(){w("click")},this)),d&&(m=new MarkerClusterer(c.map()))},c._doRedraw=function(){var a=c._computeOrderedGroups(c.data()).filter(function(a){return 0!==c.valueAccessor()(a)});p=a,f&&(n={}),d&&m.clearMarkers();var b=[],e=[],g=new google.maps.LatLngBounds;o=[],a.forEach(function(a){var h=c.keyAccessor()(a),i=null;!f&&h in n&&(i=n[h]),a.value?(null===i?i=v(a,h):i.setVisible(!0),g.extend(i.getPosition()),e.push(i),d?b.push(i):i.setMap(c.map()),o.push(i)):null!==i&&i.setVisible(!1)}),d&&b.length>0&&m.addMarkers(b),e.length&&(i||j&&!k)&&c.map().fitBounds(g),k=!1,i=!1},c.destroy=function(){ +d=new a,d.addTo(b.map())}return c.redraw()},c.redraw=function(){return d._update(),c},c.leafletLegend=function(){return d},c.position=function(a){return arguments.length?(e=a,c):e},c},function(){"use strict";return dc.baseGoogleChart?!1:void(dc.baseGoogleChart=function(a){return a=dc.baseMapChart(a),a._doRender=function(){var b=new google.maps.Map(a.root().node(),a.mapOptions());return a.center()&&a.zoom()&&(b.setCenter(a.toLocArray(a.center())),b.setZoom(a.zoom())),a.map(b),a._postRender(),a._doRedraw()},a.toLocArray=function(a){return"string"==typeof a&&(a=a.split(",")),new google.maps.LatLng(a[0],a[1])},a})}(),function(){"use strict";return dc.googleChoroplethChart?!1:void(dc.googleChoroplethChart=function(a,b){var c=dc.colorChart(dc.baseGoogleChart({})),d=[],e=!1,f=!1,g={fillColor:"black",color:"gray",opacity:.4,fillOpacity:.6,weight:1},h=null,i=function(a){return a.key},j=function(a){var b=c.featureOptions();b instanceof Function&&(b=b(a)),b=JSON.parse(JSON.stringify(b));var e=d[c.featureKeyAccessor()(a)];return e&&e.d&&(b.fillColor=c.getColor(e.d,e.i),-1!==c.filters().indexOf(e.d.key)&&(b.opacity=.8,b.fillOpacity=1)),b};c._postRender=function(){f="string"==typeof e?c.map().data.loadGeoJson(e):c.map().data.addGeoJson(e),c.map().data.setStyle(c.featureStyle()),k()},c._doRedraw=function(){d=[],c._computeOrderedGroups(c.data()).forEach(function(a,b){d[c.keyAccessor()(a)]={d:a,i:b}}),c.map().data.setStyle(c.featureStyle())},c.geojson=function(a){return arguments.length?(e=a,c):e},c.featureOptions=function(a){return arguments.length?(g=a,c):g},c.featureKeyAccessor=function(a){return arguments.length?(i=a,c):i},c.featureStyle=function(a){return arguments.length?(j=a,c):j};var k=function(a,b){c.renderPopup()&&c.map().data.addListener("click",function(a){var b=new google.maps.MVCObject,e=d[c.featureKeyAccessor()(a.feature)];h&&h.close(),e||(e={}),e.d||(e.d={}),h=new google.maps.InfoWindow({content:c.popup()(e.d,a.feature)}),b.set("position",a.latLng),h.open(c.map(),b)}),c.brushOn()&&c.map().data.addListener("click",l)},l=function(a){if(a.feature){var b=c.featureKeyAccessor()(a.feature);dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.googleMarkerChart?!1:void(dc.googleMarkerChart=function(a,b){var c=dc.baseGoogleChart({}),d=!1,e=!1,f=!1,g=!0,h=!1,i=!0,j=!1,k=!1,l=!1,m=!1,n={},o=[],p=!1,q=null,r=null;c.renderTitle(!0);var s=function(a){return c.keyAccessor()(a)},t=function(a){var b=new google.maps.Marker({position:c.toLocArray(c.locationAccessor()(a)),map:c.map(),title:c.renderTitle()?c.title()(a):"",clickable:c.renderPopup()||c.brushOn()&&!h,draggable:!1});return b};c._postRender=function(){c.brushOn()&&(h&&c.filterHandler(w),google.maps.event.addListener(c.map(),"zoom_changed",function(){c.map().getZoom()!==r&&(r=c.map().getZoom(),v("zoom"))},this),google.maps.event.addListener(c.map(),"dragend",function(){v("drag")},this),h||google.maps.event.addListener(c.map(),"click",function(){v("click")},this)),d&&(m=new MarkerClusterer(c.map()))},c._doRedraw=function(){var a=c._computeOrderedGroups(c.data()).filter(function(a){return 0!==c.valueAccessor()(a)});if(f)n={};else for(var b in n)n[b].setVisible(!1);d&&m.clearMarkers();var e=[],g=[],h=new google.maps.LatLngBounds;o=[],a.forEach(function(a){var b=c.keyAccessor()(a),i=null;!f&&b in n&&(i=n[b]),a.value?(null===i?i=u(a,b):i.setVisible(!0),h.extend(i.getPosition()),g.push(i),d?e.push(i):i.setMap(c.map()),o.push(i)):null!==i&&i.setVisible(!1)}),d&&e.length>0&&m.addMarkers(e),g.length&&(i||j&&!k)&&c.map().fitBounds(h),k=!1,i=!1},c.destroy=function(){ // clear markers and their events for(var a in n)n.hasOwnProperty(a)&&(google.maps.event.clearInstanceListeners(n[a]),n[a].setMap(null),delete n[a]); // clear map and it's events -google.maps.event.clearInstanceListeners(c.map()),c.map(null)},c.locationAccessor=function(a){return arguments.length?(t=a,c):t},c.marker=function(a){return arguments.length?(u=a,c):u},c.icon=function(a){return arguments.length?(q=a,c):q},c.cluster=function(a){return arguments.length?(d=a,c):d},c.clusterOptions=function(a){return arguments.length?(e=a,c):e},c.rebuildMarkers=function(a){return arguments.length?(f=a,c):f},c.brushOn=function(a){return arguments.length?(g=a,c):g},c.filterByArea=function(a){return arguments.length?(h=a,c):h},c.fitOnRender=function(a){return arguments.length?(i=a,c):i},c.fitOnRedraw=function(a){return arguments.length?(j=a,c):j},c.markerGroup=function(){return m},c.markers=function(a){return a?o:n};var v=function(a,b){var d=u(a);return d.key=b,c.renderPopup()&&google.maps.event.addListener(d,"click",function(){r&&r.close(),r=new google.maps.InfoWindow({content:c.popup()(a,d)}),r.open(c.map(),d)}),c.brushOn()&&!h&&google.maps.event.addListener(d,"click",y),n[b]=d,d},w=function(a){if(k=!0,h){var b;b=c.map().getCenter().equals(c.toLocArray(c.center()))&&c.map().getZoom()===c.zoom()?null:c.map().getBounds(),dc.events.trigger(function(){c.filter(null),b&&(l=!0,c.filter(b),l=!1),dc.redrawAll(c.chartGroup())})}else c.filter()&&("click"===a||c.filter()in n&&!c.map().getBounds().contains(n[c.filter()].getLatLng()))&&dc.events.trigger(function(){c.filter(null),c.renderPopup()&&c.map().closePopup(),dc.redrawAll(c.chartGroup())})},x=function(a,b){k=!0,c.dimension().filter(null),b&&b.length>0&&(c.dimension().filter(function(a){if(!(a in n))return!1;var c=n[a].position;return c&&b[0].contains(c)}),l||c.map().getBounds().toString===b[0].toString()||c.map().fitBounds(b[0]))},y=function(a){if(a.target){k=!0;var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.tooltipMixin?!1:void(dc.tooltipMixin=function(a){return a&&(a.tip={},a.tip.tooltip=null,a.tip.init=function(){if(null===a.tip.tooltip){var b=a.svg().selectAll("g.sub"); +google.maps.event.clearInstanceListeners(c.map()),c.map(null)},c.locationAccessor=function(a){return arguments.length?(s=a,c):s},c.marker=function(a){return arguments.length?(t=a,c):t},c.icon=function(a){return arguments.length?(p=a,c):p},c.cluster=function(a){return arguments.length?(d=a,c):d},c.clusterOptions=function(a){return arguments.length?(e=a,c):e},c.rebuildMarkers=function(a){return arguments.length?(f=a,c):f},c.brushOn=function(a){return arguments.length?(g=a,c):g},c.filterByArea=function(a){return arguments.length?(h=a,c):h},c.fitOnRender=function(a){return arguments.length?(i=a,c):i},c.fitOnRedraw=function(a){return arguments.length?(j=a,c):j},c.markerGroup=function(){return m},c.markers=function(a){return a?o:n};var u=function(a,b){var d=t(a);return d.key=b,c.renderPopup()&&google.maps.event.addListener(d,"click",function(){q&&q.close(),q=new google.maps.InfoWindow({content:c.popup()(a,d)}),q.open(c.map(),d)}),c.brushOn()&&!h&&google.maps.event.addListener(d,"click",x),n[b]=d,d},v=function(a){if(k=!0,h){var b;b=c.map().getCenter().equals(c.toLocArray(c.center()))&&c.map().getZoom()===c.zoom()?null:c.map().getBounds(),dc.events.trigger(function(){c.filter(null),b&&(l=!0,c.filter(b),l=!1),dc.redrawAll(c.chartGroup())})}else c.filter()&&("click"===a||c.filter()in n&&!c.map().getBounds().contains(n[c.filter()].getLatLng()))&&dc.events.trigger(function(){c.filter(null),c.renderPopup()&&c.map().closePopup(),dc.redrawAll(c.chartGroup())})},w=function(a,b){k=!0,c.dimension().filter(null),b&&b.length>0&&(c.dimension().filter(function(a){if(!(a in n))return!1;var c=n[a].position;return c&&b[0].contains(c)}),l||c.map().getBounds().toString===b[0].toString()||c.map().fitBounds(b[0]))},x=function(a){if(a.target){k=!0;var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.tooltipMixin?!1:void(dc.tooltipMixin=function(a){return a&&(a.tip={},a.tip.tooltip=null,a.tip.init=function(){if(null===a.tip.tooltip){var b=a.svg().selectAll("g.sub"); // nothing to tip so exit if(// if the chart has sub grouping (e.g. composite or series) // if no sub grouping then just use the chart svg diff --git a/dist/elastic-search/elastic-search.js b/dist/elastic-search/elastic-search.js index 59a43ed0..aeafbcfa 100644 --- a/dist/elastic-search/elastic-search.js +++ b/dist/elastic-search/elastic-search.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/elastic-search/elastic-search.min.js b/dist/elastic-search/elastic-search.min.js index ea37c419..cc7051d9 100644 --- a/dist/elastic-search/elastic-search.min.js +++ b/dist/elastic-search/elastic-search.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";window.crossfilterServer.elasticSearch={filter:function(a,b,c,d){var e=JSON.parse(JSON.stringify(c));e.hasOwnProperty("query")||(e.query={}),e.query.hasOwnProperty("filtered")||(e.query.filtered={}),e.query.filtered.hasOwnProperty("filter")||(e.query.filtered.filter={}),e.query.filtered.filter.hasOwnProperty("bool")||(e.query.filtered.filter.bool={}),e.query.filtered.filter.bool.hasOwnProperty("must")||(e.query.filtered.filter.bool.must=[]);for(var f in a)if(f!==b&&d[f]&&a[f].length>0){var g={};Array.isArray(a[f][0])?(g.range={},g.range[d[f]]={gte:a[f][0][0]instanceof Date?d3.time.format("%Y-%m-%d %H:%M:%S")(a[f][0][0]):a[f][0][0],lte:a[f][0][1]instanceof Date?d3.time.format("%Y-%m-%d %H:%M:%S")(a[f][0][1]):a[f][0][1]},e.query.filtered.filter.bool.must.push(g)):(g.terms={},g.terms[d[f]]=a[f],e.query.filtered.filter.bool.must.push(g))}return JSON.stringify(e)},send:function(a,b,c,d,e,f){var g=this.filter(a,b,d,e);d3.xhr(c).post(g,function(a,b){var c=JSON.parse(b.responseText);f(c)})}}}(); \ No newline at end of file diff --git a/dist/google-map/dc-google.js b/dist/google-map/dc-google.js index 6302dc4a..0470dd57 100644 --- a/dist/google-map/dc-google.js +++ b/dist/google-map/dc-google.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { @@ -333,7 +333,6 @@ var _layerGroup = false; var _markerList = {}; var _markerListFilterd = []; - var _currentGroups = false; var _icon = false; var _infoWindow = null; var _zoom = null; @@ -409,10 +408,12 @@ return _chart.valueAccessor()(d) !== 0; }); - _currentGroups = groups; - if (_rebuildMarkers) { _markerList = {}; + } else { + for (var key in _markerList) { + _markerList[key].setVisible(false); + } } if (_cluster) { diff --git a/dist/google-map/dc-google.min.js b/dist/google-map/dc-google.min.js index 85d98593..fc92b284 100644 --- a/dist/google-map/dc-google.min.js +++ b/dist/google-map/dc-google.min.js @@ -1,11 +1,11 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ -!function(){"use strict";return dc.baseMapChart?!1:void(dc.baseMapChart=function(a){a=dc.baseChart(a);var b,c=!0,d=!1,e=!1,f=!1,g=!1,h=function(a){L.tileLayer("http://{s}.tile.osm.org/{z}/{x}/{y}.png",{attribution:'© OpenStreetMap contributors'}).addTo(a)},i=function(b){return a.title()(b)};return a._doRender=function(){},a._postRender=function(){},a.toLocArray=function(){},a.mapOptions=function(b){return arguments.length?(d=b,a):d},a.center=function(b){return arguments.length?(e=b,a):e},a.zoom=function(b){return arguments.length?(f=b,a):f},a.tiles=function(b){return arguments.length?(h=b,a):h},a.map=function(a){return arguments.length?b=a:b},a.popup=function(b){return arguments.length?(i=b,a):i},a.renderPopup=function(b){return arguments.length?(c=b,a):c},a.brushOn=function(b){return arguments.length?(g=b,a):g},a})}(),function(){"use strict";return dc.baseGoogleChart?!1:void(dc.baseGoogleChart=function(a){return a=dc.baseMapChart(a),a._doRender=function(){var b=new google.maps.Map(a.root().node(),a.mapOptions());return a.center()&&a.zoom()&&(b.setCenter(a.toLocArray(a.center())),b.setZoom(a.zoom())),a.map(b),a._postRender(),a._doRedraw()},a.toLocArray=function(a){return"string"==typeof a&&(a=a.split(",")),new google.maps.LatLng(a[0],a[1])},a})}(),function(){"use strict";return dc.googleChoroplethChart?!1:void(dc.googleChoroplethChart=function(a,b){var c=dc.colorChart(dc.baseGoogleChart({})),d=[],e=!1,f=!1,g={fillColor:"black",color:"gray",opacity:.4,fillOpacity:.6,weight:1},h=null,i=function(a){return a.key},j=function(a){var b=c.featureOptions();b instanceof Function&&(b=b(a)),b=JSON.parse(JSON.stringify(b));var e=d[c.featureKeyAccessor()(a)];return e&&e.d&&(b.fillColor=c.getColor(e.d,e.i),-1!==c.filters().indexOf(e.d.key)&&(b.opacity=.8,b.fillOpacity=1)),b};c._postRender=function(){f="string"==typeof e?c.map().data.loadGeoJson(e):c.map().data.addGeoJson(e),c.map().data.setStyle(c.featureStyle()),k()},c._doRedraw=function(){d=[],c._computeOrderedGroups(c.data()).forEach(function(a,b){d[c.keyAccessor()(a)]={d:a,i:b}}),c.map().data.setStyle(c.featureStyle())},c.geojson=function(a){return arguments.length?(e=a,c):e},c.featureOptions=function(a){return arguments.length?(g=a,c):g},c.featureKeyAccessor=function(a){return arguments.length?(i=a,c):i},c.featureStyle=function(a){return arguments.length?(j=a,c):j};var k=function(a,b){c.renderPopup()&&c.map().data.addListener("click",function(a){var b=new google.maps.MVCObject,e=d[c.featureKeyAccessor()(a.feature)];h&&h.close(),e||(e={}),e.d||(e.d={}),h=new google.maps.InfoWindow({content:c.popup()(e.d,a.feature)}),b.set("position",a.latLng),h.open(c.map(),b)}),c.brushOn()&&c.map().data.addListener("click",l)},l=function(a){if(a.feature){var b=c.featureKeyAccessor()(a.feature);dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.googleMarkerChart?!1:void(dc.googleMarkerChart=function(a,b){var c=dc.baseGoogleChart({}),d=!1,e=!1,f=!1,g=!0,h=!1,i=!0,j=!1,k=!1,l=!1,m=!1,n={},o=[],p=!1,q=!1,r=null,s=null;c.renderTitle(!0);var t=function(a){return c.keyAccessor()(a)},u=function(a){var b=new google.maps.Marker({position:c.toLocArray(c.locationAccessor()(a)),map:c.map(),title:c.renderTitle()?c.title()(a):"",clickable:c.renderPopup()||c.brushOn()&&!h,draggable:!1});return b};c._postRender=function(){c.brushOn()&&(h&&c.filterHandler(x),google.maps.event.addListener(c.map(),"zoom_changed",function(){c.map().getZoom()!==s&&(s=c.map().getZoom(),w("zoom"))},this),google.maps.event.addListener(c.map(),"dragend",function(){w("drag")},this),h||google.maps.event.addListener(c.map(),"click",function(){w("click")},this)),d&&(m=new MarkerClusterer(c.map()))},c._doRedraw=function(){var a=c._computeOrderedGroups(c.data()).filter(function(a){return 0!==c.valueAccessor()(a)});p=a,f&&(n={}),d&&m.clearMarkers();var b=[],e=[],g=new google.maps.LatLngBounds;o=[],a.forEach(function(a){var h=c.keyAccessor()(a),i=null;!f&&h in n&&(i=n[h]),a.value?(null===i?i=v(a,h):i.setVisible(!0),g.extend(i.getPosition()),e.push(i),d?b.push(i):i.setMap(c.map()),o.push(i)):null!==i&&i.setVisible(!1)}),d&&b.length>0&&m.addMarkers(b),e.length&&(i||j&&!k)&&c.map().fitBounds(g),k=!1,i=!1},c.destroy=function(){ +!function(){"use strict";return dc.baseMapChart?!1:void(dc.baseMapChart=function(a){a=dc.baseChart(a);var b,c=!0,d=!1,e=!1,f=!1,g=!1,h=function(a){L.tileLayer("http://{s}.tile.osm.org/{z}/{x}/{y}.png",{attribution:'© OpenStreetMap contributors'}).addTo(a)},i=function(b){return a.title()(b)};return a._doRender=function(){},a._postRender=function(){},a.toLocArray=function(){},a.mapOptions=function(b){return arguments.length?(d=b,a):d},a.center=function(b){return arguments.length?(e=b,a):e},a.zoom=function(b){return arguments.length?(f=b,a):f},a.tiles=function(b){return arguments.length?(h=b,a):h},a.map=function(a){return arguments.length?b=a:b},a.popup=function(b){return arguments.length?(i=b,a):i},a.renderPopup=function(b){return arguments.length?(c=b,a):c},a.brushOn=function(b){return arguments.length?(g=b,a):g},a})}(),function(){"use strict";return dc.baseGoogleChart?!1:void(dc.baseGoogleChart=function(a){return a=dc.baseMapChart(a),a._doRender=function(){var b=new google.maps.Map(a.root().node(),a.mapOptions());return a.center()&&a.zoom()&&(b.setCenter(a.toLocArray(a.center())),b.setZoom(a.zoom())),a.map(b),a._postRender(),a._doRedraw()},a.toLocArray=function(a){return"string"==typeof a&&(a=a.split(",")),new google.maps.LatLng(a[0],a[1])},a})}(),function(){"use strict";return dc.googleChoroplethChart?!1:void(dc.googleChoroplethChart=function(a,b){var c=dc.colorChart(dc.baseGoogleChart({})),d=[],e=!1,f=!1,g={fillColor:"black",color:"gray",opacity:.4,fillOpacity:.6,weight:1},h=null,i=function(a){return a.key},j=function(a){var b=c.featureOptions();b instanceof Function&&(b=b(a)),b=JSON.parse(JSON.stringify(b));var e=d[c.featureKeyAccessor()(a)];return e&&e.d&&(b.fillColor=c.getColor(e.d,e.i),-1!==c.filters().indexOf(e.d.key)&&(b.opacity=.8,b.fillOpacity=1)),b};c._postRender=function(){f="string"==typeof e?c.map().data.loadGeoJson(e):c.map().data.addGeoJson(e),c.map().data.setStyle(c.featureStyle()),k()},c._doRedraw=function(){d=[],c._computeOrderedGroups(c.data()).forEach(function(a,b){d[c.keyAccessor()(a)]={d:a,i:b}}),c.map().data.setStyle(c.featureStyle())},c.geojson=function(a){return arguments.length?(e=a,c):e},c.featureOptions=function(a){return arguments.length?(g=a,c):g},c.featureKeyAccessor=function(a){return arguments.length?(i=a,c):i},c.featureStyle=function(a){return arguments.length?(j=a,c):j};var k=function(a,b){c.renderPopup()&&c.map().data.addListener("click",function(a){var b=new google.maps.MVCObject,e=d[c.featureKeyAccessor()(a.feature)];h&&h.close(),e||(e={}),e.d||(e.d={}),h=new google.maps.InfoWindow({content:c.popup()(e.d,a.feature)}),b.set("position",a.latLng),h.open(c.map(),b)}),c.brushOn()&&c.map().data.addListener("click",l)},l=function(a){if(a.feature){var b=c.featureKeyAccessor()(a.feature);dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.googleMarkerChart?!1:void(dc.googleMarkerChart=function(a,b){var c=dc.baseGoogleChart({}),d=!1,e=!1,f=!1,g=!0,h=!1,i=!0,j=!1,k=!1,l=!1,m=!1,n={},o=[],p=!1,q=null,r=null;c.renderTitle(!0);var s=function(a){return c.keyAccessor()(a)},t=function(a){var b=new google.maps.Marker({position:c.toLocArray(c.locationAccessor()(a)),map:c.map(),title:c.renderTitle()?c.title()(a):"",clickable:c.renderPopup()||c.brushOn()&&!h,draggable:!1});return b};c._postRender=function(){c.brushOn()&&(h&&c.filterHandler(w),google.maps.event.addListener(c.map(),"zoom_changed",function(){c.map().getZoom()!==r&&(r=c.map().getZoom(),v("zoom"))},this),google.maps.event.addListener(c.map(),"dragend",function(){v("drag")},this),h||google.maps.event.addListener(c.map(),"click",function(){v("click")},this)),d&&(m=new MarkerClusterer(c.map()))},c._doRedraw=function(){var a=c._computeOrderedGroups(c.data()).filter(function(a){return 0!==c.valueAccessor()(a)});if(f)n={};else for(var b in n)n[b].setVisible(!1);d&&m.clearMarkers();var e=[],g=[],h=new google.maps.LatLngBounds;o=[],a.forEach(function(a){var b=c.keyAccessor()(a),i=null;!f&&b in n&&(i=n[b]),a.value?(null===i?i=u(a,b):i.setVisible(!0),h.extend(i.getPosition()),g.push(i),d?e.push(i):i.setMap(c.map()),o.push(i)):null!==i&&i.setVisible(!1)}),d&&e.length>0&&m.addMarkers(e),g.length&&(i||j&&!k)&&c.map().fitBounds(h),k=!1,i=!1},c.destroy=function(){ // clear markers and their events for(var a in n)n.hasOwnProperty(a)&&(google.maps.event.clearInstanceListeners(n[a]),n[a].setMap(null),delete n[a]); // clear map and it's events -google.maps.event.clearInstanceListeners(c.map()),c.map(null)},c.locationAccessor=function(a){return arguments.length?(t=a,c):t},c.marker=function(a){return arguments.length?(u=a,c):u},c.icon=function(a){return arguments.length?(q=a,c):q},c.cluster=function(a){return arguments.length?(d=a,c):d},c.clusterOptions=function(a){return arguments.length?(e=a,c):e},c.rebuildMarkers=function(a){return arguments.length?(f=a,c):f},c.brushOn=function(a){return arguments.length?(g=a,c):g},c.filterByArea=function(a){return arguments.length?(h=a,c):h},c.fitOnRender=function(a){return arguments.length?(i=a,c):i},c.fitOnRedraw=function(a){return arguments.length?(j=a,c):j},c.markerGroup=function(){return m},c.markers=function(a){return a?o:n};var v=function(a,b){var d=u(a);return d.key=b,c.renderPopup()&&google.maps.event.addListener(d,"click",function(){r&&r.close(),r=new google.maps.InfoWindow({content:c.popup()(a,d)}),r.open(c.map(),d)}),c.brushOn()&&!h&&google.maps.event.addListener(d,"click",y),n[b]=d,d},w=function(a){if(k=!0,h){var b;b=c.map().getCenter().equals(c.toLocArray(c.center()))&&c.map().getZoom()===c.zoom()?null:c.map().getBounds(),dc.events.trigger(function(){c.filter(null),b&&(l=!0,c.filter(b),l=!1),dc.redrawAll(c.chartGroup())})}else c.filter()&&("click"===a||c.filter()in n&&!c.map().getBounds().contains(n[c.filter()].getLatLng()))&&dc.events.trigger(function(){c.filter(null),c.renderPopup()&&c.map().closePopup(),dc.redrawAll(c.chartGroup())})},x=function(a,b){k=!0,c.dimension().filter(null),b&&b.length>0&&(c.dimension().filter(function(a){if(!(a in n))return!1;var c=n[a].position;return c&&b[0].contains(c)}),l||c.map().getBounds().toString===b[0].toString()||c.map().fitBounds(b[0]))},y=function(a){if(a.target){k=!0;var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(); \ No newline at end of file +google.maps.event.clearInstanceListeners(c.map()),c.map(null)},c.locationAccessor=function(a){return arguments.length?(s=a,c):s},c.marker=function(a){return arguments.length?(t=a,c):t},c.icon=function(a){return arguments.length?(p=a,c):p},c.cluster=function(a){return arguments.length?(d=a,c):d},c.clusterOptions=function(a){return arguments.length?(e=a,c):e},c.rebuildMarkers=function(a){return arguments.length?(f=a,c):f},c.brushOn=function(a){return arguments.length?(g=a,c):g},c.filterByArea=function(a){return arguments.length?(h=a,c):h},c.fitOnRender=function(a){return arguments.length?(i=a,c):i},c.fitOnRedraw=function(a){return arguments.length?(j=a,c):j},c.markerGroup=function(){return m},c.markers=function(a){return a?o:n};var u=function(a,b){var d=t(a);return d.key=b,c.renderPopup()&&google.maps.event.addListener(d,"click",function(){q&&q.close(),q=new google.maps.InfoWindow({content:c.popup()(a,d)}),q.open(c.map(),d)}),c.brushOn()&&!h&&google.maps.event.addListener(d,"click",x),n[b]=d,d},v=function(a){if(k=!0,h){var b;b=c.map().getCenter().equals(c.toLocArray(c.center()))&&c.map().getZoom()===c.zoom()?null:c.map().getBounds(),dc.events.trigger(function(){c.filter(null),b&&(l=!0,c.filter(b),l=!1),dc.redrawAll(c.chartGroup())})}else c.filter()&&("click"===a||c.filter()in n&&!c.map().getBounds().contains(n[c.filter()].getLatLng()))&&dc.events.trigger(function(){c.filter(null),c.renderPopup()&&c.map().closePopup(),dc.redrawAll(c.chartGroup())})},w=function(a,b){k=!0,c.dimension().filter(null),b&&b.length>0&&(c.dimension().filter(function(a){if(!(a in n))return!1;var c=n[a].position;return c&&b[0].contains(c)}),l||c.map().getBounds().toString===b[0].toString()||c.map().fitBounds(b[0]))},x=function(a){if(a.target){k=!0;var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(); \ No newline at end of file diff --git a/dist/leaflet-map/dc-leaflet.js b/dist/leaflet-map/dc-leaflet.js index 848aca57..78b084e4 100644 --- a/dist/leaflet-map/dc-leaflet.js +++ b/dist/leaflet-map/dc-leaflet.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/leaflet-map/dc-leaflet.min.js b/dist/leaflet-map/dc-leaflet.min.js index b3e0f899..6a78339e 100644 --- a/dist/leaflet-map/dc-leaflet.min.js +++ b/dist/leaflet-map/dc-leaflet.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";return dc.baseMapChart?!1:void(dc.baseMapChart=function(a){a=dc.baseChart(a);var b,c=!0,d=!1,e=!1,f=!1,g=!1,h=function(a){L.tileLayer("http://{s}.tile.osm.org/{z}/{x}/{y}.png",{attribution:'© OpenStreetMap contributors'}).addTo(a)},i=function(b){return a.title()(b)};return a._doRender=function(){},a._postRender=function(){},a.toLocArray=function(){},a.mapOptions=function(b){return arguments.length?(d=b,a):d},a.center=function(b){return arguments.length?(e=b,a):e},a.zoom=function(b){return arguments.length?(f=b,a):f},a.tiles=function(b){return arguments.length?(h=b,a):h},a.map=function(a){return arguments.length?b=a:b},a.popup=function(b){return arguments.length?(i=b,a):i},a.renderPopup=function(b){return arguments.length?(c=b,a):c},a.brushOn=function(b){return arguments.length?(g=b,a):g},a})}(),function(){"use strict";return dc.baseLeafletChart?!1:void(dc.baseLeafletChart=function(a){return a=dc.baseMapChart(a),a._doRender=function(){var b=L.map(a.root().node(),a.mapOptions());return a.center()&&a.zoom()&&b.setView(a.toLocArray(a.center()),a.zoom()),a.tiles()(b),a.map(b),a._postRender(),a._doRedraw()},a.toLocArray=function(a){return"string"==typeof a&&(a=a.split(",")),a},a})}(),function(){"use strict";return dc.leafletChoroplethChart?!1:void(dc.leafletChoroplethChart=function(a,b){var c=dc.colorChart(dc.baseLeafletChart({})),d=!1,e=[],f=!1,g={fillColor:"black",color:"gray",opacity:.4,fillOpacity:.6,weight:1},h=function(a){return a.key},i=function(a){var b=c.featureOptions();b instanceof Function&&(b=b(a)),b=JSON.parse(JSON.stringify(b));var d=e[c.featureKeyAccessor()(a)];return d&&d.d&&(b.fillColor=c.getColor(d.d,d.i),-1!==c.filters().indexOf(d.d.key)&&(b.opacity=.8,b.fillOpacity=1)),b};c._postRender=function(){d=L.geoJson(c.geojson(),{style:c.featureStyle(),onEachFeature:j}),c.map().addLayer(d)},c._doRedraw=function(){d.clearLayers(),e=[],c._computeOrderedGroups(c.data()).forEach(function(a,b){e[c.keyAccessor()(a)]={d:a,i:b}}),d.addData(c.geojson())},c.geojson=function(a){return arguments.length?(f=a,c):f},c.featureOptions=function(a){return arguments.length?(g=a,c):g},c.featureKeyAccessor=function(a){return arguments.length?(h=a,c):h},c.featureStyle=function(a){return arguments.length?(i=a,c):i};var j=function(a,b){var d=e[c.featureKeyAccessor()(a)];d&&d.d&&(b.key=d.d.key,c.renderPopup()&&b.bindPopup(c.popup()(d.d,a)),c.brushOn()&&b.on("click",k))},k=function(a){if(a.target){var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(),function(){"use strict";return dc.leafletMarkerChart?!1:void(dc.leafletMarkerChart=function(a,b){var c=dc.baseLeafletChart({}),d=!0,e=!1,f=!1,g=!1,h=!0,i=!1,j=!1,k=!1,l=!1,m={},n=!1,o=!0,p=!1,q=!1;c.renderTitle(!0);var r=function(a){return c.keyAccessor()(a)},s=function(a,b){var d=new L.Marker(c.toLocArray(c.locationAccessor()(a)),{title:c.renderTitle()?c.title()(a):"",alt:c.renderTitle()?c.title()(a):"",icon:t(),clickable:c.renderPopup()||c.brushOn()&&!i,draggable:!1});return d},t=function(a,b){return new L.Icon.Default},u=function(a,b){return c.title()(a)};c._postRender=function(){c.brushOn()&&(i&&c.filterHandler(y),c.map().on("zoomend moveend",x,this),i||c.map().on("click",x,this),c.map().on("zoomstart",w,this)),l=e?new L.MarkerClusterGroup(f?f:null):new L.LayerGroup,c.map().addLayer(l)},c._doRedraw=function(){var a=c._computeOrderedGroups(c.data()).filter(function(a){return 0!==c.valueAccessor()(a)});if(!n||n.toString()!==a.toString()){n=a,g&&(m={}),l.clearLayers();var b=[];if(a.forEach(function(a,d){var e=c.keyAccessor()(a),f=null;f=!g&&e in m?m[e]:v(a,e),c.cluster()?b.push(f):l.addLayer(f)}),c.cluster()&&b.length>0&&l.addLayers(b),b.length>0&&(o||p&&!q)){var d=new L.featureGroup(b);c.map().fitBounds(d.getBounds())}q=!1,o=!1}},c.locationAccessor=function(a){return arguments.length?(r=a,c):r},c.marker=function(a){return arguments.length?(s=a,c):s},c.icon=function(a){return arguments.length?(t=a,c):t},c.popup=function(a){return arguments.length?(u=a,c):u},c.renderPopup=function(a){return arguments.length?(d=a,c):d},c.cluster=function(a){return arguments.length?(e=a,c):e},c.clusterOptions=function(a){return arguments.length?(f=a,c):f},c.rebuildMarkers=function(a){return arguments.length?(g=a,c):g},c.brushOn=function(a){return arguments.length?(h=a,c):h},c.filterByArea=function(a){return arguments.length?(i=a,c):i},c.fitOnRender=function(a){return arguments.length?(o=a,c):o},c.fitOnRedraw=function(a){return arguments.length?(p=a,c):p},c.markerGroup=function(){return l};var v=function(a,b){var d=s(a);return d.key=b,c.renderPopup()&&d.bindPopup(c.popup()(a,d)),c.brushOn()&&!i&&d.on("click",z),m[b]=d,d},w=function(a){k=!0},x=function(a){if("moveend"!==a.type||!k&&!a.hard)if(k=!1,q=!0,i){var b;b=c.map().getCenter().equals(c.center())&&c.map().getZoom()===c.zoom()?null:c.map().getBounds(),dc.events.trigger(function(){c.filter(null),b&&(j=!0,c.filter(b),j=!1),dc.redrawAll(c.chartGroup())})}else c.filter()&&("click"===a.type||-1!==m.indexOf(c.filter())&&!c.map().getBounds().contains(m[c.filter()].getLatLng()))&&dc.events.trigger(function(){c.filter(null),d&&c.map().closePopup(),dc.redrawAll(c.chartGroup())})},y=function(a,b){q=!0,c.dimension().filter(null),b&&b.length>0&&(c.dimension().filterFunction(function(a){if(!(a in m))return!1;var c=m[a].getLatLng();return c&&b[0].contains(c)}),j||c.map().getBounds().toString===b[0].toString()||c.map().fitBounds(b[0]))},z=function(a){if(a.target){q=!0;var b=a.target.key;dc.events.trigger(function(){c.filter(b),dc.redrawAll(c.chartGroup())})}};return c.anchor(a,b)})}(), diff --git a/dist/pagination/dc-pagination-mixin.js b/dist/pagination/dc-pagination-mixin.js index 8b15e28d..23ecbe72 100644 --- a/dist/pagination/dc-pagination-mixin.js +++ b/dist/pagination/dc-pagination-mixin.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/pagination/dc-pagination-mixin.min.js b/dist/pagination/dc-pagination-mixin.min.js index c7cab73a..ceaf96db 100644 --- a/dist/pagination/dc-pagination-mixin.min.js +++ b/dist/pagination/dc-pagination-mixin.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";return dc.paginationMixin?!1:void(dc.paginationMixin=function(a){ diff --git a/dist/paired-row/dc-paired-row-chart.js b/dist/paired-row/dc-paired-row-chart.js index b0608d9f..f941a230 100644 --- a/dist/paired-row/dc-paired-row-chart.js +++ b/dist/paired-row/dc-paired-row-chart.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/paired-row/dc-paired-row-chart.min.js b/dist/paired-row/dc-paired-row-chart.min.js index 90addfe2..e5eec9c2 100644 --- a/dist/paired-row/dc-paired-row-chart.min.js +++ b/dist/paired-row/dc-paired-row-chart.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";/** diff --git a/dist/server/dc-server-chart-with-animations.js b/dist/server/dc-server-chart-with-animations.js index e2f392b2..049ec077 100644 --- a/dist/server/dc-server-chart-with-animations.js +++ b/dist/server/dc-server-chart-with-animations.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/server/dc-server-chart-with-animations.min.js b/dist/server/dc-server-chart-with-animations.min.js index 06b4b175..a591c506 100644 --- a/dist/server/dc-server-chart-with-animations.min.js +++ b/dist/server/dc-server-chart-with-animations.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";return dc.serverChart?!1:("dc"in window||(window.dc={}),void(dc.serverChart=function(a){ diff --git a/dist/server/dc-server-chart.js b/dist/server/dc-server-chart.js index aea2944d..d3f649b2 100644 --- a/dist/server/dc-server-chart.js +++ b/dist/server/dc-server-chart.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/server/dc-server-chart.min.js b/dist/server/dc-server-chart.min.js index 3c2a834b..5efb82f0 100644 --- a/dist/server/dc-server-chart.min.js +++ b/dist/server/dc-server-chart.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";return dc.serverChart?!1:("dc"in window||(window.dc={}),void(dc.serverChart=function(a){ diff --git a/dist/server/dc-server.js b/dist/server/dc-server.js index f24733f7..12d8ee06 100644 --- a/dist/server/dc-server.js +++ b/dist/server/dc-server.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ // node modules diff --git a/dist/server/dc-server.min.js b/dist/server/dc-server.min.js index cd1e9722..b15dc956 100644 --- a/dist/server/dc-server.min.js +++ b/dist/server/dc-server.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ // node modules diff --git a/dist/server/server-config.js b/dist/server/server-config.js index 77c6e03f..9ec1949f 100644 --- a/dist/server/server-config.js +++ b/dist/server/server-config.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ var moment = require('moment'), diff --git a/dist/server/server-config.min.js b/dist/server/server-config.min.js index 6b19a6e2..3998ec95 100644 --- a/dist/server/server-config.min.js +++ b/dist/server/server-config.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ var moment=require("moment"),dc=require("dc");module.exports={"store-dashboard":{connection:{host:"127.0.0.1",username:"root",password:"password",database:"loyaltyone",sql:"SELECT * FROM members LIMIT 100"},charts:[{type:"pieChart",options:{width:250,height:250,margins:{top:30,right:50,bottom:25,left:40},dimension:function(a){return 0===a.gender?"Male":1===a.gender?"Female":"Unknown"},group:function(a){return a.group().reduceCount()}}},{type:"barChart",options:{ diff --git a/dist/tooltip/dc-tooltip-mixin.js b/dist/tooltip/dc-tooltip-mixin.js index 500a1874..8d3e74cd 100644 --- a/dist/tooltip/dc-tooltip-mixin.js +++ b/dist/tooltip/dc-tooltip-mixin.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ (function () { diff --git a/dist/tooltip/dc-tooltip-mixin.min.js b/dist/tooltip/dc-tooltip-mixin.min.js index 78e6c831..b3ddaf53 100644 --- a/dist/tooltip/dc-tooltip-mixin.min.js +++ b/dist/tooltip/dc-tooltip-mixin.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ !function(){"use strict";return dc.tooltipMixin?!1:void(dc.tooltipMixin=function(a){return a&&(a.tip={},a.tip.tooltip=null,a.tip.init=function(){if(null===a.tip.tooltip){var b=a.svg().selectAll("g.sub"); diff --git a/dist/utils/utils.js b/dist/utils/utils.js index 11792e85..73e3ebf0 100644 --- a/dist/utils/utils.js +++ b/dist/utils/utils.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ if (!dc.utils.getAllFilters) { diff --git a/dist/utils/utils.min.js b/dist/utils/utils.min.js index 2bc3ebe2..cf234731 100644 --- a/dist/utils/utils.min.js +++ b/dist/utils/utils.min.js @@ -1,7 +1,7 @@ /*! - * dc-addons v0.11.4 + * dc-addons v0.11.5 * - * 2015-12-17 15:06:51 + * 2016-02-08 09:21:40 * */ dc.utils.getAllFilters||(dc.utils.getAllFilters=function(){var a={},b=dc.chartRegistry.list();for(var c in b){var d=b[c];a[d.chartID()]=d.filters()}return a}); \ No newline at end of file diff --git a/package.json b/package.json index 3f38a28a..cc11e433 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dc-addons", - "version": "0.11.4", + "version": "0.11.5", "dependencies": { "crossfilter": "~1.3.11", "d3": "~3.5.5", diff --git a/src/scripts/google-marker-chart.js b/src/scripts/google-marker-chart.js index 74e268ef..09333d01 100644 --- a/src/scripts/google-marker-chart.js +++ b/src/scripts/google-marker-chart.js @@ -96,7 +96,6 @@ return _chart.valueAccessor()(d) !== 0; }); - if (_rebuildMarkers) { _markerList = {}; } else {