From cd9b52572a0c340ed0e3af3d482a9b88511f5a8c Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 12 Nov 2013 01:17:59 +0100
Subject: [PATCH] Replace ol.geom.GeometryType with ol.geom.Type

---
 examples/geojson.js                     | 8 ++++----
 src/ol/geom/geometry.js                 | 4 ++--
 src/ol/geom/linestring.js               | 2 +-
 src/ol/geom/multilinestring.js          | 2 +-
 src/ol/geom/multipoint.js               | 2 +-
 src/ol/geom/multipolygon.js             | 2 +-
 src/ol/geom/point.js                    | 2 +-
 src/ol/geom/polygon.js                  | 2 +-
 src/ol/render/canvas/canvasimmediate.js | 2 +-
 src/ol/render/vector.js                 | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/examples/geojson.js b/examples/geojson.js
index 9acff760e1..64cba64f3c 100644
--- a/examples/geojson.js
+++ b/examples/geojson.js
@@ -15,11 +15,11 @@ goog.require('ol.symbol');
 var image = ol.symbol.renderCircle(5, null, {color: 'red', width: 1});
 var styleFunction = function(feature) {
   switch (feature.getGeometry().getType()) {
-    case ol.geom.GeometryType.POINT:
+    case ol.geom.Type.POINT:
       return {
         image: image
       };
-    case ol.geom.GeometryType.POLYGON:
+    case ol.geom.Type.POLYGON:
       return {
         stroke: {
           color: 'blue',
@@ -29,14 +29,14 @@ var styleFunction = function(feature) {
           color: 'rgba(0, 0, 255, 0.1)'
         }
       };
-    case ol.geom.GeometryType.MULTI_LINE_STRING:
+    case ol.geom.Type.MULTI_LINE_STRING:
       return {
         stroke: {
           color: 'green',
           width: 1
         }
       };
-    case ol.geom.GeometryType.MULTI_POLYGON:
+    case ol.geom.Type.MULTI_POLYGON:
       return {
         stroke: {
           color: 'yellow',
diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js
index a35b3ef1c9..d31c957fd9 100644
--- a/src/ol/geom/geometry.js
+++ b/src/ol/geom/geometry.js
@@ -12,7 +12,7 @@ goog.require('ol.extent');
 /**
  * @enum {string}
  */
-ol.geom.GeometryType = {
+ol.geom.Type = {
   POINT: 'Point',
   LINE_STRING: 'LineString',
   POLYGON: 'Polygon',
@@ -156,7 +156,7 @@ ol.geom.Geometry.prototype.getStride = function() {
 
 
 /**
- * @return {ol.geom.GeometryType} Geometry type.
+ * @return {ol.geom.Type} Geometry type.
  */
 ol.geom.Geometry.prototype.getType = goog.abstractMethod;
 
diff --git a/src/ol/geom/linestring.js b/src/ol/geom/linestring.js
index 3daab3ff70..f0b32ae125 100644
--- a/src/ol/geom/linestring.js
+++ b/src/ol/geom/linestring.js
@@ -30,7 +30,7 @@ ol.geom.LineString.prototype.getCoordinates = function() {
  * @inheritDoc
  */
 ol.geom.LineString.prototype.getType = function() {
-  return ol.geom.GeometryType.LINE_STRING;
+  return ol.geom.Type.LINE_STRING;
 };
 
 
diff --git a/src/ol/geom/multilinestring.js b/src/ol/geom/multilinestring.js
index 0fe383b7e8..ef06708427 100644
--- a/src/ol/geom/multilinestring.js
+++ b/src/ol/geom/multilinestring.js
@@ -47,7 +47,7 @@ ol.geom.MultiLineString.prototype.getEnds = function() {
  * @inheritDoc
  */
 ol.geom.MultiLineString.prototype.getType = function() {
-  return ol.geom.GeometryType.MULTI_LINE_STRING;
+  return ol.geom.Type.MULTI_LINE_STRING;
 };
 
 
diff --git a/src/ol/geom/multipoint.js b/src/ol/geom/multipoint.js
index 7f2f7af09d..f323e1da02 100644
--- a/src/ol/geom/multipoint.js
+++ b/src/ol/geom/multipoint.js
@@ -30,7 +30,7 @@ ol.geom.MultiPoint.prototype.getCoordinates = function() {
  * @inheritDoc
  */
 ol.geom.MultiPoint.prototype.getType = function() {
-  return ol.geom.GeometryType.MULTI_POINT;
+  return ol.geom.Type.MULTI_POINT;
 };
 
 
diff --git a/src/ol/geom/multipolygon.js b/src/ol/geom/multipolygon.js
index 9fa28b35f8..c0587ab503 100644
--- a/src/ol/geom/multipolygon.js
+++ b/src/ol/geom/multipolygon.js
@@ -56,7 +56,7 @@ ol.geom.MultiPolygon.prototype.getEndss = function() {
  * @inheritDoc
  */
 ol.geom.MultiPolygon.prototype.getType = function() {
-  return ol.geom.GeometryType.MULTI_POLYGON;
+  return ol.geom.Type.MULTI_POLYGON;
 };
 
 
diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js
index 38e7f4eb81..7d660b92b6 100644
--- a/src/ol/geom/point.js
+++ b/src/ol/geom/point.js
@@ -45,7 +45,7 @@ ol.geom.Point.prototype.getExtent = function(opt_extent) {
  * @inheritDoc
  */
 ol.geom.Point.prototype.getType = function() {
-  return ol.geom.GeometryType.POINT;
+  return ol.geom.Type.POINT;
 };
 
 
diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js
index be5531a4c1..965df227d8 100644
--- a/src/ol/geom/polygon.js
+++ b/src/ol/geom/polygon.js
@@ -56,7 +56,7 @@ ol.geom.Polygon.prototype.getEnds = function() {
  * @inheritDoc
  */
 ol.geom.Polygon.prototype.getType = function() {
-  return ol.geom.GeometryType.POLYGON;
+  return ol.geom.Type.POLYGON;
 };
 
 
diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js
index 041d28184d..548f9950d3 100644
--- a/src/ol/render/canvas/canvasimmediate.js
+++ b/src/ol/render/canvas/canvasimmediate.js
@@ -290,7 +290,7 @@ ol.render.canvas.Immediate.prototype.setImageStyle = function(imageStyle) {
 /**
  * @const
  * @private
- * @type {Object.<ol.geom.GeometryType,
+ * @type {Object.<ol.geom.Type,
  *                function(this: ol.render.canvas.Immediate, ol.geom.Geometry)>}
  */
 ol.render.canvas.Immediate.GEOMETRY_RENDERES_ = {
diff --git a/src/ol/render/vector.js b/src/ol/render/vector.js
index 8f3cefb370..2fb0a590c0 100644
--- a/src/ol/render/vector.js
+++ b/src/ol/render/vector.js
@@ -148,7 +148,7 @@ ol.renderer.vector.renderPolygonGeometry_ =
 /**
  * @const
  * @private
- * @type {Object.<ol.geom.GeometryType,
+ * @type {Object.<ol.geom.Type,
  *                function(ol.render.IReplayReplayGroup, ol.geom.Geometry,
  *                         ol.style.Style)>}
  */