Merge pull request #1468 from ita-social-projects/feature/issue-1829

Feature/issue-1829
ita-social-projects · Dec 30, 2024 · b565d58 · b565d58
2 parents 7ff6d8d + 6764f3b
commit b565d58
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/public/index.html b/public/index.html
@@ -32,7 +32,9 @@
             href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css" />
       <link rel="stylesheet" type="text/css"
             href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css" />
-
+      <!-- Google map API -->
+      <script
+            src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCr5712Z86_z29W9biaPj8DcaggjbUAy7M&libraries=places"></script>
       <!-- Google tag (gtag.js) -->
 
       <script>

diff --git a/src/features/AdminPage/NewStreetcode/MainNewStreetcode.component.tsx b/src/features/AdminPage/NewStreetcode/MainNewStreetcode.component.tsx
@@ -77,6 +77,7 @@ import PartnerBlockAdmin from './PartnerBlock/PartnerBlockAdmin.components';
 import SubtitleBlock from './SubtitileBlock/SubtitleBlock.component';
 import TextBlock from './TextBlock/TextBlock.component';
 import TimelineBlockAdmin from './TimelineBlock/TimelineBlockAdmin.component';
+import MapBlockAdmin from './MapBlock/MapBlockAdmin.component';
 
 dayjs.extend(utc);
 dayjs.extend(tz);
@@ -657,6 +658,7 @@ const NewStreetcode = () => {
                                 onChange={handleFieldChange}
                             />
                             <TimelineBlockAdmin onChange={handleFieldChange} />
+                            <MapBlockAdmin />
                             <ArtGalleryDndContext>
                                 <StreetcodeArtsBlock />
                                 <ArtGallery

diff --git a/src/features/StreetcodePage/MapBlock/Map/Map.component.tsx b/src/features/StreetcodePage/MapBlock/Map/Map.component.tsx
@@ -65,7 +65,7 @@ const MapOSM = ({ statisticRecord, toponyms }: Props) => {
                 key={defaultZoom}
             >
                 <VectorTileLayer
-                    styleUrl="https://api.maptiler.com/maps/3f3c1ffa-9171-437c-bcce-06eae220b63f/style.json?key=UhzbQOCzR2G1uwFnnJk9"
+                    styleUrl="https://api.maptiler.com/maps/50b0b22d-fc35-41d1-9a73-b4314d0eee92/style.json?key=NO3yf5cMdVzuGIkZRCtw"
                 />
 
                 {streetcodes?.isActive && (

diff --git a/src/features/StreetcodePage/Streetcode.component.tsx b/src/features/StreetcodePage/Streetcode.component.tsx
@@ -33,6 +33,7 @@ import InterestingFactsComponent from './InterestingFactsBlock/InterestingFacts.
 import PartnersComponent from './PartnersBlock/Partners.component';
 import RelatedFiguresComponent from './RelatedFiguresBlock/RelatedFigures.component';
 import TimelineBlockComponent from './TimelineBlock/TimelineBlock.component';
+import MapBlockComponent from './MapBlock/MapBlock.component';
 
 const StreetcodeContent = () => {
     const { streetcodeStore } = useStreetcodeDataContext();
@@ -135,6 +136,7 @@ const StreetcodeContent = () => {
                 <TextBlockComponent />
                 <InterestingFactsComponent />
                 <TimelineBlockComponent />
+                <MapBlockComponent/>
                 {pageLoadercontext.isPageLoaded ? (
                     <ArtGallery isFillArtsStore />
                 ) : (