Project

General

Profile

« Previous | Next » 

Revision a57a4e2e

Added by Andreas Kohlbecker about 12 years ago

switching to new Metacarta Vmap0 + fixing some minor bugs

View differences:

5.x/modules/cdm_dataportal/settings.php
936 936
    '#default_value' => variable_get('cdm_dataportal_search_items_on_page', CDM_DATAPORTAL_SEARCH_ITEMS_ON_PAGE),
937 937
    '#description' => t('Number of results to display per page.')
938 938
  );
939
   
939

  
940 940
  $form['search_settings']['cdm_dataportal_search_items_on_page'] = array(
941 941
    '#type' => 'textfield',
942 942
    '#title' => t('Results per page'),
943 943
    '#default_value' => variable_get('cdm_dataportal_search_items_on_page', CDM_DATAPORTAL_SEARCH_ITEMS_ON_PAGE),
944 944
    '#description' => t('Number of results to display per page.')
945 945
  );
946
  
946

  
947 947
    $form['search_settings']['cdm_search_taxa'] = array(
948 948
    	'#type' => 'checkbox',
949 949
        '#title' => t('Sets the default value of <em>Search for accepted taxa</em> in the advanced search form.'),
950 950
        '#default_value' => variable_get('cdm_search_taxa', 1),
951 951
        '#description' => t('<p>If checked the <em>Search for accepted taxa </em> option will be enabled in the advanced form.</p>')
952 952
  	);
953
  	
953

  
954 954
  	$form['search_settings']['cdm_search_synonyms'] = array(
955 955
    	'#type' => 'checkbox',
956 956
        '#title' => t('Sets the default value of <em>Search for synonyms</em> in the advanced search form.'),
957 957
        '#default_value' => variable_get('cdm_search_synonyms', 1),
958 958
        '#description' => t('<p>If checked the <em>Search for synonyms</em> option will be enabled in the advanced form.</p>')
959 959
  	);
960
  	
960

  
961 961
  	$form['search_settings']['cdm_search_common_names'] = array(
962 962
    	'#type' => 'checkbox',
963 963
        '#title' => t('Sets the default value of <em>Search for common names</em> in the advanced search form.'),
964 964
        '#default_value' => variable_get('cdm_search_common_names', 0),
965 965
        '#description' => t('<p>If checked the <em>Search for common names</em> option will be enabled in the advanced form.</p>')
966 966
  	);
967
  	
967

  
968 968
  	$form['search_settings']['cdm_search_use_default_values'] = array(
969 969
  	    	'#type' => 'checkbox',
970 970
  	        '#title' => t('Sets use of default values in the advanced search form.'),
971 971
  	        '#default_value' => variable_get('cdm_search_use_default_values', 1),
972 972
  	        '#description' => t('<p>If checked the defqult values set abovewill be used for the search.</p>')
973 973
  	);
974
  
974

  
975 975

  
976 976
  // --- SEARCH TAXA GALLERY ---- //
977 977
  $items = variable_get('cdm_dataportal_search_items_on_page', CDM_DATAPORTAL_SEARCH_ITEMS_ON_PAGE);
......
1120 1120
                           them will be renderized.</li><li><em>Plain image</em> displays the map as a plain non interactive image</li></ul>')
1121 1121
    );
1122 1122

  
1123
    $openLayersEnabled = variable_get('cdm_dataportal_map_openlayers', 1) === 1;
1123
    $openLayersEnabled = variable_get('cdm_dataportal_map_openlayers', 1) == 1;
1124 1124

  
1125 1125

  
1126 1126
    // --- Plain Image Settings --- //
......
1174 1174
    );
1175 1175

  
1176 1176
    if( !$openLayersEnabled ){
1177
      $form['openlayers']['#description'] = '<div class="messages warning">' . t("The Openlayers viewer is curretnly not enabled! (see section Maps settings above )") . '</div>'
1177
      $form['openlayers']['#description'] = '<div class="messages warning">' . t("The Openlayers viewer is currently not enabled! (see section Maps settings above )") . '</div>'
1178 1178
      . $form['openlayers']['#description'];
1179 1179
    }
1180 1180

  
......
1182 1182
      /*
1183 1183
       * NOTICE: must correspond to the layers defined in js/openlayers_,ap.js#getLayersByName()
1184 1184
       */
1185
      'osgeo_vmap0' => "OpenLayers World", // EPSG:4326
1186
      'metacarta_vmap0' => "Metacarta Vmap0" , // EPSG:4326, EPSG:900913
1185
      'osgeo_vmap0' => "Metacarta Vmap0", // EPSG:4326: EPSG:900913
1186
//       'metacarta_vmap0' => "Metacarta Vmap0" , // EPSG:4326, EPSG:900913
1187 1187
       // all others EPSG:900913
1188
      'edit-vmap0_world_basic' => 'EDIT Vmap0',
1188
//       'edit-vmap0_world_basic' => 'EDIT Vmap0',
1189 1189
      'edit-etopo1' => "ETOPO1 Global Relief Model",
1190
      'osmarender' => 'OpenStreetMap',
1191
      //'oam' => 'OpenAerialMap', // currently unavailable
1190
      'mapnik' => 'OpenStreetMap',
1191
      'osmarender' => 'OpenStreetMap (Tiles@home)',
1192 1192
      'gmap' => 'Google Streets',
1193 1193
      'gsat' => 'Google Satellite',
1194 1194
      'ghyb' => 'Google Hybrid',
......
1398 1398
 */
1399 1399
function getEDITMapServiceVersionNumber() {
1400 1400

  
1401
      $pattern = '/v(\d+\.\d+)/';
1401
      $pattern = '/v([\d\.]+)$/';
1402 1402

  
1403 1403
      $url = getEDITMapServiceURI();
1404 1404
      preg_match($pattern, $url, $matches, PREG_OFFSET_CAPTURE, 3);

Also available in: Unified diff