Project

General

Profile

« Previous | Next » 

Revision 258cd5bc

Added by Andreas Kohlbecker over 14 years ago

fixed caching problem; improved openlayers map

View differences:

modules/cdm_dataportal/cdm_dataportal.theme.php
660 660
    $map_data_parameters = cdm_ws_get(CDM_WS_GEOSERVICE_DISTRIBUTIONMAP, $taxon->uuid);
661 661

  
662 662
    $display_width = variable_get('cdm_dataportal_geoservice_display_width', false);
663
    $bounding_box = variable_get('cdm_dataportal_geoservice_bounding_box', false);
663
    //$bounding_box = variable_get('cdm_dataportal_geoservice_bounding_box', false);
664 664
    $labels_on = variable_get('cdm_dataportal_geoservice_labels_on', 0);
665 665

  
666 666
    $query_string = ($display_width ? '&ms=' . $display_width: '')
667 667
      . ($bounding_box ? '&bbox=' .  $bounding_box : '')
668 668
      . ($labels_on ? '&labels=' .  $labels_on : '');
669 669
      
670
      $query_string .= '&img=false&legend=1&mlp=3';
671
      
670 672
    if(variable_get('cdm_dataportal_map_openlayers', 1)){
671 673
      // embed into openlayers viewer
672
      $server = 'http://edit.csic.es/v1/areas_sld.php';
674
      //$server = 'http://edit.csic.es/v1/areas_sld.php';
675
      $server = 'http://edit.csic.es/v1/test.php';
673 676
      $map_tdwg_Uri = url($server. '?' .$map_data_parameters->String, $query_string);
677
      
678
      //#print($map_tdwg_Uri.'<br>');
679
      
674 680
      //$map_tdwg_Uri ='http://edit.csic.es/v1/areas3_ol.php?l=earth&ad=tdwg4:c:UGAOO,SAROO,NZSOO,SUDOO,SPAAN,BGMBE,SICSI,TANOO,GEROO,SPASP,KENOO,SICMA,CLCBI,YUGMA,GRCOO,ROMOO,NZNOO,CLCMA,YUGSL,CLCLA,ALGOO,SWIOO,CLCSA,MDROO,HUNOO,ETHOO,BGMLU,COROO,BALOO,POROO,BALOO|e:CZESK,GRBOO|g:AUTAU|b:LBSLB,TUEOO|d:IREIR,AUTLI,POLOO,IRENI|f:NETOO,YUGCR|a:TUEOO,BGMBE,LBSLB||tdwg3:c:BGM,MOR,SPA,SIC,ITA,MOR,SPA,FRA|a:YUG,AUT&as=a:8dd3c7,,1|b:fdb462,,1|c:4daf4a,,1|d:ffff33,,1|e:bebada,,1|f:ff7f00,,1|g:377eb8,,1&&ms=610&bbox=-180,-90,180,90';
675 681
      //$tdwg_sldFile = cdm_http_request($map_tdwg_Uri);
676
      $tdwg_sldFiles = cdm_ws_get($map_tdwg_Uri, null, null, "GET", TRUE);
677 682
      
678
      if(isset($tdwg_sldFiles[0]->layers)){
679
        $layerSlds = $tdwg_sldFiles[0]->layers;
683
      // get the respone from the map service
684
      $responseObj = cdm_ws_get($map_tdwg_Uri, null, null, "GET", TRUE);
685
      $responseObj = $responseObj[0];
686
      
687
      // get the sld files from the response object
688
      if(isset($responseObj->layers)){
689
        $layerSlds = $responseObj->layers;
680 690
        foreach($layerSlds as $layer){
681 691
          $tdwg_sldUris[$layer->tdwg] = "http://edit.csic.es/v1/sld/".$layer->sld;
692
          //#print($tdwg_sldUris[$layer->tdwg].'<br>');
682 693
        }
683 694
      }
695
      // get the bbox from the response object
696
      $zoomto_bbox = ($responseObj->bbox ? $responseObj->bbox : '-180, -90, 180, 90');
684 697
      
685 698
      $add_tdwg1 = (isset($tdwg_sldUris['tdwg1']) ? "
686 699
          tdwg_1.params.SLD = '".$tdwg_sldUris['tdwg1']."';
......
781 794
   '.$add_tdwg2.'
782 795
   '.$add_tdwg3.'
783 796
   '.$add_tdwg4.'
784
   map.zoomToMaxExtent();
785
   
797
   map.zoomToExtent(new OpenLayers.Bounds('.$zoomto_bbox.'), true);
786 798
 }
787 799
 
788 800
$(document).ready(function(){

Also available in: Unified diff