fixes issue #745, issue #749

allenhwkim · Mar 8, 2017 · 0408fa4 · 0408fa4
1 parent 642e2b7
commit 0408fa4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/services/ng-map.js b/services/ng-map.js
@@ -47,14 +47,17 @@
   var getMap = function(id, options) {
     options = options || {};
     id = typeof id === 'object' ? id.id : id;
-    id = id || 0;
 
     var deferred = $q.defer();
     var timeout = options.timeout || 10000;
 
     function waitForMap(timeElapsed){
-      if(mapControllers[id]){
+      var keys = Object.keys(mapControllers);
+      var theFirstController = mapControllers[keys[0]];
+      if(id && mapControllers[id]){
         deferred.resolve(mapControllers[id].map);
+      } else if (!id && theFirstController && theFirstController.map) {
+        deferred.resolve(theFirstController.map);
       } else if (timeElapsed > timeout) {
         deferred.reject('could not find map');
       } else {

diff --git a/testapp/directions.html b/testapp/directions.html
@@ -45,7 +45,7 @@
         <option value="TRANSIT">Transit</option>
       </select>
 
-      <ng-map zoom="14" center="37.7699298, -122.4469157" style="height:90%" on-click="logLatLng()" >
+      <ng-map zoom="14" id="my-map" center="37.7699298, -122.4469157" style="height:90%" on-click="logLatLng()" >
         <directions 
           draggable="true"
           panel="directions-panel"