Changeset 3367502

Timestamp:

09/25/2025 03:42:37 AM (5 months ago)

Author:

RoxxiStudios

Message:

Preparing for version 1.1.1 release.

Location:

weatherbot/trunk

Files:

• assets/css/weather-bot.css (modified) (14 diffs)
• blocks/weatherbot/block.json (modified) (2 diffs)
• blocks/weatherbot/index.js (modified) (4 diffs)
• readme.txt (modified) (5 diffs)
• src/Frontend/Renderer.php (modified) (3 diffs)
• src/Shortcodes/Shortcode.php (modified) (14 diffs)
• src/Widgets/Weather_Widget.php (modified) (7 diffs)
• weatherbot.php (modified) (2 diffs)

weatherbot/trunk/assets/css/weather-bot.css

@@ -1 @@
-/* WeatherBot by RoxxiStudios — Public Styles (optimized v3.3.1 + ADA enhancements)
+/* WeatherBot by RoxxiStudios — Public Styles (optimized v3.3.1 + SEO/ADA enhancements)
    - Component-scoped, class-only selectors (no element qualifiers)
    - Predictable typography + color baseline (prevents footer/theme bleed)
@@ -39 +39 @@
    ========================= */
 
+
 /* Inherit typography safely for children */
 
-.roxxi-weather,
-.roxxi-weather[data-widget="weatherBot"] {
+aside.roxxi-weather,
+aside.roxxi-weather[data-widget="weatherBot"] {
     display: flex;
     gap: 5px;
@@ -56 +57 @@
 }
 
+aside.roxxi-weather[role="region"].wb-type-badge p,
+aside.roxxi-weather[role="region"].wb-type-compact p,
+aside.roxxi-weather[role="region"].wb-type-inline p {
+    margin: 0;
+} 
+
 
 /* =========================
@@ -89 +96 @@
 }
 
-.roxxi-weather.wb-type-badge .badge {
+
+/* UPDATED: Corrected .badge to .wb-badge to match renderer */
+
+.roxxi-weather.wb-type-badge .wb-badge {
     display: flex;
     gap: 8px;
@@ -176 +186 @@
 }
 
-.roxxi-weather.wb-right .wb-badge.conditions {
+
+/* UPDATED: Corrected selector for proper targeting */
+
+.roxxi-weather.wb-right .wb-badge .conditions {
     display: inline-flex;
     align-items: center;
@@ -203 +216 @@
 }
 
-.roxxi-weather .wb-temp,
-.roxxi-weather .wb-unit {
-    opacity: 0.9;
-}
-
 .roxxi-weather .wb-desc {
     color: var(--wb-neutral);
@@ -215 +223 @@
 .roxxi-weather .wb-temp,
 .roxxi-weather .wb-unit {
+    color: var(--wb-dark);
+    margin: 0;
+    font-size: inherit;
     font-weight: 600;
+}
+
+.roxxi-weather.wb-text-light .wb-pre,
+.roxxi-weather.wb-text-light .wb-temp,
+.roxxi-weather.wb-text-light .wb-unit {
+    color: white;
 }
 
@@ -228 +245 @@
     font-size: 12px;
     font-weight: 400;
+    /* NEW: Reset default browser margin for the new <p> tag */
+    margin: 0;
 }
 
@@ -277 +296 @@
 .roxxi-weather.wb-text-light {
     color: #ffffff;
+}
+
+.roxxi-weather .wb-powered {
+    padding-bottom: 2px;
 }
 
@@ -369 +392 @@
 }
 
+
 /* Respect user motion preferences */
+
 @media (prefers-reduced-motion: reduce) {
     .roxxi-weather .conditions.wb-loading .wb-loading-msg::after {
@@ -389 +414 @@
 .roxxi-weather [role="button"]:focus-visible {
     outline: 3px solid currentColor;
-    /* ensures ≥3:1 contrast vs background */
+    /* ensures >=3:1 contrast vs background */
     outline-offset: 2px;
     border-radius: 3px;
@@ -431 +456 @@
 
 @media (max-width: 480px) {
-    .roxxi-weather.wb-type-badge .badge {
+    /* UPDATED: Corrected .badge to .wb-badge to match renderer */
+    .roxxi-weather.wb-type-badge .wb-badge {
         display: flex;
         flex-direction: column;
@@ -466 +492 @@
     align-items: inherit;
     flex-wrap: wrap;
-    gap: 5px;
+    gap: 3px;
 }
 
@@ -484 +510 @@
 
 /* --- Hard override for dark-text variant in aggressive footers --- */
+
+
 /* Force container + all descendants to inherit dark text, except links */
+
 footer .roxxi-weather.roxxi-weather.wb-text-dark,
 footer .roxxi-weather.roxxi-weather.wb-text-dark *:not(a) {
-  color: var(--wb-dark) !important;
-}
+    color: var(--wb-dark) !important;
+}
+
 
 /* Links: restore brand color explicitly */
+
 footer .roxxi-weather.roxxi-weather.wb-text-dark a {
-  color: var(--wb-primary) !important;
-}
+    color: var(--wb-primary) !important;
+}
+
 
 /* If links wrap icons/spans, keep them inheriting from the anchor */
+
 footer .roxxi-weather.roxxi-weather.wb-text-dark a * {
-  color: inherit !important;
-}
+    color: inherit !important;
+}

weatherbot/trunk/blocks/weatherbot/block.json

@@ -45 +45 @@
       "type": "string",
       "default": ""
+    },
+    "headingTag": {
+      "type": "string",
+      "default": "h3"
     }
   },
@@ -55 +59 @@
       "fontColor": "light",
       "type": "badge",
-      "unit": "IMPERIAL"
+      "unit": "IMPERIAL",
+      "headingTag": "h3"
     }
   },

weatherbot/trunk/blocks/weatherbot/index.js

@@ -43 +43 @@
           }),
           el(SelectControl, {
-            label: 'Temperature Unit',
-            value: attributes.unit || '',
-            onChange: (v) => setAttributes({ unit: v }),
-            options: [
-              { label: 'Inherit (plugin default)', value: '' },
-              { label: 'Imperial (°F)', value: 'IMPERIAL' },
-              { label: 'Metric (°C)', value: 'METRIC' }
-            ]
-          }),
-          el(SelectControl, {
             label: 'Display Type',
             value: attributes.type || '',
@@ -61 +51 @@
               { label: 'Compact', value: 'compact' },
               { label: 'Inline', value: 'inline' }
+            ]
+          }),
+          el(SelectControl, {
+            label: 'Temperature Unit',
+            value: attributes.unit || '',
+            onChange: (v) => setAttributes({ unit: v }),
+            options: [
+              { label: 'Inherit (plugin default)', value: '' },
+              { label: 'Imperial (°F)', value: 'IMPERIAL' },
+              { label: 'Metric (°C)', value: 'METRIC' }
             ]
           }),
@@ -74 +74 @@
           }),
           el(SelectControl, {
-            label: 'Font Theme',
+            label: 'Theme Color',
             value: attributes.fontColor || '',
             onChange: (v) => setAttributes({ fontColor: v }),
             options: [
               { label: 'Inherit (plugin default)', value: '' },
-              { label: 'Light', value: 'light' },
-              { label: 'Dark', value: 'dark' }
+              { label: 'Light', value: 'dark' },
+              { label: 'Dark', value: 'light' }
             ]
           })
@@ -141 +141 @@
               }),
               el(SelectControl, {
-                label: 'Theme',
+                label: 'Theme Color',
                 value: attributes.fontColor || '',
                 onChange: (v) => setAttributes({ fontColor: v }),
                 options: [
                   { label: 'Inherit (plugin default)', value: '' },
-                  { label: 'Light', value: 'light' },
-                  { label: 'Dark', value: 'dark' }
+                  { label: 'Light', value: 'dark' },
+                  { label: 'Dark', value: 'light' }
                 ]
               }),

weatherbot/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.8
 Requires PHP: 7.4
