Merge pull request #175 from contactashish13/issue-174-1

add maps key setting in the geomap type #174

Author: selul

classes/Visualizer/Module/Chart.php

@@ -258,6 +258,9 @@ public function renderChartPages() {
 	 * Handle data and settings page
 	 */
 	private function _handleDataAndSettingsPage() {
+		if ( isset( $_POST['map_api_key'] ) ) {
+			update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
+		}
 		if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
 			if ( $this->_chart->post_status == 'auto-draft' ) {
 				$this->_chart->post_status = 'publish';
@@ -297,6 +300,7 @@ private function _handleDataAndSettingsPage() {
 			'charts' => array(
 				'canvas' => $data,
 			),
+			'map_api_key' => get_option( 'visualizer-map-api-key' ),
 		) );
 		$render          = new Visualizer_Render_Page_Data();
 		$render->chart   = $this->_chart;
@@ -421,7 +425,9 @@ public function uploadData() {
 			}
 		}
 		$render->render();
-		defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
+		if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
+			defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
+		}
 	}
 
 	/**

classes/Visualizer/Module/Frontend.php

@@ -152,7 +152,8 @@ public function renderChart( $atts ) {
 		// enqueue visualizer render and update render localizations
 		wp_enqueue_script( 'visualizer-render' );
 		wp_localize_script( 'visualizer-render', 'visualizer', array(
-			'charts' => $this->_charts,
+			'charts'        => $this->_charts,
+			'map_api_key'   => get_option( 'visualizer-map-api-key' ),
 		) );
 
 		// return placeholder div

classes/Visualizer/Render/Sidebar/Type/Geo.php

@@ -54,6 +54,22 @@ protected function _toHTML() {
 	 */
 	protected function _renderMapSettings() {
 		self::_renderGroupStart( esc_html__( 'Map Settings', 'visualizer' ) );
+
+			self::_renderSectionStart( esc_html__( 'API', 'visualizer' ), false );
+				self::_renderSectionDescription(
+					sprintf( esc_html__( 'Add the Google Maps API key (Click %1$shere%2$s to get the key)', 'visualizer' ), '<a href="https://developers.google.com/maps/documentation/javascript/get-api-key" target="_blank">', '</a>' )
+				);
+
+				self::_renderTextItem(
+					esc_html__( 'API Key', 'visualizer' ),
+					'map_api_key',
+					get_option( 'visualizer-map-api-key' ),
+					'',
+					''
+				);
+
+			self::_renderSectionEnd();
+
 			self::_renderSectionStart( esc_html__( 'Region', 'visualizer' ), false );
 				self::_renderSectionDescription(
 					esc_html__( 'Configure the region area to display on the map. (Surrounding areas will be displayed as well.) Can be one of the following:' , 'visualizer' ) .

js/render.js

@@ -200,7 +200,7 @@
 		}
 	};
 
-	g.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"]});
+	g.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"], mapsApiKey: v.map_api_key});
 	g.charts.setOnLoadCallback(function() {
 		gv = g.visualization;
 		v.render();