Using PascalCase for geometry enum values

This adds a bit more inconsistency to the library, but we didn't have complete consistency before.  Almost all existing string enum values are lowercase (a couple are camelCase and one is dash-separated).  The closure library isn't consistent either (with case for enum properties or values).  I imagine this could be justified in saying someone could blindly use GeoJSON type values in places, but in the end, you'll need to read the docs before guessing right.

examples/draw-features.html

@@ -36,9 +36,9 @@
           <form class="form-inline">
             <label>Geometry type &nbsp;</label>
               <select id="type">
-                <option value="polygon">Polygon</option>
+                <option value="Polygon">Polygon</option>
-                <option value="linestring">Linestring</option>
+                <option value="LineString">Linestring</option>
-                <option value="point">Point</option>
+                <option value="Point">Point</option>
               </select>
           </form>
 

examples/style-rules.js

@@ -44,7 +44,7 @@ var style = new ol.style.Style({rules: [
     ]
   }),
   new ol.style.Rule({
-    filter: 'geometryType("point")',
+    filter: 'geometryType("Point")',
     symbolizers: [
       new ol.style.Shape({
         size: 40,

src/objectliterals.jsdoc

@@ -346,8 +346,8 @@
  * @property {ol.layer.Vector} layer Destination layer for the features.
  * @property {number|undefined} snapTolerance Pixel distance for snapping to the
  *     drawing finish (default is 12).
- * @property {ol.geom.GeometryType} type Drawing type ('point', 'linestring',
+ * @property {ol.geom.GeometryType} type Drawing type ('Point', 'LineString',
- *     'polygon', 'multipoint', 'multilinestring', or 'multipolygon').
+ *     'Polygon', 'MultiPoint', 'MultiLineString', or 'MultiPolygon').
  * @todo stability experimental
  */
 

src/ol/geom/geometry.js

@@ -81,12 +81,12 @@ goog.inherits(ol.geom.GeometryEvent, goog.events.Event);
  * @todo stability experimental
  */
 ol.geom.GeometryType = {
-  POINT: 'point',
+  POINT: 'Point',
-  LINE_STRING: 'linestring',
+  LINE_STRING: 'LineString',
-  LINEAR_RING: 'linearring',
+  LINEAR_RING: 'LinearRing',
-  POLYGON: 'polygon',
+  POLYGON: 'Polygon',
-  MULTI_POINT: 'multipoint',
+  MULTI_POINT: 'MultiPoint',
-  MULTI_LINE_STRING: 'multilinestring',
+  MULTI_LINE_STRING: 'MultiLineString',
-  MULTI_POLYGON: 'multipolygon',
+  MULTI_POLYGON: 'MultiPolygon',
-  GEOMETRY_COLLECTION: 'geometrycollection'
+  GEOMETRY_COLLECTION: 'GeometryCollection'
 };

test/spec/ol/expr/expression.test.js

@@ -792,10 +792,10 @@ describe('ol.expr.lib', function() {
       ]])
     });
 
-    var isPoint = parse('geometryType("point")');
+    var isPoint = parse('geometryType("Point")');
-    var isLine = parse('geometryType("linestring")');
+    var isLine = parse('geometryType("LineString")');
-    var isPoly = parse('geometryType("polygon")');
+    var isPoly = parse('geometryType("Polygon")');
-    var pointOrPoly = parse('geometryType("point") || geometryType("polygon")');
+    var pointOrPoly = parse('geometryType("Point") || geometryType("Polygon")');
 
     it('distinguishes point features', function() {
       expect(evaluate(isPoint, point)).to.be(true);

test/spec/ol/parser/ogc/gml_v2.test.js

@@ -9,7 +9,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/point-coord.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('point');
+        expect(obj.geometry.type).to.eql('Point');
         expect(obj.geometry.coordinates).to.eql([1, 2]);
         done();
       });
@@ -25,7 +25,7 @@ describe('ol.parser.gml_v2', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('point');
+        expect(obj.geometry.type).to.eql('Point');
         expect(obj.geometry.coordinates).to.eql([1, 2]);
         done();
       });
@@ -34,9 +34,9 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/multipoint-coord.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('multipoint');
+        expect(obj.geometry.type).to.eql('MultiPoint');
         expect(obj.geometry.parts.length).to.eql(3);
-        expect(obj.geometry.parts[0].type).to.eql('point');
+        expect(obj.geometry.parts[0].type).to.eql('Point');
         expect(obj.geometry.parts[0].coordinates).to.eql([1, 2]);
         expect(obj.geometry.parts[1].coordinates).to.eql([2, 3]);
         expect(obj.geometry.parts[2].coordinates).to.eql([3, 4]);
@@ -54,9 +54,9 @@ describe('ol.parser.gml_v2', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multipoint');
+        expect(obj.geometry.type).to.eql('MultiPoint');
         expect(obj.geometry.parts.length).to.eql(3);
-        expect(obj.geometry.parts[0].type).to.eql('point');
+        expect(obj.geometry.parts[0].type).to.eql('Point');
         expect(obj.geometry.parts[0].coordinates).to.eql([1, 2]);
         expect(obj.geometry.parts[1].coordinates).to.eql([2, 3]);
         expect(obj.geometry.parts[2].coordinates).to.eql([3, 4]);
@@ -67,7 +67,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/linestring-coord.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('linestring');
+        expect(obj.geometry.type).to.eql('LineString');
         expect(obj.geometry.coordinates.length).to.eql(2);
         expect(obj.geometry.coordinates).to.eql([[1, 2], [3, 4]]);
         done();
@@ -84,7 +84,7 @@ describe('ol.parser.gml_v2', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('linestring');
+        expect(obj.geometry.type).to.eql('LineString');
         expect(obj.geometry.coordinates.length).to.eql(2);
         expect(obj.geometry.coordinates).to.eql([[1, 2], [3, 4]]);
         done();
@@ -94,9 +94,9 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/multilinestring-coord.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('multilinestring');
+        expect(obj.geometry.type).to.eql('MultiLineString');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('linestring');
+        expect(obj.geometry.parts[0].type).to.eql('LineString');
         expect(obj.geometry.parts[0].coordinates).to.eql([[1, 2], [2, 3]]);
         expect(obj.geometry.parts[1].coordinates).to.eql([[3, 4], [4, 5]]);
         done();
@@ -113,9 +113,9 @@ describe('ol.parser.gml_v2', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multilinestring');
+        expect(obj.geometry.type).to.eql('MultiLineString');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('linestring');
+        expect(obj.geometry.parts[0].type).to.eql('LineString');
         expect(obj.geometry.parts[0].coordinates).to.eql([[1, 2], [2, 3]]);
         expect(obj.geometry.parts[1].coordinates).to.eql([[3, 4], [4, 5]]);
         done();
@@ -125,7 +125,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/polygon-coord.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('polygon');
+        expect(obj.geometry.type).to.eql('Polygon');
         expect(obj.geometry.coordinates.length).to.eql(3);
         expect(obj.geometry.coordinates[0].length).to.eql(4);
         expect(obj.geometry.coordinates[0]).to.eql([[1, 2], [3, 4],
@@ -148,7 +148,7 @@ describe('ol.parser.gml_v2', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('polygon');
+        expect(obj.geometry.type).to.eql('Polygon');
         done();
       });
     });
@@ -156,9 +156,9 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/multipolygon-coord.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('multipolygon');
+        expect(obj.geometry.type).to.eql('MultiPolygon');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('polygon');
+        expect(obj.geometry.parts[0].type).to.eql('Polygon');
         done();
       });
     });
