From a70840e717f97bc012b229f55fa8865e800f086e Mon Sep 17 00:00:00 2001
From: Ailrun <jjc9310@gmail.com>
Date: Tue, 19 Sep 2017 22:48:15 -0400
Subject: [PATCH] Update openlayers layer options

---
 types/openlayers/index.d.ts          | 21 +++++++---
 types/openlayers/openlayers-tests.ts | 59 +++++++++++++++++++++++++++-
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 351146d884..962625f087 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Olivier Sechet <https://github.com/osechet>
 //                 Guilhem Brouat <https://github.com/ganlhi>
 //                 Bin Wang <https://github.com/wb14123>
+//                 Junyoung Clare Jang <https://github.com/ailrun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
@@ -12751,7 +12752,8 @@ declare module olx {
          *     maxResolution: (number|undefined),
          *     opacity: (number|undefined),
          *     source: (ol.source.Vector|undefined),
-         *     visible: (boolean|undefined)}}
+         *     visible: (boolean|undefined),
+         *     zIndex: (number|undefined)}}
          */
         interface HeatmapOptions {
             gradient?: string[];
@@ -12765,6 +12767,7 @@ declare module olx {
             opacity?: number;
             source: ol.source.Vector;
             visible?: boolean;
+            zIndex?: number;
         }
 
 
@@ -12775,7 +12778,8 @@ declare module olx {
          *     visible: (boolean|undefined),
          *     extent: (ol.Extent|undefined),
          *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined)}}
+         *     maxResolution: (number|undefined),
+         *     zIndex: (number|undefined)}}
          */
         interface ImageOptions {
             opacity?: number;
@@ -12785,6 +12789,7 @@ declare module olx {
             extent?: ol.Extent;
             minResolution?: number;
             maxResolution?: number;
+            zIndex?: number;
         }
 
 
@@ -12797,7 +12802,8 @@ declare module olx {
          *     extent: (ol.Extent|undefined),
          *     minResolution: (number|undefined),
          *     maxResolution: (number|undefined),
-         *     useInterimTilesOnError: (boolean|undefined)}}
+         *     useInterimTilesOnError: (boolean|undefined),
+         *     zIndex: (number|undefined)}}
          */
         interface TileOptions {
             opacity?: number;
@@ -12809,6 +12815,7 @@ declare module olx {
             minResolution?: number;
             maxResolution?: number;
             useInterimTilesOnError?: boolean;
+            zIndex?: number;
         }
 
 
@@ -12823,7 +12830,8 @@ declare module olx {
          *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
          *     updateWhileAnimating: (boolean|undefined),
          *     updateWhileInteracting: (boolean|undefined),
-         *     visible: (boolean|undefined)}}
+         *     visible: (boolean|undefined),
+         *     zIndex: (number|undefined)}}
          */
         interface VectorOptions {
             renderOrder?: (feature1: ol.Feature, feature2: ol.Feature) => number;
@@ -12838,6 +12846,7 @@ declare module olx {
             updateWhileAnimating?: boolean;
             updateWhileInteracting?: boolean;
             visible?: boolean;
+            zIndex?: number;
         }
 
 
@@ -12854,7 +12863,8 @@ declare module olx {
          *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
          *     updateWhileAnimating: (boolean|undefined),
          *     updateWhileInteracting: (boolean|undefined),
-         *     visible: (boolean|undefined)}}
+         *     visible: (boolean|undefined),
+         *     zIndex: (number|undefined)}}
          */
         interface VectorTileOptions {
             renderBuffer?: number;
@@ -12870,6 +12880,7 @@ declare module olx {
             updateWhileAnimating?: boolean;
             updateWhileInteracting?: boolean;
             visible?: boolean;
+            zIndex?: number;
         }
 
 
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index 3ebea5f095..b341ad6ffd 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -400,11 +400,68 @@ let view: ol.View = new ol.View({
 voidValue = view.setMaxZoom(numberValue);
 voidValue = view.setMinZoom(numberValue);
 
+//
+// ol.layer.Base
+//
+let baseLayer: ol.layer.Base = new ol.layer.Base({
+    zIndex: 1
+});
+
+//
+// ol.layer.Group
+//
+let groupLayer: ol.layer.Group = new ol.layer.Group({
+    zIndex: 2
+});
+
+//
+// ol.layer.Heatmap
+//
+let heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
+    source: new ol.source.Vector(),
+    weight: '',
+    zIndex: 1
+});
+
+//
+// ol.layer.Image
+//
+let imageLayer: ol.layer.Image = new ol.layer.Image({
+    source: new ol.source.Image({
+        projection: ''
+    }),
+    zIndex: 1
+});
+
+//
+// ol.layer.Layer
+//
+let layerLayer: ol.layer.Layer = new ol.layer.Layer({
+    zIndex: 2
+});
+
 //
 // ol.layer.Tile
 //
 let tileLayer: ol.layer.Tile = new ol.layer.Tile({
-    source: new ol.source.OSM()
+    source: new ol.source.OSM(),
+    zIndex: 0
+});
+
+//
+// ol.layer.Vector
+//
+let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
+    source: new ol.source.Vector(),
+    zIndex: -1
+});
+
+//
+// ol.layer.VectorTile
+//
+let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
+    renderOrder: () => 1,
+    zIndex: 2
 });
 
 //