Changeset 3392708 for wp-google-maps/trunk/includes/class.plugin.php

Timestamp:

11/10/2025 06:44:33 AM (5 months ago)

Author:

DylanAuty

Message:

• Added Leaflet engine support
• Added Azure engine, powered by Leaflet
• Added Stadia engine, powered by Leaflet
• Added Maptiler engine, powered by Leaflet
• Added LocationIQ engine, powered by Leaflet
• Added support for OpenLayers V10
• Added ability to use legacy (V6) OpenLayers, should be considered deprecated. Will be removed in the future
• Added ability to change address providers, for autocomplete and client side geocoding
• Added additional address providers including Google Maps, Azure Maps, Nominatim, LocationIQ and engine default
• Added ability to provide a supplementary address provider API key if needed
• Added ability to switch tile servers, with another from the same provider, on a per map basis
• Added additional tile server options, with providers and automated groupings
• Added ability to set line thickness on both rectangles and circles
• Added tile server previews for improved customization
• Added support for dynamic content translations with WPML
• Added Atlas Novus as the default internal build
• Added danger zone tool to reindex any spatial coordinate data for markers, where a spatial coordinate has gone missing
• Added ability to adjust rectangle boundaries with boundary input
• Added ability to bulk delete shapes
• Added ability to center on shapes and datasets within the editor
• Added dropdown context meny to shape datatables
• Added option to cachebust REST API requests
• Added improved GDPR styling, it becomes the new default
• Added quick delete button to info-window within the map editor
• Added ability to override any HTML template part via a child theme override
• Added map preview system, allowing maps to be previewed on frontpage
• Added default indexes to all tables to improve performance
• Added spatial indexes to tables where applicable to improve performance
• Added fullscreen map editor panel mode, for dataset listings, allowing more data to be viewed
• Added extended maximum zoom level (22) which is supported by all map engines
• Added mobile settings tab to editor
• Added ability to set a different map width/height for mobile devices
• Added new default engine/installer preset for zero cost mapping, for all new installations
• Added ability to reduce marker editor geocoder usage. Skips geocoding if lat/lng coordinates are present, opt in available in settings
• Added ability to select store locator button style (Icons (default), or Text) on a per map basis
• Added accessibility support, with the goal of being WCAG Level AA compliant
• - Aria labels and roles added where needed
• - Improved focus cues and managing of indexing
• - Keyboard navigation added (tab, enter, space, and escape for panels)
• - Hierarchy restructuring where needed to better support navigation
• - Tested with various tools:
• - - Microsoft Accessibility Insights: Pass (FastPass)
• - - Axe DevTools: Pass (WCAG Level AA)
• - - Google Lighthouse: Pass (100% Accessible)
• - - Wave Tools: Pass
• - Manual testing completed for navigation with a keyboard
• - We will continue to improve this over time
• - Known Issues
• - - Only supported on the frontend
• - - Does not allow marker selection via the map container (Marker listings supported, and encouraged for accessibility focused installations)
• - - Although a substantial rework has been implemented, this has not been verified by 3rd party compliance testers at this stage
• - - - We know that accessibility is more nuanced than simple machine driven tests, we'd like to work with our community to ensure we improve this further
• - - - Please reach out to us if you find anything that you feel should be improved as a priority!
• Improved internal autocomplete modules for better user experience and management
• Improved theme preset user interface
• Improved theme CSS editor
• Improved tile server system to handle params and authentication more efficiently
• Improved tile server system to properly attribute various service providers
• Improved settings user interface, adding sections and descriptors for better clarity
• Improved Google Maps Advanced Marker render mode support
• Improved Google Async support
• Improved zoom sliders within editor
• Improved map initialization state control
• Improved map initialization error correction
• Improved map initialization automatic delayed retry module
• Improved info-window open calls to include data-props in container for styling
• Improved styling system to allow native info-windows to inherit brand styling
• Improved open layers native info-window, now includes border radius and shadows
• Improved checkbox styling within the map viewport
• Improved available WP filters within our AjaxTable class, allowing count values to be filtered
• Improved internal shape architecture
• Improved batch loader logic and modularized method
• Improved welcome page to include new features
• Improved all option management by disabling autoloading, reducing impact on server resources
• Improved Legacy to Atlas Novus migration flow by introducing automatic map settings migration modules
• Improved DomDocument param handlers where needed
• Fixed issue where marker labels would not render & symbols correctly
• Fixed issue where major version mismatch would cause UI error to be thrown in REST API requests
• Fixed issue where shape datatables within the editor couldn't be searched fully
• Fixed issue where touch events would not dispatch on OpenLayers shapes
• Fixed issue with error suppression in DomDocument class, added LIBXML_NOERROR when
• Fixed issue where some overlays would overlap info-windows in Open Layers (Example clusters)
• Fixed issue with clustering translations in DE language files
• Fixed issue where engine switch notice would show even if the user has already switched to Atlas Novus (manually)
• Moved build selection Danger Zone
• Moved optimization options out of beta
• Moved map mobile zoom level control to mobile panel section
• Removed Stamen Design tile servers, as they have moved to Stadia
• Removed OpenPtMap tile server due to missing SSL
• Removed duplicate map fetch methods, which were unused
• Archived V9 changelogs

