? .openlayers.module.swp ? 710514-activated-layers-02.patch ? 710514-activated-layers-03.patch ? cleanup_javascript.patch ? dependency-detection.patch ? dependency_detection.patch ? display_projection_fix.patch ? docs_oa ? features_dependencies.patch ? maptiler_layer_type.patch ? modify_feature.diff ? multilingual.diff ? openlayers-maxextent.patch ? overlay_baselayer_unification.patch ? rmup.sh ? stash.diff ? titles_and_translation.diff ? unification_full.patch ? vector_layer_type_property.patch ? wms_and_dependencies.patch ? includes/.openlayers.presets.inc.swp ? includes/.openlayers.render.inc.swp ? includes/layer_types/multimap.inc ? includes/layer_types/multimap.js ? includes/layer_types/wms_client.inc ? js/openlayers ? modules/openlayers_cck/includes/.openlayers_cck.theme.inc.swp ? modules/openlayers_cck/includes/behaviors/js/CustomEditingToolbar.js ? modules/openlayers_ui/includes/.openlayers_ui.presets.inc.swp ? modules/openlayers_ui/includes/.openlayers_ui.styles.inc.swp Index: openlayers.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/openlayers.module,v retrieving revision 1.69.2.65 diff -u -p -r1.69.2.65 openlayers.module --- openlayers.module 30 Apr 2010 15:17:25 -0000 1.69.2.65 +++ openlayers.module 30 Apr 2010 21:13:15 -0000 @@ -142,6 +142,7 @@ function openlayers_build_map($map = arr module_load_include('inc', 'openlayers', 'includes/openlayers.render'); // If no map is specified, use the default preset. + // TODO: remove if (empty($map)) { if ($preset = openlayers_preset_load(variable_get('openlayers_default_preset', 'default'))) { $map = $preset->data; Index: includes/openlayers.presets.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/includes/Attic/openlayers.presets.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 openlayers.presets.inc --- includes/openlayers.presets.inc 21 Feb 2010 06:11:54 -0000 1.1.2.3 +++ includes/openlayers.presets.inc 30 Apr 2010 21:13:15 -0000 @@ -34,10 +34,8 @@ function _openlayers_openlayers_presets( 'zoom' => '2' ) ), - 'options' => array( - 'displayProjection' => '4326', - 'maxExtent' => openlayers_get_extent('4326'), - ), + 'displayProjection' => '4326', + 'maxExtent' => openlayers_get_extent('4326'), 'behaviors' => array( 'openlayers_behavior_panzoombar' => array(), 'openlayers_behavior_layerswitcher' => array(), Index: includes/openlayers.render.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/includes/openlayers.render.inc,v retrieving revision 1.3.2.16 diff -u -p -r1.3.2.16 openlayers.render.inc --- includes/openlayers.render.inc 27 Apr 2010 15:50:15 -0000 1.3.2.16 +++ includes/openlayers.render.inc 30 Apr 2010 21:13:15 -0000 @@ -20,10 +20,15 @@ function _openlayers_layers_process($layers = array(), &$map = array()) { $layer_data = array(); + print_r($map); + foreach ($layers as $layer) { if ($layer_object = openlayers_layer_load($layer)) { $layer_object->render($map); $layer_object->data['title'] = $layer_object->title; + if (!empty($map['center']['wrapdateline'])) { + $layer_object->data['wrapDateLine'] = TRUE; + } $layer_data[$layer_object->name] = $layer_object->data; } } Index: js/openlayers.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/js/openlayers.js,v retrieving revision 1.47.2.29 diff -u -p -r1.47.2.29 openlayers.js --- js/openlayers.js 30 Apr 2010 20:54:25 -0000 1.47.2.29 +++ js/openlayers.js 30 Apr 2010 21:13:15 -0000 @@ -1,4 +1,4 @@ -// $Id: openlayers.js,v 1.47.2.29 2010/04/30 20:54:25 tmcw Exp $ +// $Id: openlayers.js,v 1.47.2.28 2010/04/22 14:08:45 tmcw Exp $ /*jslint white: false */ /*jslint forin: true */ /*global OpenLayers Drupal $ document jQuery window */ @@ -65,30 +65,19 @@ Drupal.behaviors.openlayers = function(c .css('width', map.width) .css('height', map.height); - // Process map option settings and prepare params for OpenLayers. - if (map.options) { - alert('with map.options'); - var options = map.options; - options.projection = new OpenLayers.Projection('EPSG:' + map.projection); - options.displayProjection = new OpenLayers.Projection('EPSG:' + map.displayProjection); - options.maxExtent = new OpenLayers.Bounds.fromArray(map.options.maxExtent); - options.controls = []; - } - else { - alert('NOT with map.options'); - var options = {}; - // This is necessary because the input JSON cannot contain objects - options.projection = new OpenLayers.Projection('EPSG:' + map.projection); - options.displayProjection = new OpenLayers.Projection('EPSG:' + map.displayProjection); - // TODO: work around this scary code - if (map.projection === '900913') { - options.maxExtent = new OpenLayers.Bounds(-20037508.34, -20037508.34, 20037508.34, 20037508.34); - } - if (map.projection === '4326') { - options.maxExtent = new OpenLayers.Bounds(-180, -90, 180, 90); - } - options.maxResolution = 1.40625; - options.controls = []; + var options = { + projection: 'EPSG:' + map.projection, + displayProjection: new OpenLayers.Projection('EPSG:' + map.displayProjection), + maxResolution: 1.40625, + controls: [], + }; + + // TODO: work around this scary code + if (map.projection === '900913') { + options.maxExtent = new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508); + } + if (map.projection === '4326') { + options.maxExtent = new OpenLayers.Bounds(-180, -90, 180, 90); } // Change image path if specified @@ -105,16 +94,11 @@ Drupal.behaviors.openlayers = function(c OpenLayers.ProxyHost = relate_path(map.proxy_host, Drupal.settings.basePath); } - // Initialize openlayers map var openlayers = new OpenLayers.Map(map.id, options); - // Run the layer addition first Drupal.openlayers.addLayers(map, openlayers); - // Attach data to map DOM object $(this).data('openlayers', {'map': map, 'openlayers': openlayers}); - - // Finally, attach behaviors Drupal.attachBehaviors(this); if($.browser.msie) { @@ -179,11 +163,6 @@ Drupal.openlayers = { layer.displayInLayerSwitcher = (!map.layer_switcher || map.layer_switcher[name]); } - if (map.center.wrapdateline === '1') { - // TODO: move into layer specific settings - layer.wrapDateLine = true; - } - openlayers.addLayer(layer); } } Index: modules/openlayers_cck/includes/openlayers_cck.theme.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/modules/openlayers_cck/includes/Attic/openlayers_cck.theme.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 openlayers_cck.theme.inc --- modules/openlayers_cck/includes/openlayers_cck.theme.inc 22 Apr 2010 13:09:59 -0000 1.1.2.5 +++ modules/openlayers_cck/includes/openlayers_cck.theme.inc 30 Apr 2010 21:13:15 -0000 @@ -36,10 +36,8 @@ function theme_openlayers_cck_formatter_ $features = array(); $field = content_fields($element['#field_name'], $element['#type_name']); - // Create array of $features foreach (element_children($element) as $delta) { $features[] = array( - // First look for geo_field data, then for openlayers wkt data 'wkt' => $element[$delta]['#item']['openlayers_wkt'], 'projection' => '4326', ); Index: modules/openlayers_ui/includes/openlayers_ui.presets.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/modules/openlayers_ui/includes/Attic/openlayers_ui.presets.inc,v retrieving revision 1.1.2.21 diff -u -p -r1.1.2.21 openlayers_ui.presets.inc --- modules/openlayers_ui/includes/openlayers_ui.presets.inc 6 Apr 2010 21:33:11 -0000 1.1.2.21 +++ modules/openlayers_ui/includes/openlayers_ui.presets.inc 30 Apr 2010 21:13:15 -0000 @@ -543,7 +543,6 @@ function openlayers_ui_presets_form_proc 'layer_switcher', 'projections', 'styles', - 'options', ); // TODO: eliminate this process, too much disconnect between