Merge branch 'svg-icons' into develop

UCF · Aug 23, 2024 · 9802219 · 9802219
2 parents 6e88816 + c525aae
commit 9802219
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/App.tsx b/src/App.tsx
@@ -390,6 +390,7 @@ function App() {
 
   const defaultLayoutProps: any = {
     'icon-allow-overlap': true,
+    'icon-size': .66,
     'text-field': ['get', 'Name'],
     'text-font': [
       'Open Sans Semibold',
@@ -573,6 +574,7 @@ function App() {
     layout: {
       ...defaultLayoutProps,
       "icon-image": 'auto-door',
+      "icon-size": 1,
       visibility: visibility.accessibility.autoDoors! ? 'visible': 'none'
     },
   };
@@ -605,6 +607,7 @@ function App() {
     layout: {
       ...defaultLayoutProps,
       "icon-image": 'bike-rack',
+      "icon-size": 1,
       visibility: visibility.bikeRacks! ? 'visible': 'none'
     },
   };
@@ -615,6 +618,7 @@ function App() {
     layout: {
       ...defaultLayoutProps,
       "icon-image": 'family',
+      "icon-size": .9,
       visibility: visibility.family! ? 'visible': 'none'
     },
   };
@@ -635,6 +639,7 @@ function App() {
     layout: {
       ...defaultLayoutProps,
       "icon-image": 'art',
+      "icon-size": .9,
       visibility: visibility.art! ? 'visible': 'none'
     },
   };
@@ -645,6 +650,7 @@ function App() {
     layout: {
       ...defaultLayoutProps,
       "icon-image": 'service',
+      "icon-size": .9,
       visibility: visibility.studentServices! ? 'visible': 'none'
     },
   };

diff --git a/src/components/MapImage.tsx b/src/components/MapImage.tsx
@@ -15,7 +15,7 @@ export function MapIcon(props: MapIconProps) {
     if (!map?.hasImage(props.iconName)) {
       map?.addImage(props.iconName, blankImage);
 
-      let img = new Image(40, 40);
+      let img = new Image(60, 60);
       img.src = props.iconImageSource;
 
       img.onload = () => {