New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regionprovider Region ID fetching optimisation #1202

Merged
merged 9 commits into from Jan 5, 2016

Conversation

Projects
None yet
3 participants
@stevage
Contributor

stevage commented Dec 22, 2015

This PR includes two separate optimisations:

  1. Maintaining an index of pre-computed codes for fast matching
  2. Allowing the use of server-side JSON instead of fetching IDs from WFS. The WFS method is still available as a fallback.

stevage added a commit to TerriaJS/nationalmap that referenced this pull request Dec 22, 2015

loadText('test/csv/mini_ced.xml').then(function(xml) {
ced.loadRegionsFromXML(xml);
expect(ced.regions.length).toEqual(6);
ced.loadRegionIDs().then(function(json) {

This comment has been minimized.

@RacingTadpole

RacingTadpole Dec 23, 2015

Member

This isn't really a comment on your commit, but on the existing code - can you set it up so the unit tests didn't go off to a server at all, eg. using a spy? (eg. see ArcGisMapServerCatalogItemSpec)

@RacingTadpole

RacingTadpole Dec 23, 2015

Member

This isn't really a comment on your commit, but on the existing code - can you set it up so the unit tests didn't go off to a server at all, eg. using a spy? (eg. see ArcGisMapServerCatalogItemSpec)

This comment has been minimized.

@RacingTadpole

RacingTadpole Dec 23, 2015

Member

btw @kring's doing some cool work on this right now using sinon.fakeServer.create(), to solve the problem of failing unit tests on IE9 (which cannot load data from the region mapping server without a proxy).

@RacingTadpole

RacingTadpole Dec 23, 2015

Member

btw @kring's doing some cool work on this right now using sinon.fakeServer.create(), to solve the problem of failing unit tests on IE9 (which cannot load data from the region mapping server without a proxy).

This comment has been minimized.

@stevage

stevage Dec 23, 2015

Contributor

Yeah, good idea.

@stevage

stevage Dec 23, 2015

Contributor

Yeah, good idea.

@RacingTadpole

This comment has been minimized.

Show comment
Hide comment
@RacingTadpole

RacingTadpole Dec 23, 2015

Member

OK, that's all I can think of! Over to you again :-)

Member

RacingTadpole commented Dec 23, 2015

OK, that's all I can think of! Over to you again :-)

@RacingTadpole

This comment has been minimized.

Show comment
Hide comment
@RacingTadpole

RacingTadpole Dec 23, 2015

Member

Looks good! Let me know when you're ready for me to take another look.

Member

RacingTadpole commented Dec 23, 2015

Looks good! Let me know when you're ready for me to take another look.

@stevage

This comment has been minimized.

Show comment
Hide comment
@stevage

stevage Dec 24, 2015

Contributor

Oh, yep, I'm ready - think I addressed everything.

Contributor

stevage commented Dec 24, 2015

Oh, yep, I'm ready - think I addressed everything.

kring added a commit that referenced this pull request Jan 5, 2016

Merge pull request #1202 from TerriaJS/regionprovider-fidList
Regionprovider Region ID fetching optimisation

@kring kring merged commit fa03cf3 into master Jan 5, 2016

2 of 3 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details

@kring kring deleted the regionprovider-fidList branch Jan 5, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment