Revision 4c21ffdb
Added by Andreas Kohlbecker almost 8 years ago
| modules/cdm_dataportal/includes/maps.inc | ||
|---|---|---|
| 114 | 114 |
|
| 115 | 115 |
$edit_map_service = get_edit_map_service_settings(); |
| 116 | 116 |
|
| 117 |
drupal_add_js(drupal_get_path('module', 'cdm_dataportal') . '/js/map/openlayers_map.js');
|
|
| 118 |
drupal_add_js(drupal_get_path('module', 'cdm_dataportal') . '/js/map/openlayers_layers.js');
|
|
| 117 |
drupal_add_js(drupal_get_path('module', 'cdm_dataportal') . '/js/map/openlayers_map.js',
|
|
| 118 |
array( |
|
| 119 |
'type' => 'file', |
|
| 120 |
'group' => JS_DEFAULT, // module-layer JavaScript. |
|
| 121 |
'weight' => 0, |
|
| 122 |
'cache' => TRUE, |
|
| 123 |
'preprocess' => FALSE |
|
| 124 |
)); |
|
| 125 |
drupal_add_js(drupal_get_path('module', 'cdm_dataportal') . '/js/map/openlayers_layers.js',
|
|
| 126 |
array( |
|
| 127 |
'type' => 'file', |
|
| 128 |
'group' => JS_DEFAULT, |
|
| 129 |
'weight' => 1, // after openlayers_map.js |
|
| 130 |
'cache' => TRUE, |
|
| 131 |
'preprocess' => FALSE |
|
| 132 |
)); |
|
| 119 | 133 |
|
| 120 | 134 |
$cdm_openlayers_options = array( |
| 121 | 135 |
'legendPosition' => '3', |
| ... | ... | |
| 145 | 159 |
drupal_set_message('A Google Maps layer is configured but the API key is either missing or invalid.
|
| 146 | 160 |
Please set your Google Maps API key in the ' . l('Geo & Map Settings', 'admin/config/cdm_dataportal/settings/geo') .'.', 'warning');
|
| 147 | 161 |
} |
| 148 |
|
|
| 149 | 162 |
} |
| 150 | 163 |
} |
| 151 | 164 |
|
| ... | ... | |
| 160 | 173 |
} |
| 161 | 174 |
} |
| 162 | 175 |
|
| 163 |
|
|
| 164 | 176 |
} |
| 165 | 177 |
|
| 166 | 178 |
// --- custom wms base layer |
| ... | ... | |
| 360 | 372 |
); |
| 361 | 373 |
*/ |
| 362 | 374 |
} |
| 363 |
$out = compose_map(NULL, NULL, $query_string, $legendFormatQueryStr);
|
|
| 375 |
$out = compose_map('distribution', NULL, $query_string, $legendFormatQueryStr);
|
|
| 364 | 376 |
|
| 365 | 377 |
return $out; |
| 366 | 378 |
} |
Also available in: Unified diff
ref #5938 fixing js lib loading order (and defined map container ids)