From d54690c3e4ff13d33e617deccf344bbb11394567 Mon Sep 17 00:00:00 2001
From: Farouk Abdou <kaktus40@hotmail.fr>
Date: Wed, 5 Aug 2015 07:38:30 +0200
Subject: [PATCH 1/4] adding reverseZ

---
 Source/Scene/UrlTemplateImageryProvider.js    | 8 ++++++++
 Specs/Scene/UrlTemplateImageryProviderSpec.js | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Source/Scene/UrlTemplateImageryProvider.js b/Source/Scene/UrlTemplateImageryProvider.js
index 266f33a48154..a05954afb470 100644
--- a/Source/Scene/UrlTemplateImageryProvider.js
+++ b/Source/Scene/UrlTemplateImageryProvider.js
@@ -62,6 +62,7 @@ define([
      *     <li><code>{s}</code>: One of the available subdomains, used to overcome browser limits on the number of simultaneous requests per host.</li>
      *     <li><code>{reverseX}</code>: The tile X coordinate in the tiling scheme, where 0 is the Easternmost tile.</li>
      *     <li><code>{reverseY}</code>: The tile Y coordinate in the tiling scheme, where 0 is the Southernmost tile.</li>
+     *     <li><code>{reverseZ}</code>: The level of the tile in the tiling scheme.  Level zero is the maximum level of the quadtree pyramid. In order to use reverseZ, maximumLevel must be defined</li>
      *     <li><code>{westDegrees}</code>: The Western edge of the tile in geodetic degrees.</li>
      *     <li><code>{southDegrees}</code>: The Southern edge of the tile in geodetic degrees.</li>
      *     <li><code>{eastDegrees}</code>: The Eastern edge of the tile in geodetic degrees.</li>
@@ -201,6 +202,7 @@ define([
          *  <li> <code>{s}</code>: One of the available subdomains, used to overcome browser limits on the number of simultaneous requests per host.</li>
          *  <li> <code>{reverseX}</code>: The tile X coordinate in the tiling scheme, where 0 is the Easternmost tile.</li>
          *  <li> <code>{reverseY}</code>: The tile Y coordinate in the tiling scheme, where 0 is the Southernmost tile.</li>
+         *  <li> <code>{reverseZ}</code>: The level of the tile in the tiling scheme.  Level zero is the maximum level of the quadtree pyramid. In order to use reverseZ, maximumLevel must be defined</li>
          *  <li> <code>{westDegrees}</code>: The Western edge of the tile in geodetic degrees.</li>
          *  <li> <code>{southDegrees}</code>: The Southern edge of the tile in geodetic degrees.</li>
          *  <li> <code>{eastDegrees}</code>: The Eastern edge of the tile in geodetic degrees.</li>
@@ -598,6 +600,11 @@ define([
         return imageryProvider.tilingScheme.getNumberOfYTilesAtLevel(level) - y - 1;
     }
 
+    function reverseZTag(imageryProvider, x, y, level) {
+    	var maximumLevel=imageryProvider.maximumLevel;
+    	return (defined(maximumLevel) && level<maximumLevel) ? maximumLevel-level-1:level;
+    }
+
     function zTag(imageryProvider, x, y, level) {
         return level;
     }
@@ -777,6 +784,7 @@ define([
         '{s}': sTag,
         '{reverseX}': reverseXTag,
         '{reverseY}': reverseYTag,
+        '{reverseZ}': reverseZTag,
         '{westDegrees}': westDegreesTag,
         '{southDegrees}': southDegreesTag,
         '{eastDegrees}': eastDegreesTag,
diff --git a/Specs/Scene/UrlTemplateImageryProviderSpec.js b/Specs/Scene/UrlTemplateImageryProviderSpec.js
index b2bc2621d805..8e50aaa6ae09 100644
--- a/Specs/Scene/UrlTemplateImageryProviderSpec.js
+++ b/Specs/Scene/UrlTemplateImageryProviderSpec.js
@@ -223,17 +223,18 @@ defineSuite([
         });
     });
 
-    it('evaluation of pattern X Y reverseX reverseY Z', function() {
+    it('evaluation of pattern X Y reverseX reverseY Z reverseZ', function() {
         var provider = new UrlTemplateImageryProvider({
-            url: 'made/up/tms/server/{z}/{reverseY}/{y}/{reverseX}/{x}.PNG',
-            tilingScheme: new GeographicTilingScheme()
+            url: 'made/up/tms/server/{z}/{reverseZ}/{reverseY}/{y}/{reverseX}/{x}.PNG',
+            tilingScheme: new GeographicTilingScheme(),
+            maximumLevel: 6
         });
 
         return pollToPromise(function() {
             return provider.ready;
         }).then(function() {
             spyOn(loadImage, 'createImage').and.callFake(function(url, crossOrigin, deferred) {
-                expect(url).toEqual('made/up/tms/server/2/2/1/4/3.PNG');
+                expect(url).toEqual('made/up/tms/server/2/3/2/1/4/3.PNG');
 
                 // Just return any old image.
                 loadImage.defaultCreateImage('Data/Images/Red16x16.png', crossOrigin, deferred);

From 1d83807060b9a3694c92ca58b2a46a4c18e790cb Mon Sep 17 00:00:00 2001
From: Farouk Abdou <kaktus40@hotmail.fr>
Date: Wed, 5 Aug 2015 08:19:37 +0200
Subject: [PATCH 2/4] remove tabs

---
 Source/Scene/UrlTemplateImageryProvider.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Scene/UrlTemplateImageryProvider.js b/Source/Scene/UrlTemplateImageryProvider.js
index a05954afb470..7755ecaadc28 100644
--- a/Source/Scene/UrlTemplateImageryProvider.js
+++ b/Source/Scene/UrlTemplateImageryProvider.js
@@ -601,8 +601,8 @@ define([
     }
 
     function reverseZTag(imageryProvider, x, y, level) {
-    	var maximumLevel=imageryProvider.maximumLevel;
-    	return (defined(maximumLevel) && level<maximumLevel) ? maximumLevel-level-1:level;
+        var maximumLevel=imageryProvider.maximumLevel;
+        return (defined(maximumLevel) && level<maximumLevel) ? maximumLevel-level-1:level;
     }
 
     function zTag(imageryProvider, x, y, level) {

From 77141037165d8b27cb11daf51d00fb94da01d2a4 Mon Sep 17 00:00:00 2001
From: Farouk Abdou <kaktus40@hotmail.fr>
Date: Wed, 5 Aug 2015 14:02:52 +0200
Subject: [PATCH 3/4] update CHANGES.MD

---
 CHANGES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index ec09cf6489a5..87724d121520 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+### 1.13 - 2015-09-01
+
+* Breaking changes
+* Added `reverseZ` tag to `UrlTemplateImageryProvider`.
+
 ### 1.12 - 2015-08-03
 
 * Breaking changes

From 110f8c6fd9e7761846e9a743350eb1ed2d345ea1 Mon Sep 17 00:00:00 2001
From: Kevin Ring <kevin@kotachrome.com>
Date: Sat, 22 Aug 2015 20:45:53 -0400
Subject: [PATCH 4/4] Minor doc/formatting tweaks.

---
 Source/Scene/UrlTemplateImageryProvider.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Scene/UrlTemplateImageryProvider.js b/Source/Scene/UrlTemplateImageryProvider.js
index add433a747cc..7f78c0e97f5a 100644
--- a/Source/Scene/UrlTemplateImageryProvider.js
+++ b/Source/Scene/UrlTemplateImageryProvider.js
@@ -62,7 +62,7 @@ define([
      *     <li><code>{s}</code>: One of the available subdomains, used to overcome browser limits on the number of simultaneous requests per host.</li>
      *     <li><code>{reverseX}</code>: The tile X coordinate in the tiling scheme, where 0 is the Easternmost tile.</li>
      *     <li><code>{reverseY}</code>: The tile Y coordinate in the tiling scheme, where 0 is the Southernmost tile.</li>
-     *     <li><code>{reverseZ}</code>: The level of the tile in the tiling scheme.  Level zero is the maximum level of the quadtree pyramid. In order to use reverseZ, maximumLevel must be defined</li>
+     *     <li><code>{reverseZ}</code>: The level of the tile in the tiling scheme, where level zero is the maximum level of the quadtree pyramid.  In order to use reverseZ, maximumLevel must be defined.</li>
      *     <li><code>{westDegrees}</code>: The Western edge of the tile in geodetic degrees.</li>
      *     <li><code>{southDegrees}</code>: The Southern edge of the tile in geodetic degrees.</li>
      *     <li><code>{eastDegrees}</code>: The Eastern edge of the tile in geodetic degrees.</li>
@@ -202,7 +202,7 @@ define([
          *  <li> <code>{s}</code>: One of the available subdomains, used to overcome browser limits on the number of simultaneous requests per host.</li>
          *  <li> <code>{reverseX}</code>: The tile X coordinate in the tiling scheme, where 0 is the Easternmost tile.</li>
          *  <li> <code>{reverseY}</code>: The tile Y coordinate in the tiling scheme, where 0 is the Southernmost tile.</li>
-         *  <li> <code>{reverseZ}</code>: The level of the tile in the tiling scheme.  Level zero is the maximum level of the quadtree pyramid. In order to use reverseZ, maximumLevel must be defined</li>
+         *  <li> <code>{reverseZ}</code>: The level of the tile in the tiling scheme, where level zero is the maximum level of the quadtree pyramid.  In order to use reverseZ, maximumLevel must be defined.</li>
          *  <li> <code>{westDegrees}</code>: The Western edge of the tile in geodetic degrees.</li>
          *  <li> <code>{southDegrees}</code>: The Southern edge of the tile in geodetic degrees.</li>
          *  <li> <code>{eastDegrees}</code>: The Eastern edge of the tile in geodetic degrees.</li>
@@ -601,8 +601,8 @@ define([
     }
 
     function reverseZTag(imageryProvider, x, y, level) {
-        var maximumLevel=imageryProvider.maximumLevel;
-        return (defined(maximumLevel) && level<maximumLevel) ? maximumLevel-level-1:level;
+        var maximumLevel = imageryProvider.maximumLevel;
+        return defined(maximumLevel) && level < maximumLevel ? maximumLevel - level - 1 : level;
     }
 
     function zTag(imageryProvider, x, y, level) {