From bf622aa5b5cd9d3256ee8e4f26245b9858cccfba Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Mon, 13 Apr 2020 00:56:21 -0700
Subject: final env cleanup

---
 src/client/views/collections/CollectionMapView.tsx | 20 ++++++++++++--------
 src/server/server_Initialization.ts                |  1 -
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client/views/collections/CollectionMapView.tsx b/src/client/views/collections/CollectionMapView.tsx
index a99d5be50..b67daeb53 100644
--- a/src/client/views/collections/CollectionMapView.tsx
+++ b/src/client/views/collections/CollectionMapView.tsx
@@ -6,6 +6,7 @@ import { Map, Marker, MapProps, GoogleApiWrapper } from "google-maps-react";
 import { NumCast, StrCast } from "../../../new_fields/Types";
 import { CollectionSubView } from "./CollectionSubView";
 import { Utils } from "../../../Utils";
+import { Opt } from "../../../new_fields/Doc";
 
 type MapDocument = makeInterface<[typeof documentSchema]>;
 const MapDocument = makeInterface(documentSchema);
@@ -38,8 +39,15 @@ class CollectionMapView extends CollectionSubView<MapDocument, Partial<MapProps>
                             lat: NumCast(childLayoutPairs[0].layout.locationLat, 0),
                             lng: NumCast(childLayoutPairs[0].layout.locationLng, 0)
                         };
-                        const iconSize = new google.maps.Size(NumCast(layout.mapIconWidth, 45), NumCast(layout.mapIconHeight, 45));
-
+                        let icon: Opt<google.maps.Icon>, iconUrl: Opt<string>;
+                        if ((iconUrl = StrCast(Document.mapIconUrl, null))) {
+                            const iconSize = new google.maps.Size(NumCast(layout.mapIconWidth, 45), NumCast(layout.mapIconHeight, 45));
+                            icon = {
+                                size: iconSize,
+                                scaledSize: iconSize,
+                                url: iconUrl
+                            };
+                        }
                         return (
                             <Marker
                                 key={Utils.GenerateGuid()}
@@ -49,11 +57,7 @@ class CollectionMapView extends CollectionSubView<MapDocument, Partial<MapProps>
                                     Document.mapCenterLat = location.lat;
                                     Document.mapCenterLng = location.lng;
                                 }}
-                                icon={{
-                                    size: iconSize,
-                                    scaledSize: iconSize,
-                                    url: StrCast(Document.mapIconUrl, null)
-                                }}
+                                icon={icon}
                             />
                         );
                     })}
@@ -64,4 +68,4 @@ class CollectionMapView extends CollectionSubView<MapDocument, Partial<MapProps>
 
 }
 
-export default GoogleApiWrapper({ apiKey: process.env.GOOGLE_MAPS_API_KEY! })(CollectionMapView) as any;
\ No newline at end of file
+export default GoogleApiWrapper({ apiKey: process.env.GOOGLE_MAPS! })(CollectionMapView) as any;
\ No newline at end of file
diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 1150118f7..add607761 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -20,7 +20,6 @@ import * as request from 'request';
 import RouteSubscriber from './RouteSubscriber';
 import { publicDirectory } from '.';
 import { logPort, } from './ActionUtilities';
-import { Utils } from '../Utils';
 import { blue, yellow } from 'colors';
 import * as cors from "cors";
 
-- 
cgit v1.2.3-70-g09d2