X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis-opengl.c;h=d01a23c29c0fa6289ec865af2e61f7ec59e0570f;hp=fc0c55e05cf6062fcd6a14cc8e137f66fa546cc0;hb=07cebdd8475eeaf5f9cd155ff0424e937aa5c6d8;hpb=ad122fbc44250cabc22e81f99a7ea1f376766ca6

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index fc0c55e..d01a23c 100644
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -133,6 +133,17 @@ static void _draw_tile(GisOpenGL *opengl, GisTile *tile, GList *triangles)
 			tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
 	//g_message("drawing %4d triangles for tile edges=%7.2f,%7.2f,%7.2f,%7.2f",
 	//		g_list_length(triangles), tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
+	gdouble n = tile->edge.n;
+	gdouble s = tile->edge.s;
+	gdouble e = tile->edge.e;
+	gdouble w = tile->edge.w;
+
+	gdouble londist = e - w;
+	gdouble latdist = n - s;
+
+	gdouble xscale = tile->coords.e - tile->coords.w;
+	gdouble yscale = tile->coords.s - tile->coords.n;
+
 	for (GList *cur = triangles; cur; cur = cur->next) {
 		RoamTriangle *tri = cur->data;
 
@@ -145,14 +156,6 @@ static void _draw_tile(GisOpenGL *opengl, GisTile *tile, GList *triangles)
 			if (lon[2] > 90) lon[2] -= 360;
 		}
 
-		gdouble n = tile->edge.n;
-		gdouble s = tile->edge.s;
-		gdouble e = tile->edge.e;
-		gdouble w = tile->edge.w;
-
-		gdouble londist = e - w;
-		gdouble latdist = n - s;
-
 		gdouble xy[3][2] = {
 			{(lon[0]-w)/londist, 1-(lat[0]-s)/latdist},
 			{(lon[1]-w)/londist, 1-(lat[1]-s)/latdist},
@@ -177,6 +180,12 @@ static void _draw_tile(GisOpenGL *opengl, GisTile *tile, GList *triangles)
 		if (lat[1] == 90 || lat[1] == -90) xy[1][0] = 0.5;
 		if (lat[2] == 90 || lat[2] == -90) xy[2][0] = 0.5;
 
+		/* Scale to tile coords */
+		for (int i = 0; i < 3; i++) {
+			xy[i][0] = tile->coords.w + xy[i][0]*xscale;
+			xy[i][1] = tile->coords.n + xy[i][1]*yscale;
+		}
+
 		glEnable(GL_TEXTURE_2D);
 		glEnable(GL_POLYGON_OFFSET_FILL);
 		glBindTexture(GL_TEXTURE_2D, *(guint*)tile->data);