Collection rendering improvements

Author: Joe Hawes

inc/Front/Waymark_Shortcode.php

@@ -79,31 +79,56 @@ function handle_shortcode($shortcode_data, $content = null) {
 				//Map Class
 				$map_class .= ' waymark-collection-id-' . $collection_id;
 
-				//Iterate over Collection
-				foreach ($Collection->Maps as $Map) {
-					//Ensure we have data
-					if (!array_key_exists('map_data', $Map->data)) {
-						continue;
+				// Collection Maps as GeoJSON
+
+				// If we are embedding
+				if ('embed' === Waymark_Config::get_setting('misc', 'collection_options', 'load_method')) {
+					$collectionMaps = [
+						'type' => 'FeatureCollection',
+						'features' => [],
+					];
+
+					//Iterate over Collection
+					foreach ($Collection->Maps as $Map) {
+						//Ensure we have data
+						if (!array_key_exists('map_data', $Map->data)) {
+							continue;
+						}
+
+						//Link to Map page?
+						if (Waymark_Config::get_setting('misc', 'collection_options', 'link_to_maps') == true) {
+							//Modify map data
+							$Map->data['map_data'] = Waymark_Helper::add_map_link_to_description($Map->post_id, $Map->post_title, $Map->data['map_data']);
+
+						}
+
+						//Add to GeoJSON
+						$collectionMaps['features'] = array_merge($collectionMaps['features'], json_decode($Map->data['map_data'], true)['features']);
 					}
 
-					//Output
-					$maps_output[$Map->post_id] = array(
-						'map_id' => $Map->post_id,
-						'map_title' => $Map->post_title,
-						'collection_id' => $collection_id,
-					);
-
-					//Link to Map page?
-					if (Waymark_Config::get_setting('misc', 'collection_options', 'link_to_maps') == true) {
-						//Modify map data
-						$modified_map_data = Waymark_Helper::add_map_link_to_description($Map->post_id, $Map->post_title, $Map->data['map_data']);
-						if ($modified_map_data) {
-							$maps_output[$Map->post_id]['map_data'] = $modified_map_data;
-						} else {
-							$maps_output[$Map->post_id]['map_data'] = $Map->data['map_data'];
+					// Collection Maps
+					if (sizeof($collectionMaps['features'])) {
+						$maps_output[$collection_id] = array(
+							'map_data' => json_encode($collectionMaps),
+						);
+					}
+
+					// Loading Maps via HTTP
+				} else {
+					//Iterate over Collection
+					foreach ($Collection->Maps as $Map) {
+						//Ensure we have data
+						if (!array_key_exists('map_data', $Map->data)) {
+							continue;
 						}
-					} else {
-						$maps_output[$Map->post_id]['map_data'] = $Map->data['map_data'];
+
+						//Output
+						$maps_output[$Map->post_id] = array(
+							'map_id' => $Map->post_id,
+							'map_title' => $Map->post_title,
+							'collection_id' => $collection_id,
+							'map_data' => $Map->data['map_data'],
+						);
 					}
 				}
 

readme.md

@@ -116,10 +116,14 @@ A big thank you to the following projects and their contributors. Without their
 
 ### 0.9.30 ###
 
-* Added Marker Clustering! Once enabled, Markers will be grouped together when they are close together. This can help to reduce clutter on the Map. You can enable this feature in Settings > Maps > Clustering, or using the `show_cluster="1"` Shortcode option. There are also settings to adjust the cluster radius and what what zoom level to start clustering at.
+* **Marker Clustering**
+    * Once enabled, Markers will be grouped together when they are close together. This can help to reduce clutter on the Map.
+    * You can enable this feature in Settings > Maps > Clustering, or using the `show_cluster="1"` Shortcode option. 
+    * There are also settings to adjust the cluster radius and what what zoom level to start clustering at.
 * Added `file_start_type` and `file_end_type` options to the <a href="https://www.waymark.dev/docs/shortcodes/#shortcode-files">Shortcode Files</a> feature, which allow you to automatically add a Marker of the specified type to the start and/or end of all Lines in the file. Thanks to <a href="https://wordpress.org/support/users/digbymaass/">digbymaass</a> for the <a href="https://wordpress.org/support/topic/shortcode-option-for-start-marker/">suggestion</a>.
 * Stop Elevation plugin from adjusting map bounds. Thanks to <a href="https://wordpress.org/support/users/ellocosolo/">ellocosolo</a> for the <a href="https://wordpress.org/support/topic/map_centre-and-map_zoom-shortcodes-cannot-be-used-at-the-same-time/">report</a>.
 * Improved KML error handling when loading from URL.
+* Improved rendering of multiple Maps through the Collection Shortcode.
 * Minor bug fixes
 
 ### 0.9.29.5 ###

readme.txt

@@ -100,10 +100,14 @@ A big thank you to the following projects and their contributors. Without their
 
 = 0.9.30 =
 
-* Added Marker Clustering! Once enabled, Markers will be grouped together when they are close together. This can help to reduce clutter on the Map. You can enable this feature in Settings > Maps > Clustering, or using the `show_cluster="1"` Shortcode option. There are also settings to adjust the cluster radius and what what zoom level to start clustering at.
+* **Marker Clustering**
+    * Once enabled, Markers will be grouped together when they are close together. This can help to reduce clutter on the Map.
+    * You can enable this feature in Settings > Maps > Clustering, or using the `show_cluster="1"` Shortcode option. 
+    * There are also settings to adjust the cluster radius and what what zoom level to start clustering at.
 * Added `file_start_type` and `file_end_type` options to the <a href="https://www.waymark.dev/docs/shortcodes/#shortcode-files">Shortcode Files</a> feature, which allow you to automatically add a Marker of the specified type to the start and/or end of all Lines in the file. Thanks to <a href="https://wordpress.org/support/users/digbymaass/">digbymaass</a> for the <a href="https://wordpress.org/support/topic/shortcode-option-for-start-marker/">suggestion</a>.
 * Stop Elevation plugin from adjusting map bounds. Thanks to <a href="https://wordpress.org/support/users/ellocosolo/">ellocosolo</a> for the <a href="https://wordpress.org/support/topic/map_centre-and-map_zoom-shortcodes-cannot-be-used-at-the-same-time/">report</a>.
 * Improved KML error handling when loading from URL.
+* Improved rendering of multiple Maps through the Collection Shortcode.
 * Minor bug fixes
 
 = 0.9.29.5 =