WD Google Maps – Google Maps builder Plugin - Version 1.0.22

Version Description

  • Added: "Show in Info Window" option
Download this release

Release Info

Developer webdorado
Plugin Icon 128x128 WD Google Maps – Google Maps builder Plugin
Version 1.0.22
Comparing to
See all releases

Code changes from version 1.0.21 to 1.0.22

Files changed (12) hide show
  1. admin/models/GMWDModelMaps_gmwd.php +2 -1
  2. admin/views/GMWDViewMaps_gmwd.php +9 -1
  3. frontend/views/GMWDViewFrontendMap.php +1 -1
  4. gmwd_admin_class.php +4 -3
  5. js/init_map.js +12 -3
  6. js/init_map_admin.js +11 -3
  7. js/maps_gmwd.js +7 -0
  8. js/markers_gmwd.js +12 -3
  9. readme.txt +4 -1
  10. sql/sql.php +4 -3
  11. update/gmwd_update.php +8 -2
  12. wd-google-maps.php +1 -1
admin/models/GMWDModelMaps_gmwd.php CHANGED
@@ -22,6 +22,7 @@ class GMWDModelMaps_gmwd extends GMWDModel {
22
  $row = parent::get_row_by_id($id);
23
 
24
  if($id){
 
25
  $limit_markers = isset($_POST["limit_markers"]) ? (int)$_POST["limit_markers"] : 20;
26
  $limit_polygons = isset($_POST["limit_polygons"]) ? (int)$_POST["limit_polygons"] : 20;
27
  $limit_polylines = isset($_POST["limit_polylines"]) ? (int)$_POST["limit_polylines"] : 20;
@@ -142,7 +143,7 @@ class GMWDModelMaps_gmwd extends GMWDModel {
142
  $row->directions_window_open = 1;
143
  $row->directions_window_width_unit = "%";
144
  $row->store_locator_header_title = "Store Locator";
145
-
146
  $map_theme_code = $wpdb->get_var("SELECT map_style_code FROM ". $wpdb->prefix . "gmwd_themes WHERE `default`='1'");
147
  $row->map_theme_code = $map_theme_code ? $map_theme_code : "[]";
148
  $row->theme_id = $wpdb->get_var("SELECT id FROM ". $wpdb->prefix . "gmwd_themes WHERE `default`='1'");
22
  $row = parent::get_row_by_id($id);
23
 
24
  if($id){
25
+ $row->info_window_info = explode(",",$row->info_window_info);
26
  $limit_markers = isset($_POST["limit_markers"]) ? (int)$_POST["limit_markers"] : 20;
27
  $limit_polygons = isset($_POST["limit_polygons"]) ? (int)$_POST["limit_polygons"] : 20;
28
  $limit_polylines = isset($_POST["limit_polylines"]) ? (int)$_POST["limit_polylines"] : 20;
143
  $row->directions_window_open = 1;
144
  $row->directions_window_width_unit = "%";
145
  $row->store_locator_header_title = "Store Locator";
146
+ $row->info_window_info = array("title", "address", "desc", "pic");
147
  $map_theme_code = $wpdb->get_var("SELECT map_style_code FROM ". $wpdb->prefix . "gmwd_themes WHERE `default`='1'");
148
  $row->map_theme_code = $map_theme_code ? $map_theme_code : "[]";
149
  $row->theme_id = $wpdb->get_var("SELECT id FROM ". $wpdb->prefix . "gmwd_themes WHERE `default`='1'");
admin/views/GMWDViewMaps_gmwd.php CHANGED
@@ -1322,7 +1322,15 @@ class GMWDViewMaps_gmwd extends GMWDView{
1322
  </select>
1323
  </td>
1324
  </tr>
 
 
 
 
 
 
1325
 
 
 
1326
  <tr>
1327
  <td><label title="<?php _e("Select marker info window type.","gmwd");?>"><?php _e("Marker Info Window Type","gmwd"); ?>:</label></td>
1328
  <td>
@@ -1356,7 +1364,7 @@ class GMWDViewMaps_gmwd extends GMWDView{
1356
  </td>
1357
  </tr>
1358
  <tr>
1359
- <td><label for="searchbox_position" title="<?php _e("Select the position of the searchbox.","gmwd");?>"><?php _e("Serachbox Position","gmwd"); ?>:</label></td>
1360
  <td>
1361
  <select name="searchbox_position" id="searchbox_position">
1362
  <?php
1322
  </select>
1323
  </td>
1324
  </tr>
1325
+ <tr>
1326
+ <td><label for="info_window_info" title="<?php _e("Choose information to show in an info window.","gmwd");?>"><?php _e("Show in Info Window","gmwd");?>:</label></td>
1327
+ <td>
1328
+ <input type="checkbox" value="title" id="info_window_title" class="info_window_info" <?php echo in_array("title", $row->info_window_info) ? "checked" : ""; ?> ><label for="info_window_title"><?php _e("Marker Title","gmwd");?></label><br>
1329
+ <input type="checkbox" value="address" id="info_window_address" class="info_window_info" <?php echo in_array("address", $row->info_window_info) ? "checked" : ""; ?> ><label for="info_window_address"><?php _e("Marker Address","gmwd");?></label><br>
1330
+ <input type="hidden" name="info_window_info" value="<?php echo implode(",", $row->info_window_info); ?>">
1331
 
1332
+ </td>
1333
+ </tr>
1334
  <tr>
1335
  <td><label title="<?php _e("Select marker info window type.","gmwd");?>"><?php _e("Marker Info Window Type","gmwd"); ?>:</label></td>
1336
  <td>
1364
  </td>
1365
  </tr>
1366
  <tr>
1367
+ <td><label for="searchbox_position" title="<?php _e("Select the position of the searchbox.","gmwd");?>"><?php _e("Searchbox Position","gmwd"); ?>:</label></td>
1368
  <td>
1369
  <select name="searchbox_position" id="searchbox_position">
1370
  <?php
frontend/views/GMWDViewFrontendMap.php CHANGED
@@ -98,7 +98,7 @@ class GMWDViewFrontendMap extends GMWDViewFrontend{
98
  gmwdmapData["markerListingType" + '<?php echo $shortcode_id;?>'] = "<?php echo $row->marker_listing_type;?>";
99
  gmwdmapData["markerListInsideMap" + '<?php echo $shortcode_id;?>'] = "<?php echo $row->marker_list_inside_map;?>";
100
  gmwdmapData["markerListPosition" + '<?php echo $shortcode_id;?>'] = Number("<?php echo $row->marker_list_inside_map_position;?>");
101
-
102
  gmwdmapData["advancedInfoWindowPosition" + '<?php echo $shortcode_id;?>'] = Number("<?php echo $row->advanced_info_window_position ? $row->advanced_info_window_position : 10 ;?>");
103
  gmwdmapData["geolocateUser" + '<?php echo $shortcode_id;?>'] = Number("<?php echo $row->geolocate_user;?>");
104
  gmwdmapData["items" + '<?php echo $shortcode_id;?>'] = "<?php echo $theme->carousel_items_count;?>";
98
  gmwdmapData["markerListingType" + '<?php echo $shortcode_id;?>'] = "<?php echo $row->marker_listing_type;?>";
99
  gmwdmapData["markerListInsideMap" + '<?php echo $shortcode_id;?>'] = "<?php echo $row->marker_list_inside_map;?>";
100
  gmwdmapData["markerListPosition" + '<?php echo $shortcode_id;?>'] = Number("<?php echo $row->marker_list_inside_map_position;?>");
101
+ gmwdmapData["infoWindowInfo" + '<?php echo $shortcode_id;?>'] = "<?php echo $row->info_window_info;?>";
102
  gmwdmapData["advancedInfoWindowPosition" + '<?php echo $shortcode_id;?>'] = Number("<?php echo $row->advanced_info_window_position ? $row->advanced_info_window_position : 10 ;?>");
103
  gmwdmapData["geolocateUser" + '<?php echo $shortcode_id;?>'] = Number("<?php echo $row->geolocate_user;?>");
104
  gmwdmapData["items" + '<?php echo $shortcode_id;?>'] = "<?php echo $theme->carousel_items_count;?>";
gmwd_admin_class.php CHANGED
@@ -11,7 +11,7 @@ class GMWDAdmin{
11
  // Variables //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  protected static $instance = null;
14
- private static $version = '1.0.21';
15
  ////////////////////////////////////////////////////////////////////////////////////////
16
  // Constructor & Destructor //
17
  ////////////////////////////////////////////////////////////////////////////////////////
@@ -71,9 +71,10 @@ class GMWDAdmin{
71
  else{
72
  add_option("gmwd_pro", "no", '', 'no');
73
  }
74
- if ($version && version_compare($version, self::$version, '<')) {
 
75
  require_once GMWD_DIR . "/update/gmwd_update.php";
76
- gmwd_update($version);
77
  update_option("gmwd_version", self::$version);
78
  }
79
  else {
11
  // Variables //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  protected static $instance = null;
14
+ private static $version = '1.0.22';
15
  ////////////////////////////////////////////////////////////////////////////////////////
16
  // Constructor & Destructor //
17
  ////////////////////////////////////////////////////////////////////////////////////////
71
  else{
72
  add_option("gmwd_pro", "no", '', 'no');
73
  }
74
+
75
+ if ($version && version_compare(substr($version,2), substr(self::$version,2), '<=')) {
76
  require_once GMWD_DIR . "/update/gmwd_update.php";
77
+ gmwd_update();
78
  update_option("gmwd_version", self::$version);
79
  }
80
  else {
js/init_map.js CHANGED
@@ -22,7 +22,7 @@ function gmwdInitMainMap(el, excludeOverlays, key){
22
  minZoom: gmwdmapData["minZoom" + key],
23
  scrollwheel: gmwdmapData["mapWhellScrolling" + key],
24
  draggable: gmwdmapData["mapDragable" + key],
25
- disableDoubleClickZoom: gmwdmapData["mapDbClickZoom" + key],
26
  zoomControl: gmwdmapData["enableZoomControl" + key],
27
  mapTypeControl: gmwdmapData["enableMapTypeControl" + key],
28
  scaleControl: gmwdmapData["enableScaleControl" + key],
@@ -79,8 +79,17 @@ function gmwdSetMapMarkers(_key){
79
 
80
  var infoWindow;
81
  if(mapMarker.enable_info_window == 1){
82
- contentString = mapMarker.pic_url ? '<img src="' + mapMarker.pic_url + '" style="float:right; margin-left: 10px; max-width:100px">' : '';
83
- contentString += (mapMarker.title + "<br>" + mapMarker.address) ;
 
 
 
 
 
 
 
 
 
84
 
85
  infoWindow = new google.maps.InfoWindow({
86
  content: contentString,
22
  minZoom: gmwdmapData["minZoom" + key],
23
  scrollwheel: gmwdmapData["mapWhellScrolling" + key],
24
  draggable: gmwdmapData["mapDragable" + key],
25
+ disableDoubleClickZoom: gmwdmapData["mapDbClickZoom" + key],
26
  zoomControl: gmwdmapData["enableZoomControl" + key],
27
  mapTypeControl: gmwdmapData["enableMapTypeControl" + key],
28
  scaleControl: gmwdmapData["enableScaleControl" + key],
79
 
80
  var infoWindow;
81
  if(mapMarker.enable_info_window == 1){
82
+ contentString = '';
83
+
84
+ if(gmwdmapData["infoWindowInfo" + _key].indexOf("title") != -1){
85
+ contentString += mapMarker.title;
86
+ }
87
+ if(gmwdmapData["infoWindowInfo" + _key].indexOf("address") != -1){
88
+ if(gmwdmapData["infoWindowInfo" + _key].indexOf("title") != -1){
89
+ contentString += "<br>";
90
+ }
91
+ contentString += mapMarker.address;
92
+ }
93
 
94
  infoWindow = new google.maps.InfoWindow({
95
  content: contentString,
js/init_map_admin.js CHANGED
@@ -123,9 +123,17 @@ function gmwdSetMapMarkers(){
123
  allMarkers.push(marker);
124
  var infoWindow;
125
  if(mapMarker.enable_info_window == 1){
126
-
127
- contentString = (mapMarker.title + "<br>" + mapMarker.address);
128
-
 
 
 
 
 
 
 
 
129
  infoWindow = new google.maps.InfoWindow({
130
  content: contentString,
131
  disableAutoPan: true
123
  allMarkers.push(marker);
124
  var infoWindow;
125
  if(mapMarker.enable_info_window == 1){
126
+ var infoWindowInfo = jQuery("[name=info_window_info]").val();
127
+ contentString = "";
128
+ if(infoWindowInfo.indexOf("title") != -1){
129
+ contentString += mapMarker.title;
130
+ }
131
+ if(infoWindowInfo.indexOf("address") != -1){
132
+ if(infoWindowInfo.indexOf("title") != -1){
133
+ contentString += "<br>" ;
134
+ }
135
+ contentString += mapMarker.address;
136
+ }
137
  infoWindow = new google.maps.InfoWindow({
138
  content: contentString,
139
  disableAutoPan: true
js/maps_gmwd.js CHANGED
@@ -259,6 +259,13 @@ jQuery( document ).ready(function() {
259
  }
260
  }
261
  });
 
 
 
 
 
 
 
262
  });
263
 
264
  ////////////////////////////////////////////////////////////////////////////////////////
259
  }
260
  }
261
  });
262
+ jQuery(".info_window_info").change(function(){
263
+ var selected = [];
264
+ jQuery(".info_window_info:checked").each(function(){
265
+ selected.push(jQuery(this).val());
266
+ });
267
+ jQuery("[name=info_window_info]").val(selected.join());
268
+ });
269
  });
270
 
271
  ////////////////////////////////////////////////////////////////////////////////////////
js/markers_gmwd.js CHANGED
@@ -105,10 +105,19 @@ function gmwdSetMarker(){
105
 
106
  function gmwdCreateInfoWindow(){
107
  var contentString = "";
108
- if(jQuery("#pic_url").val()){
109
- contentString += '<img src="' + jQuery("#pic_url").val() + '" style="float:right; margin-left: 10px; max-width:100px">';
 
 
 
110
  }
111
- contentString += (jQuery("#title").val() + "<br>" + jQuery("#marker_address").val()) ;
 
 
 
 
 
 
112
  if(infoWindow){
113
  infoWindow.setOptions({content: contentString});
114
  }
105
 
106
  function gmwdCreateInfoWindow(){
107
  var contentString = "";
108
+ var infoWindowInfo = jQuery("[name=info_window_info]").val();
109
+ var contentString = "";
110
+
111
+ if(infoWindowInfo.indexOf("title") != -1){
112
+ contentString += jQuery("#title").val();
113
  }
114
+ if(infoWindowInfo.indexOf("address") != -1){
115
+ if(infoWindowInfo.indexOf("title") != -1){
116
+ contentString += "<br>";
117
+ }
118
+ contentString += jQuery("#marker_address").val();
119
+ }
120
+
121
  if(infoWindow){
122
  infoWindow.setOptions({content: contentString});
123
  }
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://web-dorado.com/products/wordpress-google-maps-plugin.html
4
  Tags: directions, google map, google map plugin, google maps, google maps plugin, map, map markers, map plugin, map widget, maps, wp google map, wp google maps
5
  Requires at least: 3.4
6
  Tested up to: 4.6
7
- Stable tag: 1.0.21
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -113,6 +113,9 @@ After downloading the ZIP file of the Google Maps WD plugin,
113
 
114
  == Changelog ==
115
 
 
 
 
116
  = 1.0.21 =
117
  * Added: Category filter
118
 
4
  Tags: directions, google map, google map plugin, google maps, google maps plugin, map, map markers, map plugin, map widget, maps, wp google map, wp google maps
5
  Requires at least: 3.4
6
  Tested up to: 4.6
7
+ Stable tag: 1.0.22
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
113
 
114
  == Changelog ==
115
 
116
+ = 1.0.22 =
117
+ * Added: "Show in Info Window" option
118
+
119
  = 1.0.21 =
120
  * Added: Category filter
121
 
sql/sql.php CHANGED
@@ -71,7 +71,8 @@ function gmwd_create_tables(){
71
  `shortcode_id` INT(16) NOT NULL,
72
  `theme_id` INT(16) NOT NULL,
73
  `enable_searchbox` TINYINT(1) NOT NULL,
74
- `searchbox_position` INT(16) NOT NULL,
 
75
  `published` TINYINT(1) NOT NULL DEFAULT '1',
76
 
77
  PRIMARY KEY (`id`)
@@ -336,9 +337,9 @@ function gmwd_create_tables(){
336
  if(!get_option("gmwd_version")){
337
  // insert map
338
 
339
- $gmwd_maps_insert = "INSERT INTO `" . $wpdb->prefix . "gmwd_maps` (`id`, `title`, `width`, `height`, `center_address`, `center_lat`, `center_lng`, `width_percent`, `map_alignment`, `border_radius`, `zoom_level`, `min_zoom`, `max_zoom`, `enable_zoom_control`, `zoom_control_position`, `enable_map_type_control`, `map_type_control_position`, `map_type_control_style`, `enable_scale_control`, `enable_street_view_control`, `street_view_control_position`, `enable_fullscreen_control`, `fullscreen_control_position`, `enable_rotate_control`, `whell_scrolling`, `map_draggable`, `map_db_click_zoom`, `enable_directions`, `directions_window_open`, `info_window_open_on`, `direction_position`, `directions_window_width`, `directions_window_width_unit`, `enable_store_locator`, `store_locator_window_width`, `store_locator_window_width_unit`, `store_locator_position`, `restrict_to_country`, `distance_in`, `show_bouncing_icon`, `enable_bicycle_layer`, `enable_traffic_layer`, `enable_transit_layer`, `georss_url`, `kml_url`, `fusion_table_id`, `geolocate_user`, `marker_listing_type`, `marker_list_position`, `enable_category_filter`, `type`, `marker_list_inside_map`, `marker_list_inside_map_position`, `advanced_info_window_position`, `circle_line_color`, `circle_line_opacity`, `circle_fill_color`, `circle_fill_opacity`, `circle_line_width`, `shortcode_id`, `theme_id`, `published`)
340
  VALUES
341
- ('', 'My First Map', '100', '', 'R. do Celeiros 2, 7780, Portugal', '42.45362248301644', '-21.056485250000033', '%', 'left', '', 3, 2, 22, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 'click', 0, '100', '%', 1, '100', '%', '', '', 'km', 0, 0, 0, 0, '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '000', '0.6', '7FDF16', '0.3', 2, 1, 1, 1)";
342
 
343
  $wpdb->query($gmwd_maps_insert);
344
 
71
  `shortcode_id` INT(16) NOT NULL,
72
  `theme_id` INT(16) NOT NULL,
73
  `enable_searchbox` TINYINT(1) NOT NULL,
74
+ `searchbox_position` INT(16) NOT NULL,
75
+ `info_window_info` VARCHAR(256) NOT NULL,
76
  `published` TINYINT(1) NOT NULL DEFAULT '1',
77
 
78
  PRIMARY KEY (`id`)
337
  if(!get_option("gmwd_version")){
338
  // insert map
339
 
340
+ $gmwd_maps_insert = "INSERT INTO `" . $wpdb->prefix . "gmwd_maps` (`id`, `title`, `width`, `height`, `center_address`, `center_lat`, `center_lng`, `width_percent`, `map_alignment`, `border_radius`, `zoom_level`, `min_zoom`, `max_zoom`, `enable_zoom_control`, `zoom_control_position`, `enable_map_type_control`, `map_type_control_position`, `map_type_control_style`, `enable_scale_control`, `enable_street_view_control`, `street_view_control_position`, `enable_fullscreen_control`, `fullscreen_control_position`, `enable_rotate_control`, `whell_scrolling`, `map_draggable`, `map_db_click_zoom`, `enable_directions`, `directions_window_open`, `info_window_open_on`, `direction_position`, `directions_window_width`, `directions_window_width_unit`, `enable_store_locator`, `store_locator_window_width`, `store_locator_window_width_unit`, `store_locator_position`, `restrict_to_country`, `distance_in`, `show_bouncing_icon`, `enable_bicycle_layer`, `enable_traffic_layer`, `enable_transit_layer`, `georss_url`, `kml_url`, `fusion_table_id`, `geolocate_user`, `marker_listing_type`, `marker_list_position`, `enable_category_filter`, `type`, `marker_list_inside_map`, `marker_list_inside_map_position`, `advanced_info_window_position`, `circle_line_color`, `circle_line_opacity`, `circle_fill_color`, `circle_fill_opacity`, `circle_line_width`, `shortcode_id`, `theme_id`, `published`, `info_window_info`)
341
  VALUES
342
+ ('', 'My First Map', '100', '', 'R. do Celeiros 2, 7780, Portugal', '42.45362248301644', '-21.056485250000033', '%', 'left', '', 3, 2, 22, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 'click', 0, '100', '%', 1, '100', '%', '', '', 'km', 0, 0, 0, 0, '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '000', '0.6', '7FDF16', '0.3', 2, 1, 1, 1, 'title,address,desc,pic')";
343
 
344
  $wpdb->query($gmwd_maps_insert);
345
 
update/gmwd_update.php CHANGED
@@ -1,5 +1,5 @@
1
  <?php
2
- function gmwd_update($version){
3
  global $wpdb;
4
  $api_key = $wpdb->get_var('SELECT id FROM ' . $wpdb->prefix . 'gmwd_options WHERE name="map_api_key"');
5
  if(!$api_key){
@@ -15,7 +15,13 @@ function gmwd_update($version){
15
  if(!$enable_searchbox){
16
  $wpdb->query("ALTER TABLE ".$wpdb->prefix . "gmwd_maps ADD `enable_searchbox` TINYINT(1) NOT NULL ");
17
  $wpdb->query("ALTER TABLE ".$wpdb->prefix . "gmwd_maps ADD `searchbox_position` INT(16) NOT NULL ");
18
- }
 
 
 
 
 
 
19
  }
20
 
21
 
1
  <?php
2
+ function gmwd_update(){
3
  global $wpdb;
4
  $api_key = $wpdb->get_var('SELECT id FROM ' . $wpdb->prefix . 'gmwd_options WHERE name="map_api_key"');
5
  if(!$api_key){
15
  if(!$enable_searchbox){
16
  $wpdb->query("ALTER TABLE ".$wpdb->prefix . "gmwd_maps ADD `enable_searchbox` TINYINT(1) NOT NULL ");
17
  $wpdb->query("ALTER TABLE ".$wpdb->prefix . "gmwd_maps ADD `searchbox_position` INT(16) NOT NULL ");
18
+ }
19
+ $info_window_info = $wpdb->get_var("SHOW COLUMNS FROM ".$wpdb->prefix . "gmwd_maps LIKE 'info_window_info'");
20
+ if(!$info_window_info){
21
+ $wpdb->query("ALTER TABLE ".$wpdb->prefix . "gmwd_maps ADD `info_window_info` VARCHAR(32) NOT NULL ");
22
+ $wpdb->query("UPDATE `" . $wpdb->prefix . "gmwd_maps` SET info_window_info='title,address,desc,pic'");
23
+
24
+ }
25
  }
26
 
27
 
wd-google-maps.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Google Maps WD
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-maps-plugin.html
6
  * Description: Google Maps WD is an intuitive tool for creating Google maps with advanced markers, custom layers and overlays for your website.
7
- * Version: 1.0.21
8
  * Author: WebDorado
9
  * Author URI: http://web-dorado.com/
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
4
  * Plugin Name: Google Maps WD
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-maps-plugin.html
6
  * Description: Google Maps WD is an intuitive tool for creating Google maps with advanced markers, custom layers and overlays for your website.
7
+ * Version: 1.0.22
8
  * Author: WebDorado
9
  * Author URI: http://web-dorado.com/
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html