slippy-tile - npm Package Compare versions

Comparing version 1.5.0 to 1.6.0

CHANGELOG.md

@@ -0,3 +1,9 @@
+
 # Changelog
 
+## 1.6.0 - 2017-01-11
+
+- Add individual parsing functions for WMS & WMTS
+- Improve typescript handling for `sample`
+
 ## 1.5.0 - 2017-01-05
@@ -4,0 +10,0 @@

index.js

@@ -12,4 +12,5 @@ "use strict";
  * @example
- * import * as slippyTile from 'slippy-tile'
- * slippyTile.parse([10, 15, 8], slippyTile.osm.standard.url)
+ * const tile = [10, 15, 8]
+ * const url = 'https://{s}.tile.openstreetmap.org/{zoom}/{x}/{y}.png'
+ * slippyTile.parse(tile, url)
  * //='https://c.tile.openstreetmap.org/8/10/15.png'
@@ -19,13 +20,8 @@ */
     const [x, y, zoom] = tile;
-    url = url.replace(/{(zoom|z|level|TileMatrix)}/, String(zoom));
-    url = url.replace(/{(x|TileCol|col)}/, String(x));
-    url = url.replace(/{(y|TileRow|row)}/, String(y));
-    url = url.replace(/{height}/, '256');
-    url = url.replace(/{width}/, '256');
-    url = url.replace(/{proj}/, 'EPSG:3857');
-    url = url.replace(/{Style}/, 'default');
-    url = url.replace(/{TileMatrixSet}/, 'GoogleMapsCompatible');
-    if (url.match(/{bbox}/)) {
-        url = url.replace(/{bbox}/, mercator.googleToBBox(tile).join(','));
-    }
+    url = wms(tile, url);
+    url = wmts(url);
+    url = parseSwitch(url);
+    url = url.replace(/{(zoom|z|level)}/, String(zoom));
+    url = url.replace(/{(x|col)}/, String(x));
+    url = url.replace(/{(y|row)}/, String(y));
     if (url.match(/{-y}/)) {
@@ -37,3 +33,5 @@ url = url.replace(/{-y}/, String(mercator.googleToTile(tile)[1]));
     }
-    url = parseSwitch(url);
+    if (url.match(/{.*}/)) {
+        throw new Error(`Could not completly parse URL ${url}`);
+    }
     return url;
@@ -43,2 +41,43 @@ }
 /**
+ * Parse WMS URL to friendly SlippyTile format
+ *
+ * @param {Tile} tile Tile [x, y, z]
+ * @param {string} url WMTS URL scheme
+ * @returns {string}
+ * @example
+ * const tile = [10, 15, 8]
+ * const url = 'https://<Tile Server>/?layers=imagery&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}'
+ * slippyTile.wmts(tile, url)
+ * //='https://<Tile Server>/?layers=imagery&SRS=EPSG:3857&WIDTH=256&HEIGHT=256&BBOX=-165.9375,82.676285,-164.53125,82.853382'
+ */
+function wms(tile, url) {
+    url = url.replace(/{height}/, '256');
+    url = url.replace(/{width}/, '256');
+    url = url.replace(/{proj}/, 'EPSG:3857');
+    if (url.match(/{bbox}/)) {
+        url = url.replace(/{bbox}/, mercator.googleToBBox(tile).join(','));
+    }
+    return url;
+}
+exports.wms = wms;
+/**
+ * Parse WMTS URL to friendly SlippyTile URL format
+ *
+ * @param {string} url WMTS URL scheme
+ * @returns {string}
+ * @example
+ * const url = 'https://<Tile Server>/WMTS/tile/1.0.0/Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg'
+ * slippyTile.wmts(url)
+ * //='https://<Tile Server>/WMTS/tile/1.0.0/Imagery/default/GoogleMapsCompatible/{z}/{y}/{x}.jpg'
+ */
+function wmts(url) {
+    url = url.replace(/{TileCol}/, '{x}');
+    url = url.replace(/{TileRow}/, '{y}');
+    url = url.replace(/{TileMatrix}/, '{z}');
+    url = url.replace(/{TileMatrixSet}/, 'GoogleMapsCompatible');
+    url = url.replace(/{Style}/, 'default');
+    return url;
+}
+exports.wmts = wmts;
+/**
  * Replaces {switch:a,b,c} with a random sample.
@@ -56,3 +95,3 @@ *
     if (url.match(/{s}/i)) {
-        const random = String(sample(['a', 'b', 'c']));
+        const random = String(exports.sample(['a', 'b', 'c']));
         return url.replace(/{s}/, random);
@@ -64,3 +103,3 @@ }
     if (found) {
-        const random = String(sample(found[1].split(',')));
+        const random = String(exports.sample(found[1].split(',')));
         return url.replace(pattern, random);
@@ -74,13 +113,11 @@ }
  *
- * @param {string[]} collection List of items
- * @returns {string} Single item from the list
+ * @param {any[]} collection List of items
+ * @returns {any} Single item from the list
  * @example
- * import * as slippyTile from 'slippy-tile'
  * slippyTile.sample(['a', 'b', 'c'])
  * //='b'
  */
-function sample(collection) {
+exports.sample = (collection) => {
     return collection[Math.floor(Math.random() * collection.length)];
-}
-exports.sample = sample;
+};
 //# sourceMappingURL=index.js.map

index.ts

@@ -15,2 +15,3 @@ import * as mercator from 'global-mercator'
   url: string
+  type: 'baselayer' | 'overlay'
 }
@@ -30,20 +31,38 @@
  * @example
- * import * as slippyTile from 'slippy-tile'
- * slippyTile.parse([10, 15, 8], slippyTile.osm.standard.url)
+ * const tile = [10, 15, 8]
+ * const url = 'https://{s}.tile.openstreetmap.org/{zoom}/{x}/{y}.png'
+ * slippyTile.parse(tile, url)
  * //='https://c.tile.openstreetmap.org/8/10/15.png'
  */
-export function parse (tile: Tile, url: string) {
+export function parse(tile: Tile, url: string) {
   const [x, y, zoom] = tile
-  url = url.replace(/{(zoom|z|level|TileMatrix)}/, String(zoom))
-  url = url.replace(/{(x|TileCol|col)}/, String(x))
-  url = url.replace(/{(y|TileRow|row)}/, String(y))
+  url = wms(tile, url)
+  url = wmts(url)
+  url = parseSwitch(url)
+  url = url.replace(/{(zoom|z|level)}/, String(zoom))
+  url = url.replace(/{(x|col)}/, String(x))
+  url = url.replace(/{(y|row)}/, String(y))
+  if (url.match(/{-y}/)) { url = url.replace(/{-y}/, String(mercator.googleToTile(tile)[1])) }
+  if (url.match(/{(quadkey|q)}/)) { url = url.replace(/{(quadkey|q)}/, mercator.googleToQuadkey(tile)) }
+  if (url.match(/{.*}/)) { throw new Error(`Could not completly parse URL ${url}`)}
+  return url
+}
+
+/**
+ * Parse WMS URL to friendly SlippyTile format
+ *
+ * @param {Tile} tile Tile [x, y, z]
+ * @param {string} url WMTS URL scheme
+ * @returns {string}
+ * @example
+ * const tile = [10, 15, 8]
+ * const url = 'https://<Tile Server>/?layers=imagery&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}'
+ * slippyTile.wmts(tile, url)
+ * //='https://<Tile Server>/?layers=imagery&SRS=EPSG:3857&WIDTH=256&HEIGHT=256&BBOX=-165.9375,82.676285,-164.53125,82.853382'
+ */
+export function wms(tile: Tile, url: string) {
   url = url.replace(/{height}/, '256')
   url = url.replace(/{width}/, '256')
   url = url.replace(/{proj}/, 'EPSG:3857')
-  url = url.replace(/{Style}/, 'default')
-  url = url.replace(/{TileMatrixSet}/, 'GoogleMapsCompatible')
   if (url.match(/{bbox}/)) { url = url.replace(/{bbox}/, mercator.googleToBBox(tile).join(',')) }
-  if (url.match(/{-y}/)) { url = url.replace(/{-y}/, String(mercator.googleToTile(tile)[1])) }
-  if (url.match(/{(quadkey|q)}/)) { url = url.replace(/{(quadkey|q)}/, mercator.googleToQuadkey(tile)) }
-  url = parseSwitch(url)
   return url
@@ -53,2 +72,21 @@ }
 /**
+ * Parse WMTS URL to friendly SlippyTile URL format
+ *
+ * @param {string} url WMTS URL scheme
+ * @returns {string}
+ * @example
+ * const url = 'https://<Tile Server>/WMTS/tile/1.0.0/Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg'
+ * slippyTile.wmts(url)
+ * //='https://<Tile Server>/WMTS/tile/1.0.0/Imagery/default/GoogleMapsCompatible/{z}/{y}/{x}.jpg'
+ */
+export function wmts(url: string) {
+  url = url.replace(/{TileCol}/, '{x}')
+  url = url.replace(/{TileRow}/, '{y}')
+  url = url.replace(/{TileMatrix}/, '{z}')
+  url = url.replace(/{TileMatrixSet}/, 'GoogleMapsCompatible')
+  url = url.replace(/{Style}/, 'default')
+  return url
+}
+
+/**
  * Replaces {switch:a,b,c} with a random sample.
@@ -63,3 +101,3 @@ *
  */
-export function parseSwitch (url: string) {
+export function parseSwitch(url: string) {
   // Default simple switch
@@ -80,14 +118,19 @@ if (url.match(/{s}/i)) {
 
+interface Sample {
+  (collection: string[]): string
+  (collection: number[]): number
+  (collection: any[]): any
+}
+
 /**
  * Sample an item from a given list
  *
- * @param {string[]} collection List of items
- * @returns {string} Single item from the list
+ * @param {any[]} collection List of items
+ * @returns {any} Single item from the list
  * @example
- * import * as slippyTile from 'slippy-tile'
  * slippyTile.sample(['a', 'b', 'c'])
  * //='b'
  */
-export function sample (collection: string[]): string {
+export const sample: Sample = (collection: any[]) => {
   return collection[Math.floor(Math.random() * collection.length)]
 }

package.json

 {
   "name": "slippy-tile",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Helps convert Slippy Map url tile schemas",
@@ -26,8 +26,8 @@ "main": "index.js",
   "devDependencies": {
-    "@types/jest": "^16.0.1",
+    "@types/jest": "^16.0.3",
     "coveralls": "^2.11.15",
-    "documentation": "4.0.0-beta10",
+    "documentation": "^4.0.0-beta.18",
     "jest-cli": "^18.1.0",
     "tslint": "^4.2.0",
-    "typescript": "^2.0.10"
+    "typescript": "^2.1.4"
   },
@@ -48,4 +48,4 @@ "keywords": [
   "dependencies": {
-    "global-mercator": "^1.6.0",
-    "jest-cli": "^18.1.0"
+    "@types/node": "^6.0.58",
+    "global-mercator": "^1.6.1"
   },
@@ -52,0 +52,0 @@ "jest": {

providers/bing.js

@@ -13,3 +13,4 @@ "use strict";
     format: 'jpg',
+    type: 'baselayer',
 };
 //# sourceMappingURL=bing.js.map

providers/bing.ts

@@ -14,2 +14,3 @@ import { Provider } from '../index'
   format: 'jpg',
+  type: 'baselayer',
 }

providers/digitalglobe.js

@@ -5,3 +5,3 @@ "use strict";
     categories: [
-        'digitalgloble',
+        'digitalglobe',
         'dg',
@@ -17,2 +17,3 @@ 'imagery',
     url: 'https://{s}.tiles.mapbox.com/v4/digitalglobe.nal0mpda/{z}/{x}/{y}.png',
+    type: 'baselayer',
 };
@@ -31,3 +32,4 @@ exports.imagery = {
     format: 'png',
+    type: 'baselayer',
 };
 //# sourceMappingURL=digitalglobe.js.map

providers/digitalglobe.ts

@@ -6,3 +6,3 @@ import { Provider } from '../index'
   categories: [
-    'digitalgloble',
+    'digitalglobe',
     'dg',
@@ -18,2 +18,3 @@ 'imagery',
   url: 'https://{s}.tiles.mapbox.com/v4/digitalglobe.nal0mpda/{z}/{x}/{y}.png',
+  type: 'baselayer',
 }
@@ -33,2 +34,3 @@
   format: 'png',
+  type: 'baselayer',
 }

providers/esri.js

@@ -10,6 +10,7 @@ "use strict";
     ],
-    url: 'https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{zoom}/{y}/{x}',
+    url: 'https://services.arcgisonline.com/arcgis/rest/services/NatGeo_World_Map/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
     description: 'This map is designed to be used as a general reference map for informational and educational purposes as well as a basemap by GIS professionals and other users for creating web maps and web mapping applications.',
     attribution: 'National Geographic, Esri, DeLorme, HERE, UNEP-WCMC, USGS, NASA, ESA, METI, NRCAN, GEBCO, NOAA, INCREMENT P',
     format: 'jpg',
+    type: 'baselayer',
 };
@@ -23,6 +24,7 @@ exports.ocean = {
     ],
-    url: 'https://services.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer/tile/{zoom}/{y}/{x}',
+    url: 'https://services.arcgisonline.com/arcgis/rest/services/Ocean_Basemap/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
     description: 'The ocean basemap includes bathymetry, surface and subsurface feature names, and derived depths. This service is designed to be used as a basemap by marine GIS professionals and as a reference map by anyone interested in ocean data.',
     attribution: 'Esri, GEBCO, NOAA, National Geographic, DeLorme, HERE, Geonames.org, and other contributors',
     format: 'jpg',
+    type: 'baselayer',
 };
@@ -36,6 +38,7 @@ exports.usatopo = {
     ],
-    url: 'https://services.arcgisonline.com/ArcGIS/rest/services/USA_Topo_Maps/MapServer/tile/{zoom}/{y}/{x}',
+    url: 'https://services.arcgisonline.com/arcgis/rest/services/USA_Topo_Maps/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
     description: 'This map service presents detailed USGS topographic maps for the United States at multiple scales.',
     attribution: '© 2011 National Geographic Society, i-cubed',
     format: 'jpg',
+    type: 'baselayer',
 };
@@ -49,6 +52,7 @@ exports.imagery = {
     ],
-    url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{zoom}/{y}/{x}',
+    url: 'https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
     description: 'This map service presents satellite imagery for the world and high-resolution imagery for the United States and other areas around the world.',
     attribution: 'Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, and the GIS User Community',
     format: 'jpg',
+    type: 'baselayer',
 };
