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

Arcgis rest layers support #371

Merged
merged 9 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app-starter/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
"terrestris-osm-wms" : {
"name": "OSM WMS",
"attributions": "<a href='https://www.openstreetmap.org/copyright' target='_blank'>© OpenStreetMap-contributors</a>"
},
"test_arcgisrest" : {
"name": "unità urbane",
Copy link
Collaborator

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?

"attributions": "<a href='https://www.padovanet.it' target='_blank'>© Comune di Padova</a>"
}
},

Expand Down
21 changes: 21 additions & 0 deletions app-starter/static/app-conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,27 @@
"opacityControl": true,
"crossOrigin": "anonymous"
},

{
"type": "TILEARCGIS",
"lid": "test_arcgisrest",
"format": "image/jpeg",
"url": "https://cartografia.comune.padova.it/server/rest/services/topo/MapServer",
"params": {
"LAYERS":"show:3,16",
"TRANSPARENT": true
},
"transparent": true,
"projection": "EPSG:3003",
"attribution": "Comune di padova",
"isBaseLayer": false,
"visible": false,
"displayInLayerList": true,
"legend": false,
"opacityControl": true,
"crossOrigin": "anonymous"
},

{
"type": "IMAGEWMS",
"lid": "ahocevar-imagewms",
Expand Down
31 changes: 30 additions & 1 deletion src/factory/Layer.js
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'
Expand Down Expand Up @@ -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') {
Expand Down Expand Up @@ -165,6 +168,31 @@ export const LayerFactory = {
return layer;
},

/**
* Returns an OpenLayers Tiled WMS layer instance due to given config.
Copy link
Collaborator

Choose a reason for hiding this comment

The 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
Copy link
Collaborator

Choose a reason for hiding this comment

The 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.
*
Expand Down Expand Up @@ -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;
Expand Down
Loading