? marker_theming.patch ? marker_theming_and_format.patch ? remove_content_dependency.patch ? js/.openlayers.layers.js.swp Index: openlayers.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/openlayers.module,v retrieving revision 1.58 diff -u -p -r1.58 openlayers.module --- openlayers.module 10 Jun 2009 01:43:28 -0000 1.58 +++ openlayers.module 11 Jun 2009 16:17:43 -0000 @@ -73,6 +73,11 @@ function openlayers_theme() { ), 'file' => 'includes/openlayers.theme.inc', ), + 'openlayers_vector_styles' => array( + 'arguments' => array( + 'map' => array(), + ), + ), ); } @@ -122,6 +127,35 @@ function openlayers_menu() { } /** + * Theme function for openlayers_map + */ +function theme_openlayers_map($map = array()) { + $output = ' +
+ '; + return $output; +} + +/** + * Theme function for openlayers_vector_styles + */ +function theme_openlayers_vector_styles() { + $styles = array(); + $styles['default'] = array( + 'pointRadius' => 5, + 'fillColor' => '#ffcc66', + 'strokeColor' => '#ff9933', + 'strokeWidth' => 4, + 'fillOpacity' => 0.5, + ); + $styles['select'] = array( + 'fillColor' => '#66ccff', + 'strokeColor' => '#3399ff', + ); + return $styles; +} + +/** * Intialize OpenLayers * * Make sure that we have everything we need for OpenLayers @@ -200,12 +234,15 @@ function openlayers_render_map($map = ar // Merge with module/system defaults $system_defaults = _openlayers_get_map_defaults(); $map = openlayers_merge_maps($system_defaults, $map); - + // Process layers $map['layers'] = _openlayers_layers_process($map['layers'], $map); // Process behaviors $map['behaviors'] = _openlayers_behaviors_process($map['behaviors'], $map); + // Process styles + $map['styles'] = theme_openlayers_vector_styles(); + // Hook for one last alter // hook_openlayers_map_alter(&$map = array()) drupal_alter('openlayers_map', $map); @@ -222,6 +259,7 @@ function openlayers_render_map($map = ar ), ), ); + drupal_add_js($openlayers, 'setting'); // Add themed HTML (no need for it to go to JS) Index: js/openlayers.layers.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/js/openlayers.layers.js,v retrieving revision 1.3 diff -u -p -r1.3 openlayers.layers.js --- js/openlayers.layers.js 29 May 2009 00:43:36 -0000 1.3 +++ js/openlayers.layers.js 11 Jun 2009 16:17:43 -0000 @@ -44,11 +44,168 @@ OL.Layers.WMS = function(layerOptions, m OL.Layers.Vector = function(layerOptions, mapid) { // Get styles var stylesAll = []; + // Process Options if (OL.isSet(layerOptions.options)){ // Process Styles if (OL.isSet(layerOptions.options.styles)) { - var stylesAdded = []; + var stylesAdded = [];// $Id: openlayers.layers.js,v 1.3 2009/05/29 00:43:36 phayes Exp $ + + /** + * @file + * JS functions to handle different types of layers for core OpenLayers modules + * + * @ingroup openlayers + */ + + /** + * Process WMS Layers + * + * Process a WMS definition into a OpenLayers WMS Object + * + * @param layerOptions + * The WMS layer part of the map definition array. + * @param mapid + * Map ID. + * @return + * OpenLayers WMS layer object. + */ + OL.Layers.WMS = function(layerOptions, mapid) { + // Check if there is a defined format + if (typeof(layerOptions.params.format) == "undefined"){ + layerOptions.params.format = "image/png"; + } + + // Return Layer object + return new OpenLayers.Layer.WMS(layerOptions.name, + layerOptions.url, layerOptions.params, layerOptions.options); + } + + /** + * Process Vector Layers + * + * Process a Vector layer definition into a OpenLayers Vector Object + * + * @param layerOptions + * The Vector layer part of the map definition array. + * @param mapid + * Map ID. + * @return + * OpenLayers Vector layer object. + */ + OL.Layers.Vector = function(layerOptions, mapid) { + + // Get styles + var stylesAll = []; + // Process Options + if (OL.isSet(layerOptions.options)){ + // Process Styles + if (OL.isSet(layerOptions.options.styles)) { + var stylesAdded = []; + for (var styleName in layerOptions.options.styles) { + stylesAdded[styleName] = new OpenLayers.Style(layerOptions.options.styles[styleName].options); + } + stylesAll = new OpenLayers.StyleMap(stylesAdded); + }; + } + + // @@TODO: not be hard-coded + var myStyles = new OpenLayers.StyleMap({ + "default": new OpenLayers.Style( + Drupal.settings.openlayers.maps[mapid].styles.default + ), + "select": new OpenLayers.Style( + Drupal.settings.openlayers.maps[mapid].styles.select + ) + }); + + + // Define layer object + var returnVector = new OpenLayers.Layer.Vector(layerOptions.name, {styleMap: myStyles}); + + // Add features if they are defined + if (typeof(layerOptions.features) != "undefined") { + var wktFormat = new OpenLayers.Format.WKT(); + var newFeatures = []; + + // Go through features + for (var feat in layerOptions.features) { + // Extract geometry either from wkt property or lon/lat properties + if (typeof(layerOptions.features[feat].wkt) != "undefined") { + var wkt; + + // Check to see if it is a string of wkt, or an array for a multipart feature. + if (typeof(layerOptions.features[feat].wkt) == "string") { + wkt = layerOptions.features[feat].wkt; + } + if (typeof(layerOptions.features[feat].wkt) == "object" && layerOptions.features[feat].wkt.length != 0) { + wkt = "GEOMETRYCOLLECTION(" + layerOptions.features[feat].wkt.join(',') + ")"; + } + + // Get new feature + var newFeatureObject = wktFormat.read(wkt); + } + else if (typeof(layerOptions.features[feat].lon) != "undefined") { + var newFeatureObject = wktFormat.read("POINT(" + layerOptions.features[feat].lon + " " + layerOptions.features[feat].lat + ")"); + } + + // If we have successfully extracted geometry add additional + // properties and queue it for addition to the layer + if (typeof(newFeatureObject) != 'undefined'){ + var newFeatureSet = []; + + // Check to see if it is a new feature, or an array of new features. + if (typeof(newFeatureObject[0]) == 'undefined'){ + // It's an actual OpenLayers feature object. + newFeatureSet[0] = newFeatureObject; + } + else{ + // It's an array of OpenLayers objects + newFeatureSet = newFeatureObject; + } + + // Go through new features + for (var i in newFeatureSet){ + var newFeature = newFeatureSet[i]; + + // Transform the geometry if the 'projection' property is different from the map projection + if (typeof(layerOptions.features[feat].projection) != 'undefined'){ + if (layerOptions.features[feat].projection != OL.mapDefs[mapid].projection){ + var featureProjection = new OpenLayers.Projection("EPSG:" + layerOptions.features[feat].projection); + var mapProjection = OL.maps[mapid].projection; + newFeature.geometry.transform(featureProjection,mapProjection); + } + } + + // Add attribute data + if (typeof(layerOptions.features[feat].attributes) != "undefined"){ + newFeature.attributes = layerOptions.features[feat].attributes; + newFeature.data = layerOptions.features[feat].attributes; + } + + // Add style information + if (typeof(layerOptions.features[feat].style) != "undefined"){ + // Merge with defaults + var featureStyle = jQuery.extend({}, OpenLayers.Feature.Vector.style['default'], layerOptions.features[feat].style); + // Add style to feature + newFeature.style = featureStyle; + } + + // Push new features + newFeatures.push(newFeature); + } + } + } + + // Add new features if there are any + if (newFeatures.length != 0){ + returnVector.addFeatures(newFeatures); + } + } + + // Return processed vector + return returnVector; + } for (var styleName in layerOptions.options.styles) { stylesAdded[styleName] = new OpenLayers.Style(layerOptions.options.styles[styleName].options); } @@ -56,19 +213,14 @@ OL.Layers.Vector = function(layerOptions }; } - // @@TODO: not be hard-coded + // Add default styles from theme_openlayers_vector_styles() var myStyles = new OpenLayers.StyleMap({ - "default": new OpenLayers.Style({ - pointRadius: 5, // sized according to type attribute - fillColor: "#ffcc66", - strokeColor: "#ff9933", - strokeWidth: 4, - fillOpacity:0.5 - }), - "select": new OpenLayers.Style({ - fillColor: "#66ccff", - strokeColor: "#3399ff" - }) + "default": new OpenLayers.Style( + Drupal.settings.openlayers.maps[mapid].styles.default + ), + "select": new OpenLayers.Style( + Drupal.settings.openlayers.maps[mapid].styles.select + ) }); // Define layer object @@ -156,4 +308,4 @@ OL.Layers.Vector = function(layerOptions // Return processed vector return returnVector; -} \ No newline at end of file +}