Revert "Issue #3252846 by hswong3i: Refine Gesture Handling Configure with Options" (ab6bd398) · Commits · project / leaflet

config/schema/leaflet.schema.yml

+3 −20

Original line number	Diff line number	Diff line
		@@ -129,16 +129,6 @@ field.widget.settings.leaflet_widget_default:
		options:
		type: text
		label: 'Options'
		gesture_handling:
		type: mapping
		label: 'Gesture Handling'
		mapping:
		control:
		type: boolean
		label: 'Control'
		options:
		type: text
		label: 'Options'
		path:
		type: text
		label: 'Path'
		@@ -210,6 +200,9 @@ field.formatter.settings.leaflet_formatter_default:
		disable_wheel:
		type: boolean
		label: 'Disable wheel'
		gesture_handling:
		type: boolean
		label: 'Gesture handling'
		popup:
		type: boolean
		label: 'Popup'
		@@ -376,16 +369,6 @@ field.formatter.settings.leaflet_formatter_default:
		options:
		type: text
		label: 'Options'
		gesture_handling:
		type: mapping
		label: 'Gesture Handling'
		mapping:
		control:
		type: boolean
		label: 'Control'
		options:
		type: text
		label: 'Options'
		path:
		type: text
		label: 'Path'

modules/leaflet_views/config/schema/leaflet_views.style.schema.yml

+3 −10

Original line number	Diff line number	Diff line
		@@ -37,6 +37,9 @@ views.style.leaflet_map:
		disable_wheel:
		type: boolean
		label: 'Disable wheel'
		gesture_handling:
		type: boolean
		label: 'Gesture handling'
		reset_map:
		type: mapping
		label: 'Reset map'
		@@ -204,16 +207,6 @@ views.style.leaflet_map:
		options:
		type: text
		label: 'Options'
		gesture_handling:
		type: mapping
		label: 'Gesture Handling'
		mapping:
		control:
		type: boolean
		label: 'Control'
		options:
		type: text
		label: 'Options'
		path:
		type: string
		label: 'Path'

modules/leaflet_views/src/Plugin/views/style/LeafletMap.php

+0 −3

Original line number	Diff line number	Diff line
		@@ -615,9 +615,6 @@ class LeafletMap extends StylePluginBase implements ContainerFactoryPluginInterf
		// Set Map Sync View Element.
		$this->setSyncViewElement($form, $this->options);

		// Set Gesture Handling Element.
		$this->setGestureHandlingElement($form, $this->options);

		// Set Map Geometries Options Element.
		$this->setMapPathOptionsElement($form, $this->options);

src/LeafletSettingsElementsTrait.php

