mirror of
https://github.com/Findus23/lightpollution.git
synced 2024-09-19 13:23:44 +02:00
latest version
This commit is contained in:
parent
acc87560f0
commit
bd2c8750d7
GPG key ID:
54DE4D798D244853
7 changed files with 946 additions and 20 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,3 +1,7 @@
|
|||
.idea/
|
||||
*.npy
|
||||
fig.png
|
||||
__pycache__/
|
||||
*.csv
|
||||
*.png
|
||||
settings.json
|
||||
116
data.py
Normal file
116
data.py
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
from dataclasses import dataclass
|
||||
from typing import Tuple, List
|
||||
|
||||
import numpy as np
|
||||
from scipy.interpolate import RectBivariateSpline, CubicSpline
|
||||
|
||||
|
||||
@dataclass
|
||||
class Measurepoint():
|
||||
def __init__(self, coord: Tuple[float, float], filename: str, name: str):
|
||||
self.coord = coord
|
||||
self.filename = filename
|
||||
self.name = name
|
||||
self.brightnesses = self.load_horizontal_sky_brightness()
|
||||
self.brightnesses2d = self.load_2d_sky_brightness()
|
||||
self.spline = self.load_spline(self.brightnesses2d)
|
||||
self.horizon_spline = self.load_horizon_spline()
|
||||
|
||||
def load_horizontal_sky_brightness(self) -> List[float]:
|
||||
brightnesses = []
|
||||
mags = []
|
||||
with open(f"../rohdaten/{self.filename} - Horizontal Sky Brightness Graph.csv") as f:
|
||||
for _ in range(29):
|
||||
next(f)
|
||||
for line in f:
|
||||
if line == "\n":
|
||||
continue
|
||||
azimuth, sky_brightness, luminance, cct = map(float, line.split(","))
|
||||
brightnesses.append(luminance)
|
||||
mags.append(10 ** (-0.4 * sky_brightness) * 108e6)
|
||||
|
||||
# plt.plot(range(len(brightnesses)), brightnesses)
|
||||
# plt.show()
|
||||
assert len(brightnesses) == 360
|
||||
brightnesses = np.array(brightnesses)
|
||||
# mags = np.array(mags)
|
||||
# print(brightnesses, mags)
|
||||
# print(brightnesses / mags)
|
||||
# plt.plot(brightnesses, mags)
|
||||
# plt.show()
|
||||
brightnesses = np.roll(brightnesses, 180)
|
||||
return brightnesses
|
||||
|
||||
@property
|
||||
def filename2d(self):
|
||||
return f"../rohdaten/{self.filename}-2D-matrix.csv"
|
||||
|
||||
def load_2d_sky_brightness(self):
|
||||
data = np.loadtxt(
|
||||
self.filename2d,
|
||||
skiprows=241,
|
||||
delimiter=",",
|
||||
max_rows=92,
|
||||
usecols=range(1, 361)
|
||||
)
|
||||
data = np.roll(data, 180, axis=1)
|
||||
data = np.flipud(data)
|
||||
return 10 ** (-0.4 * data) * 108e6
|
||||
|
||||
def load_horizon_spline(self) -> CubicSpline:
|
||||
horizon = np.loadtxt(
|
||||
self.filename2d,
|
||||
skiprows=57,
|
||||
delimiter=",",
|
||||
max_rows=237 - 58,
|
||||
usecols=(0, 1)
|
||||
)
|
||||
horizon[:, 1] = 90 - horizon[:, 1] # degrees are upside down
|
||||
cs = CubicSpline(horizon[:, 0], horizon[:, 1])
|
||||
# x = np.linspace(0, 360, 1000)
|
||||
# plt.plot(horizon[:, 0], horizon[:, 1])
|
||||
# plt.plot(x, cs(x))
|
||||
# plt.show()
|
||||
return cs
|
||||
|
||||
def load_spline(self, data2d: np.ndarray) -> RectBivariateSpline:
|
||||
x, y = np.arange(data2d.shape[0]), np.arange(data2d.shape[1])
|
||||
return RectBivariateSpline(x, y, data2d)
|
||||
|
||||
|
||||
points = [
|
||||
Measurepoint(filename="IMG_0172", name="Mistelbach-Süd", coord=(48.5232506, 16.5654793)),
|
||||
Measurepoint(filename="IMG_0176", name="Mistelbach-West", coord=(48.5747355, 16.498188)),
|
||||
Measurepoint(filename="IMG_0182", name="Mistelbach-Nordwest", coord=(48.5945091, 16.5278206)),
|
||||
Measurepoint(filename="IMG_0186", name="Mistelbach-Nord", coord=(48.6069419, 16.5606171)),
|
||||
Measurepoint(filename="IMG_0190", name="Mistelbach-Nordost", coord=(48.5913925, 16.6311699)),
|
||||
Measurepoint(filename="IMG_0194", name="Mistelbach-Südost", coord=(48.5471377, 16.6404243)),
|
||||
]
|
||||
|
||||
# interpolator = points[0].load_interpolation(points[0].brightnesses2d)
|
||||
# zoom = 5
|
||||
# z = np.zeros((93 * zoom, 360 * zoom))
|
||||
# for x in range(93 * zoom):
|
||||
# print(x)
|
||||
# for y in range(360 * zoom):
|
||||
# z[x, y] = interpolator(x / zoom, y / zoom)
|
||||
# plt.imshow(z, origin="lower")
|
||||
# plt.colorbar()
|
||||
# plt.show()
|
||||
#
|
||||
# plt.imshow(points[0].brightnesses2d, origin="lower")
|
||||
# plt.colorbar()
|
||||
# plt.show()
|
||||
|
||||
bounds = {
|
||||
"lon": {
|
||||
"upper": max(p.coord[0] for p in points) + 0.2,
|
||||
"lower": min(p.coord[0] for p in points) - 0.2
|
||||
},
|
||||
"lat": {
|
||||
"upper": max(p.coord[1] for p in points) + 0.2,
|
||||
"lower": min(p.coord[1] for p in points) - 0.2
|
||||
}
|
||||
}
|
||||
# bounds["x"]["width"] = bounds["x"]["upper"] - bounds["x"]["lower"]
|
||||
# bounds["y"]["width"] = bounds["y"]["upper"] - bounds["y"]["lower"]
|
||||
74
index.html
Normal file
74
index.html
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
|
||||
<title>Lightpollution Mistelbach</title>
|
||||
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="leaflet.css"
|
||||
integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
|
||||
crossorigin=""/>
|
||||
<script src="leaflet.js"
|
||||
integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew=="
|
||||
crossorigin=""></script>
|
||||
|
||||
<style>
|
||||
body {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
html, body, #map {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
||||
<div id="map"></div>
|
||||
<script>
|
||||
const map = L.map('map',{
|
||||
zoomSnap:0.1,
|
||||
center:[48.56766236706026, 16.571846008300785],
|
||||
zoom:13
|
||||
});
|
||||
|
||||
L.tileLayer("https://maps.lw1.at/tiles/1.0.0/osm/GLOBAL_MERCATOR/{z}/{x}/{y}.png", {
|
||||
maxZoom: 19,
|
||||
attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
|
||||
}).addTo(map);
|
||||
|
||||
function reqListener() {
|
||||
let layers = {};
|
||||
let images = JSON.parse(this.responseText);
|
||||
const def = "spline.png";
|
||||
images.forEach(function (image) {
|
||||
const l = L.imageOverlay(
|
||||
image.filename,
|
||||
image.bounds,
|
||||
{opacity: 0.8, className: "theimage"}
|
||||
);
|
||||
if (image.filename === def) {
|
||||
l.addTo(map);
|
||||
}
|
||||
layers[image.filename] = l
|
||||
});
|
||||
L.control.layers(layers, []).addTo(map);
|
||||
}
|
||||
|
||||
const oReq = new XMLHttpRequest();
|
||||
oReq.addEventListener("load", reqListener);
|
||||
oReq.open("GET", "settings.json");
|
||||
oReq.send();
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
640
leaflet.css
Normal file
640
leaflet.css
Normal file
|
|
@ -0,0 +1,640 @@
|
|||
/* required styles */
|
||||
|
||||
.leaflet-pane,
|
||||
.leaflet-tile,
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow,
|
||||
.leaflet-tile-container,
|
||||
.leaflet-pane > svg,
|
||||
.leaflet-pane > canvas,
|
||||
.leaflet-zoom-box,
|
||||
.leaflet-image-layer,
|
||||
.leaflet-layer {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
}
|
||||
.leaflet-container {
|
||||
overflow: hidden;
|
||||
}
|
||||
.leaflet-tile,
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
user-select: none;
|
||||
-webkit-user-drag: none;
|
||||
}
|
||||
/* Prevents IE11 from highlighting tiles in blue */
|
||||
.leaflet-tile::selection {
|
||||
background: transparent;
|
||||
}
|
||||
/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
|
||||
.leaflet-safari .leaflet-tile {
|
||||
image-rendering: -webkit-optimize-contrast;
|
||||
}
|
||||
/* hack that prevents hw layers "stretching" when loading new tiles */
|
||||
.leaflet-safari .leaflet-tile-container {
|
||||
width: 1600px;
|
||||
height: 1600px;
|
||||
-webkit-transform-origin: 0 0;
|
||||
}
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow {
|
||||
display: block;
|
||||
}
|
||||
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
|
||||
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
|
||||
.leaflet-container .leaflet-overlay-pane svg,
|
||||
.leaflet-container .leaflet-marker-pane img,
|
||||
.leaflet-container .leaflet-shadow-pane img,
|
||||
.leaflet-container .leaflet-tile-pane img,
|
||||
.leaflet-container img.leaflet-image-layer,
|
||||
.leaflet-container .leaflet-tile {
|
||||
max-width: none !important;
|
||||
max-height: none !important;
|
||||
}
|
||||
|
||||
.leaflet-container.leaflet-touch-zoom {
|
||||
-ms-touch-action: pan-x pan-y;
|
||||
touch-action: pan-x pan-y;
|
||||
}
|
||||
.leaflet-container.leaflet-touch-drag {
|
||||
-ms-touch-action: pinch-zoom;
|
||||
/* Fallback for FF which doesn't support pinch-zoom */
|
||||
touch-action: none;
|
||||
touch-action: pinch-zoom;
|
||||
}
|
||||
.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
|
||||
-ms-touch-action: none;
|
||||
touch-action: none;
|
||||
}
|
||||
.leaflet-container {
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
}
|
||||
.leaflet-container a {
|
||||
-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
|
||||
}
|
||||
.leaflet-tile {
|
||||
filter: inherit;
|
||||
visibility: hidden;
|
||||
}
|
||||
.leaflet-tile-loaded {
|
||||
visibility: inherit;
|
||||
}
|
||||
.leaflet-zoom-box {
|
||||
width: 0;
|
||||
height: 0;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
z-index: 800;
|
||||
}
|
||||
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
|
||||
.leaflet-overlay-pane svg {
|
||||
-moz-user-select: none;
|
||||
}
|
||||
|
||||
.leaflet-pane { z-index: 400; }
|
||||
|
||||
.leaflet-tile-pane { z-index: 200; }
|
||||
.leaflet-overlay-pane { z-index: 400; }
|
||||
.leaflet-shadow-pane { z-index: 500; }
|
||||
.leaflet-marker-pane { z-index: 600; }
|
||||
.leaflet-tooltip-pane { z-index: 650; }
|
||||
.leaflet-popup-pane { z-index: 700; }
|
||||
|
||||
.leaflet-map-pane canvas { z-index: 100; }
|
||||
.leaflet-map-pane svg { z-index: 200; }
|
||||
|
||||
.leaflet-vml-shape {
|
||||
width: 1px;
|
||||
height: 1px;
|
||||
}
|
||||
.lvml {
|
||||
behavior: url(#default#VML);
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
|
||||
/* control positioning */
|
||||
|
||||
.leaflet-control {
|
||||
position: relative;
|
||||
z-index: 800;
|
||||
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
|
||||
pointer-events: auto;
|
||||
}
|
||||
.leaflet-top,
|
||||
.leaflet-bottom {
|
||||
position: absolute;
|
||||
z-index: 1000;
|
||||
pointer-events: none;
|
||||
}
|
||||
.leaflet-top {
|
||||
top: 0;
|
||||
}
|
||||
.leaflet-right {
|
||||
right: 0;
|
||||
}
|
||||
.leaflet-bottom {
|
||||
bottom: 0;
|
||||
}
|
||||
.leaflet-left {
|
||||
left: 0;
|
||||
}
|
||||
.leaflet-control {
|
||||
float: left;
|
||||
clear: both;
|
||||
}
|
||||
.leaflet-right .leaflet-control {
|
||||
float: right;
|
||||
}
|
||||
.leaflet-top .leaflet-control {
|
||||
margin-top: 10px;
|
||||
}
|
||||
.leaflet-bottom .leaflet-control {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.leaflet-left .leaflet-control {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.leaflet-right .leaflet-control {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
|
||||
/* zoom and fade animations */
|
||||
|
||||
.leaflet-fade-anim .leaflet-tile {
|
||||
will-change: opacity;
|
||||
}
|
||||
.leaflet-fade-anim .leaflet-popup {
|
||||
opacity: 0;
|
||||
-webkit-transition: opacity 0.2s linear;
|
||||
-moz-transition: opacity 0.2s linear;
|
||||
transition: opacity 0.2s linear;
|
||||
}
|
||||
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
|
||||
opacity: 1;
|
||||
}
|
||||
.leaflet-zoom-animated {
|
||||
-webkit-transform-origin: 0 0;
|
||||
-ms-transform-origin: 0 0;
|
||||
transform-origin: 0 0;
|
||||
}
|
||||
.leaflet-zoom-anim .leaflet-zoom-animated {
|
||||
will-change: transform;
|
||||
}
|
||||
.leaflet-zoom-anim .leaflet-zoom-animated {
|
||||
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||
}
|
||||
.leaflet-zoom-anim .leaflet-tile,
|
||||
.leaflet-pan-anim .leaflet-tile {
|
||||
-webkit-transition: none;
|
||||
-moz-transition: none;
|
||||
transition: none;
|
||||
}
|
||||
|
||||
.leaflet-zoom-anim .leaflet-zoom-hide {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
|
||||
/* cursors */
|
||||
|
||||
.leaflet-interactive {
|
||||
cursor: pointer;
|
||||
}
|
||||
.leaflet-grab {
|
||||
cursor: -webkit-grab;
|
||||
cursor: -moz-grab;
|
||||
cursor: grab;
|
||||
}
|
||||
.leaflet-crosshair,
|
||||
.leaflet-crosshair .leaflet-interactive {
|
||||
cursor: crosshair;
|
||||
}
|
||||
.leaflet-popup-pane,
|
||||
.leaflet-control {
|
||||
cursor: auto;
|
||||
}
|
||||
.leaflet-dragging .leaflet-grab,
|
||||
.leaflet-dragging .leaflet-grab .leaflet-interactive,
|
||||
.leaflet-dragging .leaflet-marker-draggable {
|
||||
cursor: move;
|
||||
cursor: -webkit-grabbing;
|
||||
cursor: -moz-grabbing;
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
/* marker & overlays interactivity */
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow,
|
||||
.leaflet-image-layer,
|
||||
.leaflet-pane > svg path,
|
||||
.leaflet-tile-container {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.leaflet-marker-icon.leaflet-interactive,
|
||||
.leaflet-image-layer.leaflet-interactive,
|
||||
.leaflet-pane > svg path.leaflet-interactive,
|
||||
svg.leaflet-image-layer.leaflet-interactive path {
|
||||
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
|
||||
pointer-events: auto;
|
||||
}
|
||||
|
||||
/* visual tweaks */
|
||||
|
||||
.leaflet-container {
|
||||
background: #ddd;
|
||||
outline: 0;
|
||||
}
|
||||
.leaflet-container a {
|
||||
color: #0078A8;
|
||||
}
|
||||
.leaflet-container a.leaflet-active {
|
||||
outline: 2px solid orange;
|
||||
}
|
||||
.leaflet-zoom-box {
|
||||
border: 2px dotted #38f;
|
||||
background: rgba(255,255,255,0.5);
|
||||
}
|
||||
|
||||
|
||||
/* general typography */
|
||||
.leaflet-container {
|
||||
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
|
||||
}
|
||||
|
||||
|
||||
/* general toolbar styles */
|
||||
|
||||
.leaflet-bar {
|
||||
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
|
||||
border-radius: 4px;
|
||||
}
|
||||
.leaflet-bar a,
|
||||
.leaflet-bar a:hover {
|
||||
background-color: #fff;
|
||||
border-bottom: 1px solid #ccc;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
line-height: 26px;
|
||||
display: block;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
color: black;
|
||||
}
|
||||
.leaflet-bar a,
|
||||
.leaflet-control-layers-toggle {
|
||||
background-position: 50% 50%;
|
||||
background-repeat: no-repeat;
|
||||
display: block;
|
||||
}
|
||||
.leaflet-bar a:hover {
|
||||
background-color: #f4f4f4;
|
||||
}
|
||||
.leaflet-bar a:first-child {
|
||||
border-top-left-radius: 4px;
|
||||
border-top-right-radius: 4px;
|
||||
}
|
||||
.leaflet-bar a:last-child {
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
border-bottom: none;
|
||||
}
|
||||
.leaflet-bar a.leaflet-disabled {
|
||||
cursor: default;
|
||||
background-color: #f4f4f4;
|
||||
color: #bbb;
|
||||
}
|
||||
|
||||
.leaflet-touch .leaflet-bar a {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.leaflet-touch .leaflet-bar a:first-child {
|
||||
border-top-left-radius: 2px;
|
||||
border-top-right-radius: 2px;
|
||||
}
|
||||
.leaflet-touch .leaflet-bar a:last-child {
|
||||
border-bottom-left-radius: 2px;
|
||||
border-bottom-right-radius: 2px;
|
||||
}
|
||||
|
||||
/* zoom control */
|
||||
|
||||
.leaflet-control-zoom-in,
|
||||
.leaflet-control-zoom-out {
|
||||
font: bold 18px 'Lucida Console', Monaco, monospace;
|
||||
text-indent: 1px;
|
||||
}
|
||||
|
||||
.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
|
||||
/* layers control */
|
||||
|
||||
.leaflet-control-layers {
|
||||
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
|
||||
background: #fff;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.leaflet-control-layers-toggle {
|
||||
background-image: url(images/layers.png);
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
.leaflet-retina .leaflet-control-layers-toggle {
|
||||
background-image: url(images/layers-2x.png);
|
||||
background-size: 26px 26px;
|
||||
}
|
||||
.leaflet-touch .leaflet-control-layers-toggle {
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
}
|
||||
.leaflet-control-layers .leaflet-control-layers-list,
|
||||
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
|
||||
display: none;
|
||||
}
|
||||
.leaflet-control-layers-expanded .leaflet-control-layers-list {
|
||||
display: block;
|
||||
position: relative;
|
||||
}
|
||||
.leaflet-control-layers-expanded {
|
||||
padding: 6px 10px 6px 6px;
|
||||
color: #333;
|
||||
background: #fff;
|
||||
}
|
||||
.leaflet-control-layers-scrollbar {
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
padding-right: 5px;
|
||||
}
|
||||
.leaflet-control-layers-selector {
|
||||
margin-top: 2px;
|
||||
position: relative;
|
||||
top: 1px;
|
||||
}
|
||||
.leaflet-control-layers label {
|
||||
display: block;
|
||||
}
|
||||
.leaflet-control-layers-separator {
|
||||
height: 0;
|
||||
border-top: 1px solid #ddd;
|
||||
margin: 5px -10px 5px -6px;
|
||||
}
|
||||
|
||||
/* Default icon URLs */
|
||||
.leaflet-default-icon-path {
|
||||
background-image: url(images/marker-icon.png);
|
||||
}
|
||||
|
||||
|
||||
/* attribution and scale controls */
|
||||
|
||||
.leaflet-container .leaflet-control-attribution {
|
||||
background: #fff;
|
||||
background: rgba(255, 255, 255, 0.7);
|
||||
margin: 0;
|
||||
}
|
||||
.leaflet-control-attribution,
|
||||
.leaflet-control-scale-line {
|
||||
padding: 0 5px;
|
||||
color: #333;
|
||||
}
|
||||
.leaflet-control-attribution a {
|
||||
text-decoration: none;
|
||||
}
|
||||
.leaflet-control-attribution a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.leaflet-container .leaflet-control-attribution,
|
||||
.leaflet-container .leaflet-control-scale {
|
||||
font-size: 11px;
|
||||
}
|
||||
.leaflet-left .leaflet-control-scale {
|
||||
margin-left: 5px;
|
||||
}
|
||||
.leaflet-bottom .leaflet-control-scale {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.leaflet-control-scale-line {
|
||||
border: 2px solid #777;
|
||||
border-top: none;
|
||||
line-height: 1.1;
|
||||
padding: 2px 5px 1px;
|
||||
font-size: 11px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
|
||||
background: #fff;
|
||||
background: rgba(255, 255, 255, 0.5);
|
||||
}
|
||||
.leaflet-control-scale-line:not(:first-child) {
|
||||
border-top: 2px solid #777;
|
||||
border-bottom: none;
|
||||
margin-top: -2px;
|
||||
}
|
||||
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
|
||||
border-bottom: 2px solid #777;
|
||||
}
|
||||
|
||||
.leaflet-touch .leaflet-control-attribution,
|
||||
.leaflet-touch .leaflet-control-layers,
|
||||
.leaflet-touch .leaflet-bar {
|
||||
box-shadow: none;
|
||||
}
|
||||
.leaflet-touch .leaflet-control-layers,
|
||||
.leaflet-touch .leaflet-bar {
|
||||
border: 2px solid rgba(0,0,0,0.2);
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
||||
|
||||
/* popup */
|
||||
|
||||
.leaflet-popup {
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.leaflet-popup-content-wrapper {
|
||||
padding: 1px;
|
||||
text-align: left;
|
||||
border-radius: 12px;
|
||||
}
|
||||
.leaflet-popup-content {
|
||||
margin: 13px 19px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
.leaflet-popup-content p {
|
||||
margin: 18px 0;
|
||||
}
|
||||
.leaflet-popup-tip-container {
|
||||
width: 40px;
|
||||
height: 20px;
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
margin-left: -20px;
|
||||
overflow: hidden;
|
||||
pointer-events: none;
|
||||
}
|
||||
.leaflet-popup-tip {
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
padding: 1px;
|
||||
|
||||
margin: -10px auto 0;
|
||||
|
||||
-webkit-transform: rotate(45deg);
|
||||
-moz-transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg);
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
.leaflet-popup-content-wrapper,
|
||||
.leaflet-popup-tip {
|
||||
background: white;
|
||||
color: #333;
|
||||
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
|
||||
}
|
||||
.leaflet-container a.leaflet-popup-close-button {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
padding: 4px 4px 0 0;
|
||||
border: none;
|
||||
text-align: center;
|
||||
width: 18px;
|
||||
height: 14px;
|
||||
font: 16px/14px Tahoma, Verdana, sans-serif;
|
||||
color: #c3c3c3;
|
||||
text-decoration: none;
|
||||
font-weight: bold;
|
||||
background: transparent;
|
||||
}
|
||||
.leaflet-container a.leaflet-popup-close-button:hover {
|
||||
color: #999;
|
||||
}
|
||||
.leaflet-popup-scrolled {
|
||||
overflow: auto;
|
||||
border-bottom: 1px solid #ddd;
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.leaflet-oldie .leaflet-popup-content-wrapper {
|
||||
zoom: 1;
|
||||
}
|
||||
.leaflet-oldie .leaflet-popup-tip {
|
||||
width: 24px;
|
||||
margin: 0 auto;
|
||||
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
|
||||
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
|
||||
}
|
||||
.leaflet-oldie .leaflet-popup-tip-container {
|
||||
margin-top: -1px;
|
||||
}
|
||||
|
||||
.leaflet-oldie .leaflet-control-zoom,
|
||||
.leaflet-oldie .leaflet-control-layers,
|
||||
.leaflet-oldie .leaflet-popup-content-wrapper,
|
||||
.leaflet-oldie .leaflet-popup-tip {
|
||||
border: 1px solid #999;
|
||||
}
|
||||
|
||||
|
||||
/* div icon */
|
||||
|
||||
.leaflet-div-icon {
|
||||
background: #fff;
|
||||
border: 1px solid #666;
|
||||
}
|
||||
|
||||
|
||||
/* Tooltip */
|
||||
/* Base styles for the element that has a tooltip */
|
||||
.leaflet-tooltip {
|
||||
position: absolute;
|
||||
padding: 6px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #fff;
|
||||
border-radius: 3px;
|
||||
color: #222;
|
||||
white-space: nowrap;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
pointer-events: none;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
|
||||
}
|
||||
.leaflet-tooltip.leaflet-clickable {
|
||||
cursor: pointer;
|
||||
pointer-events: auto;
|
||||
}
|
||||
.leaflet-tooltip-top:before,
|
||||
.leaflet-tooltip-bottom:before,
|
||||
.leaflet-tooltip-left:before,
|
||||
.leaflet-tooltip-right:before {
|
||||
position: absolute;
|
||||
pointer-events: none;
|
||||
border: 6px solid transparent;
|
||||
background: transparent;
|
||||
content: "";
|
||||
}
|
||||
|
||||
/* Directions */
|
||||
|
||||
.leaflet-tooltip-bottom {
|
||||
margin-top: 6px;
|
||||
}
|
||||
.leaflet-tooltip-top {
|
||||
margin-top: -6px;
|
||||
}
|
||||
.leaflet-tooltip-bottom:before,
|
||||
.leaflet-tooltip-top:before {
|
||||
left: 50%;
|
||||
margin-left: -6px;
|
||||
}
|
||||
.leaflet-tooltip-top:before {
|
||||
bottom: 0;
|
||||
margin-bottom: -12px;
|
||||
border-top-color: #fff;
|
||||
}
|
||||
.leaflet-tooltip-bottom:before {
|
||||
top: 0;
|
||||
margin-top: -12px;
|
||||
margin-left: -6px;
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
.leaflet-tooltip-left {
|
||||
margin-left: -6px;
|
||||
}
|
||||
.leaflet-tooltip-right {
|
||||
margin-left: 6px;
|
||||
}
|
||||
.leaflet-tooltip-left:before,
|
||||
.leaflet-tooltip-right:before {
|
||||
top: 50%;
|
||||
margin-top: -6px;
|
||||
}
|
||||
.leaflet-tooltip-left:before {
|
||||
right: 0;
|
||||
margin-right: -12px;
|
||||
border-left-color: #fff;
|
||||
}
|
||||
.leaflet-tooltip-right:before {
|
||||
left: 0;
|
||||
margin-left: -12px;
|
||||
border-right-color: #fff;
|
||||
}
|
||||
5
leaflet.js
Normal file
5
leaflet.js
Normal file
File diff suppressed because one or more lines are too long
120
reconstruct.py
120
reconstruct.py
|
|
@ -1,27 +1,111 @@
|
|||
import json
|
||||
import math
|
||||
|
||||
import numpy as np
|
||||
from matplotlib import pyplot as plt
|
||||
|
||||
width = 100
|
||||
from data import points, bounds
|
||||
|
||||
grid = np.zeros((width, width), dtype=np.uint64)
|
||||
simple = True
|
||||
|
||||
all_data: dict = np.load("out.npy", allow_pickle=True).item()
|
||||
print(all_data)
|
||||
for y in range(width):
|
||||
print(y)
|
||||
for x in range(width):
|
||||
for start, bins in all_data.items():
|
||||
pixpos = np.array([x, y])
|
||||
myradians = math.atan2(start[0] - x, start[1] - y)
|
||||
angle = np.degrees(myradians)
|
||||
if not np.isnan(angle):
|
||||
bin = int(round(angle) % 360)
|
||||
grid[x, y] += bins[bin]
|
||||
|
||||
def distance(origin, destination):
|
||||
"""
|
||||
https://gist.github.com/rochacbruno/2883505
|
||||
"""
|
||||
lat1, lon1 = origin
|
||||
lat2, lon2 = destination
|
||||
radius = 6371 # km
|
||||
|
||||
dlat = math.radians(lat2 - lat1)
|
||||
dlon = math.radians(lon2 - lon1)
|
||||
a = math.sin(dlat / 2) * math.sin(dlat / 2) + math.cos(math.radians(lat1)) \
|
||||
* math.cos(math.radians(lat2)) * math.sin(dlon / 2) * math.sin(dlon / 2)
|
||||
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
|
||||
d = radius * c
|
||||
|
||||
return d
|
||||
|
||||
|
||||
cloud_height = 0.9
|
||||
|
||||
|
||||
def distance_to_angle(distance: float):
|
||||
# if randint(0,1000)==0:
|
||||
# print(distance,int(round(np.degrees(np.arctan(2 * cloud_height / distance)))))
|
||||
return np.degrees(np.arctan(2 * cloud_height / distance))
|
||||
|
||||
|
||||
def calculate(filename: str, simple: bool, spline: bool = False, checkhorizon: bool = False):
|
||||
output = np.zeros((gridsize, gridsize), dtype=np.float64)
|
||||
|
||||
# all_data: dict = np.load("out.npy", allow_pickle=True).item()
|
||||
all_data = points
|
||||
xspace = np.linspace(bounds["lon"]["lower"], bounds["lon"]["upper"], gridsize)
|
||||
yspace = np.linspace(bounds["lat"]["lower"], bounds["lat"]["upper"], gridsize)
|
||||
xgrid, ygrid = np.meshgrid(xspace, yspace)
|
||||
print(bounds)
|
||||
for yindex in range(gridsize):
|
||||
# realy = y / gridsize * bounds["y"]["width"] + bounds["y"]["lower"]
|
||||
print(yindex)
|
||||
for xindex in range(gridsize):
|
||||
y = ygrid[xindex, yindex]
|
||||
x = xgrid[xindex, yindex]
|
||||
# realx = x / gridsize * bounds["x"]["width"] + bounds["x"]["lower"]
|
||||
for point in all_data:
|
||||
if simple:
|
||||
bins = point.brightnesses
|
||||
else:
|
||||
bins = point.brightnesses2d
|
||||
dist = distance((x, y), point.coord)
|
||||
# print(dist)
|
||||
ang = distance_to_angle(dist)
|
||||
# print(ang)
|
||||
myradians = math.atan2(point.coord[1] - y, point.coord[0] - x)
|
||||
directionangle = np.degrees(myradians)
|
||||
if not np.isnan(directionangle):
|
||||
if not spline:
|
||||
bin = int(round(directionangle)) % 360
|
||||
if simple:
|
||||
value = bins[bin]
|
||||
else:
|
||||
if spline:
|
||||
if checkhorizon:
|
||||
horizon = point.horizon_spline(directionangle % 360)
|
||||
if ang < horizon:
|
||||
value = 0
|
||||
else:
|
||||
value = point.spline(ang, directionangle % 360)
|
||||
else:
|
||||
value = point.spline(ang, directionangle % 360)
|
||||
else:
|
||||
angle = int(round(ang))
|
||||
value = bins[angle, bin]
|
||||
output[xindex, yindex] += value
|
||||
# exit()
|
||||
grid = grid.T
|
||||
# grid[grid > 200] = 200
|
||||
plt.imshow(grid)
|
||||
output = output.T
|
||||
# output[output < 30] = np.nan
|
||||
plt.imshow(output, origin="lower", interpolation="bilinear")
|
||||
plt.colorbar()
|
||||
plt.show()
|
||||
plt.imsave(filename, output, origin="lower")
|
||||
data = {
|
||||
"filename": filename,
|
||||
"bounds": [
|
||||
[bounds["lon"]["lower"], bounds["lat"]["lower"]],
|
||||
[bounds["lon"]["upper"], bounds["lat"]["upper"]]
|
||||
]
|
||||
}
|
||||
# plt.show()
|
||||
return data
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
gridsize = 1000
|
||||
images = [
|
||||
calculate("simple.png", simple=True),
|
||||
calculate("clouds.png", simple=False, spline=False),
|
||||
calculate("spline.png", simple=False, spline=True),
|
||||
calculate("horizon.png", simple=False, spline=True,checkhorizon=True),
|
||||
]
|
||||
with open("settings.json", "w") as f:
|
||||
json.dump(images, f)
|
||||
|
|
|
|||
3
upload.sh
Executable file
3
upload.sh
Executable file
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
rsync -rP index.html simple.png clouds.png spline.png horizon.png leaflet.css leaflet.js images settings.json lw1.at:/var/www/static/tmp/map/
|
||||
Loading…
Reference in a new issue