File:

• wp-google-maps/trunk/includes/class.plugin.php (modified) (19 diffs)

wp-google-maps/trunk/includes/class.plugin.php

@@ -9 +9 @@
 wpgmza_require_once(WPGMZA_PLUGIN_DIR_PATH . 'includes/class.gdpr-compliance.php');
 wpgmza_require_once(WPGMZA_PLUGIN_DIR_PATH . 'includes/3rd-party-integration/class.wp-migrate-db-integration.php');
+
+wpgmza_require_once(WPGMZA_PLUGIN_DIR_PATH . 'includes/class.dynamic-translations.php');
+
 wpgmza_require_once(WPGMZA_PLUGIN_DIR_PATH . 'includes/open-layers/class.nominatim-geocode-cache.php');
 wpgmza_require_once(WPGMZA_PLUGIN_DIR_PATH . 'includes/class.maps-engine-dialog.php');
@@ -44 +47 @@
     const PAGE_ADVANCED         = "advanced";
     const PAGE_CUSTOM_FIELDS    = "custom-fields";
+    const PAGE_INSIGHTS         = "insights";
     
     const MARKER_PULL_DATABASE  = "0";
@@ -63 +67 @@
     private $_pro7Compatiblity;
     private $_pro9Compatibility;
+    private $_pro10Compatibility;
     private $_dynamicTranslations;
     private $_spatialFunctionPrefix = '';
@@ -70 +75 @@
     
     protected $_internalEngine;
+    protected $_previewMode;
     protected $_scriptLoader;
 
@@ -110 +116 @@
         
         // Dynamic translation file
-        $this->_dynamicTranslations = new DynamicTranslations();
+        $this->_dynamicTranslations = DynamicTranslations::createInstance();
         
         // Legacy settings
@@ -122 +128 @@
         $this->_pro7Compatiblity = new Pro7Compatibility();
         $this->_pro9Compatibility = new Pro9Compatibility();
+        $this->_pro10Compatibility = new Pro10Compatibility($this->_settings);
 
         $this->_restAPI = RestAPI::createInstance();
@@ -131 +138 @@
 
         $this->_internalEngine = new InternalEngine($this->settings->internal_engine);
+        $this->_previewMode = new PreviewMode();
         $this->_shortcodes = Shortcodes::createInstance($this->_internalEngine);
         
@@ -147 +155 @@
         // Include nominatim for it's legacy AJAX hooks
         // TODO: Use a RESTful approach here instead