@@ -173,9 +173,9 @@ describe('ol.parser.gml_v2', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multipolygon');
+        expect(obj.geometry.type).to.eql('MultiPolygon');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('polygon');
+        expect(obj.geometry.parts[0].type).to.eql('Polygon');
         done();
       });
     });
@@ -192,11 +192,11 @@ describe('ol.parser.gml_v2', function() {
         delete p.srsName;
         delete p.axisOrientation;
         expect(goog.dom.xml.loadXml(p.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('geometrycollection');
+        expect(obj.geometry.type).to.eql('GeometryCollection');
         expect(obj.geometry.parts.length).to.eql(3);
-        expect(obj.geometry.parts[0].type).to.eql('point');
+        expect(obj.geometry.parts[0].type).to.eql('Point');
-        expect(obj.geometry.parts[1].type).to.eql('linestring');
+        expect(obj.geometry.parts[1].type).to.eql('LineString');
-        expect(obj.geometry.parts[2].type).to.eql('polygon');
+        expect(obj.geometry.parts[2].type).to.eql('Polygon');
         done();
       });
     });
@@ -220,7 +220,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/linearring-coord.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('linearring');
+        expect(obj.geometry.type).to.eql('LinearRing');
         expect(obj.geometry.coordinates).to.eql([[1, 2], [3, 4], [5, 6],
               [1, 2]]);
         done();
