Merge pull request #63 from OpenWebconcept/feature/OWC-159

Feature/owc 159

Author: eyalacato

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## v0.2.6
+- Flush cache when saving settings.
+
+## v0.2.5
+- Added settings for default latitude, longitude and zoom level.
+- Fixed bugs for map not showing when there are no markers (AS-21249).
+
+## v0.2.4
+- Set default marker color to blue (AS-20050).
+
+## v0.2.2
+- Initialize JavaScript only when the div for the map is present (AS-19732).
+
+## v0.2.1
+- Update composer dependencies.
+
+## v0.2.0
+- Several bug fixes and new features.
+
 ## v0.1.2
 - Prepare the plugin for the use of the OpenKaarten Geodata Addon Plugin.
 

openkaarten-base.php

@@ -13,7 +13,7 @@
  * Plugin Name:       OpenKaarten Base
  * Plugin URI:        https://www.openwebconcept.nl
  * Description:       The OpenKaarten Base plugin.
- * Version:           0.2.4
+ * Version:           0.2.6
  * Author:            Acato
  * Author URI:        https://www.acato.nl
  * License:           EUPL-1.2
@@ -27,7 +27,7 @@
 	die;
 }
 
-define( 'OWC_OPENKAARTEN_BASE_VERSION', '0.2.4' );
+define( 'OWC_OPENKAARTEN_BASE_VERSION', '0.2.6' );
 
 if ( ! defined( 'OWC_OPENKAARTEN_BASE_ABSPATH' ) ) {
 	define( 'OWC_OPENKAARTEN_BASE_ABSPATH', plugin_dir_path( __FILE__ ) );

phpcs.xml.dist

@@ -66,6 +66,7 @@
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
 		<properties>
 			<property name="prefixes" type="array">
+				<element value="openkaarten"/>
 				<element value="Openkaarten_Base"/>
 				<element value="OWC_OPENKAARTEN_BASE"/>
 			</property>

src/admin/class-datalayers.php

@@ -574,9 +574,21 @@ public static function add_markers_metaboxes() {
 			]
 		);
 
+		$cmb->add_field(
+			[
+				'name'             => __( 'Default marker icon', 'openkaarten-base' ),
+				'desc'             => __( 'Select the default icon for the marker for the whole datalayer.', 'openkaarten-base' ),
+				'id'               => 'default_marker_icon',
+				'type'             => 'select',
+				'show_option_none' => true,
+				'options_cb'       => [ 'Openkaarten_Base_Plugin\Admin\Datalayers', 'cmb2_marker_icons_options' ],
+			]
+		);
+
 		$cmb->add_field(
 			[
 				'name'    => __( 'Default marker color', 'openkaarten-base' ),
+				'desc'    => __( 'Select the default color for the marker for the whole datalayer.', 'openkaarten-base' ),
 				'id'      => 'default_marker_color',
 				'type'    => 'select',
 				'default' => 'marker-blue', // default 'Blue'.
@@ -635,6 +647,7 @@ public static function add_markers_metaboxes() {
 			$group_field_id,
 			[
 				'name'    => __( 'Marker color', 'openkaarten-base' ),
+				'desc'    => __( 'Select the color for the marker.', 'openkaarten-base' ),
 				'id'      => 'marker_color',
 				'type'    => 'select',
 				'default' => 'marker-black', // Default 'Black'.

src/admin/class-locations.php

@@ -273,7 +273,7 @@ public static function get_location_marker( $datalayer_id, $location_id = false,
 		$markers      = get_post_meta( $datalayer_id, 'markers', true );
 
 		$color = get_post_meta( $datalayer_id, 'default_marker_color', true );
-		$icon  = false;
+		$icon  = get_post_meta( $datalayer_id, 'default_marker_icon', true );
 
 		$datalayer_url_type = get_post_meta( $datalayer_id, 'datalayer_url_type', true ) ? : 'import';