+15 −52

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ trait LeafletSettingsElementsTrait {
		'height_unit' => 'px',
		'hide_empty_map' => FALSE,
		'disable_wheel' => FALSE,
		'gesture_handling' => FALSE,
		'popup' => FALSE,
		'popup_content' => '',
		'map_position' => [
		@@ -102,10 +103,6 @@ trait LeafletSettingsElementsTrait {
		'control' => FALSE,
		'options' => '{"latitudeSelector":".geofield-lat","longitudeSelector":".geofield-lon"}',
		],
		'gesture_handling' => [
		'control' => FALSE,
		'options' => '{"duration":1000}',
		],
		'path' => '{"color":"#3388ff","opacity":"1.0","stroke":true,"weight":3,"fill":"depends","fillColor":"*","fillOpacity":"0.2","radius":"6"}',
		'geocoder' => [
		'control' => FALSE,
		@@ -188,6 +185,19 @@ trait LeafletSettingsElementsTrait {
		'#return_value' => 1,
		];

		$elements['gesture_handling'] = [
		'#type' => 'checkbox',
		'#title' => $this->t('Gesture Handling'),
		'#description' => $this->t('Enable the @gesture_handling_link functionality for the Map.', [
		'@gesture_handling_link' => $this->link->generate($this->t('Leaflet Gesture Handling Library'), Url::fromUri('https://github.com/elmarquis/Leaflet.GestureHandling', [
		'absolute' => TRUE,
		'attributes' => ['target' => 'blank'],
		])),
		]),
		'#default_value' => $settings['gesture_handling'],
		'#return_value' => 1,
		];

		}

		/**
		@@ -736,8 +746,7 @@ trait LeafletSettingsElementsTrait {
		$map['settings']['locate'] = isset($options['locate']) ? $options['locate'] : NULL;
		$map['settings']['resetview'] = isset($options['resetview']) ? $options['resetview'] : NULL;
		$map['settings']['syncview'] = isset($options['syncview']) ? $options['syncview'] : NULL;
		$map['settings']['gestureHandling'] = isset($options['gesture_handling']['control']) ? $options['gesture_handling']['control'] : $default_settings['gestureHandling'];
		$map['settings']['gestureHandlingOptions'] = isset($options['gesture_handling']['options']) ? $options['gesture_handling']['options'] : $default_settings['gestureHandlingOptions'];
		$map['settings']['gestureHandling'] = isset($options['gesture_handling']) ? $options['gesture_handling'] : $default_settings['gesture_handling'];
		$map['settings']['geocoder'] = isset($options['geocoder']) ? $options['geocoder'] : $default_settings['geocoder'];
		}

		@@ -953,52 +962,6 @@ trait LeafletSettingsElementsTrait {
		];
		}

		/**
		* Set Gesture Handling Element.
		*
		* @param array $element
		* The Form element to alter.
		* @param array $settings
		* The Form Settings.
		*/
		protected function setGestureHandlingElement(array &$element, array $settings) {

		$default_settings = $this::getDefaultSettings();

		$element['gesture_handling'] = [
		'#type' => 'details',
		'#title' => $this->t('Gesture Handling'),
		'#open' => FALSE,
		];

		$element['gesture_handling']['control'] = [
		'#type' => 'checkbox',
		'#title' => $this->t('Enable the functionality of the @gesture_handling_api_link.', [
		'@gesture_handling_api_link' => $this->link->generate($this->t('Leaflet Gesture Handling JS Libr
		ary'), Url::fromUri('https://github.com/elmarquis/Leaflet.GestureHandling', [
		'absolute' => TRUE,
		'attributes' => ['target' => 'blank'],
		])),
		]),
		'#default_value' => $settings['gesture_handling']['control'] ?? $default_settings['gesture_handlin
		g']['control'],
		'#return_value' => 1,
		];
		$element['gesture_handling']['options'] = [
		'#type' => 'textarea',
		'#rows' => 4,
		'#title' => $this->t('Gesture Handling Additional Options'),
		'#description' => $this->t('An object literal of additional gesture handling options, that comply
		with the Leaflet Gesture Handling JS Library.<br>The syntax should respect the javascript object notation
		(json) format.<br>As suggested in the field placeholder, always use double quotes (") both for the index
		es and the string values.'),
		'#default_value' => $settings['gesture_handling']['options'] ?? $default_settings['gesture_handlin
		g']['options'],
		'#placeholder' => $default_settings['gesture_handling']['options'],
		'#element_validate' => [[get_class($this), 'jsonValidate']],
		];
		}

		/**
		* Set Map Geocoder Control Element.
		*

src/Plugin/Field/FieldFormatter/LeafletDefaultFormatter.php

+0 −3

Original line number	Diff line number	Diff line
		@@ -244,9 +244,6 @@ class LeafletDefaultFormatter extends FormatterBase implements ContainerFactoryP
		// Generate the Leaflet Reset View Element.
		$this->setResetViewElement($elements, $settings);

		// Set Gesture Handling Element.
		$this->setGestureHandlingElement($elements, $settings);

		// Set Map Geometries Options Element.
		$this->setMapPathOptionsElement($elements, $settings);