@@ -237,7 +237,7 @@ describe('ol.parser.gml_v2', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('linearring');
+        expect(obj.geometry.type).to.eql('LinearRing');
         expect(obj.geometry.coordinates).to.eql([[1, 2], [3, 4], [5, 6],
               [1, 2]]);
         done();

test/spec/ol/parser/ogc/gml_v3.test.js

@@ -24,7 +24,7 @@ describe('ol.parser.gml_v3', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('linearring');
+        expect(obj.geometry.type).to.eql('LinearRing');
         expect(obj.geometry.coordinates).to.eql([[1, 2], [3, 4], [5, 6],
               [1, 2]]);
         done();
@@ -41,7 +41,7 @@ describe('ol.parser.gml_v3', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('linestring');
+        expect(obj.geometry.type).to.eql('LineString');
         expect(obj.geometry.coordinates).to.eql([[1, 2], [3, 4]]);
         done();
       });
@@ -51,7 +51,7 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
         // no write test since simple features only does 2D
-        expect(obj.geometry.type).to.eql('linestring');
+        expect(obj.geometry.type).to.eql('LineString');
         expect(obj.geometry.coordinates).to.eql([[1, 2, 3], [4, 5, 6]]);
         done();
       });
@@ -68,7 +68,7 @@ describe('ol.parser.gml_v3', function() {
         delete p.srsName;
         delete p.axisOrientation;
         expect(goog.dom.xml.loadXml(p.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('linestring');
+        expect(obj.geometry.type).to.eql('LineString');
         expect(obj.geometry.coordinates).to.eql([[1, 2], [3, 4]]);
         done();
       });
@@ -78,9 +78,9 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         // no write test for plural, we only write singular
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('multilinestring');
+        expect(obj.geometry.type).to.eql('MultiLineString');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('linestring');
+        expect(obj.geometry.parts[0].type).to.eql('LineString');
         done();
       });
     });
@@ -96,9 +96,9 @@ describe('ol.parser.gml_v3', function() {
         delete p.srsName;
         delete p.axisOrientation;
         expect(goog.dom.xml.loadXml(p.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multilinestring');
+        expect(obj.geometry.type).to.eql('MultiLineString');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('linestring');
+        expect(obj.geometry.parts[0].type).to.eql('LineString');
         done();
       });
     });
@@ -113,9 +113,9 @@ describe('ol.parser.gml_v3', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multilinestring');
+        expect(obj.geometry.type).to.eql('MultiLineString');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('linestring');
+        expect(obj.geometry.parts[0].type).to.eql('LineString');
         expect(obj.geometry.parts[0].coordinates).to.eql([[1, 2], [2, 3]]);
         done();
       });