@@ -62,6 +66,7 @@ exports.street = {
     ],
-    url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{zoom}/{y}/{x}',
+    url: 'https://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/WMTS/tile/1.0.0/World_Topo_Map/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
     description: 'This map service presents highway-level data for the world and street-level data for North America, Europe, Africa, parts of the Middle East, Asia, and more.',
     attribution: 'Esri, HERE, DeLorme, USGS, Intermap, INCREMENT P, NRCAN, Esri Japan, METI, Esri China (Hong Kong), Esri (Thailand), MapmyIndia, © OpenStreetMap contributors, and the GIS User Community',
     format: 'jpg',
+    type: 'baselayer',
 };
@@ -76,7 +81,9 @@ exports.topo = {
     ],
-    url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{zoom}/{y}/{x}',
+    url: 'https://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
     description: 'This world topographic map includes boundaries, cities, water features, physiographic features, parks, landmarks, transportation, and buildings.',
     attribution: 'Esri, HERE, DeLorme, Intermap, INCREMENT P, GEBCO, USGS, FAO, NPS, NRCAN, GeoBase, IGN, Kadaster NL, Ordnance Survey, Esri Japan, METI, Esri China (Hong Kong), swisstopo, MapmyIndia, © OpenStreetMap contributors, GIS User Community',
     format: 'jpg',
+    type: 'baselayer',
 };
+exports.topographic = exports.topo;
 //# sourceMappingURL=esri.js.map

providers/esri.ts

@@ -11,6 +11,7 @@ import { Provider } from '../index'
   ],
-  url: 'https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{zoom}/{y}/{x}',
+  url: 'https://services.arcgisonline.com/arcgis/rest/services/NatGeo_World_Map/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
   description: 'This map is designed to be used as a general reference map for informational and educational purposes as well as a basemap by GIS professionals and other users for creating web maps and web mapping applications.',
   attribution: 'National Geographic, Esri, DeLorme, HERE, UNEP-WCMC, USGS, NASA, ESA, METI, NRCAN, GEBCO, NOAA, INCREMENT P',
   format: 'jpg',
