shithub: map

Info  •  Files  •  Log  •  Branches

geojson: only render stuff inside the mapimage

this gets rid of some lines that are within the view, but it's
still much better than getting draw errors. It also shouldn't
matter much since most lines will be short and within the view

--- a/geojson.c

+++ b/geojson.c

@@ -75,6 +75,11 @@

 	to.x = tb.x * tilesize + tb.x;

 	to.y = tb.y * tilesize + tb.y;

+	if (!ptinrect(fo, mapimage->r))

+		return;

+	if (!ptinrect(to, mapimage->r))

+		return;

+	

 	debugprint("jsline: %P - %P\n", fo, to);

 	line(mapimage, fo, to,

@@ -116,8 +121,14 @@

 	b.x -= jpos.x;

 	b.y -= jpos.y;

+	if (b.x < 0 || b.y < 0)

+		return 1;

+	

 	off.x = b.x * tilesize + off.x;

 	off.y = b.y * tilesize + off.y;

+	

+	if (!ptinrect(off, mapimage->r))

+		return 1;

 	ellipse(mapimage, off, 5, 5, 1, display->black, ZP);

 	return 1;

--- a/img.c

+++ b/img.c

@@ -21,7 +21,7 @@

 	char file[32];

 	Rectangle r;

-	r = Rect(0, 0, 256, 256);

+	r = Rect(0, 0, tilesize, tilesize);

 	snprint(file, sizeof file, "/mnt/map/%d/%d/%d", b.z, b.x, b.y);

 	debugprint("loading file: %s\n", file);

@@ -39,10 +39,12 @@

 	lockmapimage();

 	draw(mapimage, r, loaded, nil, ZP);

 	if (debug) {

-		snprint(file, sizeof file, "%d / %d", b.x, b.y);

 		border(mapimage, r, 1, display->black, ZP);

 		border(mapimage, mapimage->r, 1, green, ZP);

+		snprint(file, sizeof file, "%d / %d", b.x, b.y);

 		string(mapimage, pos, display->black, ZP, font, file);

+		snprint(file, sizeof file, "%d / %d (rel)", pos.x / tilesize, pos.y / tilesize);

+		string(mapimage, addpt(pos, Pt(0, 12)), display->black, ZP, font, file);

 	}

 	unlockmapimage();