Merge branch 'master' into master

Author: auser

README.md

@@ -200,7 +200,7 @@ To place a marker on the Map, include it as a child of the `<Map />` component.
       url: "/path/to/custom_icon.png",
       anchor: new google.maps.Point(32,32),
       scaledSize: new google.maps.Size(64,64)
-    }}
+    }} />
 </Map>
 ```
 

dist/GoogleApiComponent.js

@@ -83,7 +83,7 @@
         options = options || {};
         var apiKey = options.apiKey;
         var libraries = options.libraries || ['places'];
-        var version = options.version || '3.24';
+        var version = options.version || '3.28';
         var language = options.language || 'en';
 
         return (0, _ScriptCache.ScriptCache)({
@@ -154,4 +154,4 @@
     };
 
     exports.default = wrapper;
-});
+});

dist/components/Marker.js

@@ -138,6 +138,8 @@
             draggable = _props.draggable,
             title = _props.title,
             animation = _props.animation;
+            optimized = _props.optimized,
+            zIndex = _props.zIndex;
 
         if (!google) {
           return null;
@@ -156,6 +158,8 @@
           title: title,
           draggable: draggable,
           animation: animation
+          optimized: optimized,
+          zIndex: zIndex
         };
         this.marker = new google.maps.Marker(pref);
 

dist/index.js

@@ -231,7 +231,7 @@
             center: center,
             zoom: this.props.zoom,
             maxZoom: this.props.maxZoom,
-            minZoom: this.props.maxZoom,
+            minZoom: this.props.minZoom,
             clickableIcons: this.props.clickableIcons,
             disableDefaultUI: this.props.disableDefaultUI,
             zoomControl: this.props.zoomControl,

dist/lib/GoogleApi.js

@@ -39,7 +39,7 @@
         var googleVersion = opts.version || '3';
 
         var script = null;
-        var google = typeof window !== 'undefined' && window.google || null;
+        var google = window.google || null;
         var loading = false;
         var channel = null;
         var language = opts.language;

src/components/Polygon.js

@@ -1,4 +1,5 @@
-import React, { PropTypes as T } from 'react'
+import T from 'prop-types';
+import React from 'react';
 
 import { camelize } from '../lib/String'
 const evtNames = ['click', 'mouseout', 'mouseover'];

src/index.js

@@ -142,7 +142,7 @@ export class Map extends React.Component {
           center: center,
           zoom: this.props.zoom,
           maxZoom: this.props.maxZoom,
-          minZoom: this.props.maxZoom,
+          minZoom: this.props.minZoom,
           clickableIcons: this.props.clickableIcons,
           disableDefaultUI: this.props.disableDefaultUI,
           zoomControl: this.props.zoomControl,