From f90ecf08d2b0d37a7e43a6ac4f1b94c845a44318 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Sun, 23 Mar 2014 23:16:11 +0100 Subject: [PATCH 1/2] browsermap: less ugly runway rendering --- webgui/map/index.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/webgui/map/index.html b/webgui/map/index.html index 075e101eb..362316579 100644 --- a/webgui/map/index.html +++ b/webgui/map/index.html @@ -192,6 +192,16 @@ L.RotatedMarker = L.Marker.extend({ weight: 1, }; } + if( feature.properties.type == "airport" ) { + return { + color: 'black', + weight: 3, + fill: 'true', + fillColor: '#606060', + fillOpacity: 1.0, + lineJoin: 'bevel', + }; + } } }); From 04c40a4232e3a6d910ed25057b41f4ac67c63cc5 Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Mon, 24 Mar 2014 00:18:29 +0100 Subject: [PATCH 2/2] canvas.gui.ScrollArea: check for valid content bounding box. --- Nasal/canvas/gui/widgets/ScrollArea.nas | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Nasal/canvas/gui/widgets/ScrollArea.nas b/Nasal/canvas/gui/widgets/ScrollArea.nas index cd5fc26ff..b39e12fc5 100644 --- a/Nasal/canvas/gui/widgets/ScrollArea.nas +++ b/Nasal/canvas/gui/widgets/ScrollArea.nas @@ -45,6 +45,11 @@ gui.widgets.ScrollArea = { { # TODO only update on content resize var bb = me.getContent().getTransformedBounds(); + + if( bb[2] < bb[0] or bb[3] < bb[1] ) + # Do nothing with invalid bounding box (probably no content yet) + return me; + var w = bb[2] - bb[0]; var h = bb[3] - bb[1];