@loaders.gl/wms 3.4.0-alpha.1 → 3.4.0-alpha.2

package/dist/es5/lib/{data-sources/image-services → services/arcgis}/arcgis-image-service.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ArcGISImageService = void 0;
+exports.ArcGISImageServer = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -15,25 +15,24 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _imageSource = require("../image-source");
-var _imageService = require("./image-service");
+var _imageSource = require("../../sources/image-source");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var ArcGISImageService = function (_ImageSource) {
-  (0, _inherits2.default)(ArcGISImageService, _ImageSource);
-  var _super = _createSuper(ArcGISImageService);
-  function ArcGISImageService(props) {
+var ArcGISImageServer = function (_ImageSource) {
+  (0, _inherits2.default)(ArcGISImageServer, _ImageSource);
+  var _super = _createSuper(ArcGISImageServer);
+  function ArcGISImageServer(props) {
     var _this;
-    (0, _classCallCheck2.default)(this, ArcGISImageService);
-    _this = _super.call(this);
+    (0, _classCallCheck2.default)(this, ArcGISImageServer);
+    _this = _super.call(this, props);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "props", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetch", void 0);
-    _this.props = (0, _imageService.mergeImageServiceProps)(props);
-    _this.fetch = (0, _imageService.getFetchFunction)(_this.props);
+    _this.props = props;
     return _this;
   }
 
-  (0, _createClass2.default)(ArcGISImageService, [{
+  (0, _createClass2.default)(ArcGISImageServer, [{
     key: "getMetadata",
     value: function () {
       var _getMetadata = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
@@ -42,7 +41,7 @@ var ArcGISImageService = function (_ImageSource) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return this.info();
+                return this.metadata();
               case 2:
                 return _context.abrupt("return", _context.sent);
               case 3:
@@ -79,9 +78,9 @@ var ArcGISImageService = function (_ImageSource) {
       return getImage;
     }()
   }, {
-    key: "info",
+    key: "metadata",
     value: function () {
-      var _info = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3() {
+      var _metadata = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3() {
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -94,10 +93,10 @@ var ArcGISImageService = function (_ImageSource) {
           }
         }, _callee3);
       }));
-      function info() {
-        return _info.apply(this, arguments);
+      function metadata() {
+        return _metadata.apply(this, arguments);
       }
-      return info;
+      return metadata;
     }()
   }, {
     key: "exportImage",
@@ -107,26 +106,34 @@ var ArcGISImageService = function (_ImageSource) {
     }
 
   }, {
-    key: "infoURL",
+    key: "metadataURL",
     value:
 
-    function infoURL(options) {
-      return this.props.url;
+    function metadataURL(options) {
+      return "".concat(this.props.url, "?f=pjson");
     }
 
   }, {
     key: "exportImageURL",
     value:
     function exportImageURL(options) {
-      return this.props.url;
+      var bbox = "bbox=".concat(options.bbox[0], ",").concat(options.bbox[1], ",").concat(options.bbox[2], ",").concat(options.bbox[3]);
+      var size = "size=".concat(options.width, ",").concat(options.height);
+      var arcgisOptions = _objectSpread(_objectSpread({}, options), {}, {
+        bbox: bbox,
+        size: size
+      });
+      delete arcgisOptions.width;
+      delete arcgisOptions.height;
+      return this.getUrl('exportImage', arcgisOptions);
     }
 
   }, {
     key: "getUrl",
     value:
 
-    function getUrl(options, extra) {
-      var url = "".concat(this.props.url);
+    function getUrl(path, options, extra) {
+      var url = "".concat(this.props.url, "/").concat(path);
       var first = true;
       for (var _i = 0, _Object$entries = Object.entries(options); _i < _Object$entries.length; _i++) {
         var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
@@ -169,11 +176,11 @@ var ArcGISImageService = function (_ImageSource) {
       return checkResponse;
     }()
   }]);
-  return ArcGISImageService;
+  return ArcGISImageServer;
 }(_imageSource.ImageSource);
-exports.ArcGISImageService = ArcGISImageService;
-(0, _defineProperty2.default)(ArcGISImageService, "type", 'arcgis-image-server');
-(0, _defineProperty2.default)(ArcGISImageService, "testURL", function (url) {
+exports.ArcGISImageServer = ArcGISImageServer;
+(0, _defineProperty2.default)(ArcGISImageServer, "type", 'arcgis-image-server');
+(0, _defineProperty2.default)(ArcGISImageServer, "testURL", function (url) {
   return url.toLowerCase().includes('ImageServer');
 });
 //# sourceMappingURL=arcgis-image-service.js.map

package/dist/es5/lib/services/arcgis/arcgis-image-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-image-service.js","names":["ArcGISImageServer","props","metadata","parameters","Error","options","url","bbox","size","width","height","arcgisOptions","getUrl","path","extra","first","Object","entries","key","value","Array","isArray","toUpperCase","join","String","response","ok","ImageSource","toLowerCase","includes"],"sources":["../../../../../src/lib/services/arcgis/arcgis-image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {ImageType} from '@loaders.gl/images';\nimport type {ImageSourceMetadata, GetImageParameters} from '../../sources/image-source';\nimport type {ImageSourceProps} from '../../sources/image-source';\nimport {ImageSource} from '../../sources/image-source';\n\nexport type ArcGISImageServerProps = ImageSourceProps & {\n  url: string;\n};\n\n/**\n * ArcGIS ImageServer\n * Note - exports a big API, that could be exposed here if there is a use case\n * @see https://developers.arcgis.com/rest/services-reference/enterprise/image-service.htm\n */\nexport class ArcGISImageServer extends ImageSource {\n  static type: 'arcgis-image-server' = 'arcgis-image-server';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('ImageServer');\n\n  props: ArcGISImageServerProps;\n\n  constructor(props: ArcGISImageServerProps) {\n    super(props);\n    this.props = props;\n  }\n\n  // ImageSource (normalized endpoints)\n\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    return (await this.metadata()) as ImageSourceMetadata;\n    // TODO - normalize metadata\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    throw new Error('not implemented');\n    // TODO - Map generic parameters to ArcGIS specific parameters\n    // return await this.exportImage(parameters);\n  }\n\n  // ImageServer endpoints\n\n  async metadata(): Promise<unknown> {\n    // We just need a JSON parsing...\n    // return this.getUrl({path: '', ...options});\n    throw new Error('not implemented');\n  }\n\n  /** \n   * Form a URL to an ESRI ImageServer\n   // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,\n   */\n  exportImage(options: {\n    boundingBox: [number, number, number, number];\n    boundingBoxSR?: string;\n    width: number;\n    height: number;\n    imageSR?: string;\n    time?: never;\n    format?: 'jpgpng';\n    pixelType?: 'U8';\n    noData?: never;\n    noDataInterpretation?: 'esriNoDataMatchAny';\n    interpolation?: '+RSP_NearestNeighbor';\n    compression?: never;\n    compressionQuality?: never;\n    bandIds?: never;\n    mosaicRule?: never;\n    renderingRule?: never;\n    f?: 'image';\n  }): Promise<ImageType> {\n    // See WMSService.getMap()\n    throw new Error('not implemented');\n  }\n\n  // URL creators\n\n  metadataURL(options: {parameters?: Record<string, unknown>}): string {\n    return `${this.props.url}?f=pjson`;\n  }\n\n  /** \n   * Form a URL to an ESRI ImageServer\n   // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?\n   //   bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&\n   //   size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&\n   //   noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&\n   //   compressionQuality=&bandIds=&mosaicRule=&renderingRule=&\n   //   f=image\n   */\n  exportImageURL(options: {\n    bbox: [number, number, number, number];\n    boxSR?: string;\n    width: number;\n    height: number;\n    imageSR?: string;\n    time?: never;\n    format?: 'jpgpng';\n    pixelType?: 'U8';\n    noData?: never;\n    noDataInterpretation?: 'esriNoDataMatchAny';\n    interpolation?: '+RSP_NearestNeighbor';\n    compression?: never;\n    compressionQuality?: never;\n    bandIds?: never;\n    mosaicRule?: never;\n    renderingRule?: never;\n    f?: 'image';\n  }): string {\n    const bbox = `bbox=${options.bbox[0]},${options.bbox[1]},${options.bbox[2]},${options.bbox[3]}`;\n    const size = `size=${options.width},${options.height}`;\n    const arcgisOptions = {...options, bbox, size};\n    // @ts-expect-error\n    delete arcgisOptions.width;\n    // @ts-expect-error\n    delete arcgisOptions.height;\n    return this.getUrl('exportImage', arcgisOptions);\n  }\n\n  // INTERNAL METHODS\n\n  /**\n   * @note protected, since perhaps getWMSUrl may need to be overridden to handle certain backends?\n   * @note if override is common, maybe add a callback prop?\n   * */\n  protected getUrl(\n    path: string,\n    options: Record<string, unknown>,\n    extra?: Record<string, unknown>\n  ): string {\n    let url = `${this.props.url}/${path}`;\n    let first = true;\n    for (const [key, value] of Object.entries(options)) {\n      url += first ? '?' : '&';\n      first = false;\n      if (Array.isArray(value)) {\n        url += `${key.toUpperCase()}=${value.join(',')}`;\n      } else {\n        url += `${key.toUpperCase()}=${value ? String(value) : ''}`;\n      }\n    }\n    return url;\n  }\n\n  /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */\n  protected async checkResponse(response: Response) {\n    if (!response.ok) {\n      // } || response.headers['content-type'] === WMSErrorLoader.mimeTypes[0]) {\n      // const arrayBuffer = await response.arrayBuffer();\n      // const error = await WMSErrorLoader.parse(arrayBuffer, this.loadOptions);\n      throw new Error('error');\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/es5/lib/services/arcgis/arcgis-server.js

@@ -0,0 +1,115 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getArcGISServices = getArcGISServices;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function getArcGISServices(_x) {
+  return _getArcGISServices.apply(this, arguments);
+}
+function _getArcGISServices() {
+  _getArcGISServices = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(url) {
+    var fetchFile,
+      serverUrl,
+      _args = arguments;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            fetchFile = _args.length > 1 && _args[1] !== undefined ? _args[1] : fetch;
+            if (!url.includes('rest/services')) {
+              _context.next = 4;
+              break;
+            }
+            serverUrl = url.replace(/rest\/services.*$/i, 'rest/services');
+            return _context.abrupt("return", loadServiceDirectory(serverUrl, fetchFile, []));
+          case 4:
+            return _context.abrupt("return", null);
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _getArcGISServices.apply(this, arguments);
+}
+function loadServiceDirectory(_x2, _x3, _x4) {
+  return _loadServiceDirectory.apply(this, arguments);
+}
+function _loadServiceDirectory() {
+  _loadServiceDirectory = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(serverUrl, fetch, path) {
+    var serviceUrl, response, directory, services, folders, promises, _iterator2, _step2, folderServices;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            serviceUrl = "".concat(serverUrl, "/").concat(path.join('/'));
+            _context2.next = 3;
+            return fetch("".concat(serviceUrl, "?f=pjson"));
+          case 3:
+            response = _context2.sent;
+            _context2.next = 6;
+            return response.json();
+          case 6:
+            directory = _context2.sent;
+            services = extractServices(directory, serviceUrl);
+            folders = directory.folders || [];
+            promises = folders.map(function (folder) {
+              return loadServiceDirectory("".concat(serverUrl), fetch, [].concat((0, _toConsumableArray2.default)(path), [folder]));
+            });
+            _context2.t0 = _createForOfIteratorHelper;
+            _context2.next = 13;
+            return Promise.all(promises);
+          case 13:
+            _context2.t1 = _context2.sent;
+            _iterator2 = (0, _context2.t0)(_context2.t1);
+            try {
+              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                folderServices = _step2.value;
+                services.push.apply(services, (0, _toConsumableArray2.default)(folderServices));
+              }
+            } catch (err) {
+              _iterator2.e(err);
+            } finally {
+              _iterator2.f();
+            }
+            return _context2.abrupt("return", services);
+          case 17:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _loadServiceDirectory.apply(this, arguments);
+}
+function extractServices(directory, url) {
+  var arcgisServices = directory.services || [];
+  var services = [];
+  var _iterator = _createForOfIteratorHelper(arcgisServices),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var service = _step.value;
+      services.push({
+        name: service.name,
+        type: "arcgis-".concat(service.type.toLocaleLowerCase().replace('server', '-server')),
+        url: "".concat(url).concat(service.name, "/").concat(service.type)
+      });
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return services;
+}
+//# sourceMappingURL=arcgis-server.js.map

package/dist/es5/lib/services/arcgis/arcgis-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-server.js","names":["getArcGISServices","url","fetchFile","fetch","includes","serverUrl","replace","loadServiceDirectory","path","serviceUrl","join","response","json","directory","services","extractServices","folders","promises","map","folder","Promise","all","folderServices","push","arcgisServices","service","name","type","toLocaleLowerCase"],"sources":["../../../../../src/lib/services/arcgis/arcgis-server.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nexport type Service = {name: string; type: string; url: string};\n\ntype FetchLike = typeof fetch;\n\n/**\n * (Recursively) load the service directory from an ArcGIS Server URL\n * @param url\n * @param fetchFile= Optional fetch function override\n * @returns\n */\nexport async function getArcGISServices(\n  url: string,\n  fetchFile: FetchLike = fetch\n): Promise<Service[] | null> {\n  if (url.includes('rest/services')) {\n    const serverUrl = url.replace(/rest\\/services.*$/i, 'rest/services');\n    return loadServiceDirectory(serverUrl, fetchFile, []);\n  }\n  return null;\n}\n\nasync function loadServiceDirectory(\n  serverUrl: string,\n  fetch: FetchLike,\n  path: string[]\n): Promise<Service[]> {\n  const serviceUrl = `${serverUrl}/${path.join('/')}`;\n\n  const response = await fetch(`${serviceUrl}?f=pjson`);\n  const directory = await response.json();\n\n  const services = extractServices(directory, serviceUrl);\n\n  const folders = (directory.folders || []) as string[];\n  const promises = folders.map((folder) =>\n    loadServiceDirectory(`${serverUrl}`, fetch, [...path, folder])\n  );\n\n  for (const folderServices of await Promise.all(promises)) {\n    services.push(...folderServices);\n  }\n\n  return services;\n}\n\nfunction extractServices(directory: unknown, url: string): Service[] {\n  const arcgisServices = ((directory as any).services || []) as {name: string; type: string}[];\n  const services: Service[] = [];\n  for (const service of arcgisServices) {\n    services.push({\n      name: service.name,\n      type: `arcgis-${service.type.toLocaleLowerCase().replace('server', '-server')}`,\n      url: `${url}${service.name}/${service.type}`\n    });\n  }\n  return services;\n}\n"],"mappings":";;;;;;;;;;;;;SAYsBA,iBAAiB;EAAA;AAAA;AAAA;EAAA,+EAAhC,iBACLC,GAAW;IAAA;MAAA;MAAA;IAAA;MAAA;QAAA;UAAA;YACXC,SAAoB,2DAAGC,KAAK;YAAA,KAExBF,GAAG,CAACG,QAAQ,CAAC,eAAe,CAAC;cAAA;cAAA;YAAA;YACzBC,SAAS,GAAGJ,GAAG,CAACK,OAAO,CAAC,oBAAoB,EAAE,eAAe,CAAC;YAAA,iCAC7DC,oBAAoB,CAACF,SAAS,EAAEH,SAAS,EAAE,EAAE,CAAC;UAAA;YAAA,iCAEhD,IAAI;UAAA;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA,CACZ;EAAA;AAAA;AAAA,SAEcK,oBAAoB;EAAA;AAAA;AAAA;EAAA,kFAAnC,kBACEF,SAAiB,EACjBF,KAAgB,EAChBK,IAAc;IAAA;IAAA;MAAA;QAAA;UAAA;YAERC,UAAU,aAAMJ,SAAS,cAAIG,IAAI,CAACE,IAAI,CAAC,GAAG,CAAC;YAAA;YAAA,OAE1BP,KAAK,WAAIM,UAAU,cAAW;UAAA;YAA/CE,QAAQ;YAAA;YAAA,OACUA,QAAQ,CAACC,IAAI,EAAE;UAAA;YAAjCC,SAAS;YAETC,QAAQ,GAAGC,eAAe,CAACF,SAAS,EAAEJ,UAAU,CAAC;YAEjDO,OAAO,GAAIH,SAAS,CAACG,OAAO,IAAI,EAAE;YAClCC,QAAQ,GAAGD,OAAO,CAACE,GAAG,CAAC,UAACC,MAAM;cAAA,OAClCZ,oBAAoB,WAAIF,SAAS,GAAIF,KAAK,6CAAMK,IAAI,IAAEW,MAAM,GAAE;YAAA,EAC/D;YAAA;YAAA;YAAA,OAEkCC,OAAO,CAACC,GAAG,CAACJ,QAAQ,CAAC;UAAA;YAAA;YAAA;YAAA;cAAxD,uDAA0D;gBAA/CK,cAAc;gBACvBR,QAAQ,CAACS,IAAI,OAAbT,QAAQ,mCAASQ,cAAc,EAAC;cAClC;YAAC;cAAA;YAAA;cAAA;YAAA;YAAA,kCAEMR,QAAQ;UAAA;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA,CAChB;EAAA;AAAA;AAED,SAASC,eAAe,CAACF,SAAkB,EAAEZ,GAAW,EAAa;EACnE,IAAMuB,cAAc,GAAKX,SAAS,CAASC,QAAQ,IAAI,EAAqC;EAC5F,IAAMA,QAAmB,GAAG,EAAE;EAAC,2CACTU,cAAc;IAAA;EAAA;IAApC,oDAAsC;MAAA,IAA3BC,OAAO;MAChBX,QAAQ,CAACS,IAAI,CAAC;QACZG,IAAI,EAAED,OAAO,CAACC,IAAI;QAClBC,IAAI,mBAAYF,OAAO,CAACE,IAAI,CAACC,iBAAiB,EAAE,CAACtB,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAE;QAC/EL,GAAG,YAAKA,GAAG,SAAGwB,OAAO,CAACC,IAAI,cAAID,OAAO,CAACE,IAAI;MAC5C,CAAC,CAAC;IACJ;EAAC;IAAA;EAAA;IAAA;EAAA;EACD,OAAOb,QAAQ;AACjB"}

package/dist/es5/lib/{data-sources/adhoc-image-service.js → services/generic/image-service.js}

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AdHocImageService = void 0;
+exports.ImageService = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -16,24 +16,24 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _images = require("@loaders.gl/images");
-var _imageSource = require("./image-source");
+var _imageSource = require("../../sources/image-source");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var AdHocImageService = function (_ImageSource) {
-  (0, _inherits2.default)(AdHocImageService, _ImageSource);
-  var _super = _createSuper(AdHocImageService);
-  function AdHocImageService(props) {
+var ImageService = function (_ImageSource) {
+  (0, _inherits2.default)(ImageService, _ImageSource);
+  var _super = _createSuper(ImageService);
+  function ImageService(props) {
     var _this;
-    (0, _classCallCheck2.default)(this, AdHocImageService);
-    _this = _super.call(this);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "templateUrl", void 0);
-    _this.templateUrl = props.templateUrl;
+    (0, _classCallCheck2.default)(this, ImageService);
+    _this = _super.call(this, props);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "props", void 0);
+    _this.props = props;
     return _this;
   }
 
-  (0, _createClass2.default)(AdHocImageService, [{
+  (0, _createClass2.default)(ImageService, [{
     key: "getMetadata",
     value: function () {
       var _getMetadata = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
@@ -66,7 +66,7 @@ var AdHocImageService = function (_ImageSource) {
                 granularParameters = this.getGranularParameters(parameters);
                 url = this.getURLFromTemplate(granularParameters);
                 _context2.next = 4;
-                return fetch(url);
+                return this.fetch(url);
               case 4:
                 response = _context2.sent;
                 _context2.next = 7;
@@ -106,24 +106,27 @@ var AdHocImageService = function (_ImageSource) {
         west: west
       });
     }
+
   }, {
     key: "getURLFromTemplate",
-    value: function getURLFromTemplate(parameters) {
-      var url = this.templateUrl;
+    value:
+    function getURLFromTemplate(parameters) {
+      var url = this.props.url;
       for (var _i = 0, _Object$entries = Object.entries(parameters); _i < _Object$entries.length; _i++) {
         var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
           key = _Object$entries$_i[0],
           value = _Object$entries$_i[1];
         url = url.replace("${".concat(key, "}"), String(value));
+        url = url.replace("{".concat(key, "}"), String(value));
       }
       return url;
     }
   }]);
-  return AdHocImageService;
+  return ImageService;
 }(_imageSource.ImageSource);
-exports.AdHocImageService = AdHocImageService;
-(0, _defineProperty2.default)(AdHocImageService, "type", 'template');
-(0, _defineProperty2.default)(AdHocImageService, "testURL", function (url) {
+exports.ImageService = ImageService;
+(0, _defineProperty2.default)(ImageService, "type", 'template');
+(0, _defineProperty2.default)(ImageService, "testURL", function (url) {
   return url.toLowerCase().includes('{');
 });
-//# sourceMappingURL=adhoc-image-service.js.map
+//# sourceMappingURL=image-service.js.map

package/dist/es5/lib/services/generic/image-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"image-service.js","names":["ImageService","props","Error","parameters","granularParameters","getGranularParameters","url","getURLFromTemplate","fetch","response","arrayBuffer","ImageLoader","parse","bbox","east","north","west","south","Object","entries","key","value","replace","String","ImageSource","toLowerCase","includes"],"sources":["../../../../../src/lib/services/generic/image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {LoaderOptions} from '@loaders.gl/loader-utils';\nimport type {ImageType} from '@loaders.gl/images';\nimport {ImageLoader} from '@loaders.gl/images';\n\nimport type {ImageSourceMetadata, GetImageParameters} from '../../sources/image-source';\nimport {ImageSource} from '../../sources/image-source';\n\n/** Template URL string should contain `${width}` etc which will be substituted. */\nexport type ImageServiceProps = {\n  /** Base URL to the service */\n  url: string;\n  /** Any load options to the loaders.gl Loaders used by the WMSService methods */\n  loadOptions?: LoaderOptions;\n};\n\n/**\n * Quickly connect to \"ad hoc\" image sources without subclassing ImageSource.\n * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources\n * Accepts a template url string and builds requests URLs\n */\nexport class ImageService extends ImageSource {\n  static type: 'template' = 'template';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('{');\n\n  props: ImageServiceProps;\n\n  constructor(props: ImageServiceProps) {\n    super(props);\n    this.props = props;\n  }\n\n  // IMAGE SOURCE API\n\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    throw new Error('ImageSource.getMetadata not implemented');\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    const granularParameters = this.getGranularParameters(parameters);\n    const url = this.getURLFromTemplate(granularParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    return await ImageLoader.parse(arrayBuffer);\n  }\n\n  // HELPERS\n\n  /** Break up bounding box in east, north, south, west */\n  protected getGranularParameters(parameters: GetImageParameters): Record<string, unknown> {\n    const [east, north, west, south] = parameters.bbox;\n    return {...parameters, east, north, south, west};\n  }\n\n  /** Supports both ${} and {} notations */\n  protected getURLFromTemplate(parameters: Record<string, unknown>): string {\n    let url = this.props.url;\n    for (const [key, value] of Object.entries(parameters)) {\n      // TODO - parameter could be repeated\n      // const regex = new RegExp(`\\${${key}}`, 'g');\n      url = url.replace(`\\${${key}}`, String(value));\n      url = url.replace(`{${key}}`, String(value));\n    }\n    return url;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAIA;AAGA;AAAuD;AAAA;AAAA;AAAA;AAAA,IAe1CA,YAAY;EAAA;EAAA;EAMvB,sBAAYC,KAAwB,EAAE;IAAA;IAAA;IACpC,0BAAMA,KAAK;IAAE;IACb,MAAKA,KAAK,GAAGA,KAAK;IAAC;EACrB;;EAAC;IAAA;IAAA;MAAA,6EAID;QAAA;UAAA;YAAA;cAAA;gBAAA,MACQ,IAAIC,KAAK,CAAC,yCAAyC,CAAC;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA,CAC3D;MAAA;QAAA;MAAA;MAAA;IAAA;EAAA;IAAA;IAAA;MAAA,0EAED,kBAAeC,UAA8B;QAAA;QAAA;UAAA;YAAA;cAAA;gBACrCC,kBAAkB,GAAG,IAAI,CAACC,qBAAqB,CAACF,UAAU,CAAC;gBAC3DG,GAAG,GAAG,IAAI,CAACC,kBAAkB,CAACH,kBAAkB,CAAC;gBAAA;gBAAA,OAChC,IAAI,CAACI,KAAK,CAACF,GAAG,CAAC;cAAA;gBAAhCG,QAAQ;gBAAA;gBAAA,OACYA,QAAQ,CAACC,WAAW,EAAE;cAAA;gBAA1CA,WAAW;gBAAA;gBAAA,OACJC,mBAAW,CAACC,KAAK,CAACF,WAAW,CAAC;cAAA;gBAAA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA,CAC5C;MAAA;QAAA;MAAA;MAAA;IAAA;EAAA;IAAA;IAAA;;IAKD,+BAAgCP,UAA8B,EAA2B;MACvF,oDAAmCA,UAAU,CAACU,IAAI;QAA3CC,IAAI;QAAEC,KAAK;QAAEC,IAAI;QAAEC,KAAK;MAC/B,uCAAWd,UAAU;QAAEW,IAAI,EAAJA,IAAI;QAAEC,KAAK,EAALA,KAAK;QAAEE,KAAK,EAALA,KAAK;QAAED,IAAI,EAAJA;MAAI;IACjD;;EAAC;IAAA;IAAA;IAGD,4BAA6Bb,UAAmC,EAAU;MACxE,IAAIG,GAAG,GAAG,IAAI,CAACL,KAAK,CAACK,GAAG;MACxB,mCAA2BY,MAAM,CAACC,OAAO,CAAChB,UAAU,CAAC,qCAAE;QAAlD;UAAOiB,GAAG;UAAEC,KAAK;QAGpBf,GAAG,GAAGA,GAAG,CAACgB,OAAO,aAAOF,GAAG,QAAKG,MAAM,CAACF,KAAK,CAAC,CAAC;QAC9Cf,GAAG,GAAGA,GAAG,CAACgB,OAAO,YAAKF,GAAG,QAAKG,MAAM,CAACF,KAAK,CAAC,CAAC;MAC9C;MACA,OAAOf,GAAG;IACZ;EAAC;EAAA;AAAA,EA3C+BkB,wBAAW;AAAA;AAAA,8BAAhCxB,YAAY,UACG,UAAU;AAAA,8BADzBA,YAAY,aAEN,UAACM,GAAW;EAAA,OAAcA,GAAG,CAACmB,WAAW,EAAE,CAACC,QAAQ,CAAC,GAAG,CAAC;AAAA"}

package/dist/es5/lib/services/generic/tile-service.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=tile-service.js.map

package/dist/es5/lib/services/generic/tile-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tile-service.js","names":[],"sources":["../../../../../src/lib/services/generic/tile-service.ts"],"sourcesContent":[""],"mappings":""}