{
- return {
- children: this.props.dispatcher.getChildren(),
- updateCounter: this.props.dispatcher.getUpdateCounter(),
- };
- }
+ _getState = () => ({
+ children: this.props.dispatcher.getChildren(),
+ updateCounter: this.props.dispatcher.getUpdateCounter(),
+ });
_onChangeHandler = () => {
if (!this.dimesionsCache_) {
@@ -126,7 +124,7 @@ export default class GoogleMapMarkers extends Component {
this.hoverChildProps_ = childProps;
this.hoverKey_ = hoverKey;
- this.setState({hoverKey: hoverKey});
+ this.setState({ hoverKey });
}
_onChildMouseLeave = () => {
@@ -144,7 +142,7 @@ export default class GoogleMapMarkers extends Component {
this.hoverKey_ = null;
this.hoverChildProps_ = null;
- this.setState({hoverKey: null});
+ this.setState({ hoverKey: null });
}
}
@@ -182,7 +180,7 @@ export default class GoogleMapMarkers extends Component {
distances.push(
{
key: childKey,
- dist: dist,
+ dist,
props: child.props,
});
}
@@ -250,7 +248,7 @@ export default class GoogleMapMarkers extends Component {
return (
{React.cloneElement(child, {
diff --git a/src/google_map_markers_prerender.js b/src/google_map_markers_prerender.js
index 930f673..8c4c360 100644
--- a/src/google_map_markers_prerender.js
+++ b/src/google_map_markers_prerender.js
@@ -1,4 +1,4 @@
-import React, {/* PropTypes, */ Component} from 'react';
+import React from 'react';
import GoogleMapMarkers from './google_map_markers.js';
const style = {
@@ -13,17 +13,10 @@ const style = {
// opacity: 0.3
};
-export default class GoogleMapMarkersPrerender extends Component {
- constructor(props) {
- super(props);
- }
-
-
- render() {
- return (
-
-
-
- );
- }
+export default function (props) {
+ return (
+
+
+
+ );
}
diff --git a/src/utils/detect.js b/src/utils/detect.js
index 07efe9e..ae09c26 100644
--- a/src/utils/detect.js
+++ b/src/utils/detect.js
@@ -22,7 +22,7 @@ export default function detectBrowser() {
isChrome = false;
}
- detectBrowserResult_ = {isExplorer, isFirefox, isOpera, isChrome, isSafari};
+ detectBrowserResult_ = { isExplorer, isFirefox, isOpera, isChrome, isSafari };
return detectBrowserResult_;
}
diff --git a/src/utils/geo.js b/src/utils/geo.js
index 2aea36d..a0c77b3 100644
--- a/src/utils/geo.js
+++ b/src/utils/geo.js
@@ -36,7 +36,7 @@ export default class Geo {
unproject(ptXY, viewFromLeftTop) {
let ptRes;
if (viewFromLeftTop) {
- const ptxy = {...ptXY};
+ const ptxy = { ...ptXY };
ptxy.x -= this.transform_.width / 2;
ptxy.y -= this.transform_.height / 2;
ptRes = this.transform_.pointLocation(Point.convert(ptxy));
@@ -75,7 +75,7 @@ export default class Geo {
}
getCenter() {
- const ptRes = this.transform_.pointLocation({x: 0, y: 0});
+ const ptRes = this.transform_.pointLocation({ x: 0, y: 0 });
return ptRes;
}
diff --git a/src/utils/lib_geo/lat_lng.js b/src/utils/lib_geo/lat_lng.js
index 8fb89c7..d519620 100644
--- a/src/utils/lib_geo/lat_lng.js
+++ b/src/utils/lib_geo/lat_lng.js
@@ -19,7 +19,7 @@ export default class LatLng {
constructor(lat, lng) {
if (isNaN(lat) || isNaN(lng)) {
- throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');
+ throw new Error(`Invalid LatLng object: (${lat}, ${lng})`);
}
this.lat = +lat;
this.lng = +lng;
diff --git a/src/utils/lib_geo/lat_lng_bounds.js b/src/utils/lib_geo/lat_lng_bounds.js
index 069c53c..fb9650f 100644
--- a/src/utils/lib_geo/lat_lng_bounds.js
+++ b/src/utils/lib_geo/lat_lng_bounds.js
@@ -39,7 +39,6 @@ export default class LatLngBounds {
if (!sw && !ne) {
this._sw = new LatLng(sw2.lat, sw2.lng);
this._ne = new LatLng(ne2.lat, ne2.lng);
-
} else {
sw.lat = Math.min(sw2.lat, sw.lat);
sw.lng = Math.min(sw2.lng, sw.lng);
diff --git a/src/utils/loaders/google_map_loader.js b/src/utils/loaders/google_map_loader.js
index 529891b..3dee0d1 100644
--- a/src/utils/loaders/google_map_loader.js
+++ b/src/utils/loaders/google_map_loader.js
@@ -13,7 +13,7 @@ const _customPromise = new Promise(resolve => {
// TODO add libraries language and other map options
export default function googleMapLoader(bootstrapURLKeys) {
if (!$script_) {
- $script_ = require('scriptjs');
+ $script_ = require('scriptjs'); // eslint-disable-line
}
// call from outside google-map-react
@@ -57,7 +57,7 @@ export default function googleMapLoader(bootstrapURLKeys) {
const queryString = reduce(
Object.keys(bootstrapURLKeys),
- (r, key) => r + `&${key}=${bootstrapURLKeys[key]}`,
+ (r, key) => `${r}&${key}=${bootstrapURLKeys[key]}`,
''
);
diff --git a/src/utils/pick.js b/src/utils/pick.js
index a2ae4dd..43f8906 100644
--- a/src/utils/pick.js
+++ b/src/utils/pick.js
@@ -3,7 +3,7 @@
export default function pick(obj, fn) {
return Object.keys(obj).reduce((result, key) => {
if (fn(obj[key])) {
- result[key] = obj[key];
+ result[key] = obj[key]; // eslint-disable-line
}
return result;
}, {});
diff --git a/src/utils/utils.js b/src/utils/utils.js
index b7efa95..5db754b 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,7 +1,7 @@
const GOOGLE_TILE_SIZE = 256;
import log2 from './math/log2';
-function latLng2World({lat, lng}) {
+function latLng2World({ lat, lng }) {
const sin = Math.sin(lat * Math.PI / 180);
const x = (lng / 360 + 0.5);
let y = (0.5 - 0.25 * Math.log((1 + sin) / (1 - sin)) / Math.PI);
@@ -11,10 +11,10 @@ function latLng2World({lat, lng}) {
: y > 1
? 1
: y;
- return {x, y};
+ return { x, y };
}
-function world2LatLng({x, y}) {
+function world2LatLng({ x, y }) {
const n = Math.PI - 2 * Math.PI * y;
// TODO test that this is faster
@@ -32,11 +32,11 @@ function latLng2MetersPerDegree({ lat }) {
1.175 * Math.cos(4 * phi) - 0.0023 * Math.cos(6 * phi);
const metersPerLngDegree = 111412.84 * Math.cos(phi) -
93.5 * Math.cos(3 * phi) + 0.118 * Math.cos(5 * phi);
- return {metersPerLatDegree, metersPerLngDegree};
+ return { metersPerLatDegree, metersPerLngDegree };
}
-function meters2LatLngBounds(meters, {lat, lng}) {
- const {metersPerLatDegree, metersPerLngDegree} = latLng2MetersPerDegree({ lat });
+function meters2LatLngBounds(meters, { lat, lng }) {
+ const { metersPerLatDegree, metersPerLngDegree } = latLng2MetersPerDegree({ lat });
const latDelta = 0.5 * meters / metersPerLatDegree;
const lngDelta = 0.5 * meters / metersPerLngDegree;
@@ -53,18 +53,18 @@ function meters2LatLngBounds(meters, {lat, lng}) {
};
}
-function meters2WorldSize(meters, {lat, lng}) {
- const {nw, se} = meters2LatLngBounds(meters, {lat, lng});
+function meters2WorldSize(meters, { lat, lng }) {
+ const { nw, se } = meters2LatLngBounds(meters, { lat, lng });
const nwWorld = latLng2World(nw);
const seWorld = latLng2World(se);
const w = Math.abs(seWorld.x - nwWorld.x);
const h = Math.abs(seWorld.y - nwWorld.y);
- return {w, h};
+ return { w, h };
}
export default {
- fitBounds({nw, se}, {width, height}) {
+ fitBounds({ nw, se }, { width, height }) {
const EPS = 0.000000001;
const nwWorld = latLng2World(nw);
const seWorld = latLng2World(se);
@@ -100,8 +100,8 @@ export default {
// -------------------------------------------------------------------
// Helpers to calc some markers size
- meters2ScreenPixels(meters, {lat, lng}, zoom) {
- const {w, h} = meters2WorldSize(meters, {lat, lng});
+ meters2ScreenPixels(meters, { lat, lng }, zoom) {
+ const { w, h } = meters2WorldSize(meters, { lat, lng });
const scale = Math.pow(2, zoom);
const wScreen = w * scale * GOOGLE_TILE_SIZE;
const hScreen = h * scale * GOOGLE_TILE_SIZE;
@@ -114,7 +114,7 @@ export default {
// --------------------------------------------------
// Helper functions for working with svg tiles, (examples coming soon)
- tile2LatLng({x, y}, zoom) {
+ tile2LatLng({ x, y }, zoom) {
const n = Math.PI - 2 * Math.PI * y / Math.pow(2, zoom);
return ({
@@ -123,8 +123,8 @@ export default {
});
},
- latLng2Tile({lat, lng}, zoom) {
- const worldCoords = latLng2World({lat, lng});
+ latLng2Tile({ lat, lng }, zoom) {
+ const worldCoords = latLng2World({ lat, lng });
const scale = Math.pow(2, zoom);
return {
@@ -133,7 +133,7 @@ export default {
};
},
- getTilesIds({from, to}, zoom) {
+ getTilesIds({ from, to }, zoom) {
const scale = Math.pow(2, zoom);
const ids = [];