@@ -132,9 +132,9 @@ describe('ol.parser.gml_v3', function() {
         delete p.srsName;
         delete p.axisOrientation;
         expect(goog.dom.xml.loadXml(p.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multilinestring');
+        expect(obj.geometry.type).to.eql('MultiLineString');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('linestring');
+        expect(obj.geometry.parts[0].type).to.eql('LineString');
         expect(obj.geometry.parts[0].coordinates).to.eql([[1, 2], [2, 3]]);
         done();
       });
@@ -143,9 +143,9 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/multipoint-plural.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('multipoint');
+        expect(obj.geometry.type).to.eql('MultiPoint');
         expect(obj.geometry.parts.length).to.eql(3);
-        expect(obj.geometry.parts[0].type).to.eql('point');
+        expect(obj.geometry.parts[0].type).to.eql('Point');
         expect(obj.geometry.parts[0].coordinates).to.eql([1, 2]);
         done();
       });
@@ -161,9 +161,9 @@ describe('ol.parser.gml_v3', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multipoint');
+        expect(obj.geometry.type).to.eql('MultiPoint');
         expect(obj.geometry.parts.length).to.eql(3);
-        expect(obj.geometry.parts[0].type).to.eql('point');
+        expect(obj.geometry.parts[0].type).to.eql('Point');
         expect(obj.geometry.parts[0].coordinates).to.eql([1, 2]);
         done();
       });
@@ -172,9 +172,9 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/multipolygon-plural.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('multipolygon');
+        expect(obj.geometry.type).to.eql('MultiPolygon');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('polygon');
+        expect(obj.geometry.parts[0].type).to.eql('Polygon');
         done();
       });
     });
@@ -190,9 +190,9 @@ describe('ol.parser.gml_v3', function() {
         delete p.srsName;
         delete p.axisOrientation;
         expect(goog.dom.xml.loadXml(p.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multipolygon');
+        expect(obj.geometry.type).to.eql('MultiPolygon');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('polygon');
+        expect(obj.geometry.parts[0].type).to.eql('Polygon');
         done();
       });
     });
@@ -200,9 +200,9 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/multisurface-plural.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        expect(obj.geometry.type).to.eql('multipolygon');
+        expect(obj.geometry.type).to.eql('MultiPolygon');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('polygon');
+        expect(obj.geometry.parts[0].type).to.eql('Polygon');
         done();
       });
     });
@@ -217,9 +217,9 @@ describe('ol.parser.gml_v3', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multipolygon');
+        expect(obj.geometry.type).to.eql('MultiPolygon');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('polygon');
+        expect(obj.geometry.parts[0].type).to.eql('Polygon');
         done();
       });
     });
@@ -235,9 +235,9 @@ describe('ol.parser.gml_v3', function() {
         delete p.srsName;
         delete p.axisOrientation;
         expect(goog.dom.xml.loadXml(p.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('multipolygon');
+        expect(obj.geometry.type).to.eql('MultiPolygon');
         expect(obj.geometry.parts.length).to.eql(2);
-        expect(obj.geometry.parts[0].type).to.eql('polygon');
+        expect(obj.geometry.parts[0].type).to.eql('Polygon');
         done();
       });
     });
@@ -252,7 +252,7 @@ describe('ol.parser.gml_v3', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('point');
+        expect(obj.geometry.type).to.eql('Point');
         expect(obj.geometry.coordinates).to.eql([1, 2]);
         done();
       });
@@ -268,7 +268,7 @@ describe('ol.parser.gml_v3', function() {
         delete parser.srsName;
         delete parser.axisOrientation;
         expect(goog.dom.xml.loadXml(parser.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('polygon');
+        expect(obj.geometry.type).to.eql('Polygon');
         done();
       });
     });
@@ -284,7 +284,7 @@ describe('ol.parser.gml_v3', function() {
         delete p.srsName;
         delete p.axisOrientation;
         expect(goog.dom.xml.loadXml(p.serialize(node))).to.xmleql(xml);
-        expect(obj.geometry.type).to.eql('polygon');
+        expect(obj.geometry.type).to.eql('Polygon');
         done();
       });
     });