v0.9.29 Release

commit 4140a919ab8400106f51204e14d0a58e6b7eab1d
Author: Joe Hawes <>
Date:   Wed Nov 1 09:54:31 2023 -0700

    Updated version number & readme

commit 68376e8b745f9729ab3fb8e8b103fb21df7846da
Author: Joe Hawes <>
Date:   Wed Nov 1 09:49:28 2023 -0700

    Line Opacity Working

commit 2f6c3c0
Author: Joe Hawes <>
Date:   Wed Nov 1 07:47:28 2023 -0700

    Update version number

commit 99995be
Author: Joe Hawes <>
Date:   Wed Nov 1 07:45:53 2023 -0700

    Updated text

commit 1f95f5b
Author: Joe Hawes <[email protected]>
Date:   Wed Nov 1 06:57:11 2023 -0700

    map_width basics

Author: Joe Hawes

Waymark.php

@@ -4,7 +4,7 @@
 Plugin Name: Waymark
 Plugin URI: https://www.waymark.dev/
 Description: Mapping with WordPress made easy. With Waymark enabled, click on the "Maps" link in the sidebar to create and edit Maps. Once you are happy with your Map, copy the Waymark shortcode and add it to your content.
-Version: 0.9.28.7
+Version: 0.9.29
 Text Domain: waymark
 Author: Joe Hawes
 Author URI: https://www.morehawes.co.uk/

assets/dist/waymark-js/js/waymark-js.js

