|
244 | 244 | var mapConfig = Object.assign({}, {
|
245 | 245 | mapTypeId: this.props.mapTypeId || mapTypeIds[mapTypeFromProps],
|
246 | 246 | center: center,
|
247 |
| - backgroundColor: this.props.backgroundColor, |
| 247 | + zoom: this.props.zoom, |
| 248 | + maxZoom: this.props.maxZoom, |
| 249 | + minZoom: this.props.minZoom, |
248 | 250 | clickableIcons: !!this.props.clickableIcons,
|
249 | 251 | disableDefaultUI: this.props.disableDefaultUI,
|
250 |
| - disableDoubleClickZoom: this.props.disableDoubleClickZoom, |
251 |
| - draggable: this.props.draggable, |
252 |
| - draggableCursor: this.props.draggableCursor, |
253 |
| - draggingCursor: this.props.draggingCursor, |
254 |
| - fullscreenControl: this.props.fullscreenControl, |
255 |
| - fullscreenControlOptions: this.props.fullscreenControlOptions, |
256 |
| - gestureHandling: this.props.gestureHandling, |
257 |
| - heading: this.props.heading, |
258 |
| - keyboardShortcuts: this.props.keyboardShortcuts, |
| 252 | + zoomControl: this.props.zoomControl, |
| 253 | + zoomControlOptions: this.props.zoomControlOptions, |
259 | 254 | mapTypeControl: this.props.mapTypeControl,
|
260 | 255 | mapTypeControlOptions: this.props.mapTypeControlOptions,
|
261 |
| - maxZoom: this.props.maxZoom, |
262 |
| - minZoom: this.props.minZoom, |
263 |
| - noClear: this.props.noClear, |
264 |
| - overviewMapControl: this.props.overviewMapControl, |
265 |
| - overviewMapControlOptions: this.props.overviewMapControlOptions, |
266 |
| - panControl: this.props.panControl, |
267 |
| - panControlOptions: this.props.panControlOptions, |
268 |
| - rotateControl: this.props.rotateControl, |
269 |
| - rotateControlOptions: this.props.rotateControlOptions, |
270 | 256 | scaleControl: this.props.scaleControl,
|
271 | 257 | scaleControlOptions: this.props.scaleControlOptions,
|
272 |
| - scrollwheel: this.props.scrollwheel, |
273 |
| - signInControl: this.props.signInControl, |
274 | 258 | streetView: this.props.streetView,
|
275 | 259 | streetViewControl: this.props.streetViewControl,
|
276 | 260 | streetViewControlOptions: this.props.streetViewControlOptions,
|
| 261 | + panControl: this.props.panControl, |
| 262 | + panControlOptions: this.props.panControlOptions, |
| 263 | + rotateControl: this.props.rotateControl, |
| 264 | + rotateControlOptions: this.props.rotateControlOptions, |
| 265 | + fullscreenControl: this.props.fullscreenControl, |
| 266 | + fullscreenControlOptions: this.props.fullscreenControlOptions, |
| 267 | + scrollwheel: this.props.scrollwheel, |
| 268 | + draggable: this.props.draggable, |
| 269 | + draggableCursor: this.props.draggableCursor, |
| 270 | + draggingCursor: this.props.draggingCursor, |
| 271 | + keyboardShortcuts: this.props.keyboardShortcuts, |
| 272 | + disableDoubleClickZoom: this.props.disableDoubleClickZoom, |
| 273 | + noClear: this.props.noClear, |
277 | 274 | styles: this.props.styles,
|
278 |
| - tilt: this.props.tilt, |
279 |
| - zoom: this.props.zoom, |
280 |
| - zoomControl: this.props.zoomControl, |
281 |
| - zoomControlOptions: this.props.zoomControlOptions |
| 275 | + gestureHandling: this.props.gestureHandling, |
| 276 | + backgroundColor: this.props.backgroundColor, |
| 277 | + heading: this.props.heading, |
| 278 | + overviewMapControl: this.props.overviewMapControl, |
| 279 | + overviewMapControlOptions: this.props.overviewMapControlOptions, |
| 280 | + signInControl: this.props.signInControl, |
| 281 | + tilt: this.props.tilt |
282 | 282 | });
|
283 | 283 |
|
284 | 284 | Object.keys(mapConfig).forEach(function (key) {
|
|
393 | 393 |
|
394 | 394 | Map.propTypes = {
|
395 | 395 | google: _propTypes2.default.object,
|
| 396 | + zoom: _propTypes2.default.number, |
396 | 397 | centerAroundCurrentLocation: _propTypes2.default.bool,
|
| 398 | + center: _propTypes2.default.object, |
397 | 399 | initialCenter: _propTypes2.default.object,
|
398 | 400 | className: _propTypes2.default.string,
|
399 | 401 | style: _propTypes2.default.object,
|
400 | 402 | containerStyle: _propTypes2.default.object,
|
401 | 403 | visible: _propTypes2.default.bool,
|
402 | 404 | mapType: _propTypes2.default.string,
|
403 |
| - bounds: _propTypes2.default.object, |
404 |
| - backgroundColor: _propTypes2.default.string, |
405 |
| - center: _propTypes2.default.object, |
| 405 | + mapTypeId: _propTypes2.default.string, |
| 406 | + maxZoom: _propTypes2.default.number, |
| 407 | + minZoom: _propTypes2.default.number, |
406 | 408 | clickableIcons: _propTypes2.default.bool,
|
407 | 409 | disableDefaultUI: _propTypes2.default.bool,
|
408 |
| - disableDoubleClickZoom: _propTypes2.default.bool, |
409 |
| - draggable: _propTypes2.default.bool, |
410 |
| - draggableCursor: _propTypes2.default.string, |
411 |
| - draggingCursor: _propTypes2.default.string, |
412 |
| - fullscreenControl: _propTypes2.default.bool, |
413 |
| - fullscreenControlOptions: _propTypes2.default.object, |
414 |
| - gestureHandling: _propTypes2.default.string, |
415 |
| - heading: _propTypes2.default.number, |
416 |
| - keyboardShortcuts: _propTypes2.default.bool, |
| 410 | + zoomControl: _propTypes2.default.bool, |
| 411 | + zoomControlOptions: _propTypes2.default.object, |
417 | 412 | mapTypeControl: _propTypes2.default.bool,
|
418 | 413 | mapTypeControlOptions: _propTypes2.default.object,
|
419 |
| - mapTypeId: _propTypes2.default.string, |
420 |
| - maxZoom: _propTypes2.default.number, |
421 |
| - minZoom: _propTypes2.default.number, |
422 |
| - noClear: _propTypes2.default.bool, |
423 |
| - overviewMapControl: _propTypes2.default.bool, |
424 |
| - overviewMapControlOptions: _propTypes2.default.object, |
425 |
| - panControl: _propTypes2.default.bool, |
426 |
| - panControlOptions: _propTypes2.default.object, |
427 |
| - rotateControl: _propTypes2.default.bool, |
428 |
| - rotateControlOptions: _propTypes2.default.object, |
429 | 414 | scaleControl: _propTypes2.default.bool,
|
430 | 415 | scaleControlOptions: _propTypes2.default.object,
|
431 |
| - scrollwheel: _propTypes2.default.bool, |
432 |
| - signInControl: _propTypes2.default.bool, |
433 | 416 | streetView: _propTypes2.default.object,
|
434 | 417 | streetViewControl: _propTypes2.default.bool,
|
435 | 418 | streetViewControlOptions: _propTypes2.default.object,
|
| 419 | + panControl: _propTypes2.default.bool, |
| 420 | + panControlOptions: _propTypes2.default.object, |
| 421 | + rotateControl: _propTypes2.default.bool, |
| 422 | + rotateControlOptions: _propTypes2.default.object, |
| 423 | + fullscreenControl: _propTypes2.default.bool, |
| 424 | + fullscreenControlOptions: _propTypes2.default.object, |
| 425 | + scrollwheel: _propTypes2.default.bool, |
| 426 | + draggable: _propTypes2.default.bool, |
| 427 | + draggableCursor: _propTypes2.default.string, |
| 428 | + draggingCursor: _propTypes2.default.string, |
| 429 | + keyboardShortcuts: _propTypes2.default.bool, |
| 430 | + disableDoubleClickZoom: _propTypes2.default.bool, |
| 431 | + noClear: _propTypes2.default.bool, |
436 | 432 | styles: _propTypes2.default.array,
|
437 |
| - tilt: _propTypes2.default.number, |
438 |
| - zoom: _propTypes2.default.number, |
439 |
| - zoomControl: _propTypes2.default.bool, |
440 |
| - zoomControlOptions: _propTypes2.default.object |
| 433 | + gestureHandling: _propTypes2.default.string, |
| 434 | + bounds: _propTypes2.default.object, |
| 435 | + backgroundColor: _propTypes2.default.string, |
| 436 | + heading: _propTypes2.default.number, |
| 437 | + overviewMapControl: _propTypes2.default.bool, |
| 438 | + overviewMapControlOptions: _propTypes2.default.object, |
| 439 | + signInControl: _propTypes2.default.bool, |
| 440 | + tilt: _propTypes2.default.number |
441 | 441 | };
|
442 | 442 |
|
443 | 443 | evtNames.forEach(function (e) {
|
|
0 commit comments