From ef1723e1c97687d9f5da81554a4da51c4f37b657 Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 22 Jul 2016 21:06:04 +0300 Subject: [PATCH 1/4] #add newBounds to fitBounds utils --- src/utils/utils.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/utils/utils.js b/src/utils/utils.js index b4c06846..bac973e5 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -91,9 +91,27 @@ const exports = { y: 0.5 * (nwWorld.y + seWorld.y), }; + const scale = Math.pow(2, zoom); + const halfW = width / scale / GOOGLE_TILE_SIZE / 2; + const halfH = height / scale / GOOGLE_TILE_SIZE / 2; + + const newNW = world2LatLng({ + x: middle.x - halfW, + y: middle.y - halfH + }); + + const newSE = world2LatLng({ + x: middle.x + halfW, + y: middle.y + halfH + }); + return { center: world2LatLng(middle), zoom, + newBounds: { + nw: newNW, + se: newSE + } }; }, From e1623fef49dc7c59c36c5e8a38c7d9409d4b473f Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 22 Jul 2016 21:13:18 +0300 Subject: [PATCH 2/4] #fix by lint rules --- npm-debug.log | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/utils/utils.js | 8 ++++---- 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 npm-debug.log diff --git a/npm-debug.log b/npm-debug.log new file mode 100644 index 00000000..8d5a17cd --- /dev/null +++ b/npm-debug.log @@ -0,0 +1,45 @@ +0 info it worked if it ends with ok +1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'lint' ] +2 info using npm@3.9.6 +3 info using node@v4.4.4 +4 verbose run-script [ 'prelint', 'lint', 'postlint' ] +5 info lifecycle google-map-react@0.16.0~prelint: google-map-react@0.16.0 +6 silly lifecycle google-map-react@0.16.0~prelint: no script for prelint, continuing +7 info lifecycle google-map-react@0.16.0~lint: google-map-react@0.16.0 +8 verbose lifecycle google-map-react@0.16.0~lint: unsafe-perm in lifecycle true +9 verbose lifecycle google-map-react@0.16.0~lint: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/Users/kolombor/Desktop/google-map-react/node_modules/.bin:/usr/local/bin:/Users/kolombor/.rbenv/shims:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/kolombor/.cache/rebar3/bin +10 verbose lifecycle google-map-react@0.16.0~lint: CWD: /Users/kolombor/Desktop/google-map-react +11 silly lifecycle google-map-react@0.16.0~lint: Args: [ '-c', 'eslint src develop' ] +12 silly lifecycle google-map-react@0.16.0~lint: Returned: code: 1 signal: null +13 info lifecycle google-map-react@0.16.0~lint: Failed to exec lint script +14 verbose stack Error: google-map-react@0.16.0 lint: `eslint src develop` +14 verbose stack Exit status 1 +14 verbose stack at EventEmitter. (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:245:16) +14 verbose stack at emitTwo (events.js:87:13) +14 verbose stack at EventEmitter.emit (events.js:172:7) +14 verbose stack at ChildProcess. (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:24:14) +14 verbose stack at emitTwo (events.js:87:13) +14 verbose stack at ChildProcess.emit (events.js:172:7) +14 verbose stack at maybeClose (internal/child_process.js:827:16) +14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:211:5) +15 verbose pkgid google-map-react@0.16.0 +16 verbose cwd /Users/kolombor/Desktop/google-map-react +17 error Darwin 15.5.0 +18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "lint" +19 error node v4.4.4 +20 error npm v3.9.6 +21 error code ELIFECYCLE +22 error google-map-react@0.16.0 lint: `eslint src develop` +22 error Exit status 1 +23 error Failed at the google-map-react@0.16.0 lint script 'eslint src develop'. +23 error Make sure you have the latest version of node.js and npm installed. +23 error If you do, this is most likely a problem with the google-map-react package, +23 error not with npm itself. +23 error Tell the author that this fails on your system: +23 error eslint src develop +23 error You can get information on how to open an issue for this project with: +23 error npm bugs google-map-react +23 error Or if that isn't available, you can get their info via: +23 error npm owner ls google-map-react +23 error There is likely additional logging output above. +24 verbose exit [ 1, true ] diff --git a/src/utils/utils.js b/src/utils/utils.js index bac973e5..c8089712 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -97,12 +97,12 @@ const exports = { const newNW = world2LatLng({ x: middle.x - halfW, - y: middle.y - halfH + y: middle.y - halfH, }); const newSE = world2LatLng({ x: middle.x + halfW, - y: middle.y + halfH + y: middle.y + halfH, }); return { @@ -110,8 +110,8 @@ const exports = { zoom, newBounds: { nw: newNW, - se: newSE - } + se: newSE, + }, }; }, From f1e0c8fb91d56f01fa69a717e12f9440e3fdf78a Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 23 Jul 2016 00:44:10 +0300 Subject: [PATCH 3/4] remove npm debug.log --- npm-debug.log | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 npm-debug.log diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index 8d5a17cd..00000000 --- a/npm-debug.log +++ /dev/null @@ -1,45 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'lint' ] -2 info using npm@3.9.6 -3 info using node@v4.4.4 -4 verbose run-script [ 'prelint', 'lint', 'postlint' ] -5 info lifecycle google-map-react@0.16.0~prelint: google-map-react@0.16.0 -6 silly lifecycle google-map-react@0.16.0~prelint: no script for prelint, continuing -7 info lifecycle google-map-react@0.16.0~lint: google-map-react@0.16.0 -8 verbose lifecycle google-map-react@0.16.0~lint: unsafe-perm in lifecycle true -9 verbose lifecycle google-map-react@0.16.0~lint: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/Users/kolombor/Desktop/google-map-react/node_modules/.bin:/usr/local/bin:/Users/kolombor/.rbenv/shims:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/kolombor/.cache/rebar3/bin -10 verbose lifecycle google-map-react@0.16.0~lint: CWD: /Users/kolombor/Desktop/google-map-react -11 silly lifecycle google-map-react@0.16.0~lint: Args: [ '-c', 'eslint src develop' ] -12 silly lifecycle google-map-react@0.16.0~lint: Returned: code: 1 signal: null -13 info lifecycle google-map-react@0.16.0~lint: Failed to exec lint script -14 verbose stack Error: google-map-react@0.16.0 lint: `eslint src develop` -14 verbose stack Exit status 1 -14 verbose stack at EventEmitter. (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:245:16) -14 verbose stack at emitTwo (events.js:87:13) -14 verbose stack at EventEmitter.emit (events.js:172:7) -14 verbose stack at ChildProcess. (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:24:14) -14 verbose stack at emitTwo (events.js:87:13) -14 verbose stack at ChildProcess.emit (events.js:172:7) -14 verbose stack at maybeClose (internal/child_process.js:827:16) -14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:211:5) -15 verbose pkgid google-map-react@0.16.0 -16 verbose cwd /Users/kolombor/Desktop/google-map-react -17 error Darwin 15.5.0 -18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "lint" -19 error node v4.4.4 -20 error npm v3.9.6 -21 error code ELIFECYCLE -22 error google-map-react@0.16.0 lint: `eslint src develop` -22 error Exit status 1 -23 error Failed at the google-map-react@0.16.0 lint script 'eslint src develop'. -23 error Make sure you have the latest version of node.js and npm installed. -23 error If you do, this is most likely a problem with the google-map-react package, -23 error not with npm itself. -23 error Tell the author that this fails on your system: -23 error eslint src develop -23 error You can get information on how to open an issue for this project with: -23 error npm bugs google-map-react -23 error Or if that isn't available, you can get their info via: -23 error npm owner ls google-map-react -23 error There is likely additional logging output above. -24 verbose exit [ 1, true ] From 5656c484ae26d37312b0cab724fa1b20f92c97e3 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 23 Jul 2016 00:56:15 +0300 Subject: [PATCH 4/4] #fix eslint by disable lines --- develop/tests/playground.spec.js | 2 +- src/google_map_markers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/develop/tests/playground.spec.js b/develop/tests/playground.spec.js index fcb3aec0..1126d814 100644 --- a/develop/tests/playground.spec.js +++ b/develop/tests/playground.spec.js @@ -10,7 +10,7 @@ describe('Playground', () => { const props$ = (new BehaviorSubject(1)) .distinctUntilChanged(comparator); - props$.subscribe(v => console.log(v)); + props$.subscribe(v => console.log(v)); // eslint-disable-line props$.next(1); props$.next(2); props$.next(1); diff --git a/src/google_map_markers.js b/src/google_map_markers.js index fdc6af25..6a55154a 100644 --- a/src/google_map_markers.js +++ b/src/google_map_markers.js @@ -170,7 +170,7 @@ export default class GoogleMapMarkers extends Component { } } - _onMouseChangeHandler_raf = () => { + _onMouseChangeHandler_raf = () => { // eslint-disable-line if (!this.dimesionsCache_) { return; }