diff --git a/LICENSE.txt b/LICENSE.txt index b25a105..d159169 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,44 +1,12 @@ -Copyright (c) 2011, Tristan O'Neil and contributors -All Rights Reserved. - -This program is dual-licensed under both the GPL version 2 and Modified BSD -License. Either license may be used at your option. - ------------------------------------------------------------------------------- -Modified BSD License - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the - names of the contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -------------------------------------------------------------------------------- - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -88,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -287,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -309,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/README.txt b/README.txt index 03af020..27cbcd7 100644 --- a/README.txt +++ b/README.txt @@ -35,15 +35,15 @@ Install the modules Geofield and geoPHP in the usual way. General information on installing Drupal modules can be found here: http://drupal. org/documentation/install/modules-themes/modules-7 -Optionally install Open Layers 2: http://drupal.org/project/openlayers +Optionally install Open Layers 3: http://drupal.org/project/openlayers +And enable the module openlayers_geofield. CONFIGURE --------- To add a geofield to a content type go to /admin/structure/types/ and choose "Manage fields" for the chosen content type. Add a new field of the field type -"Geofield", and choose the preferred widget, e.g., "OpenLayers Map". Configure -the field according ton the chosen options. +"Geofield", and choose the preferred widget. Configure accordingly Geofield comes with the basic but easy-to-use submodule Geofield Map that allows you to display geographical data in a Google map. Enable Geofield Map diff --git a/geofield.formatters.inc b/geofield.formatters.inc index b5fe6b6..737f151 100644 --- a/geofield.formatters.inc +++ b/geofield.formatters.inc @@ -57,13 +57,6 @@ function geofield_field_formatter_info() { ), ); - if (module_exists('openlayers')) { - $formatters['geofield_openlayers'] = array( - 'label' => t('OpenLayers'), - 'field types' => array('geofield'), - 'settings' => array('data' => 'full', 'map_preset' => 'geofield_formatter_map'), - ); - } // Accessibility formatters for blind users with screen-readers $formatters['geofield_def_list'] = array( @@ -110,25 +103,7 @@ function geofield_field_formatter_settings_form($field, $instance, $view_mode, $ $settings = $display['settings']; // Map preset formatter - if ($display['type'] == 'geofield_openlayers' && module_exists('openlayers')) { - // Get preset options, filtered to those which have the GeoField placeholder layer - $presets = openlayers_presets(); - $preset_options = array(); - foreach ($presets as $preset) { - if (in_array('geofield_formatter', $preset->data['layers'])) { - $preset_options[$preset->name] = $preset->title; - } - } - - $element['map_preset'] = array( - '#title' => t('OpenLayers Preset'), - '#type' => 'select', - '#default_value' => $settings['map_preset'] ? $settings['map_preset'] : 'geofield_formatter_map', - '#required' => TRUE, - '#options' => $preset_options, - '#description' => t('Select which OpenLayers map you would like to use. Only maps which have the geofield placeholder layer may be selected. If your preferred map is not here, add the geofield placeholder layer to it first.'), - ); - } + $data_options = _geofield_formatter_settings_data_options($display['type']); $element['data'] = array( @@ -189,11 +164,6 @@ function geofield_field_formatter_settings_summary($field, $instance, $view_mode $summary[] = t('No data options set'); } - if ($display['type'] == 'geofield_openlayers' && !empty($settings['map_preset'])) { - $openlayers_presets = openlayers_preset_options(); - $summary[] = t('Openlayers Map: @data', array('@data' => $openlayers_presets[$settings['map_preset']])); - } - if ($display['type'] == 'geofield_latlon') { $format_options = _geofield_formatter_settings_format_options($display['type']); // Display this setting only if image is linked. @@ -331,10 +301,6 @@ function geofield_field_formatter_view($entity_type, $entity, $field, $instance, $element[$delta] = array('#markup' => $item['geo_type']); } return $element; - case 'geofield_openlayers': - $map_name = $display['settings']['map_preset'] ? $display['settings']['map_preset'] : 'geofield_formatter_map'; - $element[0] = array('#markup' => _geofield_openlayers_formatter($map_name, $items)); - return $element; case 'geofield_def_list': foreach ($items as $delta => $item) { $element[$delta] = array('#markup' => _geofield_def_list_formatter($item, $display['settings'])); @@ -383,49 +349,6 @@ function _geofield_item_microdata_propertyvalue($entity, $instance, $item) { return $output; } -function _geofield_openlayers_formatter($map_name, $items) { - $features = array(); - geophp_load(); - - // Create array of $features - foreach ($items as $delta) { - if (array_key_exists('geom', $delta)) { - $geometry = geoPHP::load($delta['geom']); - } - else { - $geometry = geoPHP::load($delta); - } - $features[] = array( - 'wkt' => $geometry->out('wkt'), - 'projection' => 'EPSG:4326', - ); - } - - // Get map preset - $preset = openlayers_preset_load($map_name); - $map = openlayers_build_map($preset->data); - - if (!isset($map['layers']['geofield_formatter'])) { - drupal_set_message(t('Trying to render a geofield formatter on a map without the placeholder layer'), 'error'); - } - - // Add the features to the placeholder layer - $map['layers']['geofield_formatter']['features'] = $features; - - // Return themed map if no errors found - if (empty($map['errors'])) { - $js = array('openlayers' => array('maps' => array($map['id'] => $map))); - drupal_add_js($js, 'setting'); - - // Push map through theme function and return - $output = theme('openlayers_map', array( - 'map' => $map, - 'map_name' => $map_name - )); - } - return $output; -} - function _geofield_def_list_formatter($item, $settings) { geophp_load(); $geometry = geoPHP::load($item['geom']); diff --git a/geofield.info b/geofield.info index f535d9c..13d5444 100644 --- a/geofield.info +++ b/geofield.info @@ -9,7 +9,6 @@ files[] = geofield.install files[] = geofield.elements.inc files[] = geofield.widgets.inc files[] = geofield.formatters.inc -files[] = geofield.openlayers.inc files[] = geofield.feeds.inc files[] = tests/geofield.test files[] = views/geofield.views.inc @@ -24,4 +23,10 @@ files[] = views/proximity_plugins/geofieldProximityEntityURL.inc files[] = views/proximity_plugins/geofieldProximityOtherGeofield.inc files[] = views/proximity_plugins/geofieldProximityCurrentUser.inc files[] = views/proximity_plugins/geofieldProximityExposedFilter.inc -files[] = views/proximity_plugins/geofieldProximityContextualFilter.inc \ No newline at end of file +files[] = views/proximity_plugins/geofieldProximityContextualFilter.inc +; Information added by Drupal.org packaging script on 2014-09-21 +version = "7.x-2.3" +core = "7.x" +project = "geofield" +datestamp = "1411337638" + diff --git a/geofield.module b/geofield.module index c592bd0..6ae9a51 100644 --- a/geofield.module +++ b/geofield.module @@ -3,7 +3,6 @@ module_load_include('inc', 'geofield', 'geofield.elements'); module_load_include('inc', 'geofield', 'geofield.widgets'); module_load_include('inc', 'geofield', 'geofield.formatters'); -module_load_include('inc', 'geofield', 'geofield.openlayers'); module_load_include('inc', 'geofield', 'geofield.feeds'); module_load_include('inc', 'geofield', 'geofield.apachesolr'); module_load_include('inc', 'geofield', 'geofield.schemaorg'); diff --git a/geofield.widgets.inc b/geofield.widgets.inc index 2eafef4..ec0943a 100644 --- a/geofield.widgets.inc +++ b/geofield.widgets.inc @@ -30,26 +30,12 @@ define('GEOFIELD_INPUT_LAT_LON', 'lat/lon'); */ define('GEOFIELD_INPUT_BOUNDS', 'bounds'); -// If we have the Openlayers module installed, include their widget code. - -if (module_exists('openlayers')) { - module_load_include('inc', 'geofield', 'geofield.widgets.openlayers'); -} - /** * Implements hook_field_widget_info(). */ function geofield_field_widget_info() { $widgets = array(); - // OpenLayers dependant widget - if (module_exists('openlayers')) { - $widgets['geofield_openlayers'] = array( - 'label' => t('Openlayers Map'), - 'field types' => array('geofield'), - ); - } - $widgets['geofield_wkt'] = array( 'label' => t('Well Known Text (WKT)'), 'field types' => array('geofield'), diff --git a/modules/geofield_map/geofield_map.info b/modules/geofield_map/geofield_map.info index 204175a..4216a0e 100644 --- a/modules/geofield_map/geofield_map.info +++ b/modules/geofield_map/geofield_map.info @@ -5,3 +5,10 @@ dependencies[] = geofield files[] = includes/geofield_map.views.inc files[] = includes/geofield_map_plugin_style_map.inc + +; Information added by Drupal.org packaging script on 2014-09-21 +version = "7.x-2.3" +core = "7.x" +project = "geofield" +datestamp = "1411337638" + diff --git a/tests/geofield_openlayers_test.info b/tests/geofield_openlayers_test.info index aae37b9..998e0ae 100644 --- a/tests/geofield_openlayers_test.info +++ b/tests/geofield_openlayers_test.info @@ -8,3 +8,10 @@ dependencies[] = geofield dependencies[] = openlayers files[] = geofield_openlayers.test + +; Information added by Drupal.org packaging script on 2014-09-21 +version = "7.x-2.3" +core = "7.x" +project = "geofield" +datestamp = "1411337638" + diff --git a/tests/geofield_test.info b/tests/geofield_test.info index 925aa25..b5fe552 100644 --- a/tests/geofield_test.info +++ b/tests/geofield_test.info @@ -6,3 +6,10 @@ package = Testing dependencies[] = geocoder dependencies[] = geofield + +; Information added by Drupal.org packaging script on 2014-09-21 +version = "7.x-2.3" +core = "7.x" +project = "geofield" +datestamp = "1411337638" +