drop the prefix for tilematrix entirely. also get rid of arcgis nonsense

okstate-maps · May 15, 2020 · 5b4ce10 · 5b4ce10
1 parent a9a4bb5
commit 5b4ce10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/wmts.js b/lib/wmts.js
@@ -24,8 +24,6 @@ var _default = _leaflet.default.TileLayer.extend({
     // (String, Object)
     this._url = url;
 
-    this.fromArcGIS = url.search("arcgis") > -1 ? true : false;
-
     var wmtsParams = _leaflet.default.extend({}, this.defaultWmtsParams);
 
     var tileSize = options.tileSize || this.options.tileSize;
@@ -70,7 +68,7 @@ var _default = _leaflet.default.TileLayer.extend({
 
     var ident = this.matrixIds[zoom].identifier;
     //var tilematrix = this.wmtsParams.tilematrixSet + ':' + ident;
-    var tilematrix = this.fromArcGIS ? ident : this.wmtsParams.tilematrixSet + ':' + ident; // change for ArcGIS WMTS 
+    var tilematrix = ident; //few providers I've seen use the prefix method above.
     var X0 = this.matrixIds[zoom].topLeftCorner.lng;
     var Y0 = this.matrixIds[zoom].topLeftCorner.lat;
     var tilecol = Math.floor((nw.x - X0) / tilewidth);

diff --git a/src/wmts.js b/src/wmts.js
@@ -16,8 +16,7 @@ export default L.TileLayer.extend({
   initialize: function(url, options) {
     // (String, Object)
     this._url = url;
-    this.fromArcGIS = url.search("arcgis") > -1 ? true : false;
-    var wmtsParams = L.extend({}, this.defaultWmtsParams);
+   var wmtsParams = L.extend({}, this.defaultWmtsParams);
     var tileSize = options.tileSize || this.options.tileSize;
     if (options.detectRetina && L.Browser.retina) {
       wmtsParams.width = wmtsParams.height = tileSize * 2;
@@ -53,7 +52,8 @@ export default L.TileLayer.extend({
     var tilewidth = se.x - nw.x;
     //zoom = this._map.getZoom();
     var ident = this.matrixIds[zoom].identifier;
-    var tilematrix = this.fromArcGIS ? this.wmtsParams.tilematrixSet : this.wmtsParams.tilematrixSet + ':' + ident; // change for ArcGIS WMTS 
+    //var tilematrix = this.wmtsParams.tilematrixSet + ':' + ident;
+    var tilematrix = ident; //few providers I've seen use the prefix method above
     var X0 = this.matrixIds[zoom].topLeftCorner.lng;
     var Y0 = this.matrixIds[zoom].topLeftCorner.lat;
     var tilecol = Math.floor((nw.x - X0) / tilewidth);