Update Openlayers to 7.x-3.0. Remove GoogleMaps prebuild patch. Downgrade OL library to 3.11.2.
This commit is contained in:
parent
6c00f0e03a
commit
fceb3423f9
|
@ -90,12 +90,7 @@ projects[navbar][subdir] = "contrib"
|
||||||
projects[navbar][version] = "1.7"
|
projects[navbar][version] = "1.7"
|
||||||
|
|
||||||
projects[openlayers][subdir] = "contrib"
|
projects[openlayers][subdir] = "contrib"
|
||||||
projects[openlayers][download][type] = "git"
|
projects[openlayers][version] = "3.0"
|
||||||
projects[openlayers][download][url] = "http://git.drupal.org/project/openlayers.git"
|
|
||||||
projects[openlayers][download][branch] = "7.x-3.x"
|
|
||||||
projects[openlayers][download][revision] = "f25f13501b95ccae4037280f0e37edb236a7a0a4"
|
|
||||||
; Fix GoogleMaps in Geofield context.
|
|
||||||
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_googlemaps_postbuild-2538168-5.patch"
|
|
||||||
; Remove base layer assignment code.
|
; Remove base layer assignment code.
|
||||||
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_base_layer_mechanism-2543130-4.patch"
|
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_base_layer_mechanism-2543130-4.patch"
|
||||||
; Move Elements dependency to Openlayers Examples.
|
; Move Elements dependency to Openlayers Examples.
|
||||||
|
|
|
@ -32,8 +32,8 @@ function farm_install() {
|
||||||
// Show "Request new password" link on 403 pages (via LoginToboggan).
|
// Show "Request new password" link on 403 pages (via LoginToboggan).
|
||||||
variable_set('logintoboggan_site_403_user_login_block', TRUE);
|
variable_set('logintoboggan_site_403_user_login_block', TRUE);
|
||||||
|
|
||||||
// Load Openlayers 3.10.1 from CDNJS.
|
// Load Openlayers 3.11.2 from CDNJS.
|
||||||
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.12.1');
|
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.11.2');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -276,10 +276,10 @@ function farm_update_7011(&$sandbox) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load Openlayers 3.12.1 from CDNJS.
|
* Load Openlayers 3.11.2 from CDNJS.
|
||||||
*/
|
*/
|
||||||
function farm_update_7012(&$sandbox) {
|
function farm_update_7012(&$sandbox) {
|
||||||
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.12.1');
|
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.11.2');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue