From 114868b0ed52ab2c9cec9dbd8fd518b1c76a1496 Mon Sep 17 00:00:00 2001
From: Denis Ryabko <ryabkodenis@yandex-team.ru>
Date: Thu, 13 Nov 2025 19:52:05 +0300
Subject: [PATCH 1/4] feat(Map): integrate Schema.org microdata for
 GeoCoordinates in GoogleMap and YandexMap components

---
 src/components/Map/GoogleMap.tsx      | 34 ++++++++++++++--------
 src/components/Map/YMap/YandexMap.tsx | 39 +++++++++++++++++++++++--
 src/components/Map/models.ts          | 41 +++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 14 deletions(-)
 create mode 100644 src/components/Map/models.ts

diff --git a/src/components/Map/GoogleMap.tsx b/src/components/Map/GoogleMap.tsx
index 6aa322431..5204dcaa3 100644
--- a/src/components/Map/GoogleMap.tsx
+++ b/src/components/Map/GoogleMap.tsx
@@ -10,6 +10,7 @@ import {GMapProps} from '../../models';
 import {block} from '../../utils';
 
 import {getMapHeight} from './helpers';
+import {GeoCoordinatesMicrodataValues} from './models';
 
 const b = block('map');
 
@@ -67,18 +68,27 @@ const GoogleMap = (props: GMapProps) => {
     }
 
     return (
-        <iframe
-            className={b(null, className)}
-            ref={ref}
-            style={{
-                height,
-            }}
-            title="Google Map"
-            loading="lazy"
-            allowFullScreen
-            referrerPolicy="no-referrer-when-downgrade"
-            src={src}
-        />
+        <div itemScope itemType={GeoCoordinatesMicrodataValues.PlaceType}>
+            {address && (
+                <meta
+                    itemProp={GeoCoordinatesMicrodataValues.AddressProp}
+                    content={address}
+                    itemType={GeoCoordinatesMicrodataValues.TextType}
+                />
+            )}
+            <iframe
+                className={b(null, className)}
+                ref={ref}
+                style={{
+                    height,
+                }}
+                title="Google Map"
+                loading="lazy"
+                allowFullScreen
+                referrerPolicy="no-referrer-when-downgrade"
+                src={src}
+            />
+        </div>
     );
 };
 
diff --git a/src/components/Map/YMap/YandexMap.tsx b/src/components/Map/YMap/YandexMap.tsx
index 760340131..0a9688b56 100644
--- a/src/components/Map/YMap/YandexMap.tsx
+++ b/src/components/Map/YMap/YandexMap.tsx
@@ -10,6 +10,7 @@ import {YMapMarkerLabelPrivate, YMapMarkerPrivate, YMapProps} from '../../../mod
 import {block} from '../../../utils';
 import ErrorWrapper from '../../ErrorWrapper/ErrorWrapper';
 import {getMapHeight} from '../helpers';
+import {GeoCoordinatesMicrodataValues} from '../models';
 
 import {YMap} from './YMap';
 import {MapApiStatus, YMapsApiLoader} from './YandexMapApiLoader';
@@ -150,14 +151,48 @@ const YandexMap = (props: YMapProps) => {
             handler={onTryAgain}
             className={b('wrapper')}
         >
-            <div className={b('wrapper')}>
+            <div
+                className={b('wrapper')}
+                itemScope
+                itemType={GeoCoordinatesMicrodataValues.PlaceType}
+            >
                 {/* hidden - to show the map after calculating the center */}
                 <div
                     id={containerId}
                     className={b({hidden: !ready}, className)}
                     ref={ref}
                     style={{height}}
-                />
+                    itemProp={GeoCoordinatesMicrodataValues.GeoProp}
+                    itemScope
+                    itemType={GeoCoordinatesMicrodataValues.GeoCoordinatesType}
+                >
+                    {markers.map((marker, index) => (
+                        <React.Fragment key={index}>
+                            {marker.coordinate && (
+                                <React.Fragment
+                                    key={marker.address ?? marker.coordinate.join(',') ?? index}
+                                >
+                                    <meta
+                                        itemProp={GeoCoordinatesMicrodataValues.LongitudeProp}
+                                        content={String(marker.coordinate[0])}
+                                    />
+                                    <meta
+                                        itemProp={GeoCoordinatesMicrodataValues.LatitudeProp}
+                                        content={String(marker.coordinate[1])}
+                                    />
+                                </React.Fragment>
+                            )}
+                            {marker.address && (
+                                <meta
+                                    itemProp={GeoCoordinatesMicrodataValues.AddressProp}
+                                    content={marker.address}
+                                    itemType={GeoCoordinatesMicrodataValues.TextType}
+                                />
+                            )}
+                        </React.Fragment>
+                    ))}
+                </div>
+
                 {loading ? <Spin size="xl" className={b('spinner')} /> : null}
             </div>
         </ErrorWrapper>
diff --git a/src/components/Map/models.ts b/src/components/Map/models.ts
new file mode 100644
index 000000000..48906bc0c
--- /dev/null
+++ b/src/components/Map/models.ts
@@ -0,0 +1,41 @@
+/**
+ * Schema.org microdata values for GeoCoordinates
+ * @see {@link https://schema.org/GeoCoordinates}
+ */
+export const GeoCoordinatesMicrodataValues = {
+    /**
+     * Schema.org GeoCoordinates type
+     * @see {@link https://schema.org/GeoCoordinates}
+     */
+    GeoCoordinatesType: 'https://schema.org/GeoCoordinates',
+    /**
+     * Schema.org Place type
+     * @see {@link https://schema.org/Place}
+     */
+    PlaceType: 'https://schema.org/Place',
+    /**
+     * The latitude of a location
+     * @see {@link https://schema.org/latitude}
+     */
+    LatitudeProp: 'latitude',
+    /**
+     * The longitude of a location
+     * @see {@link https://schema.org/longitude}
+     */
+    LongitudeProp: 'longitude',
+    /**
+     * Physical address of the item
+     * @see {@link https://schema.org/address}
+     */
+    AddressProp: 'address',
+    /**
+     * The geo coordinates of the place
+     * @see {@link https://schema.org/geo}
+     */
+    GeoProp: 'geo',
+    /**
+     * The text type
+     * @see {@link https://schema.org/Text}
+     */
+    TextType: 'https://schema.org/Text',
+} as const;

From 2e92ff073d7de3e601d88fd41a24b4f97809d76b Mon Sep 17 00:00:00 2001
From: Denis Ryabko <ryabkodenis@yandex-team.ru>
Date: Thu, 13 Nov 2025 20:07:29 +0300
Subject: [PATCH 2/4] fix(Map): remove unwanted div from google map

---
 src/components/Map/GoogleMap.tsx | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/Map/GoogleMap.tsx b/src/components/Map/GoogleMap.tsx
index 5204dcaa3..e3aa66978 100644
--- a/src/components/Map/GoogleMap.tsx
+++ b/src/components/Map/GoogleMap.tsx
@@ -68,7 +68,20 @@ const GoogleMap = (props: GMapProps) => {
     }
 
     return (
-        <div itemScope itemType={GeoCoordinatesMicrodataValues.PlaceType}>
+        <iframe
+            className={b(null, className)}
+            ref={ref}
+            style={{
+                height,
+            }}
+            title="Google Map"
+            loading="lazy"
+            allowFullScreen
+            referrerPolicy="no-referrer-when-downgrade"
+            src={src}
+            itemScope
+            itemType={GeoCoordinatesMicrodataValues.PlaceType}
+        >
             {address && (
                 <meta
                     itemProp={GeoCoordinatesMicrodataValues.AddressProp}
@@ -76,19 +89,7 @@ const GoogleMap = (props: GMapProps) => {
                     itemType={GeoCoordinatesMicrodataValues.TextType}
                 />
             )}
-            <iframe
-                className={b(null, className)}
-                ref={ref}
-                style={{
-                    height,
-                }}
-                title="Google Map"
-                loading="lazy"
-                allowFullScreen
-                referrerPolicy="no-referrer-when-downgrade"
-                src={src}
-            />
-        </div>
+        </iframe>
     );
 };
 

From ac66cb198a170538ec228ee868f96709c753c693 Mon Sep 17 00:00:00 2001
From: Denis Ryabko <ryabkodenis@yandex-team.ru>
Date: Sat, 15 Nov 2025 08:36:35 +0300
Subject: [PATCH 3/4] feat(Map): rework schema.org to JSON-LD format

---
 src/components/Map/GoogleMap.tsx      | 26 +++++----
 src/components/Map/YMap/YandexMap.tsx | 76 ++++++++++++++-------------
 src/components/Map/models.ts          | 41 ---------------
 3 files changed, 55 insertions(+), 88 deletions(-)
 delete mode 100644 src/components/Map/models.ts

diff --git a/src/components/Map/GoogleMap.tsx b/src/components/Map/GoogleMap.tsx
index e3aa66978..57065e490 100644
--- a/src/components/Map/GoogleMap.tsx
+++ b/src/components/Map/GoogleMap.tsx
@@ -10,7 +10,6 @@ import {GMapProps} from '../../models';
 import {block} from '../../utils';
 
 import {getMapHeight} from './helpers';
-import {GeoCoordinatesMicrodataValues} from './models';
 
 const b = block('map');
 
@@ -63,6 +62,21 @@ const GoogleMap = (props: GMapProps) => {
         };
     }, [forceAspectRatio, isMobile]);
 
