OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Update Openlayers to 3.0-beta4 release, use Openlayers version 3.10.1, remove Google Maps tilt patch, add Elements dependency patch.

This commit is contained in:
Michael Stenta 2015-12-01 11:57:18 -05:00
parent a23495ad2f
commit 3e6794069e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drupal-org.make
View File

@ -88,22 +88,19 @@ projects[navbar][subdir] = "contrib"
projects[navbar][version] = "1.6"
projects[openlayers][subdir] = "contrib"
projects[openlayers][download][type] = "git"
projects[openlayers][download][url] = "http://git.drupal.org/project/openlayers.git"
projects[openlayers][download][branch] = "7.x-3.x"
projects[openlayers][download][revision] = "deee17fd3bf605a273f2bfacca40b84aa1993c65"
projects[openlayers][version] = "3.0-beta4"
; 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.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_base_layer_mechanism-2543130-4.patch"
; Set Google Maps tilt to 0.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_google_maps_tilt_0-2573005-1.patch"
; Limit ZoomToSource to the selected sources.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_zoomtosource-2626172-1.patch"
; Add cluster support to popup components.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_popup_cluster-2626200-1.patch"
; Fix popup components require multiple clicks.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_popup_click-2606054-3.patch"
; Move Elements dependency to Openlayers Examples.
projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_examples_elements_dependency-2620098-2.patch"
projects[openlayers_geolocate_button][subdir] = "contrib"
projects[openlayers_geolocate_button][version] = "3.1"

11
farm.install
View File

@ -32,8 +32,8 @@ function farm_install() {
// Show "Request new password" link on 403 pages (via LoginToboggan).
variable_set('logintoboggan_site_403_user_login_block', TRUE);
// Load Openlayers 3.8.2 from jsDelivr CDN.
\Drupal\openlayers\Config::set('openlayers.variant', 'jsdelivr:ol3:3.8.2');
// Load Openlayers 3.10.1 from CDNJS.
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.10.1');
}
/**
@ -268,6 +268,13 @@ function farm_update_7010(&$sandbox) {
}
}
/**
* Load Openlayers 3.10.1 from CDNJS.
*/
function farm_update_7011(&$sandbox) {
\Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.10.1');
}
/**
* Helper function: enable modules.
*/