From b5bcaea3a08f25a5b0143fae4fd569464b0d5099 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Thu, 14 Nov 2013 12:48:06 +0100
Subject: [PATCH] Proj4js no longer needed for wmts-from-capabilities example

The WMTS capabilities document of the Vienna map has changed. It
no longer defines a tileset for EPSG:31256, so it can be parsed
without having Proj4js and a projection definition for
EPSG:31256.
---
 examples/data/WMTSCapabilities.xml   | 134 ---------------------------
 examples/wmts-from-capabilities.html |   1 -
 examples/wmts-from-capabilities.js   |   6 --
 3 files changed, 141 deletions(-)

diff --git a/examples/data/WMTSCapabilities.xml b/examples/data/WMTSCapabilities.xml
index 11701a5f6f..b58c4644b5 100644
--- a/examples/data/WMTSCapabilities.xml
+++ b/examples/data/WMTSCapabilities.xml
@@ -179,140 +179,6 @@
 			<ResourceURL format="image/png" template="http://maps4.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png" resourceType="tile"/>
 			<ResourceURL format="image/png" template="http://maps.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png" resourceType="tile"/>
 		</Layer>
-		<TileMatrixSet>
-			<ows:Identifier>viennagis31256</ows:Identifier>
-			<ows:BoundingBox crs="urn:ogc:def:crs:EPSG::31256">
-				<ows:LowerCorner>-11500 330500</ows:LowerCorner>
-				<ows:UpperCorner>18500 354000</ows:UpperCorner>
-			</ows:BoundingBox>
-			<ows:SupportedCRS>urn:ogc:def:crs:EPSG::31256</ows:SupportedCRS>
-			<TileMatrix>
-				<ows:Identifier>0</ows:Identifier>
-				<ScaleDenominator>500000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>2</MatrixWidth>
-				<MatrixHeight>1</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>1</ows:Identifier>
-				<ScaleDenominator>250000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>3</MatrixWidth>
-				<MatrixHeight>2</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>2</ows:Identifier>
-				<ScaleDenominator>125000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>5</MatrixWidth>
-				<MatrixHeight>3</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>3</ows:Identifier>
-				<ScaleDenominator>64000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>9</MatrixWidth>
-				<MatrixHeight>6</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>4</ows:Identifier>
-				<ScaleDenominator>32000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>17</MatrixWidth>
-				<MatrixHeight>12</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>5</ows:Identifier>
-				<ScaleDenominator>16000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>33</MatrixWidth>
-				<MatrixHeight>24</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>6</ows:Identifier>
-				<ScaleDenominator>8000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>66</MatrixWidth>
-				<MatrixHeight>47</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>7</ows:Identifier>
-				<ScaleDenominator>5000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>105</MatrixWidth>
-				<MatrixHeight>74</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>8</ows:Identifier>
-				<ScaleDenominator>4000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>132</MatrixWidth>
-				<MatrixHeight>93</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>9</ows:Identifier>
-				<ScaleDenominator>3000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>175</MatrixWidth>
-				<MatrixHeight>124</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>10</ows:Identifier>
-				<ScaleDenominator>2000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>263</MatrixWidth>
-				<MatrixHeight>185</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>11</ows:Identifier>
-				<ScaleDenominator>1500.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>350</MatrixWidth>
-				<MatrixHeight>247</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>12</ows:Identifier>
-				<ScaleDenominator>1000.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>525</MatrixWidth>
-				<MatrixHeight>370</MatrixHeight>
-			</TileMatrix>
-			<TileMatrix>
-				<ows:Identifier>13</ows:Identifier>
-				<ScaleDenominator>500.0</ScaleDenominator>
-				<TopLeftCorner>355000.0 -13500.0</TopLeftCorner>
-				<TileWidth>256</TileWidth>
-				<TileHeight>256</TileHeight>
-				<MatrixWidth>1049</MatrixWidth>
-				<MatrixHeight>739</MatrixHeight>
-			</TileMatrix>
-		</TileMatrixSet>
 		<TileMatrixSet>
 			<!-- -180 85.05112878 -->
 			<ows:Identifier>google3857</ows:Identifier>
diff --git a/examples/wmts-from-capabilities.html b/examples/wmts-from-capabilities.html
index caf9292e1a..855e23256e 100644
--- a/examples/wmts-from-capabilities.html
+++ b/examples/wmts-from-capabilities.html
@@ -43,7 +43,6 @@
 
     </div>
 
-    <script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/1.1.0/proj4js-compressed.js" type="text/javascript"></script>
     <script src="loader.js?id=wmts-from-capabilities" type="text/javascript"></script>
     <script src="../resources/example-behaviour.js" type="text/javascript"></script>
 
diff --git a/examples/wmts-from-capabilities.js b/examples/wmts-from-capabilities.js
index a67b05c21f..e826adc5d6 100644
--- a/examples/wmts-from-capabilities.js
+++ b/examples/wmts-from-capabilities.js
@@ -6,12 +6,6 @@ goog.require('ol.parser.ogc.WMTSCapabilities');
 goog.require('ol.source.WMTS');
 
 
-// the getCapabilities document uses EPSG:31256 projection
-Proj4js.defs['EPSG:31256'] = '+proj=tmerc +lat_0=0 ' +
-    '+lon_0=16.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +ellps=bessel ' +
-    '+towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232 ' +
-    '+units=m +no_defs';
-
 var map, capabilities;
 var parser = new ol.parser.ogc.WMTSCapabilities();