new build

Author: allenhwkim

build/docs/NgMap.html

@@ -390,7 +390,7 @@ <h5>Parameters:</h5>
           </dd>
         </dl><dl>
           <dt>
-            <a href="source/NgMap.html#line149" class="name-link">
+            <a href="source/NgMap.html#line157" class="name-link">
               <h4 class="name">
                 observeAndSet
                 <span class="signature">(attrName, object)</span>
@@ -441,7 +441,7 @@ <h5>Returns:</h5>
           </dd>
         </dl><dl>
           <dt>
-            <a href="source/NgMap.html#line203" class="name-link">
+            <a href="source/NgMap.html#line211" class="name-link">
               <h4 class="name">
                 setDefaultOptions
                 <span class="signature">(options)</span>
@@ -481,7 +481,7 @@ <h5>Parameters:</h5>
           </dd>
         </dl><dl>
           <dt>
-            <a href="source/NgMap.html#line178" class="name-link">
+            <a href="source/NgMap.html#line186" class="name-link">
               <h4 class="name">
                 setStyle
                 <span class="signature">(map)</span>

build/docs/index.html

@@ -175,18 +175,12 @@ <h1 class="title">
             <h1>GoogleMap AngularJS Directive</h1><!--
 [![Build Status](https://travis-ci.org/allenhwkim/angularjs-google-maps.png?branch=master)](https://travis-ci.org/allenhwkim/angularjs-google-maps)
 -->
+<p><a href="https://ngmap.github.io">Demo</a><br><a href="https://rawgithub.amrom.workers.dev/allenhwkim/angularjs-google-maps/master/build/docs/index.html">Documentation</a><br><a href="https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/street-view_road_trip.html">Road Trip By StreetView</a><br><a href="https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/custom-marker.html">Maps Can Talk</a> |
+<a href="https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/custom-marker-2.html">Custom Marker</a>  </p>
 <h2>IMPORTANT NOTICE</h2><ul>
-<li><code>$scope.map</code> is deprecated. Use <code>NgMap.getMap().then(function(map) {...})</code>
- instead to get a map instance.</li>
-<li><code>$scope.$on('mapInitialized', function(event, map) {..}</code> is deprecated.
- Use <code>NgMap.getMap().then(function(map) {...})</code> instead to get a map instance.</li>
-<li><code>$scope.showInfoWindow(id)</code> is deprecated. <code>map.showInfoWindow(id)</code> instead.
- You need to get map instance usng <code>NgMap.getMap().then()</code> in advance.</li>
-<li><code>map</code> tag is deprecated. Use <code>ng-map</code> tag instead</li>
+<li>Implementation for Angular2 version has been started at <a href="https://github.com/ng2-ui/ng2-map">https://github.com/ng2-ui/ng2-map</a></li>
 </ul>
-<p><a href="http://ngmap.github.io">Demo</a><br><a href="https://rawgithub.amrom.workers.dev/allenhwkim/angularjs-google-maps/master/build/docs/index.html">Documentation</a><br><a href="https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/street-view_road_trip.html">Road Trip By StreetView</a><br><a href="https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/custom-marker.html">Maps Can Talk</a> |
-<a href="https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/custom-marker-2.html">Custom Marker</a>  </p>
-<p>There is already <a href="https://github.com/nlaplante/angular-google-maps">one</a> for this. However, I found myself doing totally different approach than the existing one, such as;</p>
+<h2>Background</h2><p>There is already <a href="https://github.com/nlaplante/angular-google-maps">one</a> for this. However, I found myself doing totally different approach than the existing one, such as;</p>
 <ol>
 <li><p><strong>Everything in tag and attributes.</strong><br>Thus, basic users don't even have to know what Javascript is. </p>
 </li>

build/docs/js/prettify.js

@@ -649,7 +649,7 @@ var prettyPrint;
     * recognized.
     *
     * Shortcut is an optional string of characters, any of which, if the first
-    * character, guarantee that this pattern and only this pattern matches.
+    * character, gurantee that this pattern and only this pattern matches.
     *
     * @param {Array} shortcutStylePatterns patterns that always start with
     *   a known character.  Must have a shortcut string.
@@ -932,7 +932,7 @@ var prettyPrint;
       // preprocessor directives.
 
       // This definition of punctuation does not include # in the list of
-      // follow-on exclusions, so # will not be broken before if preceded
+      // follow-on exclusions, so # will not be broken before if preceeded
       // by a punctuation character.  We could try to exclude # after
       // [|&;<>] but that doesn't seem to cause many major problems.
       // If that does turn out to be a problem, we should change the below

build/docs/places-auto-complete.html

@@ -223,7 +223,7 @@ <h5>Attributes:</h5>
           <h5>Example</h5>
           <pre class="prettyprint"><code><span class="str">Example:
   &lt;script src="https://maps.googleapis.com/maps/api/js?libraries=places">&lt;/script>
-  &lt;input places-auto-complete types="['geocode']" on-place-changed="myCallback(place)" /></span></code></pre>
+  &lt;input places-auto-complete types="['geocode']" on-place-changed="myCallback(place)" component-restrictions="{country:'au'}"/></span></code></pre>
         </div>
       </dd>
     </div>

build/docs/source/NgMap.html

@@ -302,6 +302,14 @@ <h1 class="title">
           deferred.reject(error);
         }
       );
+      // var geocoder = new google.maps.Geocoder();
+      // geocoder.geocode(options, function (results, status) {
+      //   if (status == google.maps.GeocoderStatus.OK) {
+      //     deferred.resolve(results);
+      //   } else {
+      //     deferred.reject(status);
+      //   }
+      // });
     }
     return deferred.promise;
   };

