Skip to content

[ZEPPELIN-157] Adding Map Visualization for Zeppelin#765

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

Closed
Madhuka wants to merge 6 commits into from
Closed

[ZEPPELIN-157] Adding Map Visualization for Zeppelin #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
63de8d9
adding leaflet
Madhuka Mar 7, 2016
c7d5a9a
adding map visualization for zeppelin
Madhuka Mar 7, 2016
0fa45ec
adding lines for index.html and karma.conf
Madhuka Mar 7, 2016
70a1006
fixing extend
Madhuka Mar 10, 2016
2dbd716
fixing bower
Madhuka May 9, 2016
31752a4
fixing grunt build
Madhuka Aug 11, 2016
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
4 changes: 3 additions & 1 deletion zeppelin-web/bower.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@
"bootstrap3-dialog": "bootstrap-dialog#~1.34.7",
"handsontable": "~0.24.2",
"moment-duration-format": "^1.3.0",
"select2": "^4.0.3"
"select2": "^4.0.3",
"leaflet": "~0.7.7",
"angular-leaflet-directive": "~0.10.0"
},
"devDependencies": {
"angular-mocks": "1.5.0"
Expand Down
4 changes: 3 additions & 1 deletion zeppelin-web/src/app/app.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,8 +33,10 @@
'xeditable',
'ngToast',
'focus-if',
'ngResource'
'ngResource',
'leaflet-directive'
])

.filter('breakFilter', function() {
return function(text) {
if (!!text) {
Expand Down
7 changes: 6 additions & 1 deletion zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@
ng-class="{'active': isGraphMode('scatterChart')}"
ng-click="setGraphMode('scatterChart', true)"><i class="cf cf-scatter-chart"></i>
</button>
<button type="button" class="btn btn-default btn-sm"
ng-class="{'active': isGraphMode('mapChart')}"
ng-click="setGraphMode('mapChart', true)"><i class="fa fa-globe"></i>
</button>

<button type="button"
ng-if="paragraph.result.type != 'TABLE'"
Expand DownExpand Up@@ -114,8 +118,9 @@
</div>

<span
ng-if="getResultType()=='TABLE' && !paragraph.config.helium.activeApp && getGraphMode()!='table' && !asIframe && !viewOnly"
ng-if="getResultType()=='TABLE' && !paragraph.config.helium.activeApp && getGraphMode()!='table' && getGraphMode()!='mapChart' && !asIframe && !viewOnly"
style="margin-left:10px; cursor:pointer; display: inline-block; vertical-align:top; position: relative; line-height:30px;">

<a class="btnText" ng-click="toggleGraphOption()">
settings <span ng-class="paragraph.config.graph.optionOpen ? 'fa fa-caret-up' : 'fa fa-caret-down'"></span>
</a>
Expand Down
5 changes: 5 additions & 0 deletions zeppelin-web/src/app/notebook/paragraph/paragraph-graph.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,4 +51,9 @@
id="p{{paragraph.id}}_scatterChart">
<svg></svg>
</div>

<div ng-if="getGraphMode()=='mapChart'"
id="p{{paragraph.id}}_mapChart">
<leaflet bounds="bounds" center="center" markers="markers"></leaflet>
</div>
</div>
50 changes: 49 additions & 1 deletion zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $rootScope, $route, $window,
$routeParams, $location, $timeout, $compile,
$http, websocketMsgSrv, baseUrlSrv, ngToast,
saveAsService) {
saveAsService, leafletBoundsHelpers) {

var ANGULAR_FUNCTION_OBJECT_NAME_PREFIX = '_Z_ANGULAR_FUNC_';
$scope.parentNote = null;
$scope.paragraph = null;
Expand DownExpand Up@@ -896,6 +897,10 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
}
};

$scope.defaults = {
scrollWheelZoom: false
};

$scope.setGraphMode = function(type, emit, refresh) {
if (emit) {
setNewMode(type);
Expand All@@ -907,6 +912,8 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r

if (!type || type === 'table') {
setTable($scope.paragraph.result, refresh);
} else if (type === 'mapChart') {
setMapChart(type, $scope.paragraph.result, refresh);
} else {
setD3Chart(type, $scope.paragraph.result, refresh);
}
Expand DownExpand Up@@ -989,6 +996,47 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r

};

var setMapChart = function(type, data, refresh) {
var latArr = [];
var lngArr = [];
var newmarkers = {};

if (!$scope.chart[type]) {
var mapChartModel = function(d) {
var key = d[1].replace('-', '_');
var obj = {};
latArr.push(Math.round(parseFloat(d[2])));
lngArr.push(Math.round(parseFloat(d[3])));
obj[key] = {
lat: parseFloat(d[2]),
lng: parseFloat(d[3]),
message: d[1],
focus: true,
draggable: false
};
return obj;
};

for (var i = 0; i < data.rows.length; i++) {
var row = data.rows[i];
var rowMarker = mapChartModel(row);
newmarkers = angular.extend(newmarkers, rowMarker);
}
}

$scope.markers = newmarkers;
var bounds = leafletBoundsHelpers.createBoundsFromArray([
[Math.max.apply(Math, latArr), Math.max.apply(Math, lngArr)],
[Math.min.apply(Math, latArr), Math.min.apply(Math, lngArr)]
]);
$scope.bounds = bounds;

// set map chart height
var height = $scope.paragraph.config.graph.height;
angular.extend('#p' + $scope.paragraph.id + '_mapChart').height(height);
$scope.center = {};
};

var groupedThousandsWith3DigitsFormatter = function(x) {
return d3.format(',')(d3.round(x, 3));
};
Expand Down
9 changes: 9 additions & 0 deletions zeppelin-web/src/app/notebook/paragraph/paragraph.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,15 @@ table.dataTable.table-condensed .sorting_desc:after {
margin-bottom: 5px !important;
}

.angular-leaflet-map {
height: 300px;
width: 100%;
}

.graphContainer .mapChart {
overflow: hidden;
}

.resizable-helper {
border: 3px solid #DDDDDD;
}
Expand Down
10 changes: 10 additions & 0 deletions zeppelin-web/src/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,16 @@
<script src="bower_components/handsontable/dist/handsontable.js"></script>
<script src="bower_components/moment-duration-format/lib/moment-duration-format.js"></script>
<script src="bower_components/select2/dist/js/select2.js"></script>
<script src="bower_components/datatables.net/js/jquery.dataTables.js"></script>
<script src="bower_components/datatables.net-bs/js/dataTables.bootstrap.js"></script>
<script src="bower_components/datatables.net-buttons/js/dataTables.buttons.js"></script>
<script src="bower_components/datatables.net-buttons/js/buttons.colVis.js"></script>
<script src="bower_components/datatables.net-buttons/js/buttons.flash.js"></script>
<script src="bower_components/datatables.net-buttons/js/buttons.html5.js"></script>
<script src="bower_components/datatables.net-buttons/js/buttons.print.js"></script>
<script src="bower_components/datatables.net-buttons-bs/js/buttons.bootstrap.js"></script>
<script src="bower_components/leaflet/dist/leaflet-src.js"></script>
<script src="bower_components/angular-leaflet-directive/dist/angular-leaflet-directive.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js({.tmp,src}) scripts/scripts.js -->
Expand Down
2 changes: 2 additions & 0 deletions zeppelin-web/test/karma.conf.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ module.exports = function(config) {
'bower_components/handsontable/dist/handsontable.js',
'bower_components/moment-duration-format/lib/moment-duration-format.js',
'bower_components/select2/dist/js/select2.js',
'bower_components/leaflet/dist/leaflet-src.js',
'bower_components/angular-leaflet-directive/dist/angular-leaflet-directive.js',
'bower_components/angular-mocks/angular-mocks.js',
// endbower
'src/app/app.js',
Expand Down