@@ -7863,7 +7863,7 @@ function Waymark_Map() {
 						layer.setStyle({
 							color: type.line_colour,
 							weight: type.line_weight,
-							opacity: '0.7'							
+							opacity: type.line_opacity							
 						});	
 
 						//Set info window
@@ -8080,6 +8080,10 @@ function Waymark_Map() {
 					{
 						'key': 'line_weight',
 						'default': '3'
+					},
+					{
+						'key': 'line_opacity',
+						'default': '0.7'
 					}										
 				];
 
@@ -9763,7 +9767,8 @@ function Waymark_Map_Editor() {
 				case 'line' :
 					layer.setStyle({
 						color: type.line_colour,
-						weight: type.line_weight							
+						weight: type.line_weight,
+						opacity: type.line_opacity													
 					});				
 
 					break;

assets/dist/waymark-js/js/waymark-js.min.js

@@ -316,6 +316,18 @@ function __construct() {
 								'(is_numeric($param_value)) ? $param_value : 3;'	//Fallback
 							)					
 						),
+						'line_opacity' => array(
+							'name' => 'line_opacity',
+							'id' => 'line_opacity',
+							'type' => 'text',
+							'class' => 'waymark-short-input',				
+							'title' => '<span class="waymark-invisible">' . esc_html__('Line', 'waymark') . '</span> ' . esc_html__('Opacity', 'waymark'),
+							'default' => Waymark_Config::get_setting('lines', 'line_types', 'line_opacity'),
+							'tip' => esc_attr__('The opacity of the Line, between 0.0 and 1.0 (e.g. "0.5").', 'waymark'),
+							'input_processing' => array(
+								'(is_numeric($param_value) && $param_value > 0 && $param_value <= 1) ? $param_value : 0.7;' //Fallback
+							)										
+						),						
 						'line_display' => array(
 							'name' => 'line_display',
 							'id' => 'line_display',
@@ -870,10 +882,11 @@ function __construct() {
 							'name' => 'map_height',
 							'id' => 'map_height',
 							'type' => 'text',
-							'class' => 'waymark-short-input',				
+							'class' => 'waymark-short-input waymark-align-top',				
 							'title' => esc_html__('Map Height', 'waymark'),
-							'default' => Waymark_Config::get_setting('misc', 'map_options', 'map_height'),
-							'tip' => sprintf(esc_attr__('Specify the desired height of the Map (in pixels). The Map will automatically adjust it’s width to fill the space available to it. Pro Tip! This will affect all Maps, but you can change the height of an individual Map through the shortcode: %s', 'waymark'), '[' . Waymark_Config::get_item('shortcode') . ' map_id=&quot;1234&quot; map_height=&quot;' . Waymark_Config::get_setting('misc', 'map_options', 'map_height') . '&quot;]'),
+							'default' => Waymark_Config::get_setting('misc', 'map_options', 'map_height'),							
+							'append' => '<br />' . sprintf(esc_attr__('Or set in Shortcode: %s', 'waymark'), '<code>[' . Waymark_Config::get_item('shortcode') . ' map_height=&quot;' . Waymark_Config::get_setting('misc', 'map_options', 'map_height') . '&quot; map_width=&quot;320&quot;]</code>'),
+							'tip' => sprintf(esc_attr__('Specify the desired height of the Map (in pixels). Pro Tip! This will affect all Maps, but you can change the height (and width) of an individual Map through the Shortcode: %s', 'waymark'), '[' . Waymark_Config::get_item('shortcode') . ' map_id=&quot;1234&quot; map_height=&quot;' . Waymark_Config::get_setting('misc', 'map_options', 'map_height') . '&quot;]'),
 							'input_processing' => array(
 								'preg_replace("/[^0-9]/", "", $param_value);'
 							),

inc/Admin/Waymark_Settings.php

@@ -124,10 +124,22 @@ function handle_shortcode($shortcode_data, $content = null) {
 			$map_height = Waymark_Config::get_setting('misc', 'map_options', 'map_height');
 		}
 
+		//Width
+		if(array_key_exists('map_width', $shortcode_data)) {
+			$map_width = $shortcode_data['map_width'];
+		} else {
+			$map_width = false;
+		}
+
 		//Output HTML container
 		$out = '<!-- START Waymark Shortcode #' . $shortcode_hash . ' -->' . "\n";
-		$out .= '<div id="waymark-shortcode-' . $shortcode_hash . '" data-shortcode_hash="' . $shortcode_hash . '" class="waymark-shortcode waymark-container">' . "\n";
-
+		
+		$shortcode_style = '';
+		if($map_width) {
+			$shortcode_style .= 'width:' . $map_width . 'px';
+		}
+		
+		$out .= '<div style="' . $shortcode_style . '" id="waymark-shortcode-' . $shortcode_hash . '" data-shortcode_hash="' . $shortcode_hash . '" class="waymark-shortcode waymark-container">' . "\n";
 
 		//Header ?
 		$do_header = 0;
@@ -190,10 +202,13 @@ function handle_shortcode($shortcode_data, $content = null) {
 
 			$out .= '	</header>' . "\n";		
 		}
-
-		//Map HTML Container (Initially hidden)
+		
+		//Map HTML Container (Initially hidden, made visible by JS)
 		$out .= '	<!-- Map -->' . "\n";
-		$out .= '	<div style="display:none;height:' . $map_height . 'px" id="waymark-map-' . $shortcode_hash . '" class="' . $map_class . '" data-shortcode_hash="' . $shortcode_hash . '"></div>' . "\n";
+
+		$map_style = 'display:none;';	
+ 		$map_style .= 'height:' . $map_height . 'px';
+		$out .= '	<div style="' . $map_style . '" id="waymark-map-' . $shortcode_hash . '" class="' . $map_class . '" data-shortcode_hash="' . $shortcode_hash . '"></div>' . "\n";
 
 		//Elevation?
 		if(array_key_exists('show_elevation', $shortcode_data)) {
@@ -236,6 +251,9 @@ function handle_shortcode($shortcode_data, $content = null) {
  		$out .= 'var waymark_config = jQuery.extend(true, {}, waymark_user_config);' . "\n";					
  		$out .= 'waymark_config.map_div_id = "waymark-map-' . $shortcode_hash . '";' . "\n";					
  		$out .= 'waymark_config.map_height = ' . $map_height . ";\n";
+ 		if($map_width) {
+			$out .= 'waymark_config.map_width = ' . $map_width . ";\n"; 		
+ 		}
 
 		// ===== Shortcode options (2/2) =====
 

inc/Front/Waymark_Shortcode.php

@@ -11,7 +11,7 @@ public static function init() {
 			'plugin_name' => 'Waymark',
 			'plugin_name_short' => 'Waymark',		
 			'custom_types' => array(),
-			'plugin_version' => '0.9.28.7',
+			'plugin_version' => '0.9.29',
 			'nonce_string' => 'Waymark_Nonce',
 			'site_url' => 'https://www.waymark.dev/',
 			'directory_url' => 'https://wordpress.org/support/plugin/waymark/',
@@ -148,6 +148,7 @@ public static function init() {
 					'line_title' => esc_html__('Red', 'waymark') . $multi_value_seperator . esc_html__('Green', 'waymark') . $multi_value_seperator . esc_html__('Blue', 'waymark'),
 					'line_colour' => '#d84848' . $multi_value_seperator . '#3cbc47' . $multi_value_seperator . '#487bd9',
 					'line_weight' => '3' . $multi_value_seperator . '3' . $multi_value_seperator . '3',
+					'line_opacity' => '0.7' . $multi_value_seperator . '0.7' . $multi_value_seperator . '0.7',
 					'line_display' => '1' . $multi_value_seperator . '1' . $multi_value_seperator . '1',
 					'line_submission' => '1' . $multi_value_seperator . '1' . $multi_value_seperator . '1'
 				)

inc/Waymark_Config.php

@@ -2,9 +2,9 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 0.9.28.7\n"
+"Project-Id-Version: Waymark 0.9.29\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
-"POT-Creation-Date: 2023-08-31 18:48:04+00:00\n"
+"POT-Creation-Date: 2023-11-01 13:54:24+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -798,10 +798,9 @@ msgstr ""
 
 #: inc/Admin/Waymark_Settings.php:876
 msgid ""
-"Specify the desired height of the Map (in pixels). The Map will "
-"automatically adjust it’s width to fill the space available to it. Pro Tip! "
-"This will affect all Maps, but you can change the height of an individual "
-"Map through the shortcode: %s"
+"Specify the desired height of the Map (in pixels). Pro Tip! This will "
+"affect all Maps, but you can change the height of an individual Map through "
+"the Shortcode: %s"
 msgstr ""
 
 #: inc/Admin/Waymark_Settings.php:888
@@ -1161,11 +1160,11 @@ msgstr ""
 msgid "Action Complete"
 msgstr ""
 
-#: inc/Front/Waymark_Shortcode.php:174
+#: inc/Front/Waymark_Shortcode.php:186
 msgid "Details"
 msgstr ""
 
-#: inc/Front/Waymark_Shortcode.php:187
+#: inc/Front/Waymark_Shortcode.php:199
 msgid "More Details"
 msgstr ""
 

languages/waymark.pot

@@ -1,6 +1,6 @@
 {
   "name": "Waymark",
-  "version": "0.9.28.7",
+  "version": "0.9.29",
   "description": "Waymark for WordPress",
   "author": "Joe Hawes",
   "main": "Gruntfile.js",

package.json

@@ -4,7 +4,7 @@
 **Requires at least:** 4.6  
 **Tested up to:** 6.2  
 **Requires PHP:** 5.2  
-**Stable tag:** 0.9.28.7  
+**Stable tag:** 0.9.29  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -111,6 +111,11 @@ A big thank you to the following projects and their contributors. Without their
 
 ## Changelog ##
 
+### 0.9.29 ###
+
+* Added `map_width` Shortcode option, which has been requested a couple of times. Thanks for bugging me! :0)
+* Added Opacity Setting for Line Types (Lines > Opacity), thanks to <a href="https://wordpress.org/support/users/digbymaass/">digbymaass</a> for the <a href="https://wordpress.org/support/topic/feature-request-opacity-setting-for-lines/">suggestion</a>.
+
 ### 0.9.28.7 ###
 
 * Meta data is now preserved when the Map is trashed/restored. Thanks to <a href="https://wordpress.org/support/users/killiandev7/">killiandev7</a> for <a href="https://wordpress.org/support/topic/feature-request-recover-map-data-after-recovering-a-deleted-map/">bringing this to my attention</a>.

readme.md

@@ -4,7 +4,7 @@ Tags: Map maker, Maps, Location, GPX, KML, GeoJSON, OpenStreetMap, Markers, Map
 Requires at least: 4.6
 Tested up to: 6.2
 Requires PHP: 5.2
-Stable tag: 0.9.28.7
+Stable tag: 0.9.29
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -97,6 +97,11 @@ A big thank you to the following projects and their contributors. Without their
 
 == Changelog ==
 
+= 0.9.29 =
+
+* Added `map_width` Shortcode option, which has been requested a couple of times. Thanks for bugging me! :0)
+* Added Opacity Setting for Line Types (Lines > Opacity), thanks to <a href="https://wordpress.org/support/users/digbymaass/">digbymaass</a> for the <a href="https://wordpress.org/support/topic/feature-request-opacity-setting-for-lines/">suggestion</a>.
+
 = 0.9.28.7 =
 
 * Meta data is now preserved when the Map is trashed/restored. Thanks to <a href="https://wordpress.org/support/users/killiandev7/">killiandev7</a> for <a href="https://wordpress.org/support/topic/feature-request-recover-map-data-after-recovering-a-deleted-map/">bringing this to my attention</a>.