+    // Generate Schema.org JSON-LD for Google Map
+    const mapMicrodataScript = React.useMemo(() => {
+        if (!address) {
+            return null;
+        }
+
+        const json = JSON.stringify({
+            '@context': 'https://schema.org',
+            '@type': 'Place',
+            address,
+        });
+
+        return <script type="application/ld+json" dangerouslySetInnerHTML={{__html: json}} />;
+    }, [address]);
+
     if (!apiKey || !address) {
         return null;
     }
@@ -79,16 +93,8 @@ const GoogleMap = (props: GMapProps) => {
             allowFullScreen
             referrerPolicy="no-referrer-when-downgrade"
             src={src}
-            itemScope
-            itemType={GeoCoordinatesMicrodataValues.PlaceType}
         >
-            {address && (
-                <meta
-                    itemProp={GeoCoordinatesMicrodataValues.AddressProp}
-                    content={address}
-                    itemType={GeoCoordinatesMicrodataValues.TextType}
-                />
-            )}
+            {mapMicrodataScript}
         </iframe>
     );
 };
diff --git a/src/components/Map/YMap/YandexMap.tsx b/src/components/Map/YMap/YandexMap.tsx
index 0a9688b56..bd5f2b2a3 100644
--- a/src/components/Map/YMap/YandexMap.tsx
+++ b/src/components/Map/YMap/YandexMap.tsx
@@ -10,7 +10,6 @@ import {YMapMarkerLabelPrivate, YMapMarkerPrivate, YMapProps} from '../../../mod
 import {block} from '../../../utils';
 import ErrorWrapper from '../../ErrorWrapper/ErrorWrapper';
 import {getMapHeight} from '../helpers';
-import {GeoCoordinatesMicrodataValues} from '../models';
 
 import {YMap} from './YMap';
 import {MapApiStatus, YMapsApiLoader} from './YandexMapApiLoader';
@@ -141,6 +140,42 @@ const YandexMap = (props: YMapProps) => {
         }
     }, [ymap, markers, zoom, disableBalloons, areaMargin]);
 
