Merge pull request #13054 from ahocevar/ogc-api-tilesets

Updates for newer version of the OGC API spec draft

src/ol/proj/epsg4326.js

@@ -63,7 +63,7 @@ export const PROJECTIONS = [
   new EPSG4326Projection('EPSG:4326', 'neu'),
   new EPSG4326Projection('urn:ogc:def:crs:OGC:1.3:CRS84'),
   new EPSG4326Projection('urn:ogc:def:crs:OGC:2:84'),
-  new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84', 'neu'),
+  new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84'),
   new EPSG4326Projection('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'),
   new EPSG4326Projection('http://www.opengis.net/def/crs/EPSG/0/4326', 'neu'),
 ];

src/ol/source/ogcTileUtil.js

@@ -373,11 +373,18 @@ function parseTileSetMetadata(sourceInfo, tileSet) {
     );
   }
 
-  if (!tileSet.tileMatrixSetDefinition) {
+  const tileMatrixSetLink = tileSet.links.find(
-    throw new Error('Expected tileMatrixSetDefinition or tileMatrixSet');
+    (link) =>
+      link.rel === 'http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme'
+  );
+  if (!tileMatrixSetLink) {
+    throw new Error(
+      'Expected http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme link or tileMatrixSet'
+    );
   }
+  const tileMatrixSetDefinition = tileMatrixSetLink.href;
 
-  const url = resolveUrl(sourceInfo.url, tileSet.tileMatrixSetDefinition);
+  const url = resolveUrl(sourceInfo.url, tileMatrixSetDefinition);
   return getJSON(url).then(function (tileMatrixSet) {
     return parseTileMatrixSet(
       sourceInfo,

test/node/ol/source/data/ogcapi/collections/blueMarble/map/tiles/WebMercatorQuad.json

@@ -1,8 +1,8 @@
 {
    "title" : "blueMarble",
-   "dataType" : "map",
    "tileMatrixSetURI" : "http://www.opengis.net/def/tilematrixset/OGC/1.0/WebMercatorQuad",
-   "tileMatrixSetDefinition" : "https://maps.ecere.com/ogcapi/tileMatrixSets/WebMercatorQuad",
+   "crs" : "http://www.opengis.net/def/crs/EPSG/0/3857",
+   "dataType" : "map",
    "tileMatrixSetLimits" : [
       { "tileMatrix" : "0", "minTileRow" : 0, "maxTileRow" : 0, "minTileCol" : 0, "maxTileCol" : 0 },
       { "tileMatrix" : "1", "minTileRow" : 0, "maxTileRow" : 1, "minTileCol" : 0, "maxTileCol" : 1 },
@@ -15,15 +15,6 @@
       { "tileMatrix" : "8", "minTileRow" : 0, "maxTileRow" : 255, "minTileCol" : 0, "maxTileCol" : 255 },
       { "tileMatrix" : "9", "minTileRow" : 0, "maxTileRow" : 511, "minTileCol" : 0, "maxTileCol" : 511 }
    ],
-   "centerPoint" : {
-      "coordinates" : [
-         0,
-         0
-      ],
-      "tileMatrix" : "4",
-      "scaleDenominator" : 34942641.501794859767,
-      "cellSize" : 9783.9396205025605
-   },
    "links" : [
       {
          "rel" : "self",
@@ -49,6 +40,12 @@
          "title" : "The TileJSON representation of the WebMercatorQuad map tileset for blueMarble",
          "href" : "/ogcapi/collections/blueMarble/map/tiles/WebMercatorQuad?f=tilejson"
       },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme",
+         "type" : "application/json",
+         "title" : "WebMercatorQuadTileMatrixSet definition (as JSON)",
+         "href" : "/ogcapi/tileMatrixSets/WebMercatorQuad"
+      },
       {
          "rel" : "http://www.opengis.net/def/rel/ogc/1.0/geodata",
          "href" : "/ogcapi/collections/blueMarble"
@@ -81,5 +78,11 @@
          "href" : "/ogcapi/collections/blueMarble/map/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.tif",
          "templated" : true
       }
-   ]
+   ],
+   "centerPoint" : {
+      "coordinates" : [ 0, 0 ],
+      "tileMatrix" : "4",
+      "scaleDenominator" : 34942641.501794859767,
+      "cellSize" : 9783.9396205025605
+   }
 }

test/node/ol/source/data/ogcapi/collections/ne_10m_admin_0_countries/tiles/WebMercatorQuad.json

@@ -1,8 +1,8 @@
 {
    "title" : "ne_10m_admin_0_countries",
-   "dataType" : "vector",
    "tileMatrixSetURI" : "http://www.opengis.net/def/tilematrixset/OGC/1.0/WebMercatorQuad",
-   "tileMatrixSetDefinition" : "https://maps.ecere.com/ogcapi/tileMatrixSets/WebMercatorQuad",
+   "crs" : "http://www.opengis.net/def/crs/EPSG/0/3857",
+   "dataType" : "vector",
    "tileMatrixSetLimits" : [
       { "tileMatrix" : "0", "minTileRow" : 0, "maxTileRow" : 0, "minTileCol" : 0, "maxTileCol" : 0 },
       { "tileMatrix" : "1", "minTileRow" : 0, "maxTileRow" : 1, "minTileCol" : 0, "maxTileCol" : 1 },
@@ -13,11 +13,82 @@
       { "tileMatrix" : "6", "minTileRow" : 0, "maxTileRow" : 63, "minTileCol" : 0, "maxTileCol" : 63 },
       { "tileMatrix" : "7", "minTileRow" : 0, "maxTileRow" : 127, "minTileCol" : 0, "maxTileCol" : 127 }
    ],
+   "links" : [
+      {
+         "rel" : "self",
+         "type" : "application/json",
+         "title" : "The JSON representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?f=json"
+      },
+      {
+         "rel" : "alternate",
+         "type" : "text/plain",
+         "title" : "The ECON representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?f=econ"
+      },
+      {
+         "rel" : "alternate",
+         "type" : "text/html",
+         "title" : "The HTML representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?=html"
+      },
+      {
+         "rel" : "alternate",
+         "type" : "application/json+tile",
+         "title" : "The TileJSON representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?f=tilejson"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme",
+         "type" : "application/json",
+         "title" : "WebMercatorQuadTileMatrixSet definition (as JSON)",
+         "href" : "/ogcapi/tileMatrixSets/WebMercatorQuad"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/geodata",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries"
+      },
+      {
+         "rel" : "item",
+         "type" : "application/vnd.gnosis-map-tile",
+         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as GNOSIS Map Tiles)",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.gmt",
+         "templated" : true
+      },
+      {
+         "rel" : "item",
+         "type" : "application/vnd.mapbox-vector-tile",
+         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as Mapbox Vector Tiles)",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.mvt",
+         "templated" : true
+      },
+      {
+         "rel" : "item",
+         "type" : "application/geo+json",
+         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as GeoJSON)",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.json",
+         "templated" : true
+      },
+      {
+         "rel" : "item",
+         "type" : "application/vnd.ogc.fg+json",
+         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as F&G GeoJSON)",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.fgjson",
+         "templated" : true
+      },
+      {
+         "rel" : "item",
+         "type" : "text/mapml",
+         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as MapML)",
+         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.mapml",
+         "templated" : true
+      }
+   ],
    "layers" : [
       {
          "id" : "ne_10m_admin_0_countries",
          "dataType" : "vector",
-         "geometryType" : "polygon",
+         "geometryDimension" : 2,
          "minScaleDenominator" : 4367830.1877243574709,
          "minCellSize" : 1222.9924525628201,
          "maxTileMatrix" : "7",
@@ -28,6 +99,71 @@
             }
          ],
          "propertiesSchema" : {
+            "type" : "object",
+            "properties" : { "geometry" : {
+               "oneOf" : [
+                  {
+                     "type" : "null"
+                  },
+                  {
+                     "title" : "GeoJSON MultiPolygon",
+                     "type" : "object",
+                     "required" : [
+                        "type",
+                        "coordinates"
+                     ],
+                     "properties" : { "coordinates" : {
+                        "type" : "array",
+                        "items" : {
+                           "type" : "array",
+                           "items" : {
+                              "type" : "array",
+                              "items" : {
+                                 "type" : "array",
+                                 "items" : {
+                                    "type" : "number"
+                                 },
+                                 "minItems" : 2
+                              },
+                              "minItems" : 3
+                           }
+                        }
+                     }, "type" : {
+                        "type" : "string",
+                        "Enum" : [
+                           "MultiPolygon"
+                        ]
+                     } }
+                  },
+                  {
+                     "title" : "GeoJSON Polygon",
+                     "type" : "object",
+                     "required" : [
+                        "type",
+                        "coordinates"
+                     ],
+                     "properties" : { "coordinates" : {
+                        "type" : "array",
+                        "items" : {
+                           "type" : "array",
+                           "items" : {
+                              "type" : "array",
+                              "items" : {
+                                 "type" : "number"
+                              },
+                              "minItems" : 2
+                           },
+                           "minItems" : 3
+                        }
+                     }, "type" : {
+                        "type" : "string",
+                        "Enum" : [
+                           "Polygon"
+                        ]
+                     } }
+                  }
+               ]
+            }, "properties" : {
                "type" : "object",
                "properties" : { "abbrev" : {
                   "type" : "string"
@@ -95,6 +231,8 @@
                   "type" : "integer"
                }, "long_len" : {
                   "type" : "integer"
+               }, "lyr.id" : {
+                  "type" : "string"
                }, "mapcolor13" : {
                   "type" : "integer"
                }, "mapcolor7" : {
@@ -123,6 +261,8 @@
                   "type" : "integer"
                }, "postal" : {
                   "type" : "string"
+               }, "rec.id" : {
+                  "type" : "integer"
                }, "region_un" : {
                   "type" : "string"
                }, "region_wb" : {
@@ -147,6 +287,8 @@
                   "type" : "string"
                }, "un_a3" : {
                   "type" : "string"
+               }, "viz.sd" : {
+                  "type" : "number"
                }, "wb_a2" : {
                   "type" : "string"
                }, "wb_a3" : {
@@ -156,74 +298,14 @@
                }, "woe_id" : {
                   "type" : "integer"
                } }
+            } }
          }
       }
    ],
    "centerPoint" : {
-      "coordinates" : [
+      "coordinates" : [ 0, 0.000102911832 ],
-         0,
-         0.000102911832
-      ],
       "tileMatrix" : "4",
       "scaleDenominator" : 34942641.501794859767,
       "cellSize" : 9783.9396205025605
-   },
-   "links" : [
-      {
-         "rel" : "self",
-         "type" : "application/json",
-         "title" : "The JSON representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?f=json"
-      },
-      {
-         "rel" : "alternate",
-         "type" : "text/plain",
-         "title" : "The ECON representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?f=econ"
-      },
-      {
-         "rel" : "alternate",
-         "type" : "text/html",
-         "title" : "The HTML representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?=html"
-      },
-      {
-         "rel" : "alternate",
-         "type" : "application/json+tile",
-         "title" : "The TileJSON representation of the WebMercatorQuad vector tileset for NaturalEarth:cultural:ne_10m_admin_0_countries",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad?f=tilejson"
-      },
-      {
-         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/geodata",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries"
-      },
-      {
-         "rel" : "item",
-         "type" : "application/vnd.gnosis-map-tile",
-         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as GNOSIS Map Tiles)",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.gmt",
-         "templated" : true
-      },
-      {
-         "rel" : "item",
-         "type" : "application/vnd.mapbox-vector-tile",
-         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as Mapbox Vector Tiles)",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.mvt",
-         "templated" : true
-      },
-      {
-         "rel" : "item",
-         "type" : "application/geo+json",
-         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as GeoJSON)",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.json",
-         "templated" : true
-      },
-      {
-         "rel" : "item",
-         "type" : "text/mapml",
-         "title" : "WebMercatorQuad vector tiles for NaturalEarth:cultural:ne_10m_admin_0_countries (as MapML)",
-         "href" : "/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{tileMatrix}/{tileRow}/{tileCol}.mapml",
-         "templated" : true
    }
-   ]
 }