-Stable tag: 1.1.0
+Stable tag: 1.1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -15 +15 @@
 
 [WeatherBot](http://roxxistudios.com/weatherbot) displays **live weather** for any location in the world using **Google’s Weather API**, with city/place resolution via **Google Maps Geocoding/Places**. Use with a **Classic Widget**, a **Gutenberg block** (with live preview), or with a **shortcode** anywhere shortcodes are supported. Outputs a clean, accessible UI that works in any theme or builder.
-
-***
-
-== Installation ==
-
-= From your WordPress dashboard =
-
-1.  Go to **Plugins → Add New**.
-2.  Search for **WeatherBot**.
-3.  Click **Install Now**, then **Activate**.
-4.  Go to **Settings → WeatherBot**, add your **Google Maps API key** (enable **Weather** and **Geocoding/Places** APIs), and save.
-5.  Add the **WeatherBot Block**, **Widget**, or **Shortcode** to your site and configure the options.
-
-= Manual installation =
-
-1.  Upload the `weatherbot` folder to `/wp-content/plugins/`.
-2.  Activate the plugin in **Plugins**.
-3.  Go to **Settings → WeatherBot**, add your **Google Maps API key** (enable **Weather** and **Geocoding/Places** APIs), and save.
-4.  Add the **WeatherBot Block**, **Widget**, or **Shortcode** to your site and configure the options.
-
-***
-
-== Frequently Asked Questions ==
-
-= 1. Does this show live location weather using Google Weather? =
-Yes. WeatherBot retrieves **current weather** from **Google’s Weather API** and resolves your `city` input with **Google Maps Geocoding/Places**.
-
-= 2. Where do I get a Google API key and what do I enable? =
-Create a key in the [**Google Maps/Weather API Platform**](https://developers.google.com/maps/documentation/weather/get-api-key) and enable **Weather** and **Geocoding/Places** APIs. Restrict your key per Google’s guidance.
-
-= 3. Can I use the shortcode in Widgets, Headers/Footers, or builder modules? =
-Yes—anywhere WordPress **parses shortcodes**: posts, pages, widgets, the Core/HTML block, and most page builders. In a PHP template you can use:
-`<?php echo do_shortcode('[weatherbot city="Lake Arrowhead, CA" type="badge"]'); ?>`
-
-= 4. How often is the weather updated? Can I clear the cache? =
-Weather results are cached briefly (about **2 minutes** per location/unit) to keep results fresh while saving API calls. Geocoding results can be cached long-term. You can **manually purge** caches from **Settings → WeatherBot**.
-
-= 5. Does the widget support dark backgrounds? =
-Yes. Choose **Theme → Light/Dark** (or `font_color` shortcode attribute) to ensure readable contrast.
-
-= 6. Does this plugin track visitors or send data to third-party servers? =
-No. API calls go directly from **your site** to **Google** using **your** key. The plugin does not phone home.
-
-= 7. Is jQuery Required? =
-**No jQuery on the front end.** WeatherBot runs on vanilla JS and WordPress packages. (The WP admin may load standard WordPress scripts.)
-
-= 8. Can I change the font styles of the weather display? =
-Yes. While WeatherBot inherits your theme’s fonts, you can easily override them with custom CSS. For example, to make the temperature bold and red, add this to your theme's Additional CSS panel:
-
-    .roxxi-weather span.wb-temp {
-        font-weight: 700;
-        color: #cc0000;
-    }
-
-See the Styling & Customization section for more options.
 
 ***
@@ -86 +31 @@
 == Features ==
 
+* **Automatic WeatherForecast Schema.org (JSON-LD) structured data** generation for SEO and Google rich results.
 * **Live local current weather** via **Google Weather API**
 * **Google Maps Geocoding/Places** for accurate city/place lookups
-* **WordPress weather block** with **live server preview** and full controls (Title, Show/Hide Title, Position, Theme, Unit, Type, City)
-* **WordPress weather shortcode** that **works anywhere shortcodes are supported** — posts, pages, widgets, Core/HTML block, most builders, and PHP templates via `echo do_shortcode()`
-* **Three display layouts** — `badge` (card), `compact` (mini), `inline` (text-flow)
-* **Optional title with on/off toggle** via `show_pre_text` (shortcode & block)
-* **Contrast themes** — **Light** / **Dark** for different backgrounds
-* **Units** — **Fahrenheit (°F)** or **Celsius (°C)**; can inherit from Settings
-* **Classic Widget** support (with **Align** option)
-* **Accessibility-minded markup** and focus styles
-* **Builder-friendly output** — guards against unwanted `<p>` wrappers and extra spacing
+* **WordPress weather block** with **live server preview** and full controls
+* **WordPress weather shortcode** that **works anywhere shortcodes are supported**
+* **Control the title's HTML tag** (H2-H6, P) for SEO hierarchy
+* **Three display layouts** — badge (card), compact (mini), inline (text-flow)
+* **Optional title with on/off toggle** via show_pre_text (shortcode & block)
+* **Intuitive Theme Selection** (Light Theme / Dark Theme) for readability on any background
+* **Units** — Fahrenheit (°F) or Celsius (°C); can inherit from Settings
+* **Classic Widget** support (with **Align** and **Heading Tag** options)
+* **Semantic and Accessible HTML5 Markup** (aside, headings) for improved SEO and screen reader support.
+* **Builder-friendly output** — guards against unwanted p wrappers and extra spacing
 * **Caching tuned for freshness** — weather (~2 minutes per location/unit); geocoding (long-lived)
 * **Manual cache purge** from Settings
 * **Optional uninstall cleanup** — delete plugin data on uninstall if enabled
-* **CSS variables** for easy theming (`--wb-primary`, `--wb-secondary`, `--wb-neutral`, etc.)
+* **CSS variables** for easy theming (--wb-primary, --wb-secondary, --wb-neutral, etc.)
 * **No jQuery on the front end** — built with modern WordPress packages and vanilla JS
 * **COMING SOON:** Our **Pro version** with **weather forecast** and other powerful features like **detailed style controls**.
@@ -249 +196 @@
 ***
 
+== Installation ==
+
+= From your WordPress dashboard =
+
+1.  Go to **Plugins → Add New**.
+2.  Search for **WeatherBot**.
+3.  Click **Install Now**, then **Activate**.
+4.  Go to **Settings → WeatherBot**, add your **Google Maps API key** (enable **Weather** and **Geocoding/Places** APIs), and save.
+5.  Add the **WeatherBot Block**, **Widget**, or **Shortcode** to your site and configure the options.
+
+= Manual installation =
+
+1.  Upload the weatherbot folder to /wp-content/plugins/.
+2.  Activate the plugin in **Plugins**.
+3.  Go to **Settings → WeatherBot**, add your **Google Maps API key** (enable **Weather** and **Geocoding/Places** APIs), and save.
+4.  Add the **WeatherBot Block**, **Widget**, or **Shortcode** to your site and configure the options.
+
+***
+
+== Frequently Asked Questions ==
+
+= 1. Does this show live location weather using Google Weather? =
+Yes. WeatherBot retrieves **current weather** from **Google’s Weather API** and resolves your `city` input with **Google Maps Geocoding/Places**.
+
+= 2. Where do I get a Google API key and what do I enable? =
+Create a key in the [**Google Maps/Weather API Platform**](https://developers.google.com/maps/documentation/weather/get-api-key) and enable **Weather** and **Geocoding/Places** APIs. Restrict your key per Google’s guidance.
+
+= 3. Can I use the shortcode in Widgets, Headers/Footers, or builder modules? =
+Yes—anywhere WordPress **parses shortcodes**: posts, pages, widgets, the Core/HTML block, and most page builders. In a PHP template you can use:
+`<?php echo do_shortcode('[weatherbot city="Lake Arrowhead, CA" type="badge"]'); ?>`
+
+= 4. How often is the weather updated? Can I clear the cache? =
+Weather results are cached briefly (about **2 minutes** per location/unit) to keep results fresh while saving API calls. Geocoding results can be cached long-term. You can **manually purge** caches from **Settings → WeatherBot**.
+
+= 5. Does the widget support dark backgrounds? =
+Yes. Choose **Theme → Light/Dark** (or `font_color` shortcode attribute) to ensure readable contrast.
+
+= 6. Does this plugin track visitors or send data to third-party servers? =
+No. API calls go directly from **your site** to **Google** using **your** key. The plugin does not phone home.
+
+= 7. Is jQuery Required? =
+**No jQuery on the front end.** WeatherBot runs on vanilla JS and WordPress packages. (The WP admin may load standard WordPress scripts.)
+
+= 8. Can I change the font styles of the weather display? =
+Yes. While WeatherBot inherits your theme’s fonts, you can easily override them with custom CSS. For example, to make the temperature bold and red, add this to your theme's Additional CSS panel:
+
+    .roxxi-weather span.wb-temp {
+        font-weight: 700;
+        color: #cc0000;
+    }
+
+See the Styling & Customization section for more options.
+
+***
+
 == Advanced Information ==
 
@@ -393 +395 @@
 
 == Changelog ==
+
+= 1.1.1 =
+* **New Feature (SEO):** Automatically generates valid `WeatherForecast` schema.org (JSON-LD) structured data for every unique location, making pages eligible for Google's weather rich results.
+* **New Feature:** Added `heading_tag` attribute to the shortcode, block, and widget to allow control over the title's HTML tag (H2-H6) for better SEO hierarchy.
+* **Enhancement:** The entire front-end HTML output has been refactored to use semantic tags (`<aside>`, `<h3>`, etc.) for improved accessibility and SEO.
+* **Enhancement:** Updated the widget's "Theme Color" setting to be more intuitive (e.g., selecting "Dark Theme" correctly applies a light font color).
+* **Tweak:** Renamed "Inherit" to "Default" in widget dropdowns for clarity.
 
 = 1.1.0 =

weatherbot/trunk/src/Frontend/Renderer.php

@@ -12 +12 @@
 
 /**
- * Frontend\Renderer (v3.1.5)
- * - Outputs inline-safe markup for WeatherBot variants.
+ * Frontend\Renderer (v3.1.5 - SEO Enhanced)
+ * - Outputs semantic, SEO-friendly markup for WeatherBot variants.
  * - Honors credit visibility via Settings (show_credit) and per-instance `show_credit="1"`.
  * - Does NOT emit page-level no-cache headers (live freshness handled via REST).
@@ -20 +20 @@
 class Renderer {
 
-    private Plugin $plugin;
-
-    public function __construct( Plugin $plugin ) {
-        $this->plugin = $plugin;
-    }
-
-    /** Decide whether to show the credit line for this render. */
-    private function should_show_credit( array $atts ): bool {
-        // Per-shortcode override wins: [weather_bot ... show_credit="1" | "0"]
-        if ( isset( $atts['show_credit'] ) ) {
-            return (string) $atts['show_credit'] === '1';
-        }
-        // Global default from Settings (policy default '0' = hidden)
-        if ( method_exists( $this->plugin, 'options' ) ) {
-            $opts   = $this->plugin->options();
-            $global = isset( $opts['show_credit'] ) ? (string) $opts['show_credit'] : '0';
-            return $global === '1';
-        }
-        // Fallback if nothing provided: hidden
-        return false;
-    }
-
-    /** Convert API unit label to symbol */
-    public function unit_symbol( $unit_label ): string {
-        $u = strtoupper( (string) $unit_label );
-        if ( $u === 'FAHRENHEIT' ) { return '°F'; }
-        if ( $u === 'CELSIUS' )    { return '°C'; }
-        return '';
-    }
-
-    /** Convert API unit label to code ('f' or 'c') for data-attribute */
-    private function unit_code( $unit_label ): string {
-        $u = strtoupper( (string) $unit_label );
-        if ( $u === 'FAHRENHEIT' ) { return 'f'; }
-        if ( $u === 'CELSIUS' )    { return 'c'; }
-        return 'f'; // sensible default
-    }
-
-    /** Safe array reader with dot notation */
-    public function read( $array, string $path, $default = null ) {
-        if ( ! is_array( $array ) ) { return $default; }
-        $seg = explode( '.', $path );
-        $ref = $array;
-        foreach ( $seg as $s ) {
-            if ( is_array( $ref ) && array_key_exists( $s, $ref ) ) {
-                $ref = $ref[ $s ];
-            } else {
-                return $default;
-            }
-        }
-        return $ref;
-    }
-
-    /**
-     * Render the BADGE type (inline-safe markup for taxonomy/content use).
-     * Does not send no-cache headers; client JS hydrates via REST.
-     */
-    public function render_badge( ?array $data, array $atts, ?float $lat = null, ?float $lon = null ): string {
-        $data = is_array( $data ) ? $data : [];
-
-        $temp       = $this->read( $data, 'temperature.degrees' );
-        $unit_label = $this->read( $data, 'temperature.unit' ); 
-        $desc       = $this->read( $data, 'weatherCondition.description.text' );
-        $icon_base  = $this->read( $data, 'weatherCondition.iconBaseUri' );
-
-        $temp_text  = is_numeric( $temp ) ? (string) round( (float) $temp ) : '';
-        $unit_text  = $this->unit_symbol( $unit_label );
-        $unit_code  = $this->unit_code( $unit_label );
-
-        $classes = [ 'roxxi-weather', 'wb-type-badge' ];
-        $attributes = [ 'role' => 'weatherBot' ];
-        if ( ! empty( $atts['align'] ) ) { $classes[] = 'wb-' . $atts['align']; }
-
-        if ( isset( $atts['font_color'] ) ) {
-            if ( $atts['font_color'] === 'light' ) { $classes[] = 'wb-text-light'; }
-            if ( $atts['font_color'] === 'dark'  ) { $classes[] = 'wb-text-dark'; }
-        }
-        if ( isset( $atts['extra_class'] ) && $atts['extra_class'] !== '' ) {
-            $classes[] = $atts['extra_class'];
-        }
-
-        $attrs = [ 'class' => implode( ' ', $classes ) ];
+    private Plugin $plugin;
+
+    public function __construct( Plugin $plugin ) {
+        $this->plugin = $plugin;
+    }
+
+    /** Decide whether to show the credit line for this render. */
+    private function should_show_credit( array $atts ): bool {
+        // Per-shortcode override wins: [weather_bot ... show_credit="1" | "0"]
+        if ( isset( $atts['show_credit'] ) ) {
+            return (string) $atts['show_credit'] === '1';
+        }
+        // Global default from Settings (policy default '0' = hidden)
+        if ( method_exists( $this->plugin, 'options' ) ) {
+            $opts   = $this->plugin->options();
+            $global = isset( $opts['show_credit'] ) ? (string) $opts['show_credit'] : '0';
+            return $global === '1';
+        }
+        // Fallback if nothing provided: hidden
+        return false;
+    }
+
+    /** Convert API unit label to symbol */
+    public function unit_symbol( $unit_label ): string {
+        $u = strtoupper( (string) $unit_label );
+        if ( $u === 'FAHRENHEIT' ) { return '°F'; }
+        if ( $u === 'CELSIUS' )    { return '°C'; }
+        return '';
+    }
+
+    /** Convert API unit label to code ('f' or 'c') for data-attribute */
+    private function unit_code( $unit_label ): string {
+        $u = strtoupper( (string) $unit_label );
+        if ( $u === 'FAHRENHEIT' ) { return 'f'; }
+        if ( $u === 'CELSIUS' )    { return 'c'; }
+        return 'f'; // sensible default
+    }
+
+    /** Safe array reader with dot notation */
+    public function read( $array, string $path, $default = null ) {
+        if ( ! is_array( $array ) ) { return $default; }
+        $seg = explode( '.', $path );
+        $ref = $array;
+        foreach ( $seg as $s ) {
+            if ( is_array( $ref ) && array_key_exists( $s, $ref ) ) {
+                $ref = $ref[ $s ];
+            } else {
+                return $default;
+            }
+        }
+        return $ref;
+    }
+
+    /**
+     * Render the BADGE type (inline-safe markup for taxonomy/content use).
+     * Does not send no-cache headers; client JS hydrates via REST.
+     */
+    public function render_badge( ?array $data, array $atts, ?float $lat = null, ?float $lon = null ): string {
+        $data = is_array( $data ) ? $data : [];
+
+        $temp       = $this->read( $data, 'temperature.degrees' );
+        $unit_label = $this->read( $data, 'temperature.unit' );
+        $desc       = $this->read( $data, 'weatherCondition.description.text' );
+        $icon_base  = $this->read( $data, 'weatherCondition.iconBaseUri' );
+
+        $temp_text = is_numeric( $temp ) ? (string) round( (float) $temp ) : '';
+        $unit_text = $this->unit_symbol( $unit_label );
+        $unit_code = $this->unit_code( $unit_label );
+
+        $classes = [ 'roxxi-weather', 'wb-type-badge' ];
+        if ( ! empty( $atts['align'] ) ) { $classes[] = 'wb-' . $atts['align']; }
+
+        if ( isset( $atts['font_color'] ) ) {
+            if ( $atts['font_color'] === 'light' ) { $classes[] = 'wb-text-light'; }
+            if ( $atts['font_color'] === 'dark' ) { $classes[] = 'wb-text-dark'; }
+        }
+        if ( isset( $atts['extra_class'] ) && $atts['extra_class'] !== '' ) {
+            $classes[] = $atts['extra_class'];
+        }
+
+        $attrs = [ 'class' => implode( ' ', $classes ) ];
+        if ( $lat !== null ) { $attrs['data-lat'] = (string) $lat; }
+        if ( $lon !== null ) { $attrs['data-lon'] = (string) $lon; }
+        $attrs['data-unit'] = $unit_code; // ← allow JS live fetch
+
+        // SEO: Add ARIA role and label for accessibility
+        $pre_text_for_label = ! empty( $atts['pre_text'] ) ? (string) $atts['pre_text'] : __( 'Current Weather', 'weatherbot' );
+        $attrs['role']       = 'region';
+        $attrs['aria-label'] = esc_attr( rtrim( $pre_text_for_label, ': ' ) );
         
-        if ( $lat !== null ) { $attrs['data-lat'] = (string) $lat; }
-        
-        if ( $lon !== null ) { $attrs['data-lon'] = (string) $lon; }
-        
-        $attrs['data-unit'] = $unit_code; // ← allow JS live fetch
-        
-        $attrs['role'] = 'weatherBot';
-
-        $attr_html = '';
-        foreach ( $attrs as $k => $v ) {
-            $attr_html .= ' ' . esc_attr( $k ) . '="' . esc_attr( $v ) . '"';
-        }
-
-        $html  = '<span' . $attr_html . '>';
-
-        // === Start Badge wrapper ===
-        $html .= '<span class="wb-badge">';
-
-            if ( isset( $atts['show_pre_text'] ) && (string) $atts['show_pre_text'] === '1' && ! empty( $atts['pre_text'] ) ) {
-                $html .= '<span class="wb-pre">' . esc_html( (string) $atts['pre_text'] ) . '</span>';
-            }
-
-            $html .= '<span class="conditions">';
-            
-                $html .= '<span class="temp">';
-
-                    if ( $icon_base ) {
-                        $alt = $desc ? (string) $desc : '';
-                        $html .= '<img class="wb-ico" src="' . esc_url( $icon_base . '.png' ) . '" title="' . esc_attr( $alt ) . '" alt="' . esc_attr( $alt ) . '" width="20" height="20" />';
-                    }
-
-                    $html .= '<span class="degree">';
-                        if ( $temp_text !== '' ) {
-                            $html .= '<span class="wb-temp">' . esc_html( $temp_text ) . '</span>';
-                        }
-                        if ( $unit_text !== '' ) {
-                            $html .= '<span class="wb-unit">' . esc_html( $unit_text ) . '</span>';
-                        }
-                    $html .= '</span>'; // .degree
-                    
-                $html .= '</span>'; // .temp
-
-                if ( $desc ) {
-                    $html .= '<span class="wb-sep">-</span><span class="wb-desc">' . esc_html( (string) $desc ) . '</span>';
-                }
-
-            $html .= '</span>'; // .conditions
-
-        $html .= '</span>'; // .badge
-        // === End Badge wrapper ===
-
-        if ( $this->should_show_credit( $atts ) ) {
-            $html .= '<span class="wb-powered" role="note">'
-                   . 'powered by <a class="wb-powered-link" href="https://roxxistudios.com/plugins/weatherbot" target="_blank" rel="noopener" title="'
-                   . esc_attr__( 'Get the WeatherBot plugin for your site.', 'weatherbot' )
-                   . '">WeatherBot™</a>'
-                   . '</span>';
-        }
-
-        $html .= '</span>';
-        return trim( $html );
-    }
-
-    /**
-     * Render the COMPACT type (inline-safe markup for taxonomy/content use).
-     * Does not send no-cache headers; client JS hydrates via REST.
-     */
-    public function render_compact( ?array $data, array $atts, ?float $lat = null, ?float $lon = null ): string {
-        $data = is_array( $data ) ? $data : [];
-
-        $temp       = $this->read( $data, 'temperature.degrees' );
-        $unit_label = $this->read( $data, 'temperature.unit' ); 
-        $desc       = $this->read( $data, 'weatherCondition.description.text' );
-        $icon_base  = $this->read( $data, 'weatherCondition.iconBaseUri' );
-
-        $temp_text  = is_numeric( $temp ) ? (string) round( (float) $temp ) : '';
-        $unit_text  = $this->unit_symbol( $unit_label );
-        $unit_code  = $this->unit_code( $unit_label );
-
-        $classes = [ 'roxxi-weather', 'wb-type-compact' ];
-        $attributes = [ 'role' => 'weatherBot' ];
-        if ( ! empty( $atts['align'] ) ) { $classes[] = 'wb-' . $atts['align']; }
-
-        if ( isset( $atts['font_color'] ) ) {
-            if ( $atts['font_color'] === 'light' ) { $classes[] = 'wb-text-light'; }
-            if ( $atts['font_color'] === 'dark'  ) { $classes[] = 'wb-text-dark'; }
-        }
-        if ( isset( $atts['extra_class'] ) && $atts['extra_class'] !== '' ) {
-            $classes[] = $atts['extra_class'];
-        }
-
-        $attrs = [ 'class' => implode( ' ', $classes ) ];
-        
-        if ( $lat !== null ) { $attrs['data-lat'] = (string) $lat; }
-        
-        if ( $lon !== null ) { $attrs['data-lon'] = (string) $lon; }
-        
-        $attrs['data-unit'] = $unit_code;
-        
-        $attrs['role'] = 'weatherBot';
-
-        $attr_html = '';
-        foreach ( $attrs as $k => $v ) {
-            $attr_html .= ' ' . esc_attr( $k ) . '="' . esc_attr( $v ) . '"';
-        }
-
-        $html  = '<span' . $attr_html . '>';
-        $html .= '<span class="details">';
-
-            if ( isset( $atts['show_pre_text'] ) && (string) $atts['show_pre_text'] === '1' && ! empty( $atts['pre_text'] ) ) {
-                $html .= '<span class="wb-pre">' . esc_html( (string) $atts['pre_text'] ) . '</span>';
-            }
-
-            $html .= '<span class="conditions">';
-                $html .= '<span class="temp">';
-
-                    if ( $icon_base ) {
-                        $alt = $desc ? (string) $desc : '';
-                        $html .= '<img class="wb-ico" src="' . esc_url( $icon_base . '.png' ) . '" title="' . esc_attr( $alt ) . '" alt="' . esc_attr( $alt ) . '" width="20" height="20" />';
-                    }
-
-                    $html .= '<span class="degree">';
-                        if ( $temp_text !== '' ) {
-                            $html .= '<span class="wb-temp">' . esc_html( $temp_text ) . '</span>';
-                        }
-                        if ( $unit_text !== '' ) {
-                            $html .= '<span class="wb-unit">' . esc_html( $unit_text ) . '</span>';
-                        }
-                    $html .= '</span>'; 
-                $html .= '</span>';
-
-            $html .= '</span>'; 
-        $html .= '</span>'; 
-
-        if ( $this->should_show_credit( $atts ) ) {
-            $html .= '<span class="wb-powered" role="note">'
-                   . 'powered by <a class="wb-powered-link" href="https://roxxistudios.com/plugins/weatherbot" target="_blank" rel="noopener" title="'
-                   . esc_attr__( 'Get the WeatherBot plugin for your site.', 'weatherbot' )
-                   . '">WeatherBot™</a>'
-                   . '</span>';
-        }
-
-        $html .= '</span>';
-        return trim( $html );
-    }
-
-    /**
-     * Render the INLINE type (minimal; no credit).
-     * Does not send no-cache headers; client JS hydrates via REST.
-     */
-    public function render_inline( ?array $data, array $atts, ?float $lat = null, ?float $lon = null ): string {
-        $data = is_array( $data ) ? $data : [];
-
-        $temp       = $this->read( $data, 'temperature.degrees' );
-        $unit_label = $this->read( $data, 'temperature.unit' );
-        $desc       = $this->read( $data, 'weatherCondition.description.text' );
-        $icon_base  = $this->read( $data, 'weatherCondition.iconBaseUri' );
-
-        $temp_text  = is_numeric( $temp ) ? (string) round( (float) $temp ) : '';
-        $unit_text  = $this->unit_symbol( $unit_label );
-        $unit_code  = $this->unit_code( $unit_label );
-
-        $classes = [ 'roxxi-weather', 'wb-type-inline' ];
-        $attributes = [ 'role' => 'weatherBot' ];
-        if ( ! empty( $atts['align'] ) ) { $classes[] = 'wb-' . $atts['align']; }
-
-        if ( isset( $atts['font_color'] ) ) {
-            if ( $atts['font_color'] === 'light' ) { $classes[] = 'wb-text-light'; }
-            if ( $atts['font_color'] === 'dark'  ) { $classes[] = 'wb-text-dark'; }
-        }
-        if ( isset( $atts['extra_class'] ) && $atts['extra_class'] !== '' ) {
-            $classes[] = $atts['extra_class'];
-        }
-
-        $attrs = [ 'class' => implode( ' ', $classes ) ];
-        
-        if ( $lat !== null ) { $attrs['data-lat'] = (string) $lat; }
-        
-        if ( $lon !== null ) { $attrs['data-lon'] = (string) $lon; }
-        
-        $attrs['data-unit'] = $unit_code;
-        
-        $attrs['role'] = 'weatherBot';
-
-        $attr_html = '';
-        foreach ( $attrs as $k => $v ) {
-            $attr_html .= ' ' . esc_attr( $k ) . '="' . esc_attr( $v ) . '"';
-        }
-
-        $html = '<span' . $attr_html . '>';
-
-        if ( isset( $atts['show_pre_text'] ) && (string) $atts['show_pre_text'] === '1' && ! empty( $atts['pre_text'] ) ) {
-            $html .= '<span class="wb-pre">' . esc_html( (string) $atts['pre_text'] ) . '</span>';
-        }
-
-        $html .= '<span class="conditions">';
-        
-        if ( $icon_base ) {
-            $alt = $desc ? (string) $desc : '';
-            $html .= '<img class="wb-ico" src="' . esc_url( $icon_base . '.png' ) . '" title="' . esc_attr( $alt ) . '" alt="' . esc_attr( $alt ) . '" width="20" height="20" />';
-        }
-
-        $html .= '<span class="degree">';
-            if ( $temp_text !== '' ) {
-                $html .= '<span class="wb-temp">' . esc_html( $temp_text ) . '</span>';
-            }
-            if ( $unit_text !== '' ) {
-                $html .= '<span class="wb-unit">' . esc_html( $unit_text ) . '</span>';
-            }
-        $html .= '</span>'; // .degree
-
-        $html .= '</span>'; // .conditions
-
-        $html .= '</span>';
-        return trim( $html );
-    }
+        $attr_html = '';
+        foreach ( $attrs as $k => $v ) {
+            $attr_html .= ' ' . esc_attr( $k ) . '="' . esc_attr( $v ) . '"';
+        }
+
+        // SEO: Changed main wrapper from <span> to <aside> for semantic accuracy.
+        $html  = '<aside' . $attr_html . '>';
+
+        // === Start Badge wrapper ===
+        // Note: The inner spans are kept for CSS styling compatibility.
+        $html .= '<div class="wb-badge">'; // Changed to div as it's inside a block-level <aside>
+
+            if ( isset( $atts['show_pre_text'] ) && (string) $atts['show_pre_text'] === '1' && ! empty( $atts['pre_text'] ) ) {
+                // SEO: Use a heading tag for the title. Allow override via shortcode attribute.
+                $valid_tags  = ['h2', 'h3', 'h4', 'h5', 'h6', 'p'];
+                $heading_tag = isset($atts['heading_tag']) && in_array($atts['heading_tag'], $valid_tags) ? $atts['heading_tag'] : 'h3';
+                $html .= '<' . $heading_tag . ' class="wb-pre">' . esc_html( (string) $atts['pre_text'] ) . '</' . $heading_tag . '>';
+            }
+
+            $html .= '<div class="conditions">'; // Changed to div
+            
+                $html .= '<div class="temp">'; // Changed to div
+
+                    if ( $icon_base ) {
+                        $alt = $desc ? (string) $desc : '';
+                        // SEO: Added role="presentation" for icons that are purely decorative next to text.
+                        $html .= '<img class="wb-ico" src="' . esc_url( $icon_base . '.png' ) . '" title="' . esc_attr( $alt ) . '" alt="' . esc_attr( $alt ) . '" width="20" height="20" role="presentation" />';
+                    }
+
+                    $html .= '<span class="degree">';
+                        if ( $temp_text !== '' ) {
+                            $html .= '<span class="wb-temp">' . esc_html( $temp_text ) . '</span>';
+                        }
+                        if ( $unit_text !== '' ) {
+                            $html .= '<span class="wb-unit">' . esc_html( $unit_text ) . '</span>';
+                        }
+                    $html .= '</span>'; // .degree
+                    
+                $html .= '</div>'; // .temp
+
+                if ( $desc ) {
+                    $html .= '<span class="wb-sep">-</span><span class="wb-desc">' . esc_html( (string) $desc ) . '</span>';
+                }
+
+            $html .= '</div>'; // .conditions
+
+        $html .= '</div>'; // .badge
+        // === End Badge wrapper ===
+
+        if ( $this->should_show_credit( $atts ) ) {
+            // SEO: Changed credit wrapper from <span> to <p>
+            $html .= '<p class="wb-powered" role="note">'
+                    . 'powered by <a class="wb-powered-link" href="https://roxxistudios.com/plugins/weatherbot" target="_blank" rel="noopener" title="'
+                    . esc_attr__( 'Get the WeatherBot plugin for your site.', 'weatherbot' )
+                    . '">WeatherBot™</a>'
+                    . '</p>';
+        }
+
+        $html .= '</aside>';
+        return trim( $html );
+    }
+
+    /**
+     * Render the COMPACT type (inline-safe markup for taxonomy/content use).
+     * Does not send no-cache headers; client JS hydrates via REST.
+     */
+    public function render_compact( ?array $data, array $atts, ?float $lat = null, ?float $lon = null ): string {
+        $data = is_array( $data ) ? $data : [];
+
+        $temp       = $this->read( $data, 'temperature.degrees' );
+        $unit_label = $this->read( $data, 'temperature.unit' );
+        $desc       = $this->read( $data, 'weatherCondition.description.text' );
+        $icon_base  = $this->read( $data, 'weatherCondition.iconBaseUri' );
+
+        $temp_text = is_numeric( $temp ) ? (string) round( (float) $temp ) : '';
+        $unit_text = $this->unit_symbol( $unit_label );
+        $unit_code = $this->unit_code( $unit_label );
+
+        $classes = [ 'roxxi-weather', 'wb-type-compact' ];
+        if ( ! empty( $atts['align'] ) ) { $classes[] = 'wb-' . $atts['align']; }
+
+        if ( isset( $atts['font_color'] ) ) {
+            if ( $atts['font_color'] === 'light' ) { $classes[] = 'wb-text-light'; }
+            if ( $atts['font_color'] === 'dark' ) { $classes[] = 'wb-text-dark'; }
+        }
+        if ( isset( $atts['extra_class'] ) && $atts['extra_class'] !== '' ) {
+            $classes[] = $atts['extra_class'];
+        }
+
+        $attrs = [ 'class' => implode( ' ', $classes ) ];
+        if ( $lat !== null ) { $attrs['data-lat'] = (string) $lat; }
+        if ( $lon !== null ) { $attrs['data-lon'] = (string) $lon; }
+        $attrs['data-unit'] = $unit_code;
+
+        // SEO: Add ARIA role and label for accessibility
+        $pre_text_for_label = ! empty( $atts['pre_text'] ) ? (string) $atts['pre_text'] : __( 'Current Weather', 'weatherbot' );
+        $attrs['role']       = 'region';
+        $attrs['aria-label'] = esc_attr( rtrim( $pre_text_for_label, ': ' ) );
+
+        $attr_html = '';
+        foreach ( $attrs as $k => $v ) {
+            $attr_html .= ' ' . esc_attr( $k ) . '="' . esc_attr( $v ) . '"';
+        }
+
+        // SEO: Changed main wrapper from <span> to <aside> for semantic accuracy.
+        $html  = '<aside' . $attr_html . '>';
+        $html .= '<div class="details">'; // Changed to div
+
+            if ( isset( $atts['show_pre_text'] ) && (string) $atts['show_pre_text'] === '1' && ! empty( $atts['pre_text'] ) ) {
+                // SEO: Use a heading tag for the title. Allow override via shortcode attribute.
+                $valid_tags  = ['h2', 'h3', 'h4', 'h5', 'h6', 'p'];
+                $heading_tag = isset($atts['heading_tag']) && in_array($atts['heading_tag'], $valid_tags) ? $atts['heading_tag'] : 'h3';
+                $html .= '<' . $heading_tag . ' class="wb-pre">' . esc_html( (string) $atts['pre_text'] ) . '</' . $heading_tag . '>';
+            }
+
+            $html .= '<div class="conditions">'; // Changed to div
+                $html .= '<div class="temp">'; // Changed to div
+
+                    if ( $icon_base ) {
+                        $alt = $desc ? (string) $desc : '';
+                        // SEO: Added role="presentation" for icons that are purely decorative next to text.
+                        $html .= '<img class="wb-ico" src="' . esc_url( $icon_base . '.png' ) . '" title="' . esc_attr( $alt ) . '" alt="' . esc_attr( $alt ) . '" width="20" height="20" role="presentation" />';
+                    }
+
+                    $html .= '<span class="degree">';
+                        if ( $temp_text !== '' ) {
+                            $html .= '<span class="wb-temp">' . esc_html( $temp_text ) . '</span>';
+                        }
+                        if ( $unit_text !== '' ) {
+                            $html .= '<span class="wb-unit">' . esc_html( $unit_text ) . '</span>';
+                        }
+                    $html .= '</span>';
+                $html .= '</div>';
+
+            $html .= '</div>';
+        $html .= '</div>';
+
+        if ( $this->should_show_credit( $atts ) ) {
+            // SEO: Changed credit wrapper from <span> to <p>
+            $html .= '<p class="wb-powered" role="note">'
+                    . 'powered by <a class="wb-powered-link" href="https://roxxistudios.com/plugins/weatherbot" target="_blank" rel="noopener" title="'
+                    . esc_attr__( 'Get the WeatherBot plugin for your site.', 'weatherbot' )
+                    . '">WeatherBot™</a>'
+                    . '</p>';
+        }
+
+        $html .= '</aside>';
+        return trim( $html );
+    }
+
+    /**
+     * Render the INLINE type (minimal; no credit).
+     * NOTE: This render method remains unchanged as it is designed for true inline use,
+     * where block-level elements like <aside> or <h3> would be inappropriate.
+     */
+    public function render_inline( ?array $data, array $atts, ?float $lat = null, ?float $lon = null ): string {
+        $data = is_array( $data ) ? $data : [];
+
+        $temp       = $this->read( $data, 'temperature.degrees' );
+        $unit_label = $this->read( $data, 'temperature.unit' );
+        $desc       = $this->read( $data, 'weatherCondition.description.text' );
+        $icon_base  = $this->read( $data, 'weatherCondition.iconBaseUri' );
+
+        $temp_text = is_numeric( $temp ) ? (string) round( (float) $temp ) : '';
+        $unit_text = $this->unit_symbol( $unit_label );
+        $unit_code = $this->unit_code( $unit_label );
+
+        $classes = [ 'roxxi-weather', 'wb-type-inline' ];
+        if ( ! empty( $atts['align'] ) ) { $classes[] = 'wb-' . $atts['align']; }
+
+        if ( isset( $atts['font_color'] ) ) {
+            if ( $atts['font_color'] === 'light' ) { $classes[] = 'wb-text-light'; }
+            if ( $atts['font_color'] === 'dark' ) { $classes[] = 'wb-text-dark'; }
+        }
+        if ( isset( $atts['extra_class'] ) && $atts['extra_class'] !== '' ) {
+            $classes[] = $atts['extra_class'];
+        }
+
+        $attrs = [ 'class' => implode( ' ', $classes ) ];
+        if ( $lat !== null ) { $attrs['data-lat'] = (string) $lat; }
+        if ( $lon !== null ) { $attrs['data-lon'] = (string) $lon; }
+        $attrs['data-unit'] = $unit_code;
+
+        // The non-standard role is removed for better standards compliance.
+        // $attrs['role'] = 'weatherBot';
+
+        $attr_html = '';
+        foreach ( $attrs as $k => $v ) {
+            $attr_html .= ' ' . esc_attr( $k ) . '="' . esc_attr( $v ) . '"';
+        }
+
+        $html = '<span' . $attr_html . '>';
+
+        if ( isset( $atts['show_pre_text'] ) && (string) $atts['show_pre_text'] === '1' && ! empty( $atts['pre_text'] ) ) {
+            $html .= '<span class="wb-pre">' . esc_html( (string) $atts['pre_text'] ) . '</span>';
+        }
+
+        $html .= '<span class="conditions">';
+
+        if ( $icon_base ) {
+            $alt = $desc ? (string) $desc : '';
+            $html .= '<img class="wb-ico" src="' . esc_url( $icon_base . '.png' ) . '" title="' . esc_attr( $alt ) . '" alt="' . esc_attr( $alt ) . '" width="20" height="20" />';
+        }
+
+        $html .= '<span class="degree">';
+            if ( $temp_text !== '' ) {
+                $html .= '<span class="wb-temp">' . esc_html( $temp_text ) . '</span>';
+            }
+            if ( $unit_text !== '' ) {
+                $html .= '<span class="wb-unit">' . esc_html( $unit_text ) . '</span>';
+            }
+        $html .= '</span>'; // .degree
+
+        $html .= '</span>'; // .conditions
+
+        $html .= '</span>';
+        return trim( $html );
+    }
 }
 
@@ -326 +335 @@
 
 
-
-
 // EOF

weatherbot/trunk/src/Shortcodes/Shortcode.php

@@ -3 +3 @@
 
 use RoxxiStudios\WeatherBot\Services\Metrics;
-
 use RoxxiStudios\WeatherBot\Plugin;
 use RoxxiStudios\WeatherBot\Frontend\Renderer;
@@ -11 +10 @@
 
 if ( ! defined( 'ABSPATH' ) ) {
-    if ( function_exists( 'status_header' ) ) {
-        status_header( 403 );
-    }
-    exit;
+    if ( function_exists( 'status_header' ) ) {
+        status_header( 403 );
+    }
+    exit;
 }
 
 /**
- * Shortcode handler for [weather_bot] (v3.1.6)
+ * Shortcode handler for [weatherbot] (v3.1.6 - JSON-LD Enhanced)
  */
 class Shortcode {
     private Plugin $plugin;
     private Renderer $renderer;
-
-    public function __construct( Plugin $plugin ) {
-        $this->plugin   = $plugin;
-        $this->renderer = new Renderer( $plugin );
-
-        // Official shortcode
-        add_shortcode( 'weather_bot', [ $this, 'render' ] );
-
-        // Alias for convenience
-        add_shortcode( 'weatherbot', [ $this, 'render' ] );
-    }
+    /**
+     * @var array Holds unique weather data to be rendered as JSON-LD in the header.
+     */
+    private static array $json_ld_data = [];
+
+    public function __construct( Plugin $plugin ) {
+        $this->plugin   = $plugin;
+        $this->renderer = new Renderer( $plugin );
+
+        // Official shortcode
+        add_shortcode( 'weather_bot', [ $this, 'render' ] );
+
+        // Alias for convenience
+        add_shortcode( 'weatherbot', [ $this, 'render' ] );
+
+        // Hook into the header for better crawler visibility.
+        add_action( 'wp_head', [ $this, 'render_json_ld_script' ] );
+    }
 
     public function render( $raw_atts = [] ): string {
@@ -59 +65 @@
             'lat'           => null,
             'lon'           => null,
-
-            // IMPORTANT: pull defaults from Settings (fixes "C selected but F persists")
-            'unit'          => $default_unit,   // accepts: IMPERIAL | METRIC | CELSIUS (alias) | F | C
-            'type'          => $default_var,    // badge | compact | inline
-            'align'         => '',              // left | center | right
+            'unit'          => $default_unit,
+            'type'          => $default_var,
+            'align'         => '',
             'show_pre_text' => $default_show_pre_text,
             'pre_text'      => $default_pre_text,
-            'font_color'    => $default_font_color, // '', 'light', 'dark'
-            'show_credit'   => $default_show_credit, // per-shortcode override
+            'heading_tag'   => 'h3',
+            'font_color'    => $default_font_color,
+            'show_credit'   => $default_show_credit,
         ], $raw_atts, 'weather_bot' );
 
@@ -90 +95 @@
         $atts['show_credit']   = ( (string) $atts['show_credit']   === '1' ) ? '1' : '0';
 
-        // If author did NOT supply show_credit in the shortcode,
-        // remove it so Renderer can fall back to the global setting.
         if ( ! array_key_exists( 'show_credit', (array) $raw_atts ) ) {
             unset( $atts['show_credit'] );
         }
 
-        // Apply font color helper class if specified
         if ( ! empty( $atts['font_color'] ) ) {
             $color = strtolower( trim( (string) $atts['font_color'] ) );
@@ -106 +108 @@
         }
 
-        // Require API key
         $apiKey = method_exists( $this->plugin, 'api_key' )
             ? (string) $this->plugin->api_key()
@@ -112 +113 @@
 
         if ( $apiKey === '' ) {
-            return '<!-- WeatherBot: Missing Google API key in Settings → WeatherBot -->';
-        }
-
-        // Resolve location → lat/lon with caching
+            return '';
+        }
+
         if ( is_numeric( $atts['lat'] ?? null ) && is_numeric( $atts['lon'] ?? null ) ) {
             $lat = (float) $atts['lat'];
@@ -126 +126 @@
             ];
             $geo_cache_key = 'rx_weatherbot_geo_' . md5( wp_json_encode( $geo_key_input ) );
-
-            // TTL (defaults to 1 yr; filterable)
             $ttl = (int) apply_filters( 'rx_weatherbot_geocode_ttl', YEAR_IN_SECONDS );
-
             $latlon   = get_transient( $geo_cache_key );
             $lock_key = $geo_cache_key . '_lock';
-
             if ( is_array( $latlon ) && isset( $latlon['lat'], $latlon['lon'] ) ) {
                 GeocodeCache::index_add( $geo_cache_key );
             }
-
             if ( false === $latlon ) {
                 if ( ! get_transient( $lock_key ) ) {
                     set_transient( $lock_key, 1, 30 );
-
                     $geocoder = new Geocoder( $apiKey );
                     $latlon   = $geocoder->to_latlon( $atts );
-
                     if ( is_array( $latlon ) && isset( $latlon['lat'], $latlon['lon'] ) ) {
                         set_transient( $geo_cache_key, $latlon, $ttl );
                         GeocodeCache::index_add( $geo_cache_key );
                     }
-
                     delete_transient( $lock_key );
                 } else {
-                    // brief backoff and retry once
-                    usleep( 150000 ); // 150ms
+                    usleep( 150000 );
                     $latlon = get_transient( $geo_cache_key );
                 }
             }
-
             if ( ! is_array( $latlon ) || ! isset( $latlon['lat'], $latlon['lon'] ) ) {
-                return '<!-- WeatherBot geocode error (cached miss) -->';
-            }
-
+                return '';
+            }
             $lat = (float) $latlon['lat'];
             $lon = (float) $latlon['lon'];
         }
 
