Skip to content

Comments

[backport] PR #7724 to 4.x - Elastic Tile Service and configurable leaflet providers#7779

Merged
epixa merged 1 commit into4.xfrom
jasper/backport/7724/4.x
Jul 21, 2016
Merged

[backport] PR #7724 to 4.x - Elastic Tile Service and configurable leaflet providers#7779
epixa merged 1 commit into4.xfrom
jasper/backport/7724/4.x

Conversation

@elastic-jasper
Copy link
Contributor

Backport PR #7724

Commit 1:
[viz] Allow for configurable map urls

Commit 2:
Adds every config option from Leaflet

Commit 3:
Removed confusing config options

Commit 4:
[vis] Don't rewrite markdown

Commit 5:
[config] Update default tile link

Commit 6:
Change bounds from object to GeoJSON (long, lat) array style

Commit 7:
[config] Set max zoom to 7

Commit 8:
[tests] Cleanup schema data

Commit 9:
[vis] Bound tilemap zoom

Commit 10:
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

Commit 11:
Made minZoom in test fixture consistent with reality

Commit 12:
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

Commit 13:
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

Commit 14:
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

Commit 15:
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

@elastic-jasper elastic-jasper added backport This PR is a backport of another PR has conflicts labels Jul 20, 2016
@epixa epixa force-pushed the jasper/backport/7724/4.x branch from e1a351b to 15744c9 Compare July 20, 2016 20:56
@epixa epixa changed the title [backport] PR #7724 to 4.x [backport] PR #7724 to 4.x - Elastic Tile Service and configurable leaflet providers Jul 20, 2016
@epixa epixa force-pushed the jasper/backport/7724/4.x branch 2 times, most recently from fb3e582 to 28fe71a Compare July 21, 2016 02:16
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z
@epixa epixa force-pushed the jasper/backport/7724/4.x branch from 28fe71a to 82177c0 Compare July 21, 2016 02:46
@epixa epixa merged commit ad36332 into 4.x Jul 21, 2016
@epixa epixa deleted the jasper/backport/7724/4.x branch July 21, 2016 13:03
elastic-jasper added a commit that referenced this pull request Jul 21, 2016
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z

-------------------------------
**Backported based on diff from PR #7779**
elastic-jasper added a commit that referenced this pull request Jul 21, 2016
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z

-------------------------------
**Backported based on diff from PR #7779**
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants