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

Improved FiresMap (makers checkbox, better calcs, etc)

Browse source
This commit is contained in:
vjrj 2017-12-03 16:54:24 +01:00
parent fe7a314d92
commit 2e36c9cd17
13 changed files with 496 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,15 +32,25 @@ var NullOr = function (type) {
});
};
// http://wiki.openstreetmap.org/wiki/Zoom_levels
// http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Resolution_and_Scale
const zoomMetersPerPixel = [156412, 78206, 39103, 19551, 9776, 4888, 2444, 1222, 610.984, 305.492, 152.746, 76.373, 38.187, 19.093, 9.547, 4.773, 2.387, 1.193, 0.596, 0.298];
var activefires = function(zoom, lat, lng) {
// http://cwestblog.com/2012/11/12/javascript-degree-and-radian-conversion/
Math.radians = function(degrees) {
return degrees * Math.PI / 180;
};
var activefires = function(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);
// console.log("Meters per pixel: " + zoomMetersPerPixel[zoom]);
var resolution = 156543.03 * Math.cos(Math.radians(lat)) / Math.pow(2,zoom);
// console.log(`Meters per pixel ${zoomMetersPerPixel[zoom]}, resolution ${resolution} meters x pixel`);
var distance = Math.trunc(Math.max(resolution*height, resolution*width));
// 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(geoData);
return ActiveFires.find({
@ -51,16 +61,19 @@ var activefires = function(zoom, lat, lng) {
coordinates: [ lng, lat]
},
$minDistance: 0,
$maxDistance: zoomMetersPerPixel[zoom] * 1000
$maxDistance: distance
}
}
});
}
Meteor.publish('activefiresmyloc', function(zoom, lat, lng) {
Meteor.publish('activefiresmyloc', function(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 === null || lng === null) {
var clientIP = this.connection.clientAddress;
if (clientIP === '127.0.0.1') {
@ -71,5 +84,5 @@ Meteor.publish('activefiresmyloc', function(zoom, lat, lng) {
lat = location.latitude;
lng = location.longitude;
}
return activefires(zoom, lat, lng);
return activefires(zoom, lat, lng, height, width);
});