+  type: 'baselayer',
 }
@@ -25,6 +26,7 @@
   ],
-  url: 'https://services.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer/tile/{zoom}/{y}/{x}',
+  url: 'https://services.arcgisonline.com/arcgis/rest/services/Ocean_Basemap/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
   description: 'The ocean basemap includes bathymetry, surface and subsurface feature names, and derived depths. This service is designed to be used as a basemap by marine GIS professionals and as a reference map by anyone interested in ocean data.',
   attribution: 'Esri, GEBCO, NOAA, National Geographic, DeLorme, HERE, Geonames.org, and other contributors',
   format: 'jpg',
+  type: 'baselayer',
 }
@@ -39,6 +41,7 @@
   ],
-  url: 'https://services.arcgisonline.com/ArcGIS/rest/services/USA_Topo_Maps/MapServer/tile/{zoom}/{y}/{x}',
+  url: 'https://services.arcgisonline.com/arcgis/rest/services/USA_Topo_Maps/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
   description: 'This map service presents detailed USGS topographic maps for the United States at multiple scales.',
   attribution: '© 2011 National Geographic Society, i-cubed',
   format: 'jpg',
+  type: 'baselayer',
 }
@@ -53,6 +56,7 @@
   ],
-  url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{zoom}/{y}/{x}',
+  url: 'https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
   description: 'This map service presents satellite imagery for the world and high-resolution imagery for the United States and other areas around the world.',
   attribution: 'Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, and the GIS User Community',
   format: 'jpg',
+  type: 'baselayer',
 }
@@ -67,6 +71,7 @@
   ],
-  url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{zoom}/{y}/{x}',
+  url: 'https://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/WMTS/tile/1.0.0/World_Topo_Map/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
   description: 'This map service presents highway-level data for the world and street-level data for North America, Europe, Africa, parts of the Middle East, Asia, and more.',
   attribution: 'Esri, HERE, DeLorme, USGS, Intermap, INCREMENT P, NRCAN, Esri Japan, METI, Esri China (Hong Kong), Esri (Thailand), MapmyIndia, © OpenStreetMap contributors, and the GIS User Community',
   format: 'jpg',
+  type: 'baselayer',
 }
@@ -82,6 +87,8 @@
   ],
-  url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{zoom}/{y}/{x}',
+  url: 'https://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/WMTS/tile/1.0.0/World_Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg',
   description: 'This world topographic map includes boundaries, cities, water features, physiographic features, parks, landmarks, transportation, and buildings.',
   attribution: 'Esri, HERE, DeLorme, Intermap, INCREMENT P, GEBCO, USGS, FAO, NPS, NRCAN, GeoBase, IGN, Kadaster NL, Ordnance Survey, Esri Japan, METI, Esri China (Hong Kong), swisstopo, MapmyIndia, © OpenStreetMap contributors, GIS User Community',
   format: 'jpg',
+  type: 'baselayer',
 }
+export const topographic = topo

providers/index.js

@@ -12,2 +12,13 @@ "use strict";
 exports.digitalglobe = digitalglobe;
+const mapbox = require("./mapbox");
+exports.mapbox = mapbox;
+// Alternate names
+const openstreetmap = osm;
+exports.openstreetmap = openstreetmap;
+const arcgis = esri;
+exports.arcgis = arcgis;
+const dg = digitalglobe;
+exports.dg = dg;
+const microsoft = bing;
+exports.microsoft = microsoft;
 //# sourceMappingURL=index.js.map

providers/index.ts

@@ -6,8 +6,21 @@ import * as bing from './bing'
 import * as digitalglobe from './digitalglobe'
+import * as mapbox from './mapbox'
+
+// Alternate names
+const openstreetmap = osm
+const arcgis = esri
+const dg = digitalglobe
+const microsoft = bing
+
 export {
+  dg,
+  digitalglobe,
+  mapbox,
+  esri,
+  arcgis,
   bing,
-  esri,
+  microsoft,
   osm,
+  openstreetmap,
   strava,
-  digitalglobe,
 }

providers/osm.js

@@ -13,2 +13,3 @@ "use strict";
     format: 'png',
+    type: 'baselayer',
 };
@@ -26,2 +27,3 @@ exports.cycle = {
     format: 'png',
+    type: 'baselayer',
 };
@@ -40,2 +42,3 @@ exports.hot = {
     format: 'png',
+    type: 'baselayer',
 };
@@ -53,2 +56,3 @@ exports.transport = {
     format: 'png',
+    type: 'baselayer',
 };
@@ -66,2 +70,3 @@ exports.wikimedia = {
     format: 'png',
+    type: 'baselayer',
 };
@@ -79,2 +84,3 @@ exports.lyrk = {
     format: 'png',
+    type: 'baselayer',
 };
@@ -92,3 +98,4 @@ exports.mapbox = {
     format: 'png',
+    type: 'baselayer',
 };
 //# sourceMappingURL=osm.js.map

providers/osm.ts

@@ -14,2 +14,3 @@ import { Provider } from '../index'
   format: 'png',
+  type: 'baselayer',
 }
@@ -27,2 +28,3 @@ export const cycle: Provider = {
   format: 'png',
+  type: 'baselayer',
 }
@@ -42,2 +44,3 @@
   format: 'png',
+  type: 'baselayer',
 }
@@ -56,2 +59,3 @@
   format: 'png',
+  type: 'baselayer',
 }
@@ -70,2 +74,3 @@
   format: 'png',
+  type: 'baselayer',
 }
@@ -84,2 +89,3 @@
   format: 'png',
+  type: 'baselayer',
 }
