From 0cf05a746805d2af31981288ead1946ba265cc30 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Tue, 25 Jan 2011 15:48:03 +0100 Subject: [PATCH] Feature #6483 - Patch: Add Google Map Maker to the available Google Map types. According to http://maps.google.com/support/bin/answer.py?answer=155714: "Use G_MAPMAKER_NORMAL_MAP and G_MAPMAKER_HYBRID_MAP in lieu of the normal map and hybrid types to show mapmaker map tiles and hybrid tiles respectively. Remember that these serve maps only the countries being edited in Map Maker, not all the countries available in maps.google.com." --- .../openlayers/includes/layer_types/google.inc | 5 ++++- .../openlayers/includes/layer_types/js/google.js | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sites/all/modules/patched/openlayers/includes/layer_types/google.inc b/sites/all/modules/patched/openlayers/includes/layer_types/google.inc index fa8a29d..42cbbb8 100644 --- a/sites/all/modules/patched/openlayers/includes/layer_types/google.inc +++ b/sites/all/modules/patched/openlayers/includes/layer_types/google.inc @@ -40,7 +40,10 @@ class openlayers_layer_type_google extends openlayers_layer_type { $google_layer_types = array( 'hybrid' => 'Hybrid', 'normal' => 'Normal', - 'satellite' => 'Satellite'); + 'satellite' => 'Satellite', + 'mapmaker-normal' => 'MapMaker Normal', + 'mapmaker-hybrid' => 'MapMaker Hybrid', + ); return array( 'type' => array( '#title' => t('Google Layer Type'), diff --git a/sites/all/modules/patched/openlayers/includes/layer_types/js/google.js b/sites/all/modules/patched/openlayers/includes/layer_types/js/google.js index 49c6232..7a0e43f 100644 --- a/sites/all/modules/patched/openlayers/includes/layer_types/js/google.js +++ b/sites/all/modules/patched/openlayers/includes/layer_types/js/google.js @@ -17,7 +17,9 @@ Drupal.openlayers.layer.google = function(title, map, options) { 'normal': G_NORMAL_MAP, 'satellite': G_SATELLITE_MAP, 'hybrid': G_HYBRID_MAP, - 'physical': G_PHYSICAL_MAP + 'physical': G_PHYSICAL_MAP, + 'mapmaker-normal': G_MAPMAKER_NORMAL_MAP, + 'mapmaker-hybrid': G_MAPMAKER_HYBRID_MAP, }; options.sphericalMercator = true; -- 1.7.3.1