Revision cdb6af36
Added by Andreas Kohlbecker over 11 years ago
7.x/modules/cdm_dataportal/cdm_dataportal.module | ||
---|---|---|
327 | 327 |
|
328 | 328 |
$out = '<div id="openlayers">'; |
329 | 329 |
$out .= '<div id="openlayers_map" class="smallmap"'; |
330 |
$out .= ' style="width: ' . $width . 'px; height:' . ($width / 2) . 'px"'; |
|
330 |
if($width) { |
|
331 |
$out .= ' style="width: ' . $width . 'px; height:' . ($width / 2) . 'px"'; |
|
332 |
} |
|
331 | 333 |
|
332 | 334 |
// Additional query parameters as set in the data portal admin section. |
333 | 335 |
$labels_on = variable_get('cdm_dataportal_geoservice_labels_on', 0); |
7.x/modules/cdm_dataportal/js/openlayers_map.js | ||
---|---|---|
59 | 59 |
/** |
60 | 60 |
* |
61 | 61 |
*/ |
62 |
this.init = function(){ |
|
62 |
this.init = function(){ // public function
|
|
63 | 63 |
|
64 | 64 |
createLayers(options.baseLayerNames, options.defaultBaseLayerName); |
65 | 65 |
|
... | ... | |
294 | 294 |
} else { |
295 | 295 |
return queryStr1 + queryStr2; |
296 | 296 |
} |
297 |
}; |
|
298 | 297 |
|
299 |
/** |
|
300 |
* |
|
301 |
*/ |
|
302 |
var createLayers = function( baseLayerNames, defaultBaseLayerName){ |
|
303 |
//var baseLayers = new Array(); |
|
304 |
for(var i = 0; i < baseLayerNames.length; i++) { |
|
305 |
//var layerName in baseLayerNames ){ |
|
306 |
baseLayers[i] = getLayersByName(baseLayerNames[i]); |
|
307 |
// set the default base layer |
|
308 |
if(baseLayerNames[i] == defaultBaseLayerName){ |
|
309 |
defaultBaseLayer = baseLayers[i]; |
|
310 |
} |
|
311 |
} |
|
312 |
|
|
313 |
//return baseLayers; |
|
314 |
}; |
|
298 |
}; |
|
315 | 299 |
|
300 |
/** |
|
301 |
* |
|
302 |
*/ |
|
303 |
var createLayers = function( baseLayerNames, defaultBaseLayerName){ |
|
304 |
for(var i = 0; i < baseLayerNames.length; i++) { |
|
305 |
baseLayers[i] = getLayersByName(baseLayerNames[i]); |
|
306 |
if(baseLayerNames[i] == defaultBaseLayerName){ |
|
307 |
defaultBaseLayer = baseLayers[i]; |
|
308 |
} |
|
309 |
} |
|
310 |
}; |
|
316 | 311 |
|
317 | 312 |
/** |
318 | 313 |
* |
319 | 314 |
*/ |
320 | 315 |
var getLayersByName = function(layerName){ |
321 | 316 |
|
322 |
var baseLayer; |
|
317 |
var baseLayer = null;
|
|
323 | 318 |
|
324 | 319 |
switch(layerName){ |
325 | 320 |
|
... | ... | |
474 | 469 |
); |
475 | 470 |
break; |
476 | 471 |
|
477 |
};
|
|
472 |
} |
|
478 | 473 |
|
479 | 474 |
return baseLayer; |
480 | 475 |
}; |
7.x/modules/cdm_dataportal/theme/cdm_dataportal.page.theme | ||
---|---|---|
365 | 365 |
$occurrenceQuery = cdm_ws_get(CDM_WS_GEOSERVICE_OCCURRENCEMAP, $taxon->uuid); |
366 | 366 |
|
367 | 367 |
if( isset($occurrenceQuery->String) ) { |
368 |
// os=&od=&legend=0&recalculate=false&image=false |
|
369 | 368 |
$occurrenceQuery = $occurrenceQuery->String; |
370 | 369 |
|
371 | 370 |
$legendFormatQueryStr = null; |
372 | 371 |
if (variable_get('cdm_dataportal_map_openlayers', 1)) { |
373 |
$out .= get_openlayers_map(variable_get('cdm_dataportal_geoservice_display_width', FALSE), variable_get('cdm_dataportal_geoservice_bounding_box', FALSE), $occurrenceQuery, NULL,
|
|
372 |
$out .= get_openlayers_map(variable_get('cdm_dataportal_geoservice_display_width', 680), variable_get('cdm_dataportal_geoservice_bounding_box', FALSE), $occurrenceQuery, NULL,
|
|
374 | 373 |
$legendFormatQueryStr, variable_get('cdm_dataportal_geoservice_map_caption', '')); |
375 | 374 |
} |
376 | 375 |
else { |
377 | 376 |
// get_image_map($width, $occurrenceQuery = FALSE, $distributionQuery = FALSE, $legendFormatQuery = FALSE, $map_caption = FALSE ) |
378 |
$out .= get_image_map(variable_get('cdm_dataportal_geoservice_display_width', FALSE), variable_get('cdm_dataportal_geoservice_bounding_box', FALSE), $occurrenceQuery, NULL,
|
|
377 |
$out .= get_image_map(variable_get('cdm_dataportal_geoservice_display_width', 680), variable_get('cdm_dataportal_geoservice_bounding_box', FALSE), $occurrenceQuery, NULL,
|
|
379 | 378 |
$legendFormatQueryStr, variable_get('cdm_dataportal_geoservice_map_caption', '')); |
380 | 379 |
} |
381 | 380 |
} |
Also available in: Unified diff
code cosmetics in openlayers_map.js and more robust handling of map width