@@ -98,2 +104,3 @@
   format: 'png',
+  type: 'baselayer',
 }

providers/strava.js

@@ -14,3 +14,4 @@ "use strict";
     format: 'png',
+    type: 'overlay',
 };
 //# sourceMappingURL=strava.js.map

providers/strava.ts

@@ -15,2 +15,3 @@ import { Provider } from '../index'
   format: 'png',
+  type: 'overlay',
 }

README.md

@@ -45,4 +45,4 @@ # [Slippy Tile](https://www.npmjs.com/package/slippy-tile)
 | ESRI World Topographic Map    | esri.topo
-| DigitalGlobe Imagery          | digitalgloble.imagery
-| DigitalGlobe Hybrid           | digitalgloble.hybrid
+| DigitalGlobe Imagery          | digitalglobe.imagery
+| DigitalGlobe Hybrid           | digitalglobe.hybrid
 
@@ -72,4 +72,2 @@
 - `{proj}`: default = EPSG:3857
-<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
-
 # parse
@@ -87,4 +85,5 @@
 ```javascript
-import * as slippyTile from 'slippy-tile'
-slippyTile.parse([10, 15, 8], slippyTile.osm.standard.url)
+const tile = [10, 15, 8]
+const url = 'https://{s}.tile.openstreetmap.org/{zoom}/{x}/{y}.png'
+slippyTile.parse(tile, url)
 //='https://c.tile.openstreetmap.org/8/10/15.png'
@@ -95,2 +94,40 @@ ```
 
+# wms
+
+Parse WMS URL to friendly SlippyTile format
+
+**Parameters**
+
+-   `tile` **[Tile](https://en.wikipedia.org/wiki/Tiled_web_map)** Tile [x, y, z]
+-   `url` **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** WMTS URL scheme
+
+**Examples**
+
+```javascript
+const tile = [10, 15, 8]
+const url = 'https://<Tile Server>/?layers=imagery&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}'
+slippyTile.wmts(tile, url)
+//='https://<Tile Server>/?layers=imagery&SRS=EPSG:3857&WIDTH=256&HEIGHT=256&BBOX=-165.9375,82.676285,-164.53125,82.853382'
+```
+
+Returns **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+# wmts
+
+Parse WMTS URL to friendly SlippyTile URL format
+
+**Parameters**
+
+-   `url` **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** WMTS URL scheme
+
+**Examples**
+
+```javascript
+const url = 'https://<Tile Server>/WMTS/tile/1.0.0/Imagery/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg'
+slippyTile.wmts(url)
+//='https://<Tile Server>/WMTS/tile/1.0.0/Imagery/default/GoogleMapsCompatible/{z}/{y}/{x}.jpg'
+```
+
+Returns **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
 # parseSwitch
@@ -120,3 +157,3 @@
 
--   `collection` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)&lt;[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)>** List of items
+-   `collection` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)&lt;any>** List of items
 
