comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better publication and count of active fires in current map

Browse source
This commit is contained in:
vjrj 2018-01-30 18:05:11 +01:00
parent 96595b3aa4
commit 2fec833aef
4 changed files with 111 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

110
imports/api/ActiveFires/server/publications.js
View file

@ -3,8 +3,8 @@
/* eslint-disable prefer-arrow-callback */
import { Meteor } from 'meteor/meteor';
import { check, Match } from 'meteor/check';
import { localize } from '/imports/startup/server/IPGeocoder';
import { check } from 'meteor/check';
import { NumberBetween } from '/imports/modules/server/other-checks';
import ActiveFires from '../ActiveFires';
const counter = new Counter('countActiveFires', ActiveFires.find({}));
@ -13,60 +13,14 @@ Meteor.publish('activefirestotal', function total() {
return counter;
});
const validZoom = Match.Where((zoom) => {
// http://wiki.openstreetmap.org/wiki/Zoom_levels
check(zoom, Number);
return zoom >= 0 && zoom <= 19;
});
// https://github.com/3stack-software/meteor-match-library
function NumberBetween(min, max) {
return Match.Where((x) => {
check(x, Number);
return min <= x && x <= max;
});
}
function NullOr(type) {
return Match.Where((x) => {
if (x === null) {
return true;
}
check(x, type);
return true;
});
}
// http://wiki.openstreetmap.org/wiki/Zoom_levels
// http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Resolution_and_Scale
// http://cwestblog.com/2012/11/12/javascript-degree-and-radian-conversion/
Math.radians = (degrees) => {
const rad = (degrees * Math.PI) / 180;
return rad;
};
const activefires = (zoom, lat, lng, height, width) => {
// latitude -90 and 90 and the longitude between -180 and 180
check(lat, NumberBetween(-90, 90));
check(lng, NumberBetween(-180, 180));
// console.log("Zoom: " + zoom + " lat: " + lat + " lng: " + lng);
const resolution = (156543.03 * Math.cos(Math.radians(lat))) / (2 ** zoom);
const distUnt = resolution * Math.max(height, width);
const distance = Math.trunc(distUnt);
// console.log(`so ${height}x${width} gives ${Math.trunc(resolution*height/1000)} x ${Math.trunc(resolution*width/1000)} km, so looking in ${distance}`);
// console.log(`So ${height}x${width} gives ${Math.trunc(resolution)} of resolution, so looking in ${Math.trunc(distance / 1000)}km`);
const activefires = (northEastLng, northEastLat, southWestLng, southWestLat) => {
const fires = ActiveFires.find({
ourid: {
$near: {
$geometry: {
type: 'Point',
coordinates: [lng, lat]
},
$minDistance: 0,
$maxDistance: distance
$geoWithin: {
$box: [
[southWestLng, southWestLat],
[northEastLng, northEastLat]
]
}
}
}, {
@ -80,48 +34,12 @@ const activefires = (zoom, lat, lng, height, width) => {
return fires;
};
Meteor.publish('allActiveFires', function allActive() {
Meteor.publish('activefiresmyloc', function activeInMyLoc(northEastLng, northEastLat, southWestLng, southWestLat) {
// latitude -90 and 90 and the longitude between -180 and 180
check(northEastLng, NumberBetween(-180, 180));
check(southWestLat, NumberBetween(-90, 90));
check(southWestLng, NumberBetween(-180, 180));
check(northEastLat, NumberBetween(-90, 90));
const { latitude, longitude } = localize().location;
// console.log(`${latitude}, ${longitude}`);
check(latitude, NumberBetween(-90, 90));
check(longitude, NumberBetween(-180, 180));
// https://docs.meteor.com/api/collections.html#Mongo-Collection-find
return ActiveFires.find({
ourid: {
$near: {
$geometry: {
type: 'Point',
coordinates: [longitude, latitude]
},
$minDistance: 0,
$maxDistance: 1000 // 156412000
}
}
}, {
fields: {
_id: 0,
lat: 1,
lon: 1,
scan: 1
},
maxTimeMs: 30000
});
});
Meteor.publish('activefiresmyloc', function activeInMyLoc(zoom, lat, lng, height, width) {
check(zoom, validZoom);
check(lat, NullOr(Number));
check(lng, NullOr(Number));
check(height, NullOr(Number));
check(width, NullOr(Number));
// console.log(`Check active fires in ${lat},${lng} with zoom ${zoom} pixels in ${height}x${width} map`);
if (lat && lng) {
return activefires(zoom, lat, lng, height, width);
}
const geo = localize();
// console.log(`${location.latitude}, ${location.longitude}`);
return activefires(zoom, geo.location.latitude, geo.location.longitude, height, width);
return activefires(northEastLng, northEastLat, southWestLng, southWestLat);
});