#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/"
#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 );
#endif
static VikLayerParamScale param_scales[] = {
+ { 1, 10000, 10, 1 },
{ 1, 10000, 10, 1 },
{ 1, 10, 1, 0 },
};
{ "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 },
+ { "min_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, "Min Elev:", VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0 },
{ "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 },
};
-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 );
(VikLayerFuncSublayerRenameRequest) NULL,
(VikLayerFuncSublayerToggleVisible) NULL,
- (VikLayerFuncCopy) dem_layer_copy,
(VikLayerFuncMarshall) dem_layer_marshall,
(VikLayerFuncUnmarshall) dem_layer_unmarshall,
GdkGC *gc;
GdkGC **gcs;
GList *files;
+ gdouble min_elev;
gdouble max_elev;
guint8 line_thickness;
gchar *color;
return vdl_type;
}
-static VikDEMLayer *dem_layer_copy ( VikDEMLayer *vdl, gpointer vp )
-{
- VikDEMLayer *rv = vik_dem_layer_new ( );
- gint i;
-
- rv->files = a_dems_list_copy ( vdl->files );
-
- for ( i = 0; i < DEM_N_COLORS; i++ ) {
- rv->gcs[i] = vdl->gcs[i];
- g_object_ref ( rv->gcs[i] );
- }
-
- rv->source = vdl->source;
- rv->max_elev = vdl->max_elev;
- rv->line_thickness = vdl->line_thickness;
-
- rv->color = g_strdup ( vdl->color );
- 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 );
{
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;
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;
}
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;
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 );
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;
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= */
}
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);
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= */
}
/* 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, *s, 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 )
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("No SRTM data available for %f, %f\n", 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',
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',
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',
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." );
projects / andy / viking.git / blobdiff