? display_projection_fix.patch
? modify_feature.diff
? multilingual.diff
? openlayers-maxextent.patch
? sld_styles.patch
? stash.diff
? titles_and_translation.diff
? includes/layer_types/.kml.js.swp
? includes/layer_types/multimap.inc
? includes/layer_types/multimap.js
? js/.openlayers.js.swp
? js/openlayers
? modules/openlayers_cck/includes/behaviors/js/CustomEditingToolbar.js
? modules/openlayers_ui/includes/.openlayers_ui.styles.inc.swp
Index: js/openlayers.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/js/openlayers.js,v
retrieving revision 1.47.2.27
diff -r1.47.2.27 openlayers.js
277a278
> 
279a281,283
>    *
>    * @param map OpenLayers Map object
>    * @param layername layer name (drupalID)
291c295,304
<         stylesAdded['default'] = new OpenLayers.Style(map.styles[style]);
---
>         if (map.styles[style].style_type == 'builder') {
>           stylesAdded['default'] = new OpenLayers.Style(map.styles[style]);
>         } 
>         else if (map.styles[style].style_type == 'sld') {
>           // TODO: keep a format object handy to avoid re-initializing
>           var format = new OpenLayers.Format.SLD();
>           s = format.read(map.styles[style].sld);
>           // TODO: grab styles besides LocalStyle
>           stylesAdded['default'] = s.namedLayers['LocalStyle'].userStyles[0];
>         }
309a323
> 
Index: modules/openlayers_ui/includes/openlayers_ui.styles.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/modules/openlayers_ui/includes/Attic/openlayers_ui.styles.inc,v
retrieving revision 1.1.2.5
diff -r1.1.2.5 openlayers_ui.styles.inc
17a18,19
>   ctools_include('dependent');
> 
40c42,45
<   $form['data'] = array('#type' => 'fieldset', '#tree' => TRUE);
---
>   $form['data'] = array(
>     '#type' => 'fieldset',
>     '#tree' => TRUE,
>   );
41a47,61
>   $form['data']['style_type'] = array(
>     '#title' => t('Style type'),
>     '#type' => 'select',
>     '#id' => 'style_type',
>     '#options' => array(
>       'builder' => t('Builder'),
>       'sld' => t('SLD')
>     ),
>     '#description' => t('Choose whether to free-input complex XML or use the style builder'),
>     '#default_value' => isset($style->data['style_type']) ? $style->data['style_type'] : ''
>   );
> 
>   /**
>    * Builder Interface
>    */
47a68,69
>     '#process' => array('ctools_dependent_process'),
>     '#dependency' => array('style_type' => array('builder')),
56a79,80
>     '#process' => array('ctools_dependent_process'),
>     '#dependency' => array('style_type' => array('builder')),
62a87,88
>     '#process' => array('ctools_dependent_process'),
>     '#dependency' => array('style_type' => array('builder')),
70a97,98
>     '#process' => array('ctools_dependent_process'),
>     '#dependency' => array('style_type' => array('builder')),
78a107,108
>     '#process' => array('ctools_dependent_process'),
>     '#dependency' => array('style_type' => array('builder')),
84a115,130
>     '#process' => array('ctools_dependent_process'),
>     '#dependency' => array('style_type' => array('builder')),
>   );
> 
>   /**
>    * SLD Interface
>    */
>   // TODO: add SLD validation in the UI
>   $form['data']['sld'] = array(
>     '#type' => 'textarea',
>     '#title' => t('SLD'),
>     '#description' => t('Advanced styling with rules and extra properties'),
>     '#default_value' => isset($style->data['sld']) ? $style->data['sld'] : '',
>     '#attributes' => array('class' => 'openlayers-form-sld'),
>     '#process' => array('ctools_dependent_process'),
>     '#dependency' => array('style_type' => array('sld')),