+    const mapMicrodataScript = React.useMemo(() => {
+        const places = markers
+            .filter((marker) => marker.address || marker.coordinate)
+            .map((marker) => {
+                const place: any = {
+                    '@type': 'Place',
+                };
+
+                if (marker.address) {
+                    place.address = {
+                        '@type': 'Text',
+                        '@value': marker.address,
+                    };
+                }
+
+                if (marker.coordinate && marker.coordinate.length === 2) {
+                    place.geo = {
+                        '@type': 'GeoCoordinates',
+                        latitude: marker.coordinate[0],
+                        longitude: marker.coordinate[1],
+                    };
+                }
+
+                return place;
+            });
+
+        const json = JSON.stringify({
+            '@context': 'https://schema.org',
+            '@graph': places,
+        });
+
+        return places.length > 0 ? (
+            <script type="application/ld+json" dangerouslySetInnerHTML={{__html: json}} />
+        ) : null;
+    }, [markers]);
+
     if (!markers) return null;
 
     return (
@@ -151,48 +186,15 @@ const YandexMap = (props: YMapProps) => {
             handler={onTryAgain}
             className={b('wrapper')}
         >
-            <div
-                className={b('wrapper')}
-                itemScope
-                itemType={GeoCoordinatesMicrodataValues.PlaceType}
-            >
+            <div className={b('wrapper')}>
+                {mapMicrodataScript}
                 {/* hidden - to show the map after calculating the center */}
                 <div
                     id={containerId}
                     className={b({hidden: !ready}, className)}
                     ref={ref}
                     style={{height}}
-                    itemProp={GeoCoordinatesMicrodataValues.GeoProp}
-                    itemScope
-                    itemType={GeoCoordinatesMicrodataValues.GeoCoordinatesType}
-                >
-                    {markers.map((marker, index) => (
-                        <React.Fragment key={index}>
-                            {marker.coordinate && (
-                                <React.Fragment
-                                    key={marker.address ?? marker.coordinate.join(',') ?? index}
-                                >
-                                    <meta
-                                        itemProp={GeoCoordinatesMicrodataValues.LongitudeProp}
-                                        content={String(marker.coordinate[0])}
-                                    />
-                                    <meta
-                                        itemProp={GeoCoordinatesMicrodataValues.LatitudeProp}
-                                        content={String(marker.coordinate[1])}
-                                    />
-                                </React.Fragment>
-                            )}
-                            {marker.address && (
-                                <meta
-                                    itemProp={GeoCoordinatesMicrodataValues.AddressProp}
-                                    content={marker.address}
-                                    itemType={GeoCoordinatesMicrodataValues.TextType}
-                                />
-                            )}
-                        </React.Fragment>
-                    ))}
-                </div>
-
+                />
                 {loading ? <Spin size="xl" className={b('spinner')} /> : null}
             </div>
         </ErrorWrapper>
diff --git a/src/components/Map/models.ts b/src/components/Map/models.ts
deleted file mode 100644
index 48906bc0c..000000000
--- a/src/components/Map/models.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Schema.org microdata values for GeoCoordinates
- * @see {@link https://schema.org/GeoCoordinates}
- */
-export const GeoCoordinatesMicrodataValues = {
-    /**
-     * Schema.org GeoCoordinates type
-     * @see {@link https://schema.org/GeoCoordinates}
-     */
-    GeoCoordinatesType: 'https://schema.org/GeoCoordinates',
-    /**
-     * Schema.org Place type
-     * @see {@link https://schema.org/Place}
-     */
-    PlaceType: 'https://schema.org/Place',
-    /**
-     * The latitude of a location
-     * @see {@link https://schema.org/latitude}
-     */
-    LatitudeProp: 'latitude',
-    /**
-     * The longitude of a location
-     * @see {@link https://schema.org/longitude}
-     */
-    LongitudeProp: 'longitude',
-    /**
-     * Physical address of the item
-     * @see {@link https://schema.org/address}
-     */
-    AddressProp: 'address',
-    /**
-     * The geo coordinates of the place
-     * @see {@link https://schema.org/geo}
-     */
-    GeoProp: 'geo',
-    /**
-     * The text type
-     * @see {@link https://schema.org/Text}
-     */
-    TextType: 'https://schema.org/Text',
-} as const;

From 8af76f0edc63bba4fd2a98308dd3caaee97dde91 Mon Sep 17 00:00:00 2001
From: Denis Ryabko <ryabkodenis@yandex-team.ru>
Date: Sat, 15 Nov 2025 08:44:39 +0300
Subject: [PATCH 4/4] fix(Map): remove any from microdata schema

---
 src/components/Map/YMap/YandexMap.tsx | 58 +++++++++++++++------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/components/Map/YMap/YandexMap.tsx b/src/components/Map/YMap/YandexMap.tsx
index bd5f2b2a3..d24167b8a 100644
--- a/src/components/Map/YMap/YandexMap.tsx
+++ b/src/components/Map/YMap/YandexMap.tsx
@@ -6,7 +6,7 @@ import debounce from 'lodash/debounce';
 import {LocaleContext} from '../../../context/localeContext/localeContext';
 import {MapsContext} from '../../../context/mapsContext/mapsContext';
 import {MobileContext} from '../../../context/mobileContext';
-import {YMapMarkerLabelPrivate, YMapMarkerPrivate, YMapProps} from '../../../models';
+import {YMapMarker, YMapMarkerLabelPrivate, YMapMarkerPrivate, YMapProps} from '../../../models';
 import {block} from '../../../utils';
 import ErrorWrapper from '../../ErrorWrapper/ErrorWrapper';
 import {getMapHeight} from '../helpers';
@@ -28,6 +28,27 @@ const BALLOON_DISABLING_MARKER_OPTIONS: YMapMarkerLabelPrivate = {
     interactivityModel: 'default#silent',
 };
 
+// Helper function to convert YMapMarker to Schema.org Place object
+const markerToSchemaPlace = (marker: YMapMarker) => {
+    return {
+        '@type': 'Place',
+        address: marker.address
+            ? {
+                  '@type': 'Text',
+                  '@value': marker.address,
+              }
+            : undefined,
+        geo:
+            marker.coordinate && marker.coordinate.length === 2
+                ? {
+                      '@type': 'GeoCoordinates',
+                      latitude: marker.coordinate[0],
+                      longitude: marker.coordinate[1],
+                  }
+                : undefined,
+    };
+};
+
 const YandexMap = (props: YMapProps) => {
     const {
         markers,
@@ -141,39 +162,24 @@ const YandexMap = (props: YMapProps) => {
     }, [ymap, markers, zoom, disableBalloons, areaMargin]);
 
     const mapMicrodataScript = React.useMemo(() => {
+        if (!markers.length) {
+            return null;
+        }
+
         const places = markers
             .filter((marker) => marker.address || marker.coordinate)
-            .map((marker) => {
-                const place: any = {
-                    '@type': 'Place',
-                };
-
-                if (marker.address) {
-                    place.address = {
-                        '@type': 'Text',
-                        '@value': marker.address,
-                    };
-                }
-
-                if (marker.coordinate && marker.coordinate.length === 2) {
-                    place.geo = {
-                        '@type': 'GeoCoordinates',
-                        latitude: marker.coordinate[0],
-                        longitude: marker.coordinate[1],
-                    };
-                }
-
-                return place;
-            });
+            .map(markerToSchemaPlace);
+
+        if (places.length === 0) {
+            return null;
+        }
 
         const json = JSON.stringify({
             '@context': 'https://schema.org',
             '@graph': places,
         });
 
-        return places.length > 0 ? (
-            <script type="application/ld+json" dangerouslySetInnerHTML={{__html: json}} />
-        ) : null;
+        return <script type="application/ld+json" dangerouslySetInnerHTML={{__html: json}} />;
     }, [markers]);
 
     if (!markers) return null;