From 41f193e8b941861e6436448b96e448ab0ac9e1cd Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:07:45 +0100
Subject: [PATCH 01/18] Allow ol.Map renderer option to be a string

---
 src/objectliterals.jsdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index ad51b137e9..6c973bdef6 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -42,7 +42,7 @@
  * @property {boolean|undefined} ol3Logo Show ol3 logo. Default is `true`.
  * @property {ol.Collection|Array.<ol.Overlay>|undefined} overlays
  *     Overlays initially added to the map.
- * @property {ol.RendererHint|Array.<ol.RendererHint>|undefined} renderer Renderer.
+ * @property {ol.RendererHint|Array.<ol.RendererHint|string>|string|undefined} renderer Renderer.
  * @property {Element|string|undefined} target The container for the map.
  * @property {ol.IView|undefined} view The map's view. Currently
  *     {@link ol.View2D} is available as view.

From a58aa0a40df663e211fb0daf6e22c8db58a83338 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:09:39 +0100
Subject: [PATCH 02/18] Use string instead of ol.RendererHint enum in examples

---
 examples/brightness-contrast.js              | 3 +--
 examples/drag-and-drop.js                    | 3 +--
 examples/draw-features.js                    | 3 +--
 examples/dynamic-data.js                     | 3 +--
 examples/epsg-4326.js                        | 3 +--
 examples/export-map.js                       | 3 +--
 examples/full-screen-drag-rotate-and-zoom.js | 3 +--
 examples/geojson.js                          | 3 +--
 examples/getfeatureinfo.js                   | 3 +--
 examples/google-map.js                       | 3 +--
 examples/gpx.js                              | 3 +--
 examples/hue-saturation.js                   | 3 +--
 examples/icon.js                             | 3 +--
 examples/igc.js                              | 3 +--
 examples/image-vector-layer.js               | 3 +--
 examples/kml-earthquakes.js                  | 3 +--
 examples/kml-timezones.js                    | 3 +--
 examples/kml.js                              | 3 +--
 examples/layer-clipping-webgl.js             | 3 +--
 examples/layer-clipping.js                   | 3 +--
 examples/layer-spy.js                        | 3 +--
 examples/layer-swipe.js                      | 3 +--
 examples/localized-openstreetmap.js          | 3 +--
 examples/mapguide-untiled.js                 | 3 +--
 examples/rtree.js                            | 3 +--
 examples/select-features.js                  | 3 +--
 examples/side-by-side.js                     | 7 +++----
 examples/static-image.js                     | 3 +--
 examples/synthetic-lines.js                  | 3 +--
 examples/synthetic-points.js                 | 3 +--
 examples/topojson.js                         | 3 +--
 examples/vector-layer.js                     | 3 +--
 examples/wms-image.js                        | 3 +--
 examples/wms-tiled.js                        | 3 +--
 examples/wmts.js                             | 3 +--
 examples/xyz-esri.js                         | 3 +--
 36 files changed, 38 insertions(+), 74 deletions(-)

