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.

Sign up for GitHub

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

Schema 3.0.0 #11

Merged
merged 7 commits into from
Sep 23, 2023
Merged

Schema 3.0.0 #11

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79e5346
feat: Remove specific HSLayers WMS layer type and newly support WMTS
fzadrazil Aug 2, 2023
3f58a69
fix: Remove obsolete OpenLayers.Layer.Vector layer type
fzadrazil Aug 2, 2023
eaab339
fix: Remove duplicit WMS class name
fzadrazil Aug 28, 2023
8cb3b52
Remove unused urls layer property
fzadrazil Aug 28, 2023
6dca65d
Forbid encoded URLs in some keys
jirik Sep 4, 2023
eb417e9
Remove WFS className as it is always just format of Vector layer
fzadrazil Sep 15, 2023
0e21246
Remove platform specific format specifiers
fzadrazil Sep 15, 2023
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
28 changes: 9 additions & 19 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"definitions": {},
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/hslayers/map-compositions/2.2.0/schema.json",
"$id": "https://raw.githubusercontent.com/hslayers/map-compositions/3.0.0/schema.json",
"type": "object",
"title": "Schema of map compositions supported in Hslayers-ng",
"required": [
Expand Down Expand Up @@ -456,17 +456,16 @@
"description": "Big type of layer. Currently all raster layers are wms layers and Vector layers are subdivided by protocol property",
"default": "",
"enum": [
"HSLayers.Layer.WMS",
"OpenLayers.Layer.Vector",
"WMS",
fzadrazil marked this conversation as resolved.
Show resolved Hide resolved
"WFS",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"ClassName: WFS" is never used, I suggest to remove it also.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not used in HSLayers either. But wouldn't it be future-proof to keep the WFS classname as an allowed value?

"WMTS",
"Vector",
"XYZ",
"ArcGISRest",
"StaticImage"
],
"examples": [
"HSLayers.Layer.WMS"
"WMS"
],
"pattern": "^(.*)$"
},
Expand Down Expand Up @@ -521,7 +520,7 @@
"examples": [
[ "https%3A%2F%2Fgeoportal.kraj-lbc.cz%2Fcgi-bin%2Fmapserv%3Fmap%3D%2Fdata%2Fgis%2FMapServer%2Fprojects%2Fwms%2Fatlas%2Fpuda.map%26version%3D1.3.0%26service%3DWMS%26request%3DGetLegendGraphic%26sld_version%3D1.1.0%26layer%3Dtridyochrany%26format%3Dimage%2Fpng%26STYLE%3Ddefault" ]
],
"pattern": "^(.*)$"
"pattern": "^https?:\\/\\/.*$"
}
},
"protocol": {
Expand All @@ -545,7 +544,8 @@
"url": {
"$id": "#/properties/layers/items/properties/protocol/properties/url",
"type": "string",
"title": "URL to load geojson, kml and other data from"
"title": "URL to load geojson, kml and other data from",
"pattern": "^https?:\\/\\/.*$"
}
}
},
Expand Down Expand Up @@ -605,23 +605,13 @@
"url": {
"$id": "#/properties/layers/items/properties/url",
"type": "string",
"title": "URL of WMS service",
"description": "WMS service URL. Vector layers which are loaded from file, see #/properties/layers/items/properties/protocol/properties/url property",
"title": "URL of map service",
"description": "Map service URL. Vector layers which are loaded from file, see #/properties/layers/items/properties/protocol/properties/url property",
"default": "",
"examples": [
"https%3A%2F%2Fgeoportal.kraj-lbc.cz%2Fcgi-bin%2Fmapserv%3Fmap%3D%2Fdata%2Fgis%2FMapServer%2Fprojects%2Fwms%2Fatlas%2Fpuda.map%26"
],
"pattern": "^(.*)$"
},
"urls": {
"$id": "#/properties/layers/items/properties/urls",
"type": "array",
"title": "Urls array of ArcGISRest service",
"description": "Urls array of ArcGISRest service.",
"default": "",
"examples": [
[ "https://example.com/arcgis/rest/services/map_pub/MapServer" ]
]
"pattern": "^https?:\\/\\/.*$"
},
"params": {
"$id": "#/properties/layers/items/properties/params",
Expand Down