build/docs/source/info-window.html

@@ -222,7 +222,7 @@ <h1 class="title">
 /* global google */
 (function() {
   'use strict';
-  var infoWindow = function(Attr2MapOptions, $compile, $timeout, $parse, NgMap)  {
+  var infoWindow = function(Attr2MapOptions, $compile, $q, $templateRequest, $timeout, $parse, NgMap)  {
     var parser = Attr2MapOptions;
     var getInfoWindow = function(options, events, element) {
       var infoWindow;
@@ -242,30 +242,45 @@ <h1 class="title">
         }
       }
       /**
-       * set template ane template-relate functions
+       * set template and template-related functions
        * it must have a container element with ng-non-bindable
        */
-      var template = element.html().trim();
-      if (angular.element(template).length != 1) {
-        throw "info-window working as a template must have a container";
-      }
-      infoWindow.__template = template.replace(/\s?ng-non-bindable[='"]+/,"");
+      var templatePromise = $q(function(resolve) {
+        if (angular.isString(element)) {
+          $templateRequest(element).then(function (requestedTemplate) {
+            resolve(angular.element(requestedTemplate).wrap('&lt;div>').parent());
+          }, function(message) {
+            throw "info-window template request failed: " + message;
+          });
+        }
+        else {
+          resolve(element);
+        }
+      }).then(function(resolvedTemplate) {
+        var template = resolvedTemplate.html().trim();
+        if (angular.element(template).length != 1) {
+          throw "info-window working as a template must have a container";
+        }
+        infoWindow.__template = template.replace(/\s?ng-non-bindable[='"]+/,"");
+      });
       infoWindow.__open = function(map, scope, anchor) {
-        $timeout(function() {
-          anchor && (scope.anchor = anchor);
-          var el = $compile(infoWindow.__template)(scope);
-          infoWindow.setContent(el[0]);
-          scope.$apply();
-          if (anchor && anchor.getPosition) {
-            infoWindow.open(map, anchor);
-          } else if (anchor && anchor instanceof google.maps.LatLng) {
-            infoWindow.open(map);
-            infoWindow.setPosition(anchor);
-          } else {
-            infoWindow.open(map);
-          }
-          var infoWindowContainerEl = infoWindow.content.parentElement.parentElement.parentElement;
-          infoWindowContainerEl.className = "ng-map-info-window";
+        templatePromise.then(function() {
+          $timeout(function() {
+            anchor && (scope.anchor = anchor);
+            var el = $compile(infoWindow.__template)(scope);
+            infoWindow.setContent(el[0]);
+            scope.$apply();
+            if (anchor && anchor.getPosition) {
+              infoWindow.open(map, anchor);
+            } else if (anchor && anchor instanceof google.maps.LatLng) {
+              infoWindow.open(map);
+              infoWindow.setPosition(anchor);
+            } else {
+              infoWindow.open(map);
+            }
+            var infoWindowContainerEl = infoWindow.content.parentElement.parentElement.parentElement;
+            infoWindowContainerEl.className = "ng-map-info-window";
+          });
         });
       };
       return infoWindow;
@@ -277,11 +292,11 @@ <h1 class="title">
       var filtered = parser.filter(attrs);
       var options = parser.getOptions(filtered, {scope: scope});
       var events = parser.getEvents(scope, filtered);
+      var infoWindow = getInfoWindow(options, events, options.template || element);
       var address;
       if (options.position && !(options.position instanceof google.maps.LatLng)) {
         address = options.position;
       }
-      var infoWindow = getInfoWindow(options, events, element);
       if (address) {
         NgMap.getGeoLocation(address).then(function(latlng) {
           infoWindow.setPosition(latlng);
@@ -292,7 +307,7 @@ <h1 class="title">
       }
       mapController.addObject('infoWindows', infoWindow);
       mapController.observeAttrSetObj(orgAttrs, attrs, infoWindow);
-      mapController.showInfoWindow = 
+      mapController.showInfoWindow =
       mapController.map.showInfoWindow = mapController.showInfoWindow ||
         function(p1, p2, p3) { //event, id, marker
           var id = typeof p1 == 'string' ? p1 : p2;
@@ -332,7 +347,8 @@ <h1 class="title">
       //TODO DEPRECATED
       scope.showInfoWindow = mapController.map.showInfoWindow;
       scope.hideInfoWindow = mapController.map.hideInfoWindow;
-      NgMap.getMap().then(function(map) {
+      var map = infoWindow.mapId ? {id:infoWindow.mapId} : 0;
+      NgMap.getMap(map).then(function(map) {
         infoWindow.visible && infoWindow.__open(map, scope);
         if (infoWindow.visibleOnMarker) {
           var markerId = infoWindow.visibleOnMarker;
@@ -347,7 +363,7 @@ <h1 class="title">
     };
   }; // infoWindow
   infoWindow.$inject =
-    ['Attr2MapOptions', '$compile', '$timeout', '$parse', 'NgMap'];
+    ['Attr2MapOptions', '$compile', '$q', '$templateRequest', '$timeout', '$parse', 'NgMap'];
   angular.module('ngMap').directive('infoWindow', infoWindow);
 })();
 </code></pre>

build/docs/source/map-lazy-load.html

@@ -209,17 +209,24 @@ <h1 class="title">
 /* global window, document */
 (function() {
   'use strict';
-  var $timeout, $compile, src, savedHtml;
+  var $timeout, $compile, src, savedHtml = [], elements = [];
   var preLinkFunc = function(scope, element, attrs) {
     var mapsUrl = attrs.mapLazyLoadParams || attrs.mapLazyLoad;
-    window.lazyLoadCallback = function() {
-      console.log('Google maps script loaded:', mapsUrl);
-      $timeout(function() { /* give some time to load */
-        element.html(savedHtml);
-        $compile(element.contents())(scope);
-      }, 100);
-    };
     if(window.google === undefined || window.google.maps === undefined) {
+      elements.push({
+        scope: scope,
+        element: element,
+        savedHtml: savedHtml[elements.length],
+      });
+      window.lazyLoadCallback = function() {
+        console.log('Google maps script loaded:', mapsUrl);
+        $timeout(function() { /* give some time to load */
+          elements.forEach(function(elm) {
+              elm.element.html(elm.savedHtml);
+              $compile(elm.element.contents())(elm.scope);
+          });
+        }, 100);
+      };
       var scriptEl = document.createElement('script');
       console.log('Prelinking script loaded,' + src);
       scriptEl.src = mapsUrl +
@@ -235,7 +242,7 @@ <h1 class="title">
   };
   var compileFunc = function(tElement, tAttrs) {
     (!tAttrs.mapLazyLoad) && console.error('requires src with map-lazy-load');
-    savedHtml = tElement.html();
+    savedHtml.push(tElement.html());
     src = tAttrs.mapLazyLoad;
     /**
      * if already loaded, stop processing it

build/docs/source/places-auto-complete.html

@@ -186,7 +186,7 @@ <h1 class="title">
  * @example
  * Example:
  *   &lt;script src="https://maps.googleapis.com/maps/api/js?libraries=places">&lt;/script>
- *   &lt;input places-auto-complete types="['geocode']" on-place-changed="myCallback(place)" />
+ *   &lt;input places-auto-complete types="['geocode']" on-place-changed="myCallback(place)" component-restrictions="{country:'au'}"/>
  */
 /* global google */
 (function() {
@@ -217,6 +217,11 @@ <h1 class="title">
           autocomplete.setTypes(optionValue);
         }
       });
+	  attrs.$observe('componentRestrictions', function (val) {
+		 if (val) {
+		   autocomplete.setComponentRestrictions(scope.$eval(val));
+		 }
+	   });
     };
     return {
       restrict: 'A',