-
Notifications
You must be signed in to change notification settings - Fork 41
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
Arcgis rest layers support #371
Merged
Merged
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c4b59ee
Arcgis rest layers support
8fc6ee6
exclude app from git
f168f0f
conflict resolution
ef1559d
docstring update
fe0f3e7
argis rest layer documentation first draft
cda489a
arcgisrest docs final draft
78e62fd
arcgis layer verbose label
enricofer 1eac080
Fix docs for ArcGIS REST URL
chrismayer db07b41
Revert .gitignore
chrismayer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
import { Image as ImageLayer, Tile as TileLayer } from 'ol/layer'; | ||
import ImageWMS from 'ol/source/ImageWMS'; | ||
import TileWmsSource from 'ol/source/TileWMS'; | ||
import TileArcGISRest from 'ol/source/TileArcGISRest.js'; | ||
import OsmSource from 'ol/source/OSM'; | ||
import VectorTileLayer from 'ol/layer/VectorTile' | ||
import VectorTileSource from 'ol/source/VectorTile' | ||
|
@@ -63,6 +64,8 @@ export const LayerFactory = { | |
// create correct layer type | ||
if (lConf.type === 'TILEWMS') { | ||
return this.createTileWmsLayer(lConf); | ||
} else if (lConf.type === 'TILEARCGIS') { | ||
return this.createTileArcGISRestLayer(lConf); | ||
} else if (lConf.type === 'IMAGEWMS') { | ||
return this.createImageWmsLayer(lConf); | ||
} else if (lConf.type === 'WFS') { | ||
|
@@ -165,6 +168,31 @@ export const LayerFactory = { | |
return layer; | ||
}, | ||
|
||
/** | ||
* Returns an OpenLayers Tiled WMS layer instance due to given config. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wrong API docs, maybe copy/paste? |
||
* | ||
* @param {Object} lConf Layer config object | ||
* @return {ol.layer.Tile} OL Tiled WMS layer instance | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wrong API docs, maybe copy/paste? |
||
*/ | ||
createTileArcGISRestLayer (lConf) { | ||
// apply additional HTTP params | ||
const params = { LAYERS: lConf.layers }; | ||
ObjectUtil.mergeDeep(params, lConf.params); | ||
|
||
const layer = new TileLayer({ | ||
...this.getCommonLayerOptions(lConf), | ||
source: new TileArcGISRest({ | ||
url: lConf.url, | ||
params, | ||
projection: lConf.projection, | ||
crossOrigin: lConf.crossOrigin, | ||
tileGrid: lConf.tileGrid | ||
}) | ||
}); | ||
|
||
return layer; | ||
}, | ||
|
||
/** | ||
* Returns an OpenLayers WFS layer instance due to given config. | ||
* | ||
|
@@ -199,7 +227,8 @@ export const LayerFactory = { | |
format: new this.formatMapping[lConf.format](lConf.formatConfig), | ||
loader: (extent) => { | ||
// assemble WFS GetFeature request | ||
let wfsRequest = lConf.url + '?service=WFS&' + | ||
const pre = lConf.url.includes('?') ? '&' : '?' | ||
let wfsRequest = lConf.url + pre + 'service=WFS&' + | ||
'version=' + lConf.version + '&request=GetFeature&' + | ||
'typename=' + lConf.typeName + '&' + | ||
'outputFormat=' + outputFormat + '&srsname=' + lConf.projection; | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please provide an English text / layer name here?