Browse Source

frontend: added mcc-mnc-list, to visualize on the map the brand of each antenna

master
arnaucode 7 years ago
parent
commit
da08a4d291
3 changed files with 29453 additions and 3 deletions
  1. +29426
    -0
      web/mcc-mnc-list.json
  2. +2
    -2
      web/package.json
  3. +25
    -1
      web/views/main/main.js

+ 29426
- 0
web/mcc-mnc-list.json
File diff suppressed because it is too large
View File


+ 2
- 2
web/package.json

@ -16,7 +16,7 @@
}, },
"dependencies": { "dependencies": {
"bower": "latest", "bower": "latest",
"connect": "latest",
"serve-static": "latest"
"connect": "latest",
"serve-static": "latest"
} }
} }

+ 25
- 1
web/views/main/main.js

@ -10,6 +10,19 @@ angular.module('app.main', ['ngRoute', 'leaflet-directive'])
}]) }])
.controller('MainCtrl', function($scope, $http, leafletMapEvents) { .controller('MainCtrl', function($scope, $http, leafletMapEvents) {
//get mcc and mnc data
$scope.mcc=[];
$http.get('mcc-mnc-list.json')
.then(function(data) {
console.log('data success');
console.log(data);
$scope.mcc = data.data;
}, function(data) {
console.log('data error');
});
//map //map
$scope.center = { $scope.center = {
lat: 41.38014146592283, lat: 41.38014146592283,
@ -86,10 +99,21 @@ angular.module('app.main', ['ngRoute', 'leaflet-directive'])
icon: markY icon: markY
}); });
for (var i = 0; i < $scope.cells.length; i++) { for (var i = 0; i < $scope.cells.length; i++) {
/*var company ="";
company = $scope.mcc.filter(function(obj){
return obj.mcc==$scope.cells[i].mcc && obj.mnc == $scope.cells[i].net;
});*/
var company = "";
for(var k in $scope.mcc){
if($scope.mcc[k].mcc==$scope.cells[i].mcc && $scope.mcc[k].mnc == $scope.cells[i].net) {
company = $scope.mcc[k];
}
}
console.log(company);
$scope.markers.push({ $scope.markers.push({
lat: Number($scope.cells[i].lat), lat: Number($scope.cells[i].lat),
lng: Number($scope.cells[i].lon), lng: Number($scope.cells[i].lon),
message: "lat:" + $scope.cells[i].lat + ", lon:" + $scope.cells[i].lon,
message: "lat:" + $scope.cells[i].lat + ", lon:" + $scope.cells[i].lon +"<br> mcc:"+ $scope.cells[i].mcc + ", mnc:" + $scope.cells[i].net + "<br>" + company.brand,
icon: antennaIcon icon: antennaIcon
}); });
} }

Loading…
Cancel
Save