Merge branch 'street-geo-editor' of https://github.com/3DStreet/3dstreet

into street-geo-editor # Conflicts: # src/editor/components/modals/GeoModal/GeoModal.component.jsx
3DStreet · Jun 2, 2024 · b1aef0d · b1aef0d
2 parents 2be89c5 + b307903
commit b1aef0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/src/editor/components/modals/GeoModal/GeoModal.component.jsx b/src/editor/components/modals/GeoModal/GeoModal.component.jsx
@@ -1,7 +1,7 @@
 import { useState, useCallback, useEffect } from 'react';
 
 import styles from './GeoModal.module.scss';
-import { Mangnifier20Icon } from '../../../icons';
+import { Mangnifier20Icon, Save24Icon } from '../../../icons';
 
 import { firebaseConfig } from '../../../services/firebase.js';
 import Modal from '../Modal.jsx';
@@ -12,7 +12,6 @@ import {
   Marker,
   Autocomplete
 } from '@react-google-maps/api';
-import { DownloadIcon } from '../../../icons/icons.jsx';
 import GeoImg from '../../../../../ui_assets/geo.png';
 
 const GeoModal = ({ isOpen, onClose }) => {
@@ -23,7 +22,7 @@ const GeoModal = ({ isOpen, onClose }) => {
   const [markerPosition, setMarkerPosition] = useState({
     lat: 37.7637072, // lat: 37.76370724481858, lng: -122.41517686259827
     lng: -122.4151768,
-    elevation: 0
+    elevation: 10
   });
 
   const [autocomplete, setAutocomplete] = useState(null);
@@ -180,7 +179,7 @@ const GeoModal = ({ isOpen, onClose }) => {
             Cancel
           </Button>
           <Button
-            leadingicon={<DownloadIcon />}
+            leadingicon={<Save24Icon />}
             variant="filled"
             onClick={onSaveHandler}
           >

diff --git a/src/editor/icons/icons.jsx b/src/editor/icons/icons.jsx
@@ -471,23 +471,6 @@ const Circle20Icon = ({ className }) => (
   </svg>
 );
 
-const DownloadIcon = () => (
-  <svg
-    width="24"
-    height="25"
-    viewBox="0 0 24 25"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M12 3.5C12.4142 3.5 12.75 3.83579 12.75 4.25V13.6893L16.1572 10.2822C16.4501 9.98928 16.9249 9.98928 17.2178 10.2822C17.5107 10.5751 17.5107 11.0499 17.2178 11.3428L12.5303 16.0303C12.2374 16.3232 11.7626 16.3232 11.4697 16.0303L6.78217 11.3428C6.48928 11.0499 6.48928 10.5751 6.78217 10.2822C7.07506 9.98928 7.54994 9.98928 7.84283 10.2822L11.25 13.6893V4.25C11.25 3.83579 11.5858 3.5 12 3.5ZM4.5 15.6875C4.91421 15.6875 5.25 16.0233 5.25 16.4375V18.3125C5.25 18.6109 5.36853 18.897 5.5795 19.108C5.79048 19.319 6.07663 19.4375 6.375 19.4375H17.625C17.9234 19.4375 18.2095 19.319 18.4205 19.108C18.6315 18.897 18.75 18.6109 18.75 18.3125V16.4375C18.75 16.0233 19.0858 15.6875 19.5 15.6875C19.9142 15.6875 20.25 16.0233 20.25 16.4375V18.3125C20.25 19.0087 19.9734 19.6764 19.4812 20.1687C18.9889 20.6609 18.3212 20.9375 17.625 20.9375H6.375C5.67881 20.9375 5.01113 20.6609 4.51884 20.1687C4.02656 19.6764 3.75 19.0087 3.75 18.3125V16.4375C3.75 16.0233 4.08579 15.6875 4.5 15.6875Z"
-      fill="white"
-    />
-  </svg>
-);
-
 const Chevron24Down = ({ className }) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
@@ -553,7 +536,6 @@ export {
   LayersIcon,
   GoogleSignInButtonSVG,
   Circle20Icon,
-  DownloadIcon,
   Chevron24Down,
   Plus20Circle
 };