diff --git a/examples/brightness-contrast.js b/examples/brightness-contrast.js
index 863d75792f..5911c2d5d1 100644
--- a/examples/brightness-contrast.js
+++ b/examples/brightness-contrast.js
@@ -1,6 +1,5 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
@@ -28,7 +27,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
 
   var map = new ol.Map({
     layers: [layer],
-    renderer: ol.RendererHint.WEBGL,
+    renderer: 'webgl',
     target: 'map',
     view: new ol.View2D({
       center: [0, 0],
diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js
index 5b123f0e82..4e39605838 100644
--- a/examples/drag-and-drop.js
+++ b/examples/drag-and-drop.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.format.GPX');
 goog.require('ol.format.GeoJSON');
@@ -104,7 +103,7 @@ var map = new ol.Map({
       })
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/draw-features.js b/examples/draw-features.js
index b87eb6c7e0..19415de98f 100644
--- a/examples/draw-features.js
+++ b/examples/draw-features.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Draw');
@@ -43,7 +42,7 @@ var vector = new ol.layer.Vector({
 
 var map = new ol.Map({
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [-11000000, 4600000],
diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js
index e6d9307e42..94e992f5f1 100644
--- a/examples/dynamic-data.js
+++ b/examples/dynamic-data.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.geom.MultiPoint');
 goog.require('ol.layer.Tile');
@@ -15,7 +14,7 @@ var map = new ol.Map({
       source: new ol.source.MapQuest({layer: 'sat'})
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js
index 2f3a4dca95..b8da7d2623 100644
--- a/examples/epsg-4326.js
+++ b/examples/epsg-4326.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
@@ -29,7 +28,7 @@ var map = new ol.Map({
   ]),
   layers: layers,
   // The OSgeo server does not set cross origin headers, so we cannot use WebGL
-  renderer: [ol.RendererHint.CANVAS, ol.RendererHint.DOM],
+  renderer: ['canvas', 'dom'],
   target: 'map',
   view: new ol.View2D({
     projection: 'EPSG:4326',
diff --git a/examples/export-map.js b/examples/export-map.js
index 21341fd7d6..4809de7440 100644
--- a/examples/export-map.js
+++ b/examples/export-map.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
@@ -11,7 +10,7 @@ var map = new ol.Map({
       source: new ol.source.OSM()
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js
index c4f66b84d9..5d62cb4a65 100644
--- a/examples/full-screen-drag-rotate-and-zoom.js
+++ b/examples/full-screen-drag-rotate-and-zoom.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.FullScreen');
@@ -25,7 +24,7 @@ var map = new ol.Map({
     })
   ],
   // Use the canvas renderer because it's currently the fastest
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [-33519607, 5616436],
diff --git a/examples/geojson.js b/examples/geojson.js
index 13d7c0f70d..f8146d1000 100644
--- a/examples/geojson.js
+++ b/examples/geojson.js
@@ -1,6 +1,5 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.geom.Circle');
 goog.require('ol.layer.Tile');
@@ -188,7 +187,7 @@ var map = new ol.Map({
     }),
     vectorLayer
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/getfeatureinfo.js b/examples/getfeatureinfo.js
index 56d9d004eb..3c7ca3e7d9 100644
--- a/examples/getfeatureinfo.js
+++ b/examples/getfeatureinfo.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.TileWMS');
@@ -24,7 +23,7 @@ var viewProjection = /** @type {ol.proj.Projection} */
 
 var map = new ol.Map({
   layers: [wmsLayer],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: view
 });
diff --git a/examples/google-map.js b/examples/google-map.js
index 643a97a57a..9b0c48c7ee 100644
--- a/examples/google-map.js
+++ b/examples/google-map.js
@@ -1,7 +1,6 @@
 // NOCOMPILE
 // This example uses the GMapx v3 API, which we do not have an exports file for.
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragPan');
@@ -56,7 +55,7 @@ google.maps.event.addListenerOnce(gmap, 'tilesloaded', function() {
     layers: [vector],
     interactions: ol.interaction.defaults({dragPan: false})
         .extend([new ol.interaction.DragPan({kinetic: false})]),
-    renderer: ol.RendererHint.CANVAS,
+    renderer: 'canvas',
     target: olmap,
     view: new ol.View2D({
       center: ol.proj.transform([center.lng(), center.lat()],
diff --git a/examples/gpx.js b/examples/gpx.js
index 5fe59d3ea0..438811d93c 100644
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -56,7 +55,7 @@ var vector = new ol.layer.Vector({
 
 var map = new ol.Map({
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: document.getElementById('map'),
   view: new ol.View2D({
     center: [-7916041.528716288, 5228379.045749711],
diff --git a/examples/hue-saturation.js b/examples/hue-saturation.js
index d80390bf70..254f85648c 100644
--- a/examples/hue-saturation.js
+++ b/examples/hue-saturation.js
@@ -1,6 +1,5 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -32,7 +31,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
 
   var map = new ol.Map({
     layers: [layer],
-    renderer: ol.RendererHint.WEBGL,
+    renderer: 'webgl',
     target: 'map',
     view: new ol.View2D({
       center: ol.proj.transform([-9.375, 51.483333], 'EPSG:4326', 'EPSG:3857'),
diff --git a/examples/icon.js b/examples/icon.js
index 7d1b3b4dfb..afe166d2ff 100644
--- a/examples/icon.js
+++ b/examples/icon.js
@@ -1,7 +1,6 @@
 goog.require('ol.Map');
 goog.require('ol.Overlay');
 goog.require('ol.OverlayPositioning');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -51,7 +50,7 @@ var vector = new ol.layer.Vector({
 
 var map = new ol.Map({
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: document.getElementById('map'),
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/igc.js b/examples/igc.js
index acac191263..7ab9d9fa49 100644
--- a/examples/igc.js
+++ b/examples/igc.js
@@ -1,6 +1,5 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.Point');
@@ -67,7 +66,7 @@ var map = new ol.Map({
       styleFunction: styleFunction
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [703365.7089403362, 5714629.865071137],
diff --git a/examples/image-vector-layer.js b/examples/image-vector-layer.js
index 58a835d953..bc38cedc5e 100644
--- a/examples/image-vector-layer.js
+++ b/examples/image-vector-layer.js
@@ -1,6 +1,5 @@
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
@@ -39,7 +38,7 @@ var map = new ol.Map({
       })
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js
index 6d04409f42..d4edebcc3b 100644
--- a/examples/kml-earthquakes.js
+++ b/examples/kml-earthquakes.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -54,7 +53,7 @@ var raster = new ol.layer.Tile({
 
 var map = new ol.Map({
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js
index afd14955db..6211b4957d 100644
--- a/examples/kml-timezones.js
+++ b/examples/kml-timezones.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -61,7 +60,7 @@ var raster = new ol.layer.Tile({
 
 var map = new ol.Map({
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/kml.js b/examples/kml.js
index 9f972bae7a..91f5494ae2 100644
--- a/examples/kml.js
+++ b/examples/kml.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -22,7 +21,7 @@ var vector = new ol.layer.Vector({
 
 var map = new ol.Map({
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: document.getElementById('map'),
   view: new ol.View2D({
     center: [876970.8463461736, 5859807.853963373],
diff --git a/examples/layer-clipping-webgl.js b/examples/layer-clipping-webgl.js
index bfea0b6932..3733e2ea1f 100644
--- a/examples/layer-clipping-webgl.js
+++ b/examples/layer-clipping-webgl.js
@@ -1,6 +1,5 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
@@ -19,7 +18,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
 
   var map = new ol.Map({
     layers: [osm],
-    renderer: ol.RendererHint.WEBGL,
+    renderer: 'webgl',
     target: 'map',
     view: new ol.View2D({
       center: [0, 0],
diff --git a/examples/layer-clipping.js b/examples/layer-clipping.js
index aeebe39437..72a67fdf5a 100644
--- a/examples/layer-clipping.js
+++ b/examples/layer-clipping.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
@@ -10,7 +9,7 @@ var osm = new ol.layer.Tile({
 
 var map = new ol.Map({
   layers: [osm],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/layer-spy.js b/examples/layer-spy.js
index fb282f7283..04f597e137 100644
--- a/examples/layer-spy.js
+++ b/examples/layer-spy.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -17,7 +16,7 @@ var imagery = new ol.layer.Tile({
 
 var map = new ol.Map({
   layers: [roads, imagery],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: ol.proj.transform([-109, 46.5], 'EPSG:4326', 'EPSG:3857'),
diff --git a/examples/layer-swipe.js b/examples/layer-swipe.js
index 821576afc5..f79313ecba 100644
--- a/examples/layer-swipe.js
+++ b/examples/layer-swipe.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
@@ -17,7 +16,7 @@ var bing = new ol.layer.Tile({
 
 var map = new ol.Map({
   layers: [osm, bing],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js
index 11857960d9..1a2a1f3c75 100644
--- a/examples/localized-openstreetmap.js
+++ b/examples/localized-openstreetmap.js
@@ -1,6 +1,5 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
@@ -42,7 +41,7 @@ var map = new ol.Map({
     openCycleMapLayer,
     openSeaMapLayer
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     maxZoom: 18,
diff --git a/examples/mapguide-untiled.js b/examples/mapguide-untiled.js
index d8b84060c1..0d6b900aed 100644
--- a/examples/mapguide-untiled.js
+++ b/examples/mapguide-untiled.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.source.MapGuide');
@@ -30,7 +29,7 @@ var map = new ol.Map({
       })
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [-87.7302542509315, 43.744459064634],
diff --git a/examples/rtree.js b/examples/rtree.js
index eeb9296a41..61c8154d3e 100644
--- a/examples/rtree.js
+++ b/examples/rtree.js
@@ -2,7 +2,6 @@
 // FIXME this example dives into private members and will never compile :)
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.extent');
 goog.require('ol.geom.Point');
@@ -100,7 +99,7 @@ var rtree = new ol.layer.Vector({
 
 var map = new ol.Map({
   layers: [vector, rtree],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/select-features.js b/examples/select-features.js
index 3ad4395357..c27b5b22d7 100644
--- a/examples/select-features.js
+++ b/examples/select-features.js
@@ -1,6 +1,5 @@
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Select');
@@ -52,7 +51,7 @@ var select = new ol.interaction.Select({
 var map = new ol.Map({
   interactions: ol.interaction.defaults().extend([select]),
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/side-by-side.js b/examples/side-by-side.js
index 994be60551..7b13f52607 100644
--- a/examples/side-by-side.js
+++ b/examples/side-by-side.js
@@ -1,6 +1,5 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
@@ -12,7 +11,7 @@ var domMap = new ol.Map({
       source: new ol.source.MapQuest({layer: 'sat'})
     })
   ],
-  renderer: ol.RendererHint.DOM,
+  renderer: 'dom',
   target: 'domMap',
   view: new ol.View2D({
     center: [0, 0],
@@ -22,7 +21,7 @@ var domMap = new ol.Map({
 
 if (ol.BrowserFeature.HAS_WEBGL) {
   var webglMap = new ol.Map({
-    renderer: ol.RendererHint.WEBGL,
+    renderer: 'webgl',
     target: 'webglMap'
   });
   webglMap.bindTo('layergroup', domMap);
@@ -36,7 +35,7 @@ if (ol.BrowserFeature.HAS_WEBGL) {
 }
 
 var canvasMap = new ol.Map({
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'canvasMap'
 });
 canvasMap.bindTo('layergroup', domMap);
diff --git a/examples/static-image.js b/examples/static-image.js
index e6dca89119..919c403c9f 100644
--- a/examples/static-image.js
+++ b/examples/static-image.js
@@ -1,6 +1,5 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.extent');
 goog.require('ol.layer.Image');
@@ -34,7 +33,7 @@ var map = new ol.Map({
       })
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     projection: pixelProjection,
diff --git a/examples/synthetic-lines.js b/examples/synthetic-lines.js
index f563115837..9a5dd9e4ee 100644
--- a/examples/synthetic-lines.js
+++ b/examples/synthetic-lines.js
@@ -1,6 +1,5 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.geom.LineString');
 goog.require('ol.layer.Vector');
@@ -60,7 +59,7 @@ var view = new ol.View2D({
 
 var map = new ol.Map({
   layers: [vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: view
 });
diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js
index 18cce095de..7ebd447c4b 100644
--- a/examples/synthetic-points.js
+++ b/examples/synthetic-points.js
@@ -1,7 +1,6 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.Point');
@@ -58,7 +57,7 @@ var popup = new ol.Overlay({
 
 var map = new ol.Map({
   layers: [vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: document.getElementById('map'),
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/topojson.js b/examples/topojson.js
index b6a35fe36c..9a60037a5a 100644
--- a/examples/topojson.js
+++ b/examples/topojson.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -39,7 +38,7 @@ var vector = new ol.layer.Vector({
 
 var map = new ol.Map({
   layers: [raster, vector],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/vector-layer.js b/examples/vector-layer.js
index 4282da9e23..8b36ced3a3 100644
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -1,6 +1,5 @@
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -53,7 +52,7 @@ var map = new ol.Map({
     }),
     vectorLayer
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],
diff --git a/examples/wms-image.js b/examples/wms-image.js
index c752304978..1e1e142920 100644
--- a/examples/wms-image.js
+++ b/examples/wms-image.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
@@ -21,7 +20,7 @@ var layers = [
   })
 ];
 var map = new ol.Map({
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   layers: layers,
   target: 'map',
   view: new ol.View2D({
diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js
index e6c0bc048c..042bb27058 100644
--- a/examples/wms-tiled.js
+++ b/examples/wms-tiled.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
@@ -20,7 +19,7 @@ var layers = [
   })
 ];
 var map = new ol.Map({
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   layers: layers,
   target: 'map',
   view: new ol.View2D({
diff --git a/examples/wmts.js b/examples/wmts.js
index ff6efc6d51..4110a62ba2 100644
--- a/examples/wmts.js
+++ b/examples/wmts.js
@@ -1,5 +1,4 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.extent');
 goog.require('ol.layer.Tile');
@@ -43,7 +42,7 @@ var map = new ol.Map({
       })
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   target: 'map',
   view: new ol.View2D({
     center: [-13677832, 5213272],
diff --git a/examples/xyz-esri.js b/examples/xyz-esri.js
index b1700b640f..dd1259b9b3 100644
--- a/examples/xyz-esri.js
+++ b/examples/xyz-esri.js
@@ -1,6 +1,5 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -23,7 +22,7 @@ var map = new ol.Map({
       })
     })
   ],
-  renderer: ol.RendererHint.CANVAS,
+  renderer: 'canvas',
   view: new ol.View2D({
     center: ol.proj.transform([-121.1, 47.5], 'EPSG:4326', 'EPSG:3857'),
     zoom: 7

From 14f40e6f47d89526818d93734b258431dbeed071 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:18:54 +0100
Subject: [PATCH 03/18] Don't export ol.RendererHint

---
 src/ol/map.exports | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/ol/map.exports b/src/ol/map.exports
index 561170e7cf..6ffc569010 100644
--- a/src/ol/map.exports
+++ b/src/ol/map.exports
@@ -22,10 +22,5 @@
 @exportProperty ol.Map.prototype.requestRenderFrame
 @exportProperty ol.Map.prototype.updateSize
 
-@exportSymbol ol.RendererHint
-@exportProperty ol.RendererHint.CANVAS
-@exportProperty ol.RendererHint.DOM
-@exportProperty ol.RendererHint.WEBGL
-
 @exportSymbol ol.RendererHints
 @exportProperty ol.RendererHints.createFromQueryData

From dc2bb57d185e9aa6fe040ce740413db78b259f58 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:24:49 +0100
Subject: [PATCH 04/18] Allow ol.Overlay positioning option to be a string

---
 src/objectliterals.jsdoc | 2 +-
 src/ol/overlay.js        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 6c973bdef6..c2eb124ea1 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -55,7 +55,7 @@
  * @property {Element|undefined} element The overlay element.
  * @property {ol.Coordinate|undefined} position The overlay position in map
  *     projection.
- * @property {ol.OverlayPositioning|undefined} positioning Positioning.
+ * @property {ol.OverlayPositioning|string|undefined} positioning Positioning.
  * @property {boolean|undefined} stopEvent Whether event propagation to the map
  *     viewport should be stopped. Default is `true`. If `true` the overlay is
  *     placed in the same container as that of the controls
diff --git a/src/ol/overlay.js b/src/ol/overlay.js
index 17081ba375..c6fa9b92c8 100644
--- a/src/ol/overlay.js
+++ b/src/ol/overlay.js
@@ -134,7 +134,8 @@ ol.Overlay = function(options) {
     this.setPosition(options.position);
   }
   if (goog.isDef(options.positioning)) {
-    this.setPositioning(options.positioning);
+    this.setPositioning(
+        /** @type {ol.OverlayPositioning} */ (options.positioning));
   }
 
 };

From 9af436b5a011885ace4bea1238ee2707ac3a8252 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:25:22 +0100
Subject: [PATCH 05/18] Use string instead of ol.OverlayPositioning enum in
 examples

---
 examples/geolocation.js | 3 +--
 examples/icon.js        | 3 +--
 examples/overlay.js     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/examples/geolocation.js b/examples/geolocation.js
index 36c18f4e95..c70626a4ff 100644
--- a/examples/geolocation.js
+++ b/examples/geolocation.js
@@ -5,7 +5,6 @@
 goog.require('ol.Geolocation');
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.OverlayPositioning');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
@@ -45,7 +44,7 @@ geolocation.on('propertychange', function() {
 
 var marker = new ol.Overlay({
   element: /** @type {Element} */ ($('<i/>').addClass('icon-flag').get(0)),
-  positioning: ol.OverlayPositioning.BOTTOM_LEFT,
+  positioning: 'bottom-left',
   stopEvent: false
 });
 map.addOverlay(marker);
diff --git a/examples/icon.js b/examples/icon.js
index afe166d2ff..8a70c7a9b7 100644
--- a/examples/icon.js
+++ b/examples/icon.js
@@ -1,6 +1,5 @@
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.OverlayPositioning');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -62,7 +61,7 @@ var element = document.getElementById('popup');
 
 var popup = new ol.Overlay({
   element: element,
-  positioning: ol.OverlayPositioning.BOTTOM_CENTER,
+  positioning: 'bottom-center',
   stopEvent: false
 });
 map.addOverlay(popup);
diff --git a/examples/overlay.js b/examples/overlay.js
index 41a5d650ce..d6d9d0a3b2 100644
--- a/examples/overlay.js
+++ b/examples/overlay.js
@@ -1,6 +1,5 @@
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.OverlayPositioning');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.coordinate');
@@ -28,7 +27,7 @@ var pos = ol.proj.transform([16.3725, 48.208889], 'EPSG:4326', 'EPSG:3857');
 // Vienna marker
 var marker = new ol.Overlay({
   position: pos,
-  positioning: ol.OverlayPositioning.CENTER_CENTER,
+  positioning: 'center-center',
   element: document.getElementById('marker'),
   stopEvent: false
 });

From 2cef7b98fd83a146d938edeab2cbe56f43446aa4 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:25:49 +0100
Subject: [PATCH 06/18] Don't export ol.OverlayPositioning

---
 src/ol/overlay.exports | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/ol/overlay.exports b/src/ol/overlay.exports
index 772a546710..c2ce24085b 100644
--- a/src/ol/overlay.exports
+++ b/src/ol/overlay.exports
@@ -1,12 +1 @@
 @exportSymbol ol.Overlay
-
-@exportSymbol ol.OverlayPositioning
-@exportProperty ol.OverlayPositioning.BOTTOM_LEFT
-@exportProperty ol.OverlayPositioning.BOTTOM_CENTER
-@exportProperty ol.OverlayPositioning.BOTTOM_RIGHT
-@exportProperty ol.OverlayPositioning.CENTER_LEFT
-@exportProperty ol.OverlayPositioning.CENTER_CENTER
-@exportProperty ol.OverlayPositioning.CENTER_RIGHT
-@exportProperty ol.OverlayPositioning.TOP_LEFT
-@exportProperty ol.OverlayPositioning.TOP_CENTER
-@exportProperty ol.OverlayPositioning.TOP_RIGHT

From 84fd853dc150f12298b8ce2b22660c9630bcb1cb Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:34:15 +0100
Subject: [PATCH 07/18] Allow ol.control.ScaleLine units option to be a string

---
 src/objectliterals.jsdoc           | 4 ++--
 src/ol/control/scalelinecontrol.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index c2eb124ea1..60792392ac 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -236,8 +236,8 @@
  * @property {string|undefined} className CSS Class name. Default is `ol-scale-line`.
  * @property {number|undefined} minWidth Minimum width in pixels. Default is `64`.
  * @property {Element|undefined} target Target.
- * @property {ol.control.ScaleLineUnits|undefined} units Units.
- *     Default is `ol.control.ScaleLineUnits.METRIC`.
+ * @property {ol.control.ScaleLineUnits|string|undefined} units Units.
+ *     Default is `metric`.
  * @todo stability experimental
  */
 
diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js
index 5c18bac16c..2aafe41044 100644
--- a/src/ol/control/scalelinecontrol.js
+++ b/src/ol/control/scalelinecontrol.js
@@ -122,7 +122,8 @@ ol.control.ScaleLine = function(opt_options) {
       this, ol.Object.getChangeEventType(ol.control.ScaleLineProperty.UNITS),
       this.handleUnitsChanged_, false, this);
 
-  this.setUnits(options.units || ol.control.ScaleLineUnits.METRIC);
+  this.setUnits(/** @type {ol.control.ScaleLineUnits} */ (options.units) ||
+      ol.control.ScaleLineUnits.METRIC);
 
 };
 goog.inherits(ol.control.ScaleLine, ol.control.Control);

From 901af3c15f4c55fd22b00e558f4209a3d65538e2 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:34:39 +0100
Subject: [PATCH 08/18] Use string instead of ol.control.ScaleLineUnits enum in
 examples

---
 examples/epsg-4326.js       | 3 +--
 examples/wms-custom-proj.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js
index b8da7d2623..4ae9f3bc74 100644
--- a/examples/epsg-4326.js
+++ b/examples/epsg-4326.js
@@ -2,7 +2,6 @@ goog.require('ol.Map');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
-goog.require('ol.control.ScaleLineUnits');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.TileWMS');
 
@@ -23,7 +22,7 @@ var layers = [
 var map = new ol.Map({
   controls: ol.control.defaults().extend([
     new ol.control.ScaleLine({
-      units: ol.control.ScaleLineUnits.DEGREES
+      units: 'degrees'
     })
   ]),
   layers: layers,
diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js
index daf90947b3..f240f96322 100644
--- a/examples/wms-custom-proj.js
+++ b/examples/wms-custom-proj.js
@@ -4,7 +4,6 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
-goog.require('ol.control.ScaleLineUnits');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.TileWMS');
@@ -55,7 +54,7 @@ var layers = [
 var map = new ol.Map({
   controls: ol.control.defaults().extend([
     new ol.control.ScaleLine({
-      units: ol.control.ScaleLineUnits.METRIC
+      units: 'metric'
     })
   ]),
   layers: layers,

From e53d7e954b4a497d86f78c13b7cfece63f374cd5 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:35:16 +0100
Subject: [PATCH 09/18] Don't export ol.control.ScaleLineUnits

---
 src/ol/control/scalelinecontrol.exports | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/ol/control/scalelinecontrol.exports b/src/ol/control/scalelinecontrol.exports
index ccdf40d51b..4493ffde49 100644
--- a/src/ol/control/scalelinecontrol.exports
+++ b/src/ol/control/scalelinecontrol.exports
@@ -1,9 +1,2 @@
 @exportSymbol ol.control.ScaleLine
 @exportProperty ol.control.ScaleLine.prototype.setMap
-
-@exportSymbol ol.control.ScaleLineUnits
-@exportProperty ol.control.ScaleLineUnits.DEGREES
-@exportProperty ol.control.ScaleLineUnits.IMPERIAL
-@exportProperty ol.control.ScaleLineUnits.NAUTICAL
-@exportProperty ol.control.ScaleLineUnits.METRIC
-@exportProperty ol.control.ScaleLineUnits.US

From 88c87832712fba91a02a074cfff6f50a61bc6908 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:40:45 +0100
Subject: [PATCH 10/18] Allow ol.source.Source state option to be a string

---
 src/objectliterals.jsdoc     | 4 ++--
 src/ol/source/imagesource.js | 2 +-
 src/ol/source/source.js      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 60792392ac..9a7afa90bc 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -711,7 +711,7 @@
  *     on.
  * @property {Array.<number>|undefined} resolutions Resolutions. If specified,
  *     new canvases will be created for these resolutions only.
- * @property {ol.source.State|undefined} state Source state.
+ * @property {ol.source.State|string|undefined} state Source state.
  */
 
 /**
@@ -836,7 +836,7 @@
  * @property {Array.<ol.Feature>|undefined} features Features.
  * @property {string|undefined} logo Logo.
  * @property {ol.proj.ProjectionLike} projection Projection.
- * @property {ol.source.State|undefined} state State.
+ * @property {ol.source.State|string|undefined} state State.
  */
 
 /**
diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js
index 51b8f1f0b3..4e8ea558d3 100644
--- a/src/ol/source/imagesource.js
+++ b/src/ol/source/imagesource.js
@@ -15,7 +15,7 @@ goog.require('ol.source.Source');
  *            logo: (string|undefined),
  *            projection: ol.proj.ProjectionLike,
  *            resolutions: (Array.<number>|undefined),
- *            state: (ol.source.State|undefined)}}
+ *            state: (ol.source.State|string|undefined)}}
  */
 ol.source.ImageOptions;
 
diff --git a/src/ol/source/source.js b/src/ol/source/source.js
index 03f0fa027e..c9039bbbf7 100644
--- a/src/ol/source/source.js
+++ b/src/ol/source/source.js
@@ -23,7 +23,7 @@ ol.source.State = {
  *            extent: (ol.Extent|undefined),
  *            logo: (string|undefined),
  *            projection: ol.proj.ProjectionLike,
- *            state: (ol.source.State|undefined)}}
+ *            state: (ol.source.State|string|undefined)}}
  * @todo stability experimental
  */
 ol.source.SourceOptions;
@@ -72,7 +72,7 @@ ol.source.Source = function(options) {
    * @type {ol.source.State}
    */
   this.state_ = goog.isDef(options.state) ?
-      options.state : ol.source.State.READY;
+      /** @type {ol.source.State} */ (options.state) : ol.source.State.READY;
 
 };
 goog.inherits(ol.source.Source, ol.Observable);

From 3408b8b8355e5a94627356d367c7db8f7af56fb2 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:41:10 +0100
Subject: [PATCH 11/18] Don't export ol.source.State

---
 src/ol/source/source.exports | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/ol/source/source.exports b/src/ol/source/source.exports
index c732cc3572..1d3863d0f3 100644
--- a/src/ol/source/source.exports
+++ b/src/ol/source/source.exports
@@ -1,7 +1,2 @@
 @exportProperty ol.source.Source.prototype.getExtent
 @exportProperty ol.source.Source.prototype.getState
-
-@exportSymbol ol.source.State
-@exportProperty ol.source.State.LOADING
-@exportProperty ol.source.State.READY
-@exportProperty ol.source.State.ERROR

From d4ebfac74a4045297e67af29cd4a9ab298b0ae0d Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:48:45 +0100
Subject: [PATCH 12/18] Allow ol.source.{Image,Tile}WMS serverType option to be
 a string

---
 src/objectliterals.jsdoc        | 4 ++--
 src/ol/source/imagewmssource.js | 3 ++-
 src/ol/source/tilewmssource.js  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 9a7afa90bc..930aca200a 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -739,7 +739,7 @@
  * @property {ol.Extent|undefined} extent Extent.
  * @property {boolean|undefined} hidpi Use the `ol.Map#pixelRatio` value when
  *     requesting the image from the remote server. Default is `true`.
- * @property {ol.source.wms.ServerType|undefined} serverType The type of the remote WMS
+ * @property {ol.source.wms.ServerType|string|undefined} serverType The type of the remote WMS
  *     server: `mapserver`, `geoserver` or `qgis`. Only needed if `hidpi` is `true`.
  *     Default is `undefined`.
  * @property {string|undefined} logo Logo.
@@ -818,7 +818,7 @@
  * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid.
  * @property {number|undefined} maxZoom Maximum zoom.
  * @property {ol.proj.ProjectionLike} projection Projection.
- * @property {ol.source.wms.ServerType|undefined} serverType The type of the remote WMS
+ * @property {ol.source.wms.ServerType|string|undefined} serverType The type of the remote WMS
  *     server: `mapserver`, `geoserver` or `qgis`. Only needed if `hidpi` is `true`.
  *     Default is `undefined`.
  * @property {ol.TileLoadFunctionType|undefined} tileLoadFunction Optional
diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js
index 0e48cd1bcd..8b7445c7c1 100644
--- a/src/ol/source/imagewmssource.js
+++ b/src/ol/source/imagewmssource.js
@@ -63,7 +63,8 @@ ol.source.ImageWMS = function(opt_options) {
    * @private
    * @type {ol.source.wms.ServerType|undefined}
    */
-  this.serverType_ = options.serverType;
+  this.serverType_ =
+      /** @type {ol.source.wms.ServerType|undefined} */ (options.serverType);
 
   /**
    * @private
diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js
index 2cd5989cd4..f80ec49719 100644
--- a/src/ol/source/tilewmssource.js
+++ b/src/ol/source/tilewmssource.js
@@ -84,7 +84,8 @@ ol.source.TileWMS = function(opt_options) {
    * @private
    * @type {ol.source.wms.ServerType|undefined}
    */
-  this.serverType_ = options.serverType;
+  this.serverType_ =
+      /** @type {ol.source.wms.ServerType|undefined} */ (options.serverType);
 
   /**
    * @private

From 0475705a4921d045944b2f78d4071f81b1b8f51f Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 22:32:42 +0100
Subject: [PATCH 13/18] Don't use ol.source.wms.ServerType enum in examples

---
 examples/wms-image.js   | 2 +-
 examples/wms-no-proj.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/wms-image.js b/examples/wms-image.js
index 1e1e142920..92f7d6a968 100644
--- a/examples/wms-image.js
+++ b/examples/wms-image.js
@@ -14,7 +14,7 @@ var layers = [
     source: new ol.source.ImageWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states'},
-      serverType: /** @type {ol.source.wms.ServerType} */ ('geoserver'),
+      serverType: 'geoserver',
       extent: [-13884991, 2870341, -7455066, 6338219]
     })
   })
diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js
index e7ea3ad019..ee42a3be65 100644
--- a/examples/wms-no-proj.js
+++ b/examples/wms-no-proj.js
@@ -37,7 +37,7 @@ var layers = [
       })],
       crossOrigin: 'anonymous',
       params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'},
-      serverType: /** @type {ol.source.wms.ServerType} */ ('mapserver'),
+      serverType: 'mapserver',
       url: 'http://wms.geo.admin.ch/'
     })
   })

From ae215c7c0b17c1e7fe38932ef6964500a0280940 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 22:33:02 +0100
Subject: [PATCH 14/18] Remove no-longer-needed typecasts

---
 examples/wms-custom-proj.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js
index f240f96322..62a3f00fee 100644
--- a/examples/wms-custom-proj.js
+++ b/examples/wms-custom-proj.js
@@ -17,7 +17,7 @@ var projection = ol.proj.configureProj4jsProjection({
 var extent = [420000, 30000, 900000, 350000];
 var layers = [
   new ol.layer.Tile({
-    source: new ol.source.TileWMS(/** @type {olx.source.TileWMSOptions} */ ({
+    source: new ol.source.TileWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: [new ol.Attribution({
@@ -32,10 +32,10 @@ var layers = [
       },
       extent: extent,
       serverType: 'mapserver'
-    }))
+    })
   }),
   new ol.layer.Tile({
-    source: new ol.source.TileWMS(/** @type {olx.source.TileWMSOptions} */ ({
+    source: new ol.source.TileWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: [new ol.Attribution({
@@ -47,7 +47,7 @@ var layers = [
       params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'},
       extent: extent,
       serverType: 'mapserver'
-    }))
+    })
   })
 ];
 

From 37d5a4af6592826c5dfdf16522a8191e15881b48 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 22:36:47 +0100
Subject: [PATCH 15/18] Don't export ol.source.wms.ServerType

---
 src/ol/source/wmssource.exports | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/ol/source/wmssource.exports

diff --git a/src/ol/source/wmssource.exports b/src/ol/source/wmssource.exports
deleted file mode 100644
index b5669e8ec7..0000000000
--- a/src/ol/source/wmssource.exports
+++ /dev/null
@@ -1,4 +0,0 @@
-@exportSymbol ol.source.wms.ServerType
-@exportProperty ol.source.wms.ServerType.GEOSERVER
-@exportProperty ol.source.wms.ServerType.MAPSERVER
-@exportProperty ol.source.wms.ServerType.QGIS

From b901fba742dae7757b27a056accf2359bf5e9922 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 22:42:36 +0100
Subject: [PATCH 16/18] Allow ol.proj.Projection units option to be a string

---
 src/objectliterals.jsdoc | 2 +-
 src/ol/proj/proj.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 930aca200a..86ba8617c4 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -82,7 +82,7 @@
  * Object literal with config options for the projection.
  * @typedef {Object} olx.ProjectionOptions
  * @property {string} code The SRS identifier code, e.g. `EPSG:4326`.
- * @property {ol.proj.Units} units Units.
+ * @property {ol.proj.Units|string} units Units.
  * @property {ol.Extent|undefined} extent The validity extent for the SRS.
  * @property {string|undefined} axisOrientation The axis orientation as
  *     specified in Proj4. The default is `enu`.
diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js
index f65a77e90f..bf3ddc3882 100644
--- a/src/ol/proj/proj.js
+++ b/src/ol/proj/proj.js
@@ -77,7 +77,7 @@ ol.proj.Projection = function(options) {
    * @private
    * @type {ol.proj.Units}
    */
-  this.units_ = options.units;
+  this.units_ = /** @type {ol.proj.Units} */ (options.units);
 
   /**
    * @private

From 55c99db238771dd33bafac5bce193ed4bf005e75 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 22:43:25 +0100
Subject: [PATCH 17/18] Use string instead of ol.proj.Units enum in examples

---
 examples/static-image.js | 3 +--
 examples/wms-no-proj.js  | 3 +--
 examples/zoomify.js      | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/examples/static-image.js b/examples/static-image.js
index 919c403c9f..9697a74785 100644
--- a/examples/static-image.js
+++ b/examples/static-image.js
@@ -4,7 +4,6 @@ goog.require('ol.View2D');
 goog.require('ol.extent');
 goog.require('ol.layer.Image');
 goog.require('ol.proj.Projection');
-goog.require('ol.proj.Units');
 goog.require('ol.source.ImageStatic');
 
 
@@ -13,7 +12,7 @@ goog.require('ol.source.ImageStatic');
 // map can use to properly display the layer.
 var pixelProjection = new ol.proj.Projection({
   code: 'pixel',
-  units: ol.proj.Units.PIXELS,
+  units: 'pixels',
   extent: [0, 0, 1024, 968]
 });
 
diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js
index ee42a3be65..6ec230650b 100644
--- a/examples/wms-no-proj.js
+++ b/examples/wms-no-proj.js
@@ -5,7 +5,6 @@ goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj.Projection');
-goog.require('ol.proj.Units');
 goog.require('ol.source.ImageWMS');
 goog.require('ol.source.TileWMS');
 
@@ -48,7 +47,7 @@ var layers = [
 // projection object.
 var projection = new ol.proj.Projection({
   code: 'EPSG:21781',
-  units: ol.proj.Units.METERS
+  units: 'm'
 });
 
 var map = new ol.Map({
diff --git a/examples/zoomify.js b/examples/zoomify.js
index 112c4f506b..cd0136c531 100644
--- a/examples/zoomify.js
+++ b/examples/zoomify.js
@@ -4,7 +4,6 @@ goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.proj.Projection');
-goog.require('ol.proj.Units');
 goog.require('ol.source.Zoomify');
 
 // This server does not support CORS, and so is incompatible with WebGL.
@@ -26,7 +25,7 @@ var imgCenter = [imgWidth / 2, - imgHeight / 2];
 // can use to properly display the layer.
 var proj = new ol.proj.Projection({
   code: 'ZOOMIFY',
-  units: ol.proj.Units.PIXELS,
+  units: 'pixels',
   extent: [0, 0, imgWidth, imgHeight]
 });
 

From dade8e4e1a2f6bad2d8baa30a6dbc95109dbd8bf Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 22:44:17 +0100
Subject: [PATCH 18/18] Don't export ol.proj.Units

---
 src/ol/proj/proj.exports | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/ol/proj/proj.exports b/src/ol/proj/proj.exports
index 2db32e18c2..e78ec36f9a 100644
--- a/src/ol/proj/proj.exports
+++ b/src/ol/proj/proj.exports
@@ -3,12 +3,6 @@
 @exportProperty ol.proj.Projection.prototype.getExtent
 @exportProperty ol.proj.Projection.prototype.getUnits
 
-@exportSymbol ol.proj.Units
-@exportProperty ol.proj.Units.DEGREES
-@exportProperty ol.proj.Units.FEET
-@exportProperty ol.proj.Units.METERS
-@exportProperty ol.proj.Units.PIXELS
-
 @exportSymbol ol.proj.addProjection
 @exportSymbol ol.proj.get
 @exportSymbol ol.proj.getTransform