-                Metrics::incr( 'weather_requests' );
-        // Weather caching with TTL + SWR + coalescing
+        Metrics::incr( 'weather_requests' );
         $opts = $this->plugin->options();
-        $ttl         = (int) ( $opts['weather_ttl'] ?? 120 );
+        $ttl        = (int) ( $opts['weather_ttl'] ?? 120 );
         if ( $ttl < 120 ) { $ttl = 120; } if ( $ttl > 300 ) { $ttl = 300; }
         $swr_window  = (int) ( $opts['swr_window'] ?? 900 );
         if ( $swr_window < 300 ) { $swr_window = 300; } if ( $swr_window > 1800 ) { $swr_window = 1800; }
         $coalesce_on = (string) ( $opts['coalesce_enabled'] ?? '1' ) === '1';
-
         $weather_key_input = [
             'lat'  => round( $lat, 4 ),
@@ -183 +170 @@
         $cached            = get_transient( $weather_cache_key );
         $now               = time();
-
-        // Allow transient to live through TTL+SWR so we can serve stale
         $data = null;
         $age  = null;
@@ -191 +176 @@
             $age  = max( 0, $now - (int) $cached['fetched'] );
         }
-
-        // In-request coalescing to avoid duplicate fetches during one render
         static $wb_inreq = [];
         $inreq_key = $weather_cache_key;
         if ( $coalesce_on && isset( $wb_inreq[ $inreq_key ] ) ) {
             $data = $wb_inreq[ $inreq_key ];
-            $age  = 0; // treat as fresh for this render
-        }
-
+            $age  = 0;
+        }
         $need_live = true;
         if ( is_array( $data ) && $age !== null ) {
             if ( $age <= $ttl ) {
-                // Fresh → serve and skip live
                 $need_live = false;
             } elseif ( $age <= ( $ttl + $swr_window ) ) {
-                // SWR: serve stale and refresh in background (if not already locked)
                 $need_live = false;
                 if ( $coalesce_on ) {
                     if ( ! get_transient( $lock_key ) ) {
-                        set_transient( $lock_key, 1, 20 ); // short lock to avoid stampedes
+                        set_transient( $lock_key, 1, 20 );
                         if ( ! wp_next_scheduled( 'rx_weatherbot_refresh_weather', [ $weather_cache_key, $lat, $lon, $unit, $ttl, $swr_window ] ) ) {
                             wp_schedule_single_event( time() + 1, 'rx_weatherbot_refresh_weather', [ $weather_cache_key, $lat, $lon, $unit, $ttl, $swr_window ] );
@@ -222 +202 @@
             }
         }
-
         if ( $need_live ) {
-            // Cross-request coalescing lock
             $got_lock = true;
             if ( $coalesce_on ) {
@@ -238 +216 @@
                     $data = $live;
                 } else {
-                    // On live failure, if we have cached, keep using it; else bubble error
                     if ( ! is_array( $data ) ) {
                         $data = $live;
@@ -245 +222 @@
                 delete_transient( $lock_key );
             } else {
-                // Another request is fetching; if no cached value, wait briefly once
                 if ( ! is_array( $data ) ) {
-                    usleep( 120000 ); // 120ms
+                    usleep( 120000 );
                     $cached = get_transient( $weather_cache_key );
                     if ( is_array( $cached ) && isset( $cached['payload'] ) ) {
@@ -256 +232 @@
         }
 
+        if ( ! isset( $data['error'] ) ) {
+            $this->collect_json_ld_data( $data, $atts, $lat, $lon );
+        }
+
         if ( isset( $data['error'] ) ) {
-            $detail = isset( $data['status'] ) ? ( ' status=' . (int) $data['status'] ) : '';
-            return '<!-- WeatherBot API error:' . esc_html( (string) $data['error'] ) . $detail . ' -->';
-        }
-
-        // Render type (pass lat/lon so the live JS can hydrate)
+            return '';
+        }
+
         if ( $type === 'compact' ) {
             if ( method_exists( $this->renderer, 'render_compact' ) ) {
                 return $this->renderer->render_compact( $data, $atts, $lat, $lon );
             }
-            return $this->renderer->render_badge( $data, $atts, $lat, $lon ); // graceful fallback
+            return $this->renderer->render_badge( $data, $atts, $lat, $lon );
         }
 
@@ -277 +255 @@
         }
 
-        // default
         return $this->renderer->render_badge( $data, $atts, $lat, $lon );
     }
+
+    /**
+     * Collects and deduplicates weather data for JSON-LD.
+     */
+    private function collect_json_ld_data( array $data, array $atts, float $lat, float $lon ): void {
+        $location_key = md5( round( $lat, 4 ) . ',' . round( $lon, 4 ) );
+
+        if ( isset( self::$json_ld_data[ $location_key ] ) ) {
+            return;
+        }
+
+        $temp_degrees = $this->renderer->read( $data, 'temperature.degrees' );
+        $unit_label   = $this->renderer->read( $data, 'temperature.unit' );
+        $description  = $this->renderer->read( $data, 'weatherCondition.description.text' );
+
+        if ( ! is_numeric( $temp_degrees ) || empty( $description ) ) {
+            return;
+        }
+
+        $location_name = ! empty( $atts['city'] ) ? $atts['city'] : ( ! empty( $atts['pre_text'] ) ? trim( rtrim( $atts['pre_text'], ': ' ) ) : 'Current Weather' );
+        $unit_code = ( strtoupper( $unit_label ) === 'FAHRENHEIT' ) ? 'FAH' : 'CEL';
+
+        // UPDATED: This structure now includes the required properties for Google's Rich Results Test.
+        self::$json_ld_data[ $location_key ] = [
+            '@context'           => 'https://schema.org',
+            '@type'              => 'WeatherForecast',
+            'location'           => [
+                '@type' => 'Place',
+                'name'  => $location_name,
+                'geo'   => [
+                    '@type'     => 'GeoCoordinates',
+                    'latitude'  => (string) $lat,
+                    'longitude' => (string) $lon,
+                ],
+            ],
+            // Add the current date as the forecastDate.
+            'forecastDate'       => function_exists('wp_date') ? wp_date('Y-m-d') : date_i18n('Y-m-d', time()),
+            // Use the current temperature for both high and low to meet requirements.
+            'temperatureHigh'    => [
+                '@type'    => 'QuantitativeValue',
+                'value'    => (string) round( (float) $temp_degrees ),
+                'unitCode' => $unit_code,
+            ],
+            'temperatureLow'     => [
+                '@type'    => 'QuantitativeValue',
+                'value'    => (string) round( (float) $temp_degrees ),
+                'unitCode' => $unit_code,
+            ],
+            'weatherCondition'   => $description,
+        ];
+    }
+
+    /**
+     * Renders the final JSON-LD script in the header.
+     */
+    public function render_json_ld_script(): void {
+        if ( empty( self::$json_ld_data ) ) {
+            return;
+        }
+
+        // Loop through each forecast and print a separate script tag for each one.
+        foreach ( self::$json_ld_data as $forecast_data ) {
+            echo '<script type="application/ld+json">' . wp_json_encode( $forecast_data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT ) . '</script>';
+        }
+    }
 }
-
-
-
-
-// EOF

weatherbot/trunk/src/Widgets/Weather_Widget.php

@@ -12 +12 @@
 
 /**
- * WeatherBot Widget (with align support)
+ * WeatherBot Widget (with align and heading_tag support)
  */
 class Weather_Widget extends WP_Widget {
@@ -27 +27 @@
         echo wp_kses_post( $args['before_widget'] );
 
-        $title       = isset( $instance['title'] )        ? (string) $instance['title']        : '';
-        $type        = isset( $instance['type'] )         ? (string) $instance['type']         : 'inline';
-        $city        = isset( $instance['city'] )         ? (string) $instance['city']         : '';
-        $lat         = isset( $instance['lat'] )          ? (string) $instance['lat']          : '';
-        $lon         = isset( $instance['lon'] )          ? (string) $instance['lon']          : '';
-        $unit        = isset( $instance['unit'] )         ? (string) $instance['unit']         : 'IMPERIAL';
+        $title       = isset( $instance['title'] )       ? (string) $instance['title']       : '';
+        $type        = isset( $instance['type'] )        ? (string) $instance['type']        : 'inline';
+        $city        = isset( $instance['city'] )        ? (string) $instance['city']        : '';
+        $lat         = isset( $instance['lat'] )         ? (string) $instance['lat']         : '';
+        $lon         = isset( $instance['lon'] )         ? (string) $instance['lon']         : '';
+        $unit        = isset( $instance['unit'] )        ? (string) $instance['unit']        : 'IMPERIAL';
         $show_pre    = ! empty( $instance['show_pre'] )   ? '1' : '0';
-        $pre_text    = isset( $instance['pre_text'] )     ? (string) $instance['pre_text']     : '';
-        $font_color  = isset( $instance['font_color'] )   ? (string) $instance['font_color']   : '';
-        $align       = isset( $instance['align'] )        ? (string) $instance['align']        : ''; // left|center|right
+        $pre_text    = isset( $instance['pre_text'] )    ? (string) $instance['pre_text']    : '';
+        $font_color  = isset( $instance['font_color'] )  ? (string) $instance['font_color']  : '';
+        $align       = isset( $instance['align'] )       ? (string) $instance['align']       : '';
+        $heading_tag = isset( $instance['heading_tag'] ) ? (string) $instance['heading_tag'] : 'h3';
 
         $show_credit = ( isset( $instance['show_credit'] ) && (string) $instance['show_credit'] === '1' ) ? '1' : '0';
@@ -49 +50 @@
             'show_pre_text' => $show_pre,
             'pre_text'      => $pre_text,
+            'heading_tag'   => $heading_tag,
         ];
         if ( $city !== '' ) {
@@ -71 +73 @@
             $parts[] = $k . '="' . esc_attr( $v ) . '"';
         }
-        $shortcode = '[weather_bot ' . implode( ' ', $parts ) . ']';
+        $shortcode = '[weatherbot ' . implode( ' ', $parts ) . ']';
 
         echo do_shortcode( $shortcode ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -120 +122 @@
           <label for="<?php echo esc_attr( $this->get_field_id('align') ); ?>"><?php esc_html_e('Align', 'weatherbot'); ?></label>
           <select class="widefat" id="<?php echo esc_attr( $this->get_field_id('align') ); ?>" name="<?php echo esc_attr( $this->get_field_name('align') ); ?>">
-            <option value=""      <?php selected( $get('align',''), '' );      ?>><?php esc_html_e('Inherit', 'weatherbot'); ?></option>
-            <option value="left"  <?php selected( $get('align',''), 'left' );  ?>><?php esc_html_e('Left', 'weatherbot'); ?></option>
-            <option value="center"<?php selected( $get('align',''), 'center' );?>><?php esc_html_e('Center', 'weatherbot'); ?></option>
-            <option value="right" <?php selected( $get('align',''), 'right' ); ?>><?php esc_html_e('Right', 'weatherbot'); ?></option>
+            <option value=""      <?php selected( $get('align',''), '' );       ?>><?php esc_html_e('Default', 'weatherbot'); ?></option>
+            <option value="left"  <?php selected( $get('align',''), 'left' );   ?>><?php esc_html_e('Left', 'weatherbot'); ?></option>
+            <option value="center"<?php selected( $get('align',''), 'center' ); ?>><?php esc_html_e('Center', 'weatherbot'); ?></option>
+            <option value="right" <?php selected( $get('align',''), 'right' );  ?>><?php esc_html_e('Right', 'weatherbot'); ?></option>
           </select>
         </p>
@@ -137 +139 @@
         </p>
         <p>
-          <label for="<?php echo esc_attr( $this->get_field_id('font_color') ); ?>"><?php esc_html_e('Font color', 'weatherbot'); ?></label>
+            <label for="<?php echo esc_attr( $this->get_field_id('heading_tag') ); ?>"><?php esc_html_e('Pre-text Heading Tag', 'weatherbot'); ?></label>
+            <select class="widefat" id="<?php echo esc_attr( $this->get_field_id('heading_tag') ); ?>" name="<?php echo esc_attr( $this->get_field_name('heading_tag') ); ?>">
+                <option value="h2" <?php selected( $get('heading_tag','h3'), 'h2' ); ?>>H2</option>
+                <option value="h3" <?php selected( $get('heading_tag','h3'), 'h3' ); ?>>H3 (Default)</option>
+                <option value="h4" <?php selected( $get('heading_tag','h3'), 'h4' ); ?>>H4</option>
+                <option value="h5" <?php selected( $get('heading_tag','h3'), 'h5' ); ?>>H5</option>
+                <option value="h6" <?php selected( $get('heading_tag','h3'), 'h6' ); ?>>H6</option>
+                <option value="p"  <?php selected( $get('heading_tag','h3'), 'p' );  ?>><?php esc_html_e('Paragraph', 'weatherbot'); ?></option>
+            </select>
+        </p>
+        <p>
+          <label for="<?php echo esc_attr( $this->get_field_id('font_color') ); ?>"><?php esc_html_e('Theme Color', 'weatherbot'); ?></label>
           <select class="widefat" id="<?php echo esc_attr( $this->get_field_id('font_color') ); ?>" name="<?php echo esc_attr( $this->get_field_name('font_color') ); ?>">
-            <option value=""      <?php selected( $get('font_color',''), '' );      ?>><?php esc_html_e('Inherit', 'weatherbot'); ?></option>
-            <option value="light" <?php selected( $get('font_color',''), 'light' ); ?>><?php esc_html_e('Light', 'weatherbot'); ?></option>
-            <option value="dark"  <?php selected( $get('font_color',''), 'dark' );  ?>><?php esc_html_e('Dark', 'weatherbot'); ?></option>
+            <option value=""      <?php selected( $get('font_color',''), '' );      ?>><?php esc_html_e('Default', 'weatherbot'); ?></option>
+            <option value="dark"  <?php selected( $get('font_color',''), 'dark' );  ?>><?php esc_html_e('Light Theme', 'weatherbot'); ?></option>
+            <option value="light" <?php selected( $get('font_color',''), 'light' ); ?>><?php esc_html_e('Dark Theme', 'weatherbot'); ?></option>
           </select>
         </p>
@@ -162 +175 @@
     public function update( $new, $old ) {
         $clean = [];
-        $clean['title']       = sanitize_text_field( $new['title']       ?? '' );
-        $clean['city']        = sanitize_text_field( $new['city']        ?? '' );
-        $clean['lat']         = sanitize_text_field( $new['lat']         ?? '' );
-        $clean['lon']         = sanitize_text_field( $new['lon']         ?? '' );
+        $clean['title']       = sanitize_text_field( $new['title']      ?? '' );
+        $clean['city']        = sanitize_text_field( $new['city']       ?? '' );
+        $clean['lat']         = sanitize_text_field( $new['lat']        ?? '' );
+        $clean['lon']         = sanitize_text_field( $new['lon']        ?? '' );
         $clean['unit']        = in_array( $new['unit'] ?? 'IMPERIAL', ['IMPERIAL','CELSIUS'], true ) ? $new['unit'] : 'IMPERIAL';
         $clean['type']        = in_array( $new['type'] ?? 'inline', ['inline','badge','compact'], true ) ? $new['type'] : 'inline';
         $clean['align']       = in_array( $new['align'] ?? '', ['', 'left','center','right'], true ) ? $new['align'] : '';
         $clean['show_pre']    = ! empty( $new['show_pre'] ) ? 1 : 0;
-        $clean['pre_text']    = sanitize_text_field( $new['pre_text']    ?? '' );
+        $clean['pre_text']    = sanitize_text_field( $new['pre_text']   ?? '' );
         $clean['font_color']  = in_array( $new['font_color'] ?? '', ['', 'light', 'dark'], true ) ? $new['font_color'] : '';
         $clean['show_credit'] = ( isset( $new['show_credit'] ) && (string)$new['show_credit'] === '1' ) ? 1 : 0;
+
+        $valid_tags = ['h2', 'h3', 'h4', 'h5', 'h6', 'p'];
+        $clean['heading_tag'] = in_array( $new['heading_tag'] ?? 'h3', $valid_tags, true ) ? $new['heading_tag'] : 'h3';
 
         return $clean;
     }
 }
-
-
-
-
-// EOF

weatherbot/trunk/weatherbot.php

@@ -4 +4 @@
 Plugin URI: https://roxxistudios.com/plugins/weatherbot
 Description: WeatherBot — free version is a clean, easy to use weather plugin. Add fast, accessible, location-based weather using the Google Maps Platform (Weather + Geocoding). Includes a shortcode with inline/badge/compact variants and a widget.
-Version: 1.1.0
+Version: 1.1.1
 Requires at least: 6.0
 Requires PHP: 7.4
@@ -38 +38 @@
  * -------------------------------------------------------------------------- */
 if ( ! defined( 'RX_WEATHERBOT_VERSION' ) ) {
-    define( 'RX_WEATHERBOT_VERSION', '1.1.0' );
+    define( 'RX_WEATHERBOT_VERSION', '1.1.1' );
 }
 if ( ! defined( 'RX_WEATHERBOT_FILE' ) ) {