popups #1206

Author: mtennekes

R/tmapLeafletDataPlot_polygons.R

@@ -13,8 +13,11 @@ tmapLeafletDataPlot.tm_data_polygons = function(a, shpTM, dt, pdt, popup.format,
 
 	dt = res$dt
 
+	idt_null = is.null(idt)
 	if (!is.null(idt)) {
 		idt = idt$id[match(dt$tmapID__, idt$tmapID__)]
+	} else {
+		idt = sprintf("%07d", dt$tmapID__)[shpTM_match]
 	}
 	if (!is.null(hdt)) {
 		hdt = hdt$hover[match(dt$tmapID__, hdt$tmapID__)]
@@ -27,7 +30,7 @@ tmapLeafletDataPlot.tm_data_polygons = function(a, shpTM, dt, pdt, popup.format,
 		mtch = match(dt$tmapID__, pdt$tmapID__)
 		pdt = pdt[mtch][, tmapID__ := NULL]
 
-		if (is.null(idt) && !is.null(hdt)) {
+		if (idt_null && !is.null(hdt)) {
 			popups = view_format_popups(id = hdt, titles = names(pdt), values = pdt, format = popup.format)
 		} else {
 			popups = view_format_popups(id = idt, titles = names(pdt), values = pdt, format = popup.format)

R/tmapLeafletDataPlot_symbols.R

@@ -28,7 +28,9 @@ tmapLeafletDataPlot.tm_data_symbols = function(a, shpTM, dt, pdt, popup.format,
 		shpTM_match = TRUE
 	}
 
-	if (!is.null(idt)) {
+	idt_null = is.null(idt)
+
+	if (!idt_null) {
 		idt = idt$id[match(dt$tmapID__[shpTM_match], idt$tmapID__)]
 	} else {
 		idt = sprintf("%07d", dt$tmapID__)[shpTM_match]
@@ -43,7 +45,11 @@ tmapLeafletDataPlot.tm_data_symbols = function(a, shpTM, dt, pdt, popup.format,
 		mtch = match(dt$tmapID__[shpTM_match], pdt$tmapID__)
 		pdt = pdt[mtch][, tmapID__ := NULL]
 
-		popups = view_format_popups(id = idt, titles = names(pdt), values = pdt, format = popup.format)
+		if (idt_null) {
+			popups = view_format_popups(titles = names(pdt), values = pdt, format = popup.format)
+		} else {
+			popups = view_format_popups(id = idt, titles = names(pdt), values = pdt, format = popup.format)
+		}
 	}
 
 	idt = submit_labels(idt, "symbols", pane, group)

R/tmapLeaflet_layers.R

@@ -123,7 +123,6 @@ tmapLeafletDataPlot.default = function(a, shpTM, dt, pdt, popup.format, hdt, idt
 #		x * scale
 #	})
 lty2dash = function(lty, lwd) {
-	po(lty,lwd)
 	k = max(length(lty), length(lwd))
 	lty = rep(lty, length.out = k)
 	lwd = rep(lwd, length.out = k)

R/view_format_popups.R

@@ -21,7 +21,7 @@ view_format_popups <- function(id=NULL, titles, format, values) {
 		}
 	})
 	if (!is.null(id)) {
-		labels <- paste("<b>", h[[1]](id), "</b>", sep="")
+		labels <- (paste("<b>", id, "</b>", sep=""))
 	} else {
 		labels <- ""
 	}