X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/8c721f83feaa525b9fd0de58b9fc6dc7698b4a48..de2fc9aa9e8db8e0258c8328161c6b5eda176a0a:/src/vikdemlayer.c?ds=sidebyside diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c index 087918bb..bfe51ab2 100644 --- a/src/vikdemlayer.c +++ b/src/vikdemlayer.c @@ -18,11 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include #include #include +#include #include "config.h" #include "globals.h" @@ -38,16 +42,16 @@ #include "vikaggregatelayer.h" #include "viklayerspanel.h" #include "vikdemlayer.h" -#include "vikdemlayer_pixmap.h" -#include "vikmapslayer.h" #include "dialog.h" #include "dem.h" #include "dems.h" +#include "icons/icons.h" + #define MAPS_CACHE_DIR maps_layer_default_dir() -#define SRTM_CACHE_TEMPLATE "%ssrtm3-%s%c%02d%c%03d.hgt.zip" +#define SRTM_CACHE_TEMPLATE "%ssrtm3-%s%s%c%02d%c%03d.hgt.zip" #define SRTM_FTP_SITE "e0srp01u.ecs.nasa.gov" #define SRTM_FTP_URI "/srtm/version2/SRTM3/" @@ -56,7 +60,6 @@ #endif -static VikDEMLayer *dem_layer_copy ( VikDEMLayer *vdl, gpointer vp ); static void dem_layer_marshall( VikDEMLayer *vdl, guint8 **data, gint *len ); static VikDEMLayer *dem_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ); static gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData data, VikViewport *vp ); @@ -70,6 +73,7 @@ static void dem24k_draw_existence ( VikViewport *vp ); #endif static VikLayerParamScale param_scales[] = { + { 1, 10000, 10, 1 }, { 1, 10000, 10, 1 }, { 1, 10, 1, 0 }, }; @@ -80,6 +84,7 @@ static gchar *params_source[] = { "USA 10m (USGS 24k)", #endif "None", + NULL }; enum { DEM_SOURCE_SRTM, @@ -90,23 +95,25 @@ enum { DEM_SOURCE_SRTM, }; static VikLayerParam dem_layer_params[] = { - { "files", VIK_LAYER_PARAM_STRING_LIST, VIK_LAYER_GROUP_NONE, "DEM Files:", VIK_LAYER_WIDGET_FILELIST }, - { "source", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, "Download Source:", VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_source, NULL }, - { "color", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, "Color:", VIK_LAYER_WIDGET_ENTRY }, - { "max_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, "Max Elev:", VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0 }, - { "line_thickness", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, "Line Thickness:", VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 1 }, + { "files", VIK_LAYER_PARAM_STRING_LIST, VIK_LAYER_GROUP_NONE, N_("DEM Files:"), VIK_LAYER_WIDGET_FILELIST }, + { "source", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Download Source:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_source, NULL }, + { "color", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Color:"), VIK_LAYER_WIDGET_ENTRY }, + { "min_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Min Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0 }, + { "max_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Max Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0 }, + { "line_thickness", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Line Thickness:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 1 }, }; -enum { PARAM_FILES=0, PARAM_SOURCE, PARAM_COLOR, PARAM_MAX_ELEV, PARAM_LINE_THICKNESS, NUM_PARAMS }; +enum { PARAM_FILES=0, PARAM_SOURCE, PARAM_COLOR, PARAM_MIN_ELEV, PARAM_MAX_ELEV, PARAM_LINE_THICKNESS, NUM_PARAMS }; static gpointer dem_layer_download_create ( VikWindow *vw, VikViewport *vvp); static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *event, VikViewport *vvp ); static gboolean dem_layer_download_click ( VikDEMLayer *vdl, GdkEventButton *event, VikViewport *vvp ); static VikToolInterface dem_tools[] = { - { "DEM Download/Import", (VikToolConstructorFunc) dem_layer_download_create, NULL, NULL, NULL, - (VikToolMouseFunc) dem_layer_download_click, NULL, (VikToolMouseFunc) dem_layer_download_release }, + { N_("DEM Download/Import"), (VikToolConstructorFunc) dem_layer_download_create, NULL, NULL, NULL, + (VikToolMouseFunc) dem_layer_download_click, NULL, (VikToolMouseFunc) dem_layer_download_release, + (VikToolKeyFunc) NULL, GDK_CURSOR_IS_PIXMAP, &cursor_demdl_pixbuf }, }; @@ -219,12 +226,12 @@ static gchar *dem_colors[] = { }; */ -static const guint dem_n_colors = sizeof(dem_colors)/sizeof(dem_colors[0]); +static const guint DEM_N_COLORS = sizeof(dem_colors)/sizeof(dem_colors[0]); VikLayerInterface vik_dem_layer_interface = { "DEM", - &demlayer_pixbuf, + &vikdemlayer_pixbuf, dem_tools, sizeof(dem_tools) / sizeof(dem_tools[0]), @@ -254,7 +261,6 @@ VikLayerInterface vik_dem_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, - (VikLayerFuncCopy) dem_layer_copy, (VikLayerFuncMarshall) dem_layer_marshall, (VikLayerFuncUnmarshall) dem_layer_unmarshall, @@ -276,6 +282,7 @@ struct _VikDEMLayer { GdkGC *gc; GdkGC **gcs; GList *files; + gdouble min_elev; gdouble max_elev; guint8 line_thickness; gchar *color; @@ -306,21 +313,6 @@ GType vik_dem_layer_get_type () return vdl_type; } -static VikDEMLayer *dem_layer_copy ( VikDEMLayer *vdl, gpointer vp ) -{ - VikDEMLayer *rv = vik_dem_layer_new ( ); - - - /* TODO -- FIX for files */ - - rv->color = g_strdup ( vdl->color ); - rv->max_elev = vdl->max_elev; - rv->line_thickness = vdl->line_thickness; - rv->gc = vdl->gc; - g_object_ref ( rv->gc ); - return rv; -} - static void dem_layer_marshall( VikDEMLayer *vdl, guint8 **data, gint *len ) { vik_layer_marshall_params ( VIK_LAYER(vdl), data, len ); @@ -328,7 +320,13 @@ static void dem_layer_marshall( VikDEMLayer *vdl, guint8 **data, gint *len ) static VikDEMLayer *dem_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ) { - VikDEMLayer *rv = vik_dem_layer_new ( vvp ); + VikDEMLayer *rv = vik_dem_layer_new (); + gint i; + + /* TODO: share GCS between layers */ + for ( i = 0; i < DEM_N_COLORS; i++ ) + rv->gcs[i] = vik_viewport_new_gc ( vvp, dem_colors[i], rv->line_thickness ); + vik_layer_unmarshall_params ( VIK_LAYER(rv), data, len, vvp ); return rv; } @@ -339,6 +337,7 @@ gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData d { case PARAM_COLOR: if ( vdl->color ) g_free ( vdl->color ); vdl->color = g_strdup ( data.s ); break; case PARAM_SOURCE: vdl->source = data.u; break; + case PARAM_MIN_ELEV: vdl->min_elev = data.d; break; case PARAM_MAX_ELEV: vdl->max_elev = data.d; break; case PARAM_LINE_THICKNESS: if ( data.u >= 1 && data.u <= 15 ) vdl->line_thickness = data.u; break; case PARAM_FILES: a_dems_load_list ( &(data.sl) ); a_dems_list_free ( vdl->files ); vdl->files = data.sl; break; @@ -354,6 +353,7 @@ static VikLayerParamData dem_layer_get_param ( VikDEMLayer *vdl, guint16 id ) case PARAM_FILES: rv.sl = vdl->files; break; case PARAM_SOURCE: rv.u = vdl->source; break; case PARAM_COLOR: rv.s = vdl->color ? vdl->color : ""; break; + case PARAM_MIN_ELEV: rv.d = vdl->min_elev; break; case PARAM_MAX_ELEV: rv.d = vdl->max_elev; break; case PARAM_LINE_THICKNESS: rv.i = vdl->line_thickness; break; } @@ -372,6 +372,7 @@ static void dem_layer_post_read ( VikLayer *vl, VikViewport *vp, gboolean from_f VikDEMLayer *vik_dem_layer_new ( ) { VikDEMLayer *vdl = VIK_DEM_LAYER ( g_object_new ( VIK_DEM_LAYER_TYPE, NULL ) ); + vik_layer_init ( VIK_LAYER(vdl), VIK_LAYER_DEM ); vdl->files = NULL; @@ -379,8 +380,10 @@ VikDEMLayer *vik_dem_layer_new ( ) vdl->gc = NULL; - vdl->gcs = g_malloc(sizeof(GdkGC *)*dem_n_colors); + vdl->gcs = g_malloc(sizeof(GdkGC *)*DEM_N_COLORS); + /* make new gcs only if we need it (copy layer -> use old) */ + vdl->min_elev = 0.0; vdl->max_elev = 1000.0; vdl->source = DEM_SOURCE_SRTM; vdl->line_thickness = 3; @@ -494,6 +497,10 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * vik_dem_east_north_to_xy ( dem, start_lon_as, start_lat_as, &start_x, &start_y ); + /* verify sane elev interval */ + if ( vdl->max_elev <= vdl->min_elev ) + vdl->max_elev = vdl->min_elev + 1; + for ( x=start_x, counter.lon = start_lon; counter.lon <= end_lon; counter.lon += escale_deg * skip_factor, x += skip_factor ) { if ( x > 0 && x < dem->n_columns ) { column = g_ptr_array_index ( dem->columns, x ); @@ -501,7 +508,13 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * if ( y > column->n_points ) break; elev = column->points[y]; - if ( elev > vdl->max_elev ) elev=vdl->max_elev; + + if ( elev != VIK_DEM_INVALID_ELEVATION && elev < vdl->min_elev ) + elev=vdl->min_elev; + if ( elev != VIK_DEM_INVALID_ELEVATION && elev > vdl->max_elev ) + elev=vdl->max_elev; + + { gint a, b; @@ -512,7 +525,7 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * else if ( elev <= 0 ) vik_viewport_draw_rectangle(vp, vdl->gcs[0], TRUE, a-2, b-2, 4, 4 ); else - vik_viewport_draw_rectangle(vp, vdl->gcs[(gint)floor(elev/vdl->max_elev*(dem_n_colors-2))+1], TRUE, a-2, b-2, 4, 4 ); + vik_viewport_draw_rectangle(vp, vdl->gcs[(gint)floor((elev - vdl->min_elev)/(vdl->max_elev - vdl->min_elev)*(DEM_N_COLORS-2))+1], TRUE, a-2, b-2, 4, 4 ); } } /* for y= */ } @@ -582,7 +595,11 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * if ( y > column->n_points ) continue; elev = column->points[y]; - if ( elev > vdl->max_elev ) elev=vdl->max_elev; + if ( elev != VIK_DEM_INVALID_ELEVATION && elev < vdl->min_elev ) + elev=vdl->min_elev; + if ( elev != VIK_DEM_INVALID_ELEVATION && elev > vdl->max_elev ) + elev=vdl->max_elev; + { gint a, b; vik_coord_load_from_utm(&tmp, vik_viewport_get_coord_mode(vp), &counter); @@ -592,7 +609,7 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * else if ( elev <= 0 ) vik_viewport_draw_rectangle(vp, vdl->gcs[0], TRUE, a-2, b-2, 4, 4 ); else - vik_viewport_draw_rectangle(vp, vdl->gcs[(gint)floor(elev/vdl->max_elev*(dem_n_colors-2))+1], TRUE, a-2, b-2, 4, 4 ); + vik_viewport_draw_rectangle(vp, vdl->gcs[(gint)floor((elev - vdl->min_elev)/(vdl->max_elev - vdl->min_elev)*(DEM_N_COLORS-2))+1], TRUE, a-2, b-2, 4, 4 ); } } /* for y= */ } @@ -602,9 +619,32 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * /* return the continent for the specified lat, lon */ /* TODO */ -const gchar *srtm_continent_dir ( gint lat, gint lon ) +static const gchar *srtm_continent_dir ( gint lat, gint lon ) { - return "North_America/"; + extern const char *_srtm_continent_data[]; + static GHashTable *srtm_continent = NULL; + const gchar *continent; + gchar name[16]; + + if (!srtm_continent) { + const gchar **s; + + srtm_continent = g_hash_table_new(g_str_hash, g_str_equal); + s = _srtm_continent_data; + while (*s != (gchar *)-1) { + continent = *s++; + while (*s) { + g_hash_table_insert(srtm_continent, (gpointer) *s, (gpointer) continent); + s++; + } + s++; + } + } + g_snprintf(name, sizeof(name), "%c%02d%c%03d", + (lat >= 0) ? 'N' : 'S', ABS(lat), + (lon >= 0) ? 'E' : 'W', ABS(lon)); + + return(g_hash_table_lookup(srtm_continent, name)); } void vik_dem_layer_draw ( VikDEMLayer *vdl, gpointer data ) @@ -633,19 +673,23 @@ void vik_dem_layer_draw ( VikDEMLayer *vdl, gpointer data ) void vik_dem_layer_free ( VikDEMLayer *vdl ) { + gint i; if ( vdl->gc != NULL ) g_object_unref ( G_OBJECT(vdl->gc) ); if ( vdl->color != NULL ) g_free ( vdl->color ); + if ( vdl->gcs ) + for ( i = 0; i < DEM_N_COLORS; i++ ) + g_object_unref ( vdl->gcs[i] ); + g_free ( vdl->gcs ); + a_dems_list_free ( vdl->files ); } static void dem_layer_update_gc ( VikDEMLayer *vdl, VikViewport *vp, const gchar *color ) { - guint i; - if ( vdl->color ) g_free ( vdl->color ); @@ -655,15 +699,17 @@ static void dem_layer_update_gc ( VikDEMLayer *vdl, VikViewport *vp, const gchar g_object_unref ( G_OBJECT(vdl->gc) ); vdl->gc = vik_viewport_new_gc ( vp, vdl->color, vdl->line_thickness ); - - for ( i = 0 ; i < dem_n_colors; i++ ) - vdl->gcs[i] = vik_viewport_new_gc ( vp, dem_colors[i], vdl->line_thickness ); - } VikDEMLayer *vik_dem_layer_create ( VikViewport *vp ) { VikDEMLayer *vdl = vik_dem_layer_new (); + gint i; + + /* TODO: share GCS between layers */ + for ( i = 0; i < DEM_N_COLORS; i++ ) + vdl->gcs[i] = vik_viewport_new_gc ( vp, dem_colors[i], vdl->line_thickness ); + dem_layer_update_gc ( vdl, vp, "red" ); return vdl; } @@ -688,18 +734,27 @@ typedef struct { static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata ) { gint intlat, intlon; + const gchar *continent_dir; intlat = (int)floor(p->lat); intlon = (int)floor(p->lon); - gchar *src_fn = g_strdup_printf("%s%s%c%02d%c%03d.hgt.zip", + continent_dir = srtm_continent_dir(intlat, intlon); + + if (!continent_dir) { + g_warning(N_("No SRTM data available for %f, %f"), p->lat, p->lon); + return; + } + + gchar *src_fn = g_strdup_printf("%s%s%s%c%02d%c%03d.hgt.zip", SRTM_FTP_URI, - srtm_continent_dir(intlat, intlon), + continent_dir, + G_DIR_SEPARATOR_S, (intlat >= 0) ? 'N' : 'S', ABS(intlat), (intlon >= 0) ? 'E' : 'W', ABS(intlon) ); - DownloadOptions options = { NULL, 0 }; + static DownloadOptions options = { NULL, 0, a_check_map_file }; a_ftp_download_get_url ( SRTM_FTP_SITE, src_fn, p->dest, &options ); g_free ( src_fn ); } @@ -707,10 +762,18 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata static gchar *srtm_lat_lon_to_dest_fn ( gdouble lat, gdouble lon ) { gint intlat, intlon; + const gchar *continent_dir; + intlat = (int)floor(lat); intlon = (int)floor(lon); - return g_strdup_printf("srtm3-%s%c%02d%c%03d.hgt.zip", - srtm_continent_dir(intlat, intlon), + continent_dir = srtm_continent_dir(intlat, intlon); + + if (!continent_dir) + continent_dir = "nowhere"; + + return g_strdup_printf("srtm3-%s%s%c%02d%c%03d.hgt.zip", + continent_dir, + G_DIR_SEPARATOR_S, (intlat >= 0) ? 'N' : 'S', ABS(intlat), (intlon >= 0) ? 'E' : 'W', @@ -729,14 +792,18 @@ static void srtm_draw_existence ( VikViewport *vp ) for (i = floor(min_lat); i <= floor(max_lat); i++) { for (j = floor(min_lon); j <= floor(max_lon); j++) { + const gchar *continent_dir; + if ((continent_dir = srtm_continent_dir(i, j)) == NULL) + continue; g_snprintf(buf, sizeof(buf), SRTM_CACHE_TEMPLATE, MAPS_CACHE_DIR, - srtm_continent_dir(i, j), + continent_dir, + G_DIR_SEPARATOR_S, (i >= 0) ? 'N' : 'S', ABS(i), (j >= 0) ? 'E' : 'W', ABS(j) ); - if ( access(buf, F_OK ) == 0 ) { + if ( g_file_test(buf, G_FILE_TEST_EXISTS ) == TRUE ) { VikCoord ne, sw; gint x1, y1, x2, y2; sw.north_south = i; @@ -797,7 +864,7 @@ static void dem24k_draw_existence ( VikViewport *vp ) g_snprintf(buf, sizeof(buf), "%sdem24k/%d/", MAPS_CACHE_DIR, (gint) i ); - if ( access(buf, F_OK) != 0 ) + if ( g_file_test(buf, G_FILE_TEST_EXISTS) == FALSE ) continue; for (j = floor(min_lon*8)/8; j <= floor(max_lon*8)/8; j+=0.125) { /* check lon dir first -- faster */ @@ -805,7 +872,7 @@ static void dem24k_draw_existence ( VikViewport *vp ) MAPS_CACHE_DIR, (gint) i, (gint) j ); - if ( access(buf, F_OK) != 0 ) + if ( g_file_test(buf, G_FILE_TEST_EXISTS) == FALSE ) continue; g_snprintf(buf, sizeof(buf), "%sdem24k/%d/%d/%.03f,%.03f.dem", MAPS_CACHE_DIR, @@ -813,7 +880,7 @@ static void dem24k_draw_existence ( VikViewport *vp ) (gint) j, floor(i*8)/8, floor(j*8)/8 ); - if ( access(buf, F_OK ) == 0 ) { + if ( g_file_test(buf, G_FILE_TEST_EXISTS ) == TRUE ) { VikCoord ne, sw; gint x1, y1, x2, y2; sw.north_south = i; @@ -853,15 +920,15 @@ static void weak_ref_cb ( gpointer ptr, GObject * dead_vdl ) */ static gboolean dem_layer_add_file ( VikDEMLayer *vdl, const gchar *full_path ) { - if ( access(full_path, F_OK ) == 0 ) { - /* only load if file size is not 0 (not in progress */ + if ( g_file_test(full_path, G_FILE_TEST_EXISTS ) == TRUE ) { + /* only load if file size is not 0 (not in progress) */ struct stat sb; stat (full_path, &sb); if ( sb.st_size ) { gchar *duped_path = g_strdup(full_path); vdl->files = g_list_prepend ( vdl->files, duped_path ); a_dems_load ( duped_path ); - g_warning(duped_path); + g_debug("%s: %s", __FUNCTION__, duped_path); vik_layer_emit_update ( VIK_LAYER(vdl) ); } return TRUE; @@ -912,10 +979,8 @@ static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *e gchar *full_path; gchar *dem_file = NULL; - if ( !vdl) return FALSE; - if ( vdl->source == DEM_SOURCE_NONE ) - a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vdl), "No download source selected. Edit layer properties." ); + a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vdl), _("No download source selected. Edit layer properties.") ); vik_viewport_screen_to_coord ( vvp, event->x, event->y, &coord ); vik_coord_to_latlon ( &coord, &ll ); @@ -933,12 +998,12 @@ static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *e full_path = g_strdup_printf("%s%s", MAPS_CACHE_DIR, dem_file ); - g_warning(full_path); + g_debug("%s: %s", __FUNCTION__, full_path); // TODO: check if already in filelist if ( ! dem_layer_add_file(vdl, full_path) ) { - gchar *tmp = g_strdup_printf ( "Downloading DEM %s ", dem_file ); + gchar *tmp = g_strdup_printf ( _("Downloading DEM %s"), dem_file ); DEMDownloadParams *p = g_malloc(sizeof(DEMDownloadParams)); p->dest = g_strdup(full_path); p->lat = ll.lat;