refactor(source): The projection option to instance a TMS and WMTS so…

…urce is mandatory. BREAKING CHANGE: The projection option to instance a TMS and WMTS source is mandatory.
iTowns · Jul 29, 2019 · 1f35627 · 1f35627
1 parent f191a74
commit 1f35627
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 91 deletions.
diff --git a/examples/layers/JSONLayers/Administrative.json b/examples/layers/JSONLayers/Administrative.json
@@ -5,6 +5,7 @@
   "opacity": 1,
   "transparent": true,
   "source": {
+    "projection": "EPSG:3857",
     "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
     "tileMatrixSet": "PM",
     "format": "image/png",

diff --git a/examples/layers/JSONLayers/Cada.json b/examples/layers/JSONLayers/Cada.json
@@ -6,6 +6,7 @@
   "transparent": true,
   "source": {
     "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+    "projection": "EPSG:3857",
     "networkOptions": {
       "crossOrigin": "omit"
     },

diff --git a/examples/layers/JSONLayers/Cassini.json b/examples/layers/JSONLayers/Cassini.json
@@ -2,6 +2,7 @@
     "id":         "Cassini",
     "source": {
         "url": "http://wxs.ign.fr/va5orxd0pgzvq3jxutqfuy0b/geoportail/wmts",
+        "projection": "EPSG:3857",
         "networkOptions": {
             "crossOrigin": "anonymous"
         },

diff --git a/examples/layers/JSONLayers/DARK.json b/examples/layers/JSONLayers/DARK.json
@@ -1,6 +1,7 @@
 {
     "id": "DARK",
     "source": {
+        "projection": "EPSG:3857",
 	    "networkOptions": { "crossOrigin" : "anonymous" },
         "format": "image/png",
         "url": "http://a.basemaps.cartocdn.com/dark_all/${z}/${x}/${y}.png",

diff --git a/examples/layers/JSONLayers/Denomination.json b/examples/layers/JSONLayers/Denomination.json
@@ -6,6 +6,7 @@
   "transparent": true,
   "source": {
     "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+    "projection": "EPSG:3857",
     "tileMatrixSet": "PM",
     "format": "image/png",
     "name": "GEOGRAPHICALNAMES.NAMES",

diff --git a/examples/layers/JSONLayers/EtatMajor.json b/examples/layers/JSONLayers/EtatMajor.json
@@ -3,6 +3,7 @@
     "opacity": 1,
     "transparent": true,
     "source": {
+        "projection": "EPSG:3857",
         "url":        "http://wxs.ign.fr/va5orxd0pgzvq3jxutqfuy0b/geoportail/wmts",
         "networkOptions": {
             "crossOrigin": "anonymous"

diff --git a/examples/layers/JSONLayers/IGN_MNT.json b/examples/layers/JSONLayers/IGN_MNT.json
@@ -9,6 +9,7 @@
     },
     "source": {
         "url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "projection": "EPSG:4326",
         "format": "image/x-bil;bits=32",
         "attribution" : {
             "name":"IGN",

diff --git a/examples/layers/JSONLayers/IGN_MNT_HIGHRES.json b/examples/layers/JSONLayers/IGN_MNT_HIGHRES.json
@@ -9,6 +9,7 @@
 	},
 	"source": {
 		"url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "projection": "EPSG:4326",
 		"format": "image/x-bil;bits=32",
 		"attribution" : {
 			"name":"IGN",

diff --git a/examples/layers/JSONLayers/OPENSM.json b/examples/layers/JSONLayers/OPENSM.json
@@ -1,6 +1,7 @@
 {
     "id": "OPENSM",
     "source": {
+        "projection": "EPSG:3857",
         "isInverted": true,
         "format": "image/png",
         "url": "http://osm.oslandia.io/styles/klokantech-basic/${z}/${x}/${y}.png",

diff --git a/examples/layers/JSONLayers/Ortho.json b/examples/layers/JSONLayers/Ortho.json
@@ -2,6 +2,7 @@
     "id":   "Ortho",
     "source": {
         "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "projection": "EPSG:3857",
         "networkOptions": {
             "crossOrigin": "anonymous"
         },

diff --git a/examples/layers/JSONLayers/OrthosCRS.json b/examples/layers/JSONLayers/OrthosCRS.json
diff --git a/examples/layers/JSONLayers/Railways.json b/examples/layers/JSONLayers/Railways.json
@@ -5,6 +5,7 @@
   "opacity": 1,
   "transparent": true,
   "source": {
+    "projection": "EPSG:3857",
     "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
     "format": "image/png",
     "networkOptions": {

diff --git a/examples/layers/JSONLayers/ScanEX.json b/examples/layers/JSONLayers/ScanEX.json
@@ -2,7 +2,8 @@
     "id":         "ScanEX",
     "fx" :        2.5,
     "source": {
-        "url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "projection": "EPSG:3857",
+        "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
         "format": "image/jpeg",
         "name": "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN-EXPRESS.STANDARD",
         "attribution" : {

diff --git a/examples/layers/JSONLayers/Top25.json b/examples/layers/JSONLayers/Top25.json
@@ -1,6 +1,7 @@
 {
     "id":         "Top25",
     "source": {
+        "projection": "EPSG:3857",
         "url":        "http://wxs.ign.fr/va5orxd0pgzvq3jxutqfuy0b/geoportail/wmts",
         "networkOptions": {
             "crossOrigin": "anonymous"

diff --git a/examples/layers/JSONLayers/Transport.json b/examples/layers/JSONLayers/Transport.json
@@ -5,6 +5,7 @@
   "opacity": 1,
   "transparent": true,
   "source": {
+    "projection": "EPSG:3857",
     "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
     "format": "image/png",
     "networkOptions": {

diff --git a/examples/layers/JSONLayers/WORLD_DTM.json b/examples/layers/JSONLayers/WORLD_DTM.json
@@ -10,6 +10,7 @@
     },
     "source": {
         "format": "image/x-bil;bits=32",
+        "projection": "EPSG:4326",
         "url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
         "name": "ELEVATION.ELEVATIONGRIDCOVERAGE.SRTM3",
         "tileMatrixSet": "WGS84G",

diff --git a/examples/tiff.html b/examples/tiff.html
@@ -34,6 +34,7 @@
             var tiffSource = new itowns.TMSSource({
                 url: 'https://raw.githubusercontent.com/iTowns/iTowns2-sample-data/master/geoid/localcolors/tiff/${z}/localcolors_${x}_${y}.tif',
                 tileMatrixSet: 'WGS84G',
+                projection: 'EPSG:4326',
                 parser: TIFFParser.parse,
                 fetcher: itowns.Fetcher.arrayBuffer,
                 zoom: { min: 0, max: 4 },

diff --git a/index.html b/index.html
@@ -37,7 +37,6 @@
             }
 
             itowns.Fetcher.json('examples/layers/JSONLayers/Ortho.json').then(createWMTSSourceFromConfig).then(addColorLayerFromConfig);
-            itowns.Fetcher.json('examples/layers/JSONLayers/OrthosCRS.json').then(createWMTSSourceFromConfig).then(addColorLayerFromConfig);
             itowns.Fetcher.json('examples/layers/JSONLayers/ScanEX.json').then(createWMTSSourceFromConfig).then(addColorLayerFromConfig);
             itowns.Fetcher.json('examples/layers/JSONLayers/Region.json')
                 .then(function _(config) {