diff --git a/externs/esrijson.js b/externs/esrijson.js
index 3e4f680763..3f6886f3b9 100644
--- a/externs/esrijson.js
+++ b/externs/esrijson.js
@@ -41,6 +41,13 @@ EsriJSONCRS.prototype.wkid;
 var EsriJSONPoint = function() {};
 
 
+/**
+ * M value of point.
+ * @type {!number}
+ */
+EsriJSONPoint.prototype.m;
+
+
 /**
  * X coordinate of point.
  * @type {!number}
diff --git a/src/ol/format/esrijsonformat.js b/src/ol/format/esrijsonformat.js
index 3c43a334a6..043442d9ba 100644
--- a/src/ol/format/esrijsonformat.js
+++ b/src/ol/format/esrijsonformat.js
@@ -1,4 +1,3 @@
-// FIXME add support for hasM
 goog.provide('ol.format.EsriJSON');
 
 goog.require('goog.array');
@@ -69,7 +68,8 @@ ol.format.EsriJSON.readGeometry_ = function(object, opt_options) {
       type = 'MultiLineString';
     }
   } else if (goog.isDefAndNotNull(object.rings)) {
-    var rings = ol.format.EsriJSON.convertRings_(object.rings, object.hasZ);
+    var layout = ol.format.EsriJSON.getGeometryLayout_(object);
+    var rings = ol.format.EsriJSON.convertRings_(object.rings, layout);
     object = /** @type {EsriJSONGeometry} */(goog.object.clone(object));
     if (rings.length === 1) {
       type = 'Polygon';
@@ -92,18 +92,18 @@ ol.format.EsriJSON.readGeometry_ = function(object, opt_options) {
 /**
  * Determines inner and outer rings.
  * @param {Array.<!Array.<!Array.<number>>>} rings Rings.
- * @param {boolean|undefined} hasZ Do rings have Z values in them.
+ * @param {ol.geom.GeometryLayout} layout Geometry layout.
  * @private
  * @return {Array.<!Array.<!Array.<number>>>} Transoformed rings.
  */
-ol.format.EsriJSON.convertRings_ = function(rings, hasZ) {
+ol.format.EsriJSON.convertRings_ = function(rings, layout) {
   var outerRings = [];
   var holes = [];
   var i, ii;
   for (i = 0, ii = rings.length; i < ii; ++i) {
     var flatRing = goog.array.flatten(rings[i]);
     var clockwise = ol.geom.flat.orient.linearRingIsClockwise(flatRing, 0,
-        flatRing.length, hasZ === true ? 3 : 2);
+        flatRing.length, layout.length);
     if (clockwise) {
       outerRings.push([rings[i]]);
     } else {
@@ -140,9 +140,15 @@ ol.format.EsriJSON.readPointGeometry_ = function(object) {
   goog.asserts.assert(goog.isNumber(object.x), 'object.x should be number');
   goog.asserts.assert(goog.isNumber(object.y), 'object.y should be number');
   var point;
-  if (goog.isDefAndNotNull(object.z)) {
+  if (goog.isDefAndNotNull(object.m) && goog.isDefAndNotNull(object.z)) {
+    point = new ol.geom.Point([object.x, object.y, object.z, object.m],
+        ol.geom.GeometryLayout.XYZM);
+  } else if (goog.isDefAndNotNull(object.z)) {
     point = new ol.geom.Point([object.x, object.y, object.z],
         ol.geom.GeometryLayout.XYZ);
+  } else if (goog.isDefAndNotNull(object.m)) {
+    point = new ol.geom.Point([object.x, object.y, object.m],
+        ol.geom.GeometryLayout.XYM);
   } else {
     point = new ol.geom.Point([object.x, object.y]);
   }
@@ -160,9 +166,8 @@ ol.format.EsriJSON.readLineStringGeometry_ = function(object) {
       'object.paths should be an array');
   goog.asserts.assert(object.paths.length === 1,
       'object.paths array length should be 1');
-  return new ol.geom.LineString(object.paths[0].slice(0),
-      object.hasZ === true ? ol.geom.GeometryLayout.XYZ :
-      ol.geom.GeometryLayout.XY);
+  var layout = ol.format.EsriJSON.getGeometryLayout_(object);
+  return new ol.geom.LineString(object.paths[0], layout);
 };
 
 
@@ -176,7 +181,26 @@ ol.format.EsriJSON.readMultiLineStringGeometry_ = function(object) {
       'object.paths should be an array');
   goog.asserts.assert(object.paths.length > 1,
       'object.paths array length should be more than 1');
-  return new ol.geom.MultiLineString(object.paths.slice(0));
+  var layout = ol.format.EsriJSON.getGeometryLayout_(object);
+  return new ol.geom.MultiLineString(object.paths, layout);
+};
+
+
+/**
+ * @param {EsriJSONGeometry} object Object.
+ * @private
+ * @return {ol.geom.GeometryLayout} The geometry layout to use.
+ */
+ol.format.EsriJSON.getGeometryLayout_ = function(object) {
+  var layout = ol.geom.GeometryLayout.XY;
+  if (object.hasZ === true && object.hasM === true) {
+    layout = ol.geom.GeometryLayout.XYZM;
+  } else if (object.hasZ === true) {
+    layout = ol.geom.GeometryLayout.XYZ;
+  } else if (object.hasM === true) {
+    layout = ol.geom.GeometryLayout.XYM;
+  }
+  return layout;
 };
 
 
@@ -188,7 +212,8 @@ ol.format.EsriJSON.readMultiLineStringGeometry_ = function(object) {
 ol.format.EsriJSON.readMultiPointGeometry_ = function(object) {
   goog.asserts.assert(goog.isDefAndNotNull(object.points),
       'object.points should be defined');
-  return new ol.geom.MultiPoint(object.points);
+  var layout = ol.format.EsriJSON.getGeometryLayout_(object);
+  return new ol.geom.MultiPoint(object.points, layout);
 };
 
 
@@ -201,10 +226,10 @@ ol.format.EsriJSON.readMultiPolygonGeometry_ = function(object) {
   goog.asserts.assert(goog.isDefAndNotNull(object.rings));
   goog.asserts.assert(object.rings.length > 1,
       'object.rings should have length larger than 1');
+  var layout = ol.format.EsriJSON.getGeometryLayout_(object);
   return new ol.geom.MultiPolygon(
       /** @type {Array.<Array.<Array.<Array.<number>>>>} */(object.rings),
-      object.hasZ === true ? ol.geom.GeometryLayout.XYZ :
-      ol.geom.GeometryLayout.XY);
+      layout);
 };
 
 
@@ -215,9 +240,8 @@ ol.format.EsriJSON.readMultiPolygonGeometry_ = function(object) {
  */
 ol.format.EsriJSON.readPolygonGeometry_ = function(object) {
   goog.asserts.assert(goog.isDefAndNotNull(object.rings));
-  return new ol.geom.Polygon(object.rings,
-      object.hasZ === true ? ol.geom.GeometryLayout.XYZ :
-      ol.geom.GeometryLayout.XY);
+  var layout = ol.format.EsriJSON.getGeometryLayout_(object);
+  return new ol.geom.Polygon(object.rings, layout);
 };
 
 
@@ -231,21 +255,53 @@ ol.format.EsriJSON.writePointGeometry_ = function(geometry, opt_options) {
   goog.asserts.assertInstanceof(geometry, ol.geom.Point,
       'geometry should be an ol.geom.Point');
   var coordinates = geometry.getCoordinates();
-  if (geometry.getLayout() === ol.geom.GeometryLayout.XYZ) {
+  var layout = geometry.getLayout();
+  if (layout === ol.geom.GeometryLayout.XYZ) {
     return /** @type {EsriJSONPoint} */ ({
       'x': coordinates[0],
       'y': coordinates[1],
       'z': coordinates[2]
     });
-  } else {
+  } else if (layout === ol.geom.GeometryLayout.XYM) {
+    return /** @type {EsriJSONPoint} */ ({
+      'x': coordinates[0],
+      'y': coordinates[1],
+      'm': coordinates[2]
+    });
+  } else if (layout === ol.geom.GeometryLayout.XYZM) {
+    return /** @type {EsriJSONPoint} */ ({
+      'x': coordinates[0],
+      'y': coordinates[1],
+      'z': coordinates[2],
+      'm': coordinates[3]
+    });
+  } else if (layout === ol.geom.GeometryLayout.XY) {
     return /** @type {EsriJSONPoint} */ ({
       'x': coordinates[0],
       'y': coordinates[1]
     });
+  } else {
+    goog.asserts.fail('Unknown geometry layout');
   }
 };
 
 
+/**
+ * @param {ol.geom.SimpleGeometry} geometry Geometry.
+ * @private
+ * @return {Object} Object with boolean hasZ and hasM keys.
+ */
+ol.format.EsriJSON.getHasZM_ = function(geometry) {
+  var layout = geometry.getLayout();
+  return {
+    hasZ: (layout === ol.geom.GeometryLayout.XYZ ||
+        layout === ol.geom.GeometryLayout.XYZM),
+    hasM: (layout === ol.geom.GeometryLayout.XYM ||
+        layout === ol.geom.GeometryLayout.XYZM)
+  };
+};
+
+
 /**
  * @param {ol.geom.Geometry} geometry Geometry.
  * @param {olx.format.WriteOptions=} opt_options Write options.
@@ -255,8 +311,10 @@ ol.format.EsriJSON.writePointGeometry_ = function(geometry, opt_options) {
 ol.format.EsriJSON.writeLineStringGeometry_ = function(geometry, opt_options) {
   goog.asserts.assertInstanceof(geometry, ol.geom.LineString,
       'geometry should be an ol.geom.LineString');
+  var hasZM = ol.format.EsriJSON.getHasZM_(geometry);
   return /** @type {EsriJSONPolyline} */ ({
-    'hasZ': (geometry.getLayout() === ol.geom.GeometryLayout.XYZ),
+    'hasZ': hasZM.hasZ,
+    'hasM': hasZM.hasM,
     'paths': [geometry.getCoordinates()]
   });
 };
@@ -272,8 +330,10 @@ ol.format.EsriJSON.writePolygonGeometry_ = function(geometry, opt_options) {
   goog.asserts.assertInstanceof(geometry, ol.geom.Polygon,
       'geometry should be an ol.geom.Polygon');
   // Esri geometries use the left-hand rule
+  var hasZM = ol.format.EsriJSON.getHasZM_(geometry);
   return /** @type {EsriJSONPolygon} */ ({
-    'hasZ': (geometry.getLayout() === ol.geom.GeometryLayout.XYZ),
+    'hasZ': hasZM.hasZ,
+    'hasM': hasZM.hasM,
     'rings': geometry.getCoordinates(false)
   });
 };
@@ -289,8 +349,10 @@ ol.format.EsriJSON.writeMultiLineStringGeometry_ =
     function(geometry, opt_options) {
   goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString,
       'geometry should be an ol.geom.MultiLineString');
+  var hasZM = ol.format.EsriJSON.getHasZM_(geometry);
   return /** @type {EsriJSONPolyline} */ ({
-    'hasZ': (geometry.getLayout() === ol.geom.GeometryLayout.XYZ),
+    'hasZ': hasZM.hasZ,
+    'hasM': hasZM.hasM,
     'paths': geometry.getCoordinates()
   });
 };
@@ -305,8 +367,10 @@ ol.format.EsriJSON.writeMultiLineStringGeometry_ =
 ol.format.EsriJSON.writeMultiPointGeometry_ = function(geometry, opt_options) {
   goog.asserts.assertInstanceof(geometry, ol.geom.MultiPoint,
       'geometry should be an ol.geom.MultiPoint');
+  var hasZM = ol.format.EsriJSON.getHasZM_(geometry);
   return /** @type {EsriJSONMultipoint} */ ({
-    'hasZ': (geometry.getLayout() === ol.geom.GeometryLayout.XYZ),
+    'hasZ': hasZM.hasZ,
+    'hasM': hasZM.hasM,
     'points': geometry.getCoordinates()
   });
 };
@@ -322,6 +386,7 @@ ol.format.EsriJSON.writeMultiPolygonGeometry_ = function(geometry,
     opt_options) {
   goog.asserts.assertInstanceof(geometry, ol.geom.MultiPolygon,
       'geometry should be an ol.geom.MultiPolygon');
+  var hasZM = ol.format.EsriJSON.getHasZM_(geometry);
   var coordinates = geometry.getCoordinates(false);
   var output = [];
   for (var i = 0; i < coordinates.length; i++) {
@@ -330,7 +395,8 @@ ol.format.EsriJSON.writeMultiPolygonGeometry_ = function(geometry,
     }
   }
   return /** @type {EsriJSONPolygon} */ ({
-    'hasZ': (geometry.getLayout() === ol.geom.GeometryLayout.XYZ),
+    'hasZ': hasZM.hasZ,
+    'hasM': hasZM.hasM,
     'rings': output
   });
 };
diff --git a/test/spec/ol/format/esrijsonformat.test.js b/test/spec/ol/format/esrijsonformat.test.js
index 3008877221..383503f102 100644
--- a/test/spec/ol/format/esrijsonformat.test.js
+++ b/test/spec/ol/format/esrijsonformat.test.js
@@ -348,6 +348,33 @@ describe('ol.format.EsriJSON', function() {
       expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZ);
     });
 
+    it('parses XYM point', function() {
+      var str = JSON.stringify({
+        x: 10,
+        y: 20,
+        m: 10
+      });
+
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.Point);
+      expect(obj.getCoordinates()).to.eql([10, 20, 10]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYM);
+    });
+
+    it('parses XYZM point', function() {
+      var str = JSON.stringify({
+        x: 10,
+        y: 20,
+        z: 0,
+        m: 10
+      });
+
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.Point);
+      expect(obj.getCoordinates()).to.eql([10, 20, 0, 10]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZM);
+    });
+
     it('parses multipoint', function() {
       var str = JSON.stringify({
         points: [[10, 20], [20, 30]]
@@ -371,6 +398,31 @@ describe('ol.format.EsriJSON', function() {
       expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZ);
     });
 
+    it('parses XYM multipoint', function() {
+      var str = JSON.stringify({
+        points: [[10, 20, 0], [20, 30, 0]],
+        hasM: true
+      });
+
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiPoint);
+      expect(obj.getCoordinates()).to.eql([[10, 20, 0], [20, 30, 0]]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYM);
+    });
+
+    it('parses XYZM multipoint', function() {
+      var str = JSON.stringify({
+        points: [[10, 20, 0, 1], [20, 30, 0, 1]],
+        hasZ: true,
+        hasM: true
+      });
+
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiPoint);
+      expect(obj.getCoordinates()).to.eql([[10, 20, 0, 1], [20, 30, 0, 1]]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZM);
+    });
+
     it('parses linestring', function() {
       var str = JSON.stringify({
         paths: [[[10, 20], [30, 40]]]
@@ -394,6 +446,104 @@ describe('ol.format.EsriJSON', function() {
       expect(obj.getCoordinates()).to.eql([[10, 20, 1534], [30, 40, 1420]]);
     });
 
+    it('parses XYM linestring', function() {
+      var str = JSON.stringify({
+        hasM: true,
+        paths: [[[10, 20, 1534], [30, 40, 1420]]]
+      });
+
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.LineString);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYM);
+      expect(obj.getCoordinates()).to.eql([[10, 20, 1534], [30, 40, 1420]]);
+    });
+
+    it('parses XYZM linestring', function() {
+      var str = JSON.stringify({
+        hasZ: true,
+        hasM: true,
+        paths: [[[10, 20, 1534, 1], [30, 40, 1420, 2]]]
+      });
+
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.LineString);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZM);
+      expect(obj.getCoordinates()).to.eql([[10, 20, 1534, 1],
+            [30, 40, 1420, 2]]);
+    });
+
+    it('parses multilinestring', function() {
+      var str = JSON.stringify({
+        paths: [[
+          [102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
+        ], [
+          [105.0, 3.0], [106.0, 4.0], [107.0, 3.0], [108.0, 4.0]
+        ]]
+      });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiLineString);
+      expect(obj.getCoordinates()).to.eql([
+        [[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]],
+        [[105.0, 3.0], [106.0, 4.0], [107.0, 3.0], [108.0, 4.0]]
+      ]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XY);
+    });
+
+    it('parses XYZ multilinestring', function() {
+      var str = JSON.stringify({
+        hasZ: true,
+        paths: [[
+          [102.0, 0.0, 1], [103.0, 1.0, 1], [104.0, 0.0, 1], [105.0, 1.0, 1]
+        ], [
+          [105.0, 3.0, 1], [106.0, 4.0, 1], [107.0, 3.0, 1], [108.0, 4.0, 1]
+        ]]
+      });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiLineString);
+      expect(obj.getCoordinates()).to.eql([
+        [[102.0, 0.0, 1], [103.0, 1.0, 1], [104.0, 0.0, 1], [105.0, 1.0, 1]],
+        [[105.0, 3.0, 1], [106.0, 4.0, 1], [107.0, 3.0, 1], [108.0, 4.0, 1]]
+      ]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZ);
+    });
+
+    it('parses XYM multilinestring', function() {
+      var str = JSON.stringify({
+        hasM: true,
+        paths: [[
+          [102.0, 0.0, 1], [103.0, 1.0, 1], [104.0, 0.0, 1], [105.0, 1.0, 1]
+        ], [
+          [105.0, 3.0, 1], [106.0, 4.0, 1], [107.0, 3.0, 1], [108.0, 4.0, 1]
+        ]]
+      });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiLineString);
+      expect(obj.getCoordinates()).to.eql([
+        [[102.0, 0.0, 1], [103.0, 1.0, 1], [104.0, 0.0, 1], [105.0, 1.0, 1]],
+        [[105.0, 3.0, 1], [106.0, 4.0, 1], [107.0, 3.0, 1], [108.0, 4.0, 1]]
+      ]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYM);
+    });
+
+    it('parses XYZM multilinestring', function() {
+      var str = JSON.stringify({
+        hasM: true,
+        hasZ: true,
+        paths: [[
+          [102, 0, 1, 2], [103, 1, 1, 2], [104, 0, 1, 2], [105, 1, 1, 2]
+        ], [
+          [105, 3, 1, 2], [106, 4, 1, 2], [107, 3, 1, 2], [108, 4, 1, 2]
+        ]]
+      });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiLineString);
+      expect(obj.getCoordinates()).to.eql([
+        [[102, 0, 1, 2], [103, 1, 1, 2], [104, 0, 1, 2], [105, 1, 1, 2]],
+        [[105, 3, 1, 2], [106, 4, 1, 2], [107, 3, 1, 2], [108, 4, 1, 2]]
+      ]);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZM);
+    });
+
     it('parses polygon', function() {
       var outer = [[0, 0], [0, 10], [10, 10], [10, 0], [0, 0]],
           inner1 = [[1, 1], [2, 1], [2, 2], [1, 2], [1, 1]],
@@ -406,6 +556,7 @@ describe('ol.format.EsriJSON', function() {
       expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XY);
       var rings = obj.getLinearRings();
       expect(rings.length).to.be(3);
+      expect(rings[0].getCoordinates()[0].length).to.equal(2);
       expect(rings[0]).to.be.a(ol.geom.LinearRing);
       expect(rings[1]).to.be.a(ol.geom.LinearRing);
       expect(rings[2]).to.be.a(ol.geom.LinearRing);
@@ -424,11 +575,72 @@ describe('ol.format.EsriJSON', function() {
       expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZ);
       var rings = obj.getLinearRings();
       expect(rings.length).to.be(3);
+      expect(rings[0].getCoordinates()[0].length).to.equal(3);
       expect(rings[0]).to.be.a(ol.geom.LinearRing);
       expect(rings[1]).to.be.a(ol.geom.LinearRing);
       expect(rings[2]).to.be.a(ol.geom.LinearRing);
     });
 
+    it('parses XYM polygon', function() {
+      var outer = [[0, 0, 5], [0, 10, 5], [10, 10, 5], [10, 0, 5], [0, 0, 5]],
+          inner1 = [[1, 1, 3], [2, 1, 3], [2, 2, 3], [1, 2, 3], [1, 1, 3]],
+          inner2 = [[8, 8, 2], [9, 8, 2], [9, 9, 2], [8, 9, 2], [8, 8, 2]],
+          str = JSON.stringify({
+            rings: [outer, inner1, inner2],
+            hasM: true
+          });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.Polygon);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYM);
+      var rings = obj.getLinearRings();
+      expect(rings.length).to.be(3);
+      expect(rings[0].getCoordinates()[0].length).to.equal(3);
+      expect(rings[0]).to.be.a(ol.geom.LinearRing);
+      expect(rings[1]).to.be.a(ol.geom.LinearRing);
+      expect(rings[2]).to.be.a(ol.geom.LinearRing);
+    });
+
+    it('parses XYZM polygon', function() {
+      var outer = [[0, 0, 5, 1], [0, 10, 5, 1], [10, 10, 5, 1],
+            [10, 0, 5, 1], [0, 0, 5, 1]],
+          inner1 = [[1, 1, 3, 2], [2, 1, 3, 2], [2, 2, 3, 2],
+            [1, 2, 3, 2], [1, 1, 3, 2]],
+          inner2 = [[8, 8, 2, 1], [9, 8, 2, 1], [9, 9, 2, 1],
+            [8, 9, 2, 1], [8, 8, 2, 1]],
+          str = JSON.stringify({
+            rings: [outer, inner1, inner2],
+            hasZ: true,
+            hasM: true
+          });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.Polygon);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZM);
+      var rings = obj.getLinearRings();
+      expect(rings.length).to.be(3);
+      expect(rings[0].getCoordinates()[0].length).to.equal(4);
+      expect(rings[0]).to.be.a(ol.geom.LinearRing);
+      expect(rings[1]).to.be.a(ol.geom.LinearRing);
+      expect(rings[2]).to.be.a(ol.geom.LinearRing);
+    });
+
+    it('parses XY multipolygon', function() {
+      var str = JSON.stringify({
+        rings: [
+          [[0, 1], [1, 4], [4, 3], [3, 0]],
+          [[2, 2], [3, 2], [3, 3], [2, 3]],
+          [[10, 1], [11, 5], [14, 3], [13, 0]]
+        ]
+      });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiPolygon);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XY);
+      expect(obj.getCoordinates()).to.eql([
+        [[[0, 1], [1, 4], [4, 3], [3, 0]], [[2, 2], [3, 2],
+            [3, 3], [2, 3]]],
+        [[[10, 1], [11, 5], [14, 3], [13, 0]]]
+      ]);
+    });
+
     it('parses XYZ multipolygon', function() {
       var str = JSON.stringify({
         rings: [
@@ -448,6 +660,46 @@ describe('ol.format.EsriJSON', function() {
       ]);
     });
 
+    it('parses XYM multipolygon', function() {
+      var str = JSON.stringify({
+        rings: [
+          [[0, 1, 0], [1, 4, 0], [4, 3, 0], [3, 0, 0]],
+          [[2, 2, 0], [3, 2, 0], [3, 3, 0], [2, 3, 0]],
+          [[10, 1, 0], [11, 5, 0], [14, 3, 0], [13, 0, 0]]
+        ],
+        hasM: true
+      });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiPolygon);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYM);
+      expect(obj.getCoordinates()).to.eql([
+        [[[0, 1, 0], [1, 4, 0], [4, 3, 0], [3, 0, 0]], [[2, 2, 0], [3, 2, 0],
+            [3, 3, 0], [2, 3, 0]]],
+        [[[10, 1, 0], [11, 5, 0], [14, 3, 0], [13, 0, 0]]]
+      ]);
+    });
+
+    it('parses XYZM multipolygon', function() {
+      var str = JSON.stringify({
+        rings: [
+          [[0, 1, 0, 1], [1, 4, 0, 1], [4, 3, 0, 1], [3, 0, 0, 1]],
+          [[2, 2, 0, 1], [3, 2, 0, 1], [3, 3, 0, 1], [2, 3, 0, 1]],
+          [[10, 1, 0, 1], [11, 5, 0, 1], [14, 3, 0, 1], [13, 0, 0, 1]]
+        ],
+        hasZ: true,
+        hasM: true
+      });
+      var obj = format.readGeometry(str);
+      expect(obj).to.be.a(ol.geom.MultiPolygon);
+      expect(obj.getLayout()).to.eql(ol.geom.GeometryLayout.XYZM);
+      expect(obj.getCoordinates()).to.eql([
+        [[[0, 1, 0, 1], [1, 4, 0, 1], [4, 3, 0, 1], [3, 0, 0, 1]],
+          [[2, 2, 0, 1], [3, 2, 0, 1],
+            [3, 3, 0, 1], [2, 3, 0, 1]]],
+        [[[10, 1, 0, 1], [11, 5, 0, 1], [14, 3, 0, 1], [13, 0, 0, 1]]]
+      ]);
+    });
+
   });
 
   describe('#readProjection', function() {
@@ -511,6 +763,21 @@ describe('ol.format.EsriJSON', function() {
           format.readGeometry(esrijson).getCoordinates());
     });
 
+    it('encodes XYM point', function() {
+      var point = new ol.geom.Point([10, 20, 0], ol.geom.GeometryLayout.XYM);
+      var esrijson = format.writeGeometry(point);
+      expect(point.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
+    it('encodes XYZM point', function() {
+      var point = new ol.geom.Point([10, 20, 5, 0],
+          ol.geom.GeometryLayout.XYZM);
+      var esrijson = format.writeGeometry(point);
+      expect(point.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
     it('encodes linestring', function() {
       var linestring = new ol.geom.LineString([[10, 20], [30, 40]]);
       var esrijson = format.writeGeometry(linestring);
@@ -526,6 +793,23 @@ describe('ol.format.EsriJSON', function() {
           format.readGeometry(esrijson).getCoordinates());
     });
 
+    it('encodes XYM linestring', function() {
+      var linestring = new ol.geom.LineString([[10, 20, 1534], [30, 40, 1420]],
+          ol.geom.GeometryLayout.XYM);
+      var esrijson = format.writeGeometry(linestring);
+      expect(linestring.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
+    it('encodes XYZM linestring', function() {
+      var linestring = new ol.geom.LineString([[10, 20, 1534, 1],
+            [30, 40, 1420, 1]],
+          ol.geom.GeometryLayout.XYZM);
+      var esrijson = format.writeGeometry(linestring);
+      expect(linestring.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
     it('encodes polygon', function() {
       var outer = [[0, 0], [10, 0], [10, 10], [0, 10], [0, 0]],
           inner1 = [[1, 1], [2, 1], [2, 2], [1, 2], [1, 1]],
@@ -547,6 +831,31 @@ describe('ol.format.EsriJSON', function() {
           format.readGeometry(esrijson).getCoordinates());
     });
 
+    it('encodes XYM polygon', function() {
+      var outer = [[0, 0, 5], [0, 10, 5], [10, 10, 5], [10, 0, 5], [0, 0, 5]],
+          inner1 = [[1, 1, 3], [2, 1, 3], [2, 2, 3], [1, 2, 3], [1, 1, 3]],
+          inner2 = [[8, 8, 2], [9, 8, 2], [9, 9, 2], [8, 9, 2], [8, 8, 2]];
+      var polygon = new ol.geom.Polygon([outer, inner1, inner2],
+          ol.geom.GeometryLayout.XYM);
+      var esrijson = format.writeGeometry(polygon);
+      expect(polygon.getCoordinates(false)).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
+    it('encodes XYZM polygon', function() {
+      var outer = [[0, 0, 5, 1], [0, 10, 5, 2], [10, 10, 5, 1],
+            [10, 0, 5, 1], [0, 0, 5, 1]],
+          inner1 = [[1, 1, 3, 1], [2, 1, 3, 2], [2, 2, 3, 1], [1, 2, 3, 1],
+            [1, 1, 3, 1]],
+          inner2 = [[8, 8, 2, 1], [9, 8, 2, 2], [9, 9, 2, 1], [8, 9, 2, 1],
+            [8, 8, 2, 1]];
+      var polygon = new ol.geom.Polygon([outer, inner1, inner2],
+          ol.geom.GeometryLayout.XYZM);
+      var esrijson = format.writeGeometry(polygon);
+      expect(polygon.getCoordinates(false)).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
     it('encodes multipoint', function() {
       var multipoint = new ol.geom.MultiPoint([[102.0, 0.0] , [103.0, 1.0]]);
       var esrijson = format.writeGeometry(multipoint);
@@ -562,6 +871,22 @@ describe('ol.format.EsriJSON', function() {
           format.readGeometry(esrijson).getCoordinates());
     });
 
+    it('encodes XYM multipoint', function() {
+      var multipoint = new ol.geom.MultiPoint([[102.0, 0.0, 3],
+            [103.0, 1.0, 4]], ol.geom.GeometryLayout.XYM);
+      var esrijson = format.writeGeometry(multipoint);
+      expect(multipoint.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
+    it('encodes XYZM multipoint', function() {
+      var multipoint = new ol.geom.MultiPoint([[102.0, 0.0, 3, 1],
+            [103.0, 1.0, 4, 1]], ol.geom.GeometryLayout.XYZM);
+      var esrijson = format.writeGeometry(multipoint);
+      expect(multipoint.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
     it('encodes multilinestring', function() {
       var multilinestring = new ol.geom.MultiLineString([
         [[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]],
@@ -582,6 +907,28 @@ describe('ol.format.EsriJSON', function() {
           format.readGeometry(esrijson).getCoordinates());
     });
 
+    it('encodes XYM multilinestring', function() {
+      var multilinestring = new ol.geom.MultiLineString([
+        [[102.0, 0.0, 1], [103.0, 1.0, 2], [104.0, 0.0, 3], [105.0, 1.0, 4]],
+        [[105.0, 3.0, 1], [106.0, 4.0, 2], [107.0, 3.0, 3], [108.0, 4.0, 4]]
+      ], ol.geom.GeometryLayout.XYM);
+      var esrijson = format.writeGeometry(multilinestring);
+      expect(multilinestring.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
+    it('encodes XYZM multilinestring', function() {
+      var multilinestring = new ol.geom.MultiLineString([
+        [[102.0, 0.0, 1, 0], [103.0, 1.0, 2, 2], [104.0, 0.0, 3, 1],
+          [105.0, 1.0, 4, 2]],
+        [[105.0, 3.0, 1, 0], [106.0, 4.0, 2, 1], [107.0, 3.0, 3, 1],
+          [108.0, 4.0, 4, 2]]
+      ], ol.geom.GeometryLayout.XYZM);
+      var esrijson = format.writeGeometry(multilinestring);
+      expect(multilinestring.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
     it('encodes multipolygon', function() {
       var multipolygon = new ol.geom.MultiPolygon([
         [[[0, 1], [1, 4], [4, 3], [3, 0]], [[2, 2], [3, 2], [3, 3], [2, 3]]],
@@ -603,6 +950,29 @@ describe('ol.format.EsriJSON', function() {
           format.readGeometry(esrijson).getCoordinates());
     });
 
+    it('encodes XYM multipolygon', function() {
+      var multipolygon = new ol.geom.MultiPolygon([
+        [[[0, 1, 0], [1, 4, 0], [4, 3, 0], [3, 0, 0]], [[2, 2, 0], [3, 2, 0],
+            [3, 3, 0], [2, 3, 0]]],
+        [[[10, 1, 0], [11, 5, 0], [14, 3, 0], [13, 0, 0]]]
+      ], ol.geom.GeometryLayout.XYM);
+      var esrijson = format.writeGeometry(multipolygon);
+      expect(multipolygon.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
+    it('encodes XYZM multipolygon', function() {
+      var multipolygon = new ol.geom.MultiPolygon([
+        [[[0, 1, 0, 1], [1, 4, 0, 1], [4, 3, 0, 3], [3, 0, 0, 3]],
+          [[2, 2, 0, 3], [3, 2, 0, 4],
+            [3, 3, 0, 1], [2, 3, 0, 1]]],
+        [[[10, 1, 0, 1], [11, 5, 0, 2], [14, 3, 0, 3], [13, 0, 0, 3]]]
+      ], ol.geom.GeometryLayout.XYZM);
+      var esrijson = format.writeGeometry(multipolygon);
+      expect(multipolygon.getCoordinates()).to.eql(
+          format.readGeometry(esrijson).getCoordinates());
+    });
+
     it('transforms and encodes a point', function() {
       var point = new ol.geom.Point([2, 3]);
       var esrijson = format.writeGeometry(point, {