@@ -126,3 +163,2 @@ **Examples**
 ```javascript
-import * as slippyTile from 'slippy-tile'
 slippyTile.sample(['a', 'b', 'c'])
@@ -132,5 +168,11 @@ //='b'
 
-Returns **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Single item from the list
+Returns **any** Single item from the list
+
 # Changelog
 
+## 1.6.0 - 2017-01-11
+
+- Add individual parsing functions for WMS & WMTS
+- Improve typescript handling for `sample`
+
 ## 1.5.0 - 2017-01-05
@@ -137,0 +179,0 @@

No alert changes

Improved metrics

Total package byte prevSize

44868

increased by25.98%

Number of package files

30

increased by11.11%

Lines of code

807

increased by30.58%

Number of lines in readme file

213

increased by24.56%

Dependency changes

• + Added@types/node@^6.0.58

• + Added@types/node@6.14.13(transitive)

• - Removedjest-cli@^18.1.0

• - Removedabab@1.0.4(transitive)

• - Removedacorn@4.0.13(transitive)

• - Removedacorn-globals@3.1.0(transitive)

• - Removedajv@6.12.6(transitive)

• - Removedansi-escapes@1.4.03.2.0(transitive)

• - Removedansi-regex@2.1.1(transitive)

• - Removedansi-styles@2.2.13.2.1(transitive)

• - Removedansicolors@0.3.2(transitive)

• - Removedappend-transform@0.4.0(transitive)

• - Removedargparse@1.0.10(transitive)

• - Removedarr-diff@2.0.0(transitive)

• - Removedarr-flatten@1.1.0(transitive)

• - Removedarray-equal@1.0.2(transitive)

• - Removedarray-unique@0.2.1(transitive)

• - Removedarrify@1.0.1(transitive)

• - Removedasn1@0.2.6(transitive)

• - Removedassert-plus@1.0.0(transitive)

• - Removedasync@2.6.4(transitive)

• - Removedasynckit@0.4.0(transitive)

• - Removedaws-sign2@0.7.0(transitive)

• - Removedaws4@1.13.2(transitive)

• - Removedbabel-code-frame@6.26.0(transitive)

• - Removedbabel-core@6.26.3(transitive)

• - Removedbabel-generator@6.26.1(transitive)

• - Removedbabel-helpers@6.24.1(transitive)

• - Removedbabel-jest@18.0.0(transitive)

• - Removedbabel-messages@6.23.0(transitive)

• - Removedbabel-plugin-istanbul@3.1.2(transitive)

• - Removedbabel-plugin-jest-hoist@18.0.0(transitive)

• - Removedbabel-preset-jest@18.0.0(transitive)

• - Removedbabel-register@6.26.0(transitive)

• - Removedbabel-runtime@6.26.0(transitive)

• - Removedbabel-template@6.26.0(transitive)

• - Removedbabel-traverse@6.26.0(transitive)

• - Removedbabel-types@6.26.0(transitive)

• - Removedbabylon@6.18.0(transitive)

• - Removedbalanced-match@1.0.2(transitive)

• - Removedbcrypt-pbkdf@1.0.2(transitive)

• - Removedbrace-expansion@1.1.11(transitive)

• - Removedbraces@1.8.5(transitive)

• - Removedbrowser-resolve@1.11.3(transitive)

• - Removedbser@1.0.2(transitive)

• - Removedcall-bind@1.0.8(transitive)

• - Removedcall-bind-apply-helpers@1.0.1(transitive)

• - Removedcall-bound@1.0.3(transitive)

• - Removedcallsites@2.0.0(transitive)

• - Removedcamelcase@3.0.0(transitive)

• - Removedcardinal@2.1.1(transitive)

• - Removedcaseless@0.12.0(transitive)

• - Removedchalk@1.1.32.4.2(transitive)

• - Removedci-info@1.6.0(transitive)

• - Removedcli-table@0.3.11(transitive)

• - Removedcli-usage@0.1.10(transitive)

• - Removedcliui@3.2.0(transitive)

• - Removedcode-point-at@1.1.0(transitive)

• - Removedcolor-convert@1.9.3(transitive)

• - Removedcolor-name@1.1.3(transitive)

• - Removedcolors@1.0.3(transitive)

• - Removedcombined-stream@1.0.8(transitive)

• - Removedconcat-map@0.0.1(transitive)

• - Removedcontent-type-parser@1.0.2(transitive)

• - Removedconvert-source-map@1.9.0(transitive)

• - Removedcore-js@2.6.12(transitive)

• - Removedcore-util-is@1.0.2(transitive)

• - Removedcssom@0.3.8(transitive)

• - Removedcssstyle@0.2.37(transitive)

• - Removeddashdash@1.14.1(transitive)

• - Removeddebug@2.6.93.2.7(transitive)

• - Removeddecamelize@1.2.0(transitive)

• - Removeddeep-is@0.1.4(transitive)

• - Removeddefault-require-extensions@1.0.0(transitive)

• - Removeddefine-data-property@1.1.4(transitive)

• - Removeddelayed-stream@1.0.0(transitive)

• - Removeddetect-indent@4.0.0(transitive)

• - Removeddiff@3.5.0(transitive)

• - Removeddunder-proto@1.0.1(transitive)

• - Removedecc-jsbn@0.1.2(transitive)

• - Removederrno@0.1.8(transitive)

• - Removederror-ex@1.3.2(transitive)

• - Removedes-define-property@1.0.1(transitive)

• - Removedes-errors@1.3.0(transitive)

• - Removedes-object-atoms@1.1.1(transitive)

• - Removedescape-string-regexp@1.0.5(transitive)

• - Removedescodegen@1.14.3(transitive)

• - Removedesprima@4.0.1(transitive)

• - Removedestraverse@4.3.0(transitive)

• - Removedesutils@2.0.3(transitive)

• - Removedexec-sh@0.2.2(transitive)

• - Removedexpand-brackets@0.1.5(transitive)

• - Removedexpand-range@1.8.2(transitive)

• - Removedextend@3.0.2(transitive)

• - Removedextglob@0.3.2(transitive)

• - Removedextsprintf@1.3.0(transitive)

• - Removedfast-deep-equal@3.1.3(transitive)

• - Removedfast-json-stable-stringify@2.1.0(transitive)

• - Removedfast-levenshtein@2.0.6(transitive)

• - Removedfb-watchman@1.9.2(transitive)

• - Removedfilename-regex@2.0.1(transitive)

• - Removedfileset@2.0.3(transitive)

• - Removedfill-range@2.2.4(transitive)

• - Removedfind-up@1.1.2(transitive)

• - Removedfor-in@1.0.2(transitive)

• - Removedfor-own@0.1.5(transitive)

• - Removedforever-agent@0.6.1(transitive)

• - Removedform-data@2.3.3(transitive)

• - Removedfs.realpath@1.0.0(transitive)

• - Removedfunction-bind@1.1.2(transitive)

• - Removedget-caller-file@1.0.3(transitive)

• - Removedget-intrinsic@1.2.7(transitive)

• - Removedget-proto@1.0.1(transitive)

• - Removedgetpass@0.1.7(transitive)

• - Removedglob@7.2.3(transitive)

• - Removedglob-base@0.3.0(transitive)

• - Removedglob-parent@2.0.0(transitive)

• - Removedglobals@9.18.0(transitive)

• - Removedgopd@1.2.0(transitive)

• - Removedgraceful-fs@4.2.11(transitive)

• - Removedgrowly@1.3.0(transitive)

• - Removedhandlebars@4.7.8(transitive)

• - Removedhar-schema@2.0.0(transitive)

• - Removedhar-validator@5.1.5(transitive)

• - Removedhas-ansi@2.0.0(transitive)

• - Removedhas-flag@1.0.02.0.03.0.0(transitive)

• - Removedhas-property-descriptors@1.0.2(transitive)

• - Removedhas-symbols@1.1.0(transitive)

• - Removedhasown@2.0.2(transitive)

• - Removedhome-or-tmp@2.0.0(transitive)

• - Removedhosted-git-info@2.8.9(transitive)

• - Removedhtml-encoding-sniffer@1.0.2(transitive)

• - Removedhttp-signature@1.2.0(transitive)

• - Removediconv-lite@0.4.24(transitive)

• - Removedinflight@1.0.6(transitive)

• - Removedinherits@2.0.4(transitive)

• - Removedinvariant@2.2.4(transitive)

• - Removedinvert-kv@1.0.0(transitive)

• - Removedis-arrayish@0.2.1(transitive)

• - Removedis-buffer@1.1.6(transitive)

• - Removedis-ci@1.2.1(transitive)

• - Removedis-core-module@2.16.1(transitive)

• - Removedis-dotfile@1.0.3(transitive)

• - Removedis-equal-shallow@0.1.3(transitive)

• - Removedis-extendable@0.1.1(transitive)

• - Removedis-extglob@1.0.0(transitive)

• - Removedis-finite@1.1.0(transitive)

• - Removedis-fullwidth-code-point@1.0.0(transitive)

• - Removedis-glob@2.0.1(transitive)

• - Removedis-number@2.1.04.0.0(transitive)

• - Removedis-posix-bracket@0.1.1(transitive)

• - Removedis-primitive@2.0.0(transitive)

• - Removedis-typedarray@1.0.0(transitive)

• - Removedis-utf8@0.2.1(transitive)

• - Removedisarray@1.0.02.0.5(transitive)

• - Removedisexe@2.0.0(transitive)

• - Removedisobject@2.1.0(transitive)

• - Removedisstream@0.1.2(transitive)

• - Removedistanbul-api@1.3.7(transitive)

• - Removedistanbul-lib-coverage@1.2.1(transitive)

• - Removedistanbul-lib-hook@1.2.2(transitive)

• - Removedistanbul-lib-instrument@1.10.2(transitive)

• - Removedistanbul-lib-report@1.1.5(transitive)

• - Removedistanbul-lib-source-maps@1.2.6(transitive)

• - Removedistanbul-reports@1.5.1(transitive)

• - Removedjest-changed-files@17.0.2(transitive)

• - Removedjest-cli@18.1.0(transitive)

• - Removedjest-config@18.1.0(transitive)

• - Removedjest-diff@18.1.0(transitive)

• - Removedjest-environment-jsdom@18.1.0(transitive)

• - Removedjest-environment-node@18.1.0(transitive)

• - Removedjest-file-exists@17.0.0(transitive)

• - Removedjest-haste-map@18.1.0(transitive)

• - Removedjest-jasmine2@18.1.0(transitive)

• - Removedjest-matcher-utils@18.1.0(transitive)

• - Removedjest-matchers@18.1.0(transitive)

• - Removedjest-mock@18.0.0(transitive)

• - Removedjest-resolve@18.1.0(transitive)

• - Removedjest-resolve-dependencies@18.1.0(transitive)

• - Removedjest-runtime@18.1.0(transitive)

• - Removedjest-snapshot@18.1.0(transitive)

• - Removedjest-util@18.1.0(transitive)

• - Removedjs-tokens@3.0.2(transitive)

• - Removedjs-yaml@3.14.1(transitive)

• - Removedjsbn@0.1.1(transitive)

• - Removedjsdom@9.12.0(transitive)

• - Removedjsesc@1.3.0(transitive)

• - Removedjson-schema@0.4.0(transitive)

• - Removedjson-schema-traverse@0.4.1(transitive)

• - Removedjson-stable-stringify@1.2.1(transitive)

• - Removedjson-stringify-safe@5.0.1(transitive)

• - Removedjson5@0.5.1(transitive)

• - Removedjsonify@0.0.1(transitive)

• - Removedjsprim@1.4.2(transitive)

• - Removedkind-of@3.2.26.0.3(transitive)

• - Removedlcid@1.0.0(transitive)

• - Removedlevn@0.3.0(transitive)

• - Removedload-json-file@1.1.0(transitive)

• - Removedlodash@4.17.21(transitive)

• - Removedlodash._arraycopy@3.0.0(transitive)

• - Removedlodash._arrayeach@3.0.0(transitive)

• - Removedlodash._baseassign@3.2.0(transitive)

• - Removedlodash._baseclone@3.3.0(transitive)

• - Removedlodash._basecopy@3.0.1(transitive)

• - Removedlodash._basefor@3.0.3(transitive)

• - Removedlodash._bindcallback@3.0.1(transitive)

• - Removedlodash._getnative@3.9.1(transitive)

• - Removedlodash.clonedeep@3.0.2(transitive)

• - Removedlodash.isarguments@3.1.0(transitive)

• - Removedlodash.isarray@3.0.4(transitive)

• - Removedlodash.keys@3.1.2(transitive)

• - Removedloose-envify@1.4.0(transitive)

• - Removedmakeerror@1.0.12(transitive)

• - Removedmarked@0.7.0(transitive)

• - Removedmarked-terminal@3.3.0(transitive)

• - Removedmath-intrinsics@1.1.0(transitive)

• - Removedmath-random@1.0.4(transitive)

• - Removedmerge@1.2.1(transitive)

• - Removedmicromatch@2.3.11(transitive)

• - Removedmime-db@1.52.0(transitive)

• - Removedmime-types@2.1.35(transitive)

• - Removedminimatch@3.1.2(transitive)

• - Removedminimist@1.2.8(transitive)

• - Removedmkdirp@0.5.6(transitive)

• - Removedms@2.0.02.1.3(transitive)

• - Removednatural-compare@1.4.0(transitive)

• - Removedneo-async@2.6.2(transitive)

• - Removednode-emoji@1.11.0(transitive)

• - Removednode-int64@0.4.0(transitive)

• - Removednode-notifier@4.6.1(transitive)

• - Removednormalize-package-data@2.5.0(transitive)

• - Removednormalize-path@2.1.1(transitive)

• - Removednumber-is-nan@1.0.1(transitive)

• - Removednwmatcher@1.4.4(transitive)

• - Removedoauth-sign@0.9.0(transitive)

• - Removedobject-assign@4.1.1(transitive)

• - Removedobject-keys@1.1.1(transitive)

• - Removedobject.omit@2.0.1(transitive)

• - Removedonce@1.4.0(transitive)

• - Removedoptionator@0.8.3(transitive)

• - Removedos-homedir@1.0.2(transitive)

• - Removedos-locale@1.4.0(transitive)

• - Removedos-tmpdir@1.0.2(transitive)

• - Removedparse-glob@3.0.4(transitive)

• - Removedparse-json@2.2.0(transitive)

• - Removedparse5@1.5.1(transitive)

• - Removedpath-exists@2.1.0(transitive)

• - Removedpath-is-absolute@1.0.1(transitive)

• - Removedpath-parse@1.0.7(transitive)

• - Removedpath-type@1.1.0(transitive)

• - Removedperformance-now@2.1.0(transitive)

• - Removedpify@2.3.0(transitive)

• - Removedpinkie@2.0.4(transitive)

• - Removedpinkie-promise@2.0.1(transitive)

• - Removedprelude-ls@1.1.2(transitive)

• - Removedpreserve@0.2.0(transitive)

• - Removedpretty-format@18.1.0(transitive)

• - Removedprivate@0.1.8(transitive)

• - Removedprr@1.0.1(transitive)

• - Removedpsl@1.15.0(transitive)

• - Removedpunycode@2.3.1(transitive)

• - Removedqs@6.5.3(transitive)

• - Removedrandomatic@3.1.1(transitive)

• - Removedread-pkg@1.1.0(transitive)

• - Removedread-pkg-up@1.0.1(transitive)

• - Removedredeyed@2.1.1(transitive)

• - Removedregenerator-runtime@0.11.1(transitive)

• - Removedregex-cache@0.4.4(transitive)

• - Removedremove-trailing-separator@1.1.0(transitive)

• - Removedrepeat-element@1.1.4(transitive)

• - Removedrepeat-string@1.6.1(transitive)

• - Removedrepeating@2.0.1(transitive)

• - Removedrequest@2.88.2(transitive)

• - Removedrequire-directory@2.1.1(transitive)

• - Removedrequire-main-filename@1.0.1(transitive)

• - Removedresolve@1.1.71.22.10(transitive)

• - Removedrimraf@2.7.1(transitive)

• - Removedsafe-buffer@5.2.1(transitive)

• - Removedsafer-buffer@2.1.2(transitive)

• - Removedsane@1.4.1(transitive)

• - Removedsax@1.4.1(transitive)

• - Removedsemver@5.7.2(transitive)

• - Removedset-blocking@2.0.0(transitive)

• - Removedset-function-length@1.2.2(transitive)

• - Removedshellwords@0.1.1(transitive)

• - Removedslash@1.0.0(transitive)

• - Removedsource-map@0.5.70.6.1(transitive)

• - Removedsource-map-support@0.4.18(transitive)

• - Removedspdx-correct@3.2.0(transitive)

• - Removedspdx-exceptions@2.5.0(transitive)

• - Removedspdx-expression-parse@3.0.1(transitive)

• - Removedspdx-license-ids@3.0.21(transitive)

• - Removedsprintf-js@1.0.3(transitive)

• - Removedsshpk@1.18.0(transitive)

• - Removedstring-width@1.0.2(transitive)

• - Removedstrip-ansi@3.0.1(transitive)

• - Removedstrip-bom@2.0.0(transitive)

• - Removedsupports-color@2.0.03.2.35.5.0(transitive)

• - Removedsupports-hyperlinks@1.0.1(transitive)

• - Removedsupports-preserve-symlinks-flag@1.0.0(transitive)

• - Removedsymbol-tree@3.2.4(transitive)

• - Removedtest-exclude@3.3.0(transitive)

• - Removedthroat@3.2.0(transitive)

• - Removedtmpl@1.0.5(transitive)

• - Removedto-fast-properties@1.0.3(transitive)

• - Removedtough-cookie@2.5.0(transitive)

• - Removedtr46@0.0.3(transitive)

• - Removedtrim-right@1.0.1(transitive)

• - Removedtunnel-agent@0.6.0(transitive)

• - Removedtweetnacl@0.14.5(transitive)

• - Removedtype-check@0.3.2(transitive)

• - Removeduglify-js@3.19.3(transitive)

• - Removeduri-js@4.4.1(transitive)

• - Removeduuid@3.4.0(transitive)

• - Removedvalidate-npm-package-license@3.0.4(transitive)

• - Removedverror@1.10.0(transitive)

• - Removedwalker@1.0.8(transitive)

• - Removedwatch@0.10.0(transitive)

• - Removedwebidl-conversions@3.0.14.0.2(transitive)

• - Removedwhatwg-encoding@1.0.5(transitive)

• - Removedwhatwg-url@4.8.0(transitive)

• - Removedwhich@1.3.1(transitive)

• - Removedwhich-module@1.0.0(transitive)

• - Removedword-wrap@1.2.5(transitive)

• - Removedwordwrap@1.0.0(transitive)

• - Removedworker-farm@1.7.0(transitive)

• - Removedwrap-ansi@2.1.0(transitive)

• - Removedwrappy@1.0.2(transitive)

• - Removedxml-name-validator@2.0.1(transitive)

• - Removedy18n@3.2.2(transitive)

• - Removedyargs@6.6.0(transitive)

• - Removedyargs-parser@4.2.1(transitive)

• Updatedglobal-mercator@^1.6.1