-        if($this->settings->engine == 'open-layers')
+        if($this->settings->engine == 'open-layers' || $this->settings->engine === 'open-layers-latest' 
+            || $this->settings->engine === 'leaflet' || $this->settings->engine === 'leaflet-zerocost'
+            || $this->settings->engine === 'leaflet-azure' || $this->settings->engine === 'leaflet-maptiler'
+            || $this->settings->engine === 'leaflet-stadia' || $this->settings->engine === 'leaflet-locationiq'){
             require_once(plugin_dir_path(__FILE__) . 'open-layers/class.nominatim-geocode-cache.php');
+        }
 
         
@@ -188 +200 @@
                     add_action('admin_init', function(){
                         /* In admin area, has not seen welcome page, and not doing ajax right now */
-                        update_option('wpgmza_welcome_screen_done', true);
+                        update_option('wpgmza_welcome_screen_done', true, false);
                         wp_redirect(admin_url('admin.php?page=wp-google-maps-menu&action=welcome_page'));
                         exit;
@@ -239 +251 @@
             case 'scriptLoader':
             case 'internalEngine':
+            case 'previewMode':
             case 'adminNotices':
                 return $this->{'_' . $name};
@@ -296 +309 @@
             /* Plugin is being activated in the background, we can't redirect in this case */
             /* We will pick this up when they refresh the page */
-            update_option('wpgmza_welcome_screen_done', true);
+            update_option('wpgmza_welcome_screen_done', true, false);
             wp_redirect(admin_url('admin.php?page=wp-google-maps-menu&action=welcome_page'));
             exit;
@@ -335 +348 @@
         $this->database->onFirstRun();
         
-        update_option('wpgmza-first-run', date(\DateTime::ISO8601));
+        update_option('wpgmza-first-run', date(\DateTime::ISO8601), false);
 
         /* Developer Hook (Action) - Add to first run plugin logic */     
@@ -411 +424 @@
         $resturl = preg_replace('#^http(s?):#', '', $resturl);
         
+        $tileServer = TileServers::getBySettings($settings);
+
+        $settings = apply_filters('wpgmza_plugin_get_localized_data_settings', $settings);
+
         /* Developer Hook (Filter) - Add or alter localization variables */
         $result = apply_filters('wpgmza_plugin_get_localized_data', array(
@@ -434 +451 @@
             'stylingSettings'       => $stylingSettings,
             'currentPage'           => $this->getCurrentPage(),
+            'tileServer'            => $tileServer,
             
             'userCanAdministrator'  => (current_user_can('administrator') ? 1 : 0),
@@ -535 +553 @@
             case 'wp-google-maps-menu-custom-fields':
                 return Plugin::PAGE_CUSTOM_FIELDS;
+                break;
+
+            case 'wp-google-maps-menu-insights':
+                return Plugin::PAGE_INSIGHTS;
                 break;
         }
@@ -625 +647 @@
         $simulateFirstRun = false;
         
+        $byMapTables = array();
+        $byMapTarget = false;
 
         switch($type){
@@ -713 +737 @@
                 $truncateTables[] = $WPGMZA_TABLE_NAME_POINT_LABELS;
                 $truncateTables[] = $WPGMZA_TABLE_NAME_IMAGE_OVERLAYS;
+                break;
+            case 'destroy_by_map':
+                /* By map does not truncate, but it target delets */
+                if(!empty($_POST['data_type']) && !empty($_POST['map_id'])){
+                    $dataType = trim(strip_tags($_POST['data_type']));
+                    $byMapTarget = !empty(intval($_POST['map_id'])) ? intval($_POST['map_id']) : false;
+                    if(!empty($dataType)){
+                        if($dataType === 'markers'){
+                            /* All markers */
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_MARKERS;
+                        } else if($dataType === 'shapes'){
+                            /* All shape related tables */
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_POLYGONS;
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_POLYLINES;
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_CIRCLES;
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_RECTANGLES;
+
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_HEATMAPS;
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_POINT_LABELS;
+                            $byMapTables[] = $WPGMZA_TABLE_NAME_IMAGE_OVERLAYS;
+                        }
+                    }
+                }
                 break;
             default:
@@ -748 +795 @@
                     $wpdb->query("TRUNCATE TABLE `{$table}`");
                 }
+            }
+        }
+
+        if(!empty($byMapTables) && !empty($byMapTarget)){
+            /* Specific targeted maps - Usually only available with Pro as it supports multiple maps */
+            foreach($byMapTables as $targetTable){
+                $wpdb->query($wpdb->prepare("DELETE FROM `{$targetTable}` WHERE map_id = %d", array($byMapTarget)));
             }
         }
@@ -985 +1039 @@
     
         $data = implode("", array_reverse($data));
-        update_option("wpgmza_temp_api", $data);
+        update_option("wpgmza_temp_api", $data, false);
     }