Skip to content
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

Filtered: Add support for map providers; re-enable `filtered` by default #272

Merged
merged 3 commits into from Jul 23, 2017

Conversation

Projects
None yet
2 participants
@s7eph4n
Copy link
Contributor

commented Jul 19, 2017

This PR includes:

  • Update of RELEASE-NOTES.md
  • Tests (unit/integration)
  • CI build passed

@s7eph4n s7eph4n changed the title Filtered: Add support for map providers; re-enable `filtered` by default [WIP] Filtered: Add support for map providers; re-enable `filtered` by default Jul 19, 2017

@JeroenDeDauw

This comment has been minimized.

Copy link
Member

commented Jul 19, 2017

s7eph4n added a commit to s7eph4n/SemanticMediaWiki that referenced this pull request Jul 20, 2017

Allow adding globals in TestEnvironment; allow extending permitted se…
…ttings in JsonScripts

In sum this patch will allow to define additional allowed globals for JsonScript tests in sub-classes of JsonTestCaseScriptRunnerTest.
It will also allow adding globals that are not already defined in the TestEnvironment.

Use case: SRF's "filtered" format will support $srfgMapProvider, that is unset by default. See SemanticMediaWiki/SemanticResultFormats#272

* add getPermittedSettings() to JsonTestCaseScriptRunnerTest
* track new globals in a dedicated array in TestEnvironment and unset them on tearDown
* add delete($key) method to Options
@s7eph4n

This comment has been minimized.

Copy link
Contributor Author

commented Jul 20, 2017

I cheated: https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/272/files#diff-a481f0ef06aa5f346c4b43a56583136cR62 😃
This will make ext.srf.filtered.leaflet.js undebuggable, but SRF is probably not the place for that anyway.

s7eph4n added a commit to s7eph4n/SemanticMediaWiki that referenced this pull request Jul 22, 2017

Allow adding globals in TestEnvironment; allow extending permitted se…
…ttings in JsonScripts

In sum this patch will allow to define additional allowed globals for JsonScript tests in sub-classes of JsonTestCaseScriptRunnerTest.
It will also allow adding globals that are not already defined in the TestEnvironment.

Use case: SRF's "filtered" format will support $srfgMapProvider, that is unset by default. See SemanticMediaWiki/SemanticResultFormats#272

* add getPermittedSettings() to JsonTestCaseScriptRunnerTest
* allow undefined global settings in JsonTestCaseScriptRunnerTest::prepareTest
* track new globals in a dedicated array in TestEnvironment and unset them on tearDown
* add delete($key) method to Options

s7eph4n added a commit to s7eph4n/SemanticMediaWiki that referenced this pull request Jul 22, 2017

Allow adding globals in TestEnvironment; allow extending permitted se…
…ttings in JsonScripts

In sum this patch will allow to define additional allowed globals for JsonScript tests in sub-classes of JsonTestCaseScriptRunnerTest.
It will also allow adding globals that are not already defined in the TestEnvironment.

Use case: SRF's "filtered" format will support $srfgMapProvider, that is unset by default. See SemanticMediaWiki/SemanticResultFormats#272

* add getPermittedSettings() to JsonTestCaseScriptRunnerTest
* allow undefined global settings in JsonTestCaseScriptRunnerTest::prepareTest
* track new globals in a dedicated array in TestEnvironment and unset them on tearDown
* add delete($key) method to Options

s7eph4n added some commits Jul 19, 2017

Filtered: Add support for map providers; re-enable `filtered` by default
* Introduces global `$srfgMapProvider`. Use a value from http://leaflet-extras.github.io/leaflet-providers/preview/index.html, e.g. `OpenStreetMap.Mapnik`
* If `$srfgMapProvider` is not set, external map providers will not be queried, which allows to...
* Restore `filtered` format to be enabled by default

@s7eph4n s7eph4n force-pushed the s7eph4n:filtered branch from 1f63631 to 2a1d297 Jul 22, 2017

@s7eph4n s7eph4n changed the title [WIP] Filtered: Add support for map providers; re-enable `filtered` by default Filtered: Add support for map providers; re-enable `filtered` by default Jul 23, 2017

@s7eph4n s7eph4n merged commit eea7866 into SemanticMediaWiki:master Jul 23, 2017

2 checks passed

Scrutinizer 2 new issues, 5 updated code elements
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.