resolve merge conflict

googlemaps-samples · Apr 29, 2021 · db9dc42 · db9dc42
1 parent 9ee8f79
commit db9dc42
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/solution/src/app.js b/solution/src/app.js
@@ -17,20 +17,19 @@ import * as THREE from 'three';
 import {GLTFLoader} from 'three/examples/jsm/loaders/GLTFLoader.js';
 
 const apiOptions = {
-  "apiKey": 'YOUR_API_KEY',
-  "version": "beta",
-  "map_ids": "YOUR_MAP_ID"
+  apiKey: “YOUR API KEY”,
+  version: "beta",
+  map_ids: ["YOUR MAP ID"]
 };
 
 const mapOptions = {
   "tilt": 0,
   "heading": 0,
   "zoom": 18,
   "center": { lat: 35.6594945, lng: 139.6999859 },
-  "mapId": "YOUR_MAP_ID"    
+  "mapId": "YOUR MAP ID"    
 }
 
-
 async function initMap() {    
   const mapDiv = document.getElementById("map");
   const apiLoader = new Loader(apiOptions);
@@ -119,5 +118,5 @@ function initWebglOverlayView(map) {
 
 (async () => {        
   const map = await initMap();
-  const webglOverlayView = initWebglOverlayView(map);    
+  initWebglOverlayView(map);    
 })();