Project

General

Profile

« Previous | Next » 

Revision a38ef7b2

Added by Andreas Kohlbecker about 14 years ago

adapt to new map service & others

View differences:

modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme
340 340

  
341 341
		if(variable_get('cdm_dataportal_map_openlayers', 1)){
342 342
			// embed into openlayers viewer
343
			//$server = 'http://edit.csic.es/v1/areas.php';
344
			$server = 'http://edit.africamuseum.be/edit_wp5/v1/areas.php';
345 343
			$query_string .= '&img=false&legend=1&mlp=3';
346
			$map_tdwg_Uri = url($server. '?' .$map_data_parameters->String, $query_string);
344
			$map_tdwg_Uri = url($server. '/areas.php?' .$map_data_parameters->String, $query_string);
347 345
			$legend_url_font_size = variable_get('cdm_dataportal_geoservice_legend_font_size', 10);
348 346
			$legend_url_font_style = variable_get('cdm_dataportal_geoservice_legend_font_style', 1);
349 347
			$legend_url_font_style = $fontStyles[$legend_url_font_style];
......
359 357
			$responseObj = cdm_ws_get($map_tdwg_Uri, null, null, "GET", TRUE);
360 358
			$responseObj = $responseObj[0];
361 359

  
360
			$geoserver_uri = $responseObj->geoserver;
362 361
			// get the sld files from the response object
363 362
			if(isset($responseObj->layers)){
364 363
				if(isset($responseObj->legend)){
......
372 371
				}
373 372
				$layerSlds = $responseObj->layers;
374 373
				foreach($layerSlds as $layer){
375
					//$tdwg_sldUris[$layer->tdwg] = "http://edit.csic.es/v1/sld/".$layer->sld;
376
					//$tdwg_sldUris[$layer->tdwg] = "http://edit.africamuseum.be/edit_wp5/v1/sld/wms".$layer->sld;
377 374
					$tdwg_sldUris[$layer->tdwg] = $layer->sld;
378 375
					//#print($tdwg_sldUris[$layer->tdwg].'<br>');
379 376
				}
......
418 415
 
419 416
 var tdwg_1 = new OpenLayers.Layer.WMS.Untiled( 
420 417
    "tdwg level 1", 
421
    "http://193.190.223.46:8080/geoserver/wms/",
418
    "'.$geoserver_uri.'/wms",
422 419
    {layers:"topp:tdwg_level_1",transparent:"true", format:"image/png"},
423 420
    layerOptions
424 421
  );
425 422
  
426 423
 var tdwg_2 = new OpenLayers.Layer.WMS.Untiled( 
427 424
    "tdwg level 2", 
428
    "http://193.190.223.46:8080/geoserver/wms/",
425
    "'.$geoserver_uri.'/wms",
429 426
    {layers:"topp:tdwg_level_2",transparent:"true", format:"image/png"},
430 427
    layerOptions
431 428
  );
432 429
  
433 430
 var tdwg_3 = new OpenLayers.Layer.WMS.Untiled( 
434 431
    "tdwg level 3", 
435
    "http://193.190.223.46:8080/geoserver/wms/",
432
    "'.$geoserver_uri.'/wms",
436 433
    {layers:"topp:tdwg_level_3", transparent:"true", format:"image/png"},
437 434
    layerOptions
438 435
  );
439 436
  
440 437
  var tdwg_4 = new OpenLayers.Layer.WMS.Untiled( 
441 438
    "tdwg level 4", 
442
    "http://193.190.223.46:8080/geoserver/wms/",
439
    "'.$geoserver_uri.'/wms",
443 440
    {layers:"topp:tdwg_level_4",transparent:"true", format:"image/png"},
444 441
    layerOptions
445 442
  );
......
502 499
			// simple image
503 500
			$mapStaticCaption = '&mc_s=Georgia,15,blue&mc=' . variable_get('cdm_dataportal_geoservice_map_caption', '');
504 501
			$query_string .= '&img=true&legend=1&mlp=3' . $mapStaticCaption . '&recalculate=false';
505
			//$query_string .= '&img=true&legend=1&mlp=3' . $mapStaticCaption;
506 502
			$mapUri = url($server. '/areas.php?' .$map_data_parameters->String, $query_string);
507 503
			$out .= '<img class="distribution_map" src="' . $mapUri . '" alt="Distribution Map" />';
508 504
		}

Also available in: Unified diff