Skip to content

Commit

Permalink
Test reading with shared vertices
Browse files Browse the repository at this point in the history
  • Loading branch information
@tschaub
tschaub committed Mar 3, 2013
1 parent 4af3256 commit b247031
Show file tree
Hide file tree
Showing 3 changed files with 305 additions and 32 deletions.
91 changes: 60 additions & 31 deletions src/ol/parser/geojson.js
View file
Expand Up @@ -8,6 +8,7 @@ goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.geom.SharedVertices');
goog.require('ol.parser.Parser');


Expand All @@ -23,62 +24,63 @@ goog.inherits(ol.parser.GeoJSON, ol.parser.Parser);
/**
* Parse a GeoJSON string.
* @param {string} str GeoJSON string.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.Feature|Array.<ol.Feature>|
* ol.geom.Geometry|Array.<ol.geom.Geometry>} Parsed geometry or array
* of geometries.
*/
ol.parser.GeoJSON.prototype.read = function(str) {
// TODO: add options and accept projection
ol.parser.GeoJSON.prototype.read = function(str, opt_options) {
var json = /** @type {GeoJSONObject} */ (JSON.parse(str));
return ol.parser.GeoJSON.prototype.parse_(json);
return this.parse_(json, opt_options);
};


/**
* @param {GeoJSONObject} json GeoJSON object.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.Feature|Array.<ol.Feature>|
* ol.geom.Geometry|Array.<ol.geom.Geometry>} Parsed geometry or array
* of geometries.
* @private
*/
ol.parser.GeoJSON.prototype.parse_ = function(json) {
ol.parser.GeoJSON.prototype.parse_ = function(json, opt_options) {
var result;
switch (json.type) {
case 'FeatureCollection':
result = this.parseFeatureCollection_(
/** @type {GeoJSONFeatureCollection} */ (json));
/** @type {GeoJSONFeatureCollection} */ (json), opt_options);
break;
case 'Feature':
result = this.parseFeature_(
/** @type {GeoJSONFeature} */ (json));
/** @type {GeoJSONFeature} */ (json), opt_options);
break;
case 'GeometryCollection':
result = this.parseGeometryCollection_(
/** @type {GeoJSONGeometryCollection} */ (json));
/** @type {GeoJSONGeometryCollection} */ (json), opt_options);
break;
case 'Point':
result = this.parsePoint_(
/** @type {GeoJSONGeometry} */ (json));
/** @type {GeoJSONGeometry} */ (json), opt_options);
break;
case 'LineString':
result = this.parseLineString_(
/** @type {GeoJSONGeometry} */ (json));
/** @type {GeoJSONGeometry} */ (json), opt_options);
break;
case 'Polygon':
result = this.parsePolygon_(
/** @type {GeoJSONGeometry} */ (json));
/** @type {GeoJSONGeometry} */ (json), opt_options);
break;
case 'MultiPoint':
result = this.parseMultiPoint_(
/** @type {GeoJSONGeometry} */ (json));
/** @type {GeoJSONGeometry} */ (json), opt_options);
break;
case 'MultiLineString':
result = this.parseMultiLineString_(
/** @type {GeoJSONGeometry} */ (json));
/** @type {GeoJSONGeometry} */ (json), opt_options);
break;
case 'MultiPolygon':
result = this.parseMultiPolygon_(
/** @type {GeoJSONGeometry} */ (json));
/** @type {GeoJSONGeometry} */ (json), opt_options);
break;
default:
throw new Error('GeoJSON parsing not implemented for type: ' + json.type);
Expand All @@ -89,15 +91,16 @@ ol.parser.GeoJSON.prototype.parse_ = function(json) {

/**
* @param {GeoJSONFeature} json GeoJSON feature.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.Feature} Parsed feature.
* @private
*/
ol.parser.GeoJSON.prototype.parseFeature_ = function(json) {
ol.parser.GeoJSON.prototype.parseFeature_ = function(json, opt_options) {
var geomJson = json.geometry,
geometry = null;
if (geomJson) {
geometry = /** @type {ol.geom.Geometry} */ (this.parse_(
/** @type {GeoJSONGeometry} */ (geomJson)));
/** @type {GeoJSONGeometry} */ (geomJson), opt_options));
}
var feature = new ol.Feature();
feature.setGeometry(geometry);
Expand All @@ -108,97 +111,123 @@ ol.parser.GeoJSON.prototype.parseFeature_ = function(json) {

/**
* @param {GeoJSONFeatureCollection} json GeoJSON feature collection.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {Array.<ol.Feature>} Parsed array of features.
* @private
*/
ol.parser.GeoJSON.prototype.parseFeatureCollection_ = function(json) {
ol.parser.GeoJSON.prototype.parseFeatureCollection_ = function(
json, opt_options) {
var features = json.features,
len = features.length,
result = new Array(len),
i;

for (i = 0; i < len; ++i) {
result[i] = this.parse_(
/** @type {GeoJSONFeature} */ (features[i]));
/** @type {GeoJSONFeature} */ (features[i]), opt_options);
}
return result;
};


/**
* @param {GeoJSONGeometryCollection} json GeoJSON geometry collection.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {Array.<ol.geom.Geometry>} Parsed array of geometries.
* @private
*/
ol.parser.GeoJSON.prototype.parseGeometryCollection_ = function(json) {
ol.parser.GeoJSON.prototype.parseGeometryCollection_ = function(
json, opt_options) {
var geometries = json.geometries,
len = geometries.length,
result = new Array(len),
i;

for (i = 0; i < len; ++i) {
result[i] = this.parse_(
/** @type {GeoJSONGeometry} */ (geometries[i]));
/** @type {GeoJSONGeometry} */ (geometries[i]), opt_options);
}
return result;
};


/**
* @param {GeoJSONGeometry} json GeoJSON linestring.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.geom.LineString} Parsed linestring.
* @private
*/
ol.parser.GeoJSON.prototype.parseLineString_ = function(json) {
return new ol.geom.LineString(json.coordinates);
ol.parser.GeoJSON.prototype.parseLineString_ = function(json, opt_options) {
var vertices = opt_options && opt_options.lineVertices;
return new ol.geom.LineString(json.coordinates, vertices);
};


/**
* @param {GeoJSONGeometry} json GeoJSON multi-linestring.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.geom.MultiLineString} Parsed multi-linestring.
* @private
*/
ol.parser.GeoJSON.prototype.parseMultiLineString_ = function(json) {
return new ol.geom.MultiLineString(json.coordinates);
ol.parser.GeoJSON.prototype.parseMultiLineString_ = function(
json, opt_options) {
var vertices = opt_options && opt_options.lineVertices;
return new ol.geom.MultiLineString(json.coordinates, vertices);
};


/**
* @param {GeoJSONGeometry} json GeoJSON multi-point.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.geom.MultiPoint} Parsed multi-point.
* @private
*/
ol.parser.GeoJSON.prototype.parseMultiPoint_ = function(json) {
return new ol.geom.MultiPoint(json.coordinates);
ol.parser.GeoJSON.prototype.parseMultiPoint_ = function(json, opt_options) {
var vertices = opt_options && opt_options.pointVertices;
return new ol.geom.MultiPoint(json.coordinates, vertices);
};


/**
* @param {GeoJSONGeometry} json GeoJSON multi-polygon.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.geom.MultiPolygon} Parsed multi-polygon.
* @private
*/
ol.parser.GeoJSON.prototype.parseMultiPolygon_ = function(json) {
return new ol.geom.MultiPolygon(json.coordinates);
ol.parser.GeoJSON.prototype.parseMultiPolygon_ = function(json, opt_options) {
var vertices = opt_options && opt_options.polygonVertices;
return new ol.geom.MultiPolygon(json.coordinates, vertices);
};


/**
* @param {GeoJSONGeometry} json GeoJSON point.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.geom.Point} Parsed multi-point.
* @private
*/
ol.parser.GeoJSON.prototype.parsePoint_ = function(json) {
return new ol.geom.Point(json.coordinates);
ol.parser.GeoJSON.prototype.parsePoint_ = function(json, opt_options) {
var vertices = opt_options && opt_options.pointVertices;
return new ol.geom.Point(json.coordinates, vertices);
};


/**
* @param {GeoJSONGeometry} json GeoJSON polygon.
* @param {ol.parser.GeoJSON.ReadOptions=} opt_options Read options.
* @return {ol.geom.Polygon} Parsed polygon.
* @private
*/
ol.parser.GeoJSON.prototype.parsePolygon_ = function(json) {
return new ol.geom.Polygon(json.coordinates);
ol.parser.GeoJSON.prototype.parsePolygon_ = function(json, opt_options) {
var vertices = opt_options && opt_options.polygonVertices;
return new ol.geom.Polygon(json.coordinates, vertices);
};


/**
* @typedef {{pointVertices: (ol.geom.SharedVertices|undefined),
* lineVertices: (ol.geom.SharedVertices|undefined),
* polygonVertices: (ol.geom.SharedVertices|undefined)}}
* TODO: add support for toProjection
*/
ol.parser.GeoJSON.ReadOptions;
65 changes: 64 additions & 1 deletion test/spec/ol/parser/geojson.test.js
View file
Expand Up @@ -68,7 +68,7 @@ describe('ol.parser.GeoJSON', function() {
]
};

describe('read()', function() {
describe('#read()', function() {

it('parses point', function() {
var str = JSON.stringify({
Expand Down Expand Up @@ -143,6 +143,68 @@ describe('ol.parser.GeoJSON', function() {
expect(secondGeom).toBeA(ol.geom.LineString);
});

it('parses countries.json', function() {
afterLoadText('spec/ol/parser/geojson/countries.json', function(text) {
var result = parser.read(text);
expect(result.length).toBe(179);

var first = result[0];
expect(first).toBeA(ol.Feature);
expect(first.get('name')).toBe('Afghanistan');
var firstGeom = first.getGeometry();
expect(firstGeom).toBeA(ol.geom.Polygon);
expect(firstGeom.getBounds().equals(
new ol.Extent(60.52843, 29.318572, 75.158028, 38.486282)))
.toBe(true);

var last = result[178];
expect(last).toBeA(ol.Feature);
expect(last.get('name')).toBe('Zimbabwe');
var lastGeom = last.getGeometry();
expect(lastGeom).toBeA(ol.geom.Polygon);
expect(lastGeom.getBounds().equals(
new ol.Extent(25.264226, -22.271612, 32.849861, -15.507787)))
.toBe(true);
});
});

it('parses countries.json with shared vertices', function() {
afterLoadText('spec/ol/parser/geojson/countries.json', function(text) {
var pointVertices = new ol.geom.SharedVertices();
var lineVertices = new ol.geom.SharedVertices();
var polygonVertices = new ol.geom.SharedVertices();

var result = parser.read(text, {
pointVertices: pointVertices,
lineVertices: lineVertices,
polygonVertices: polygonVertices
});
expect(result.length).toBe(179);

expect(pointVertices.coordinates.length).toBe(0);
expect(lineVertices.coordinates.length).toBe(0);
expect(polygonVertices.coordinates.length).toBe(21344);

var first = result[0];
expect(first).toBeA(ol.Feature);
expect(first.get('name')).toBe('Afghanistan');
var firstGeom = first.getGeometry();
expect(firstGeom).toBeA(ol.geom.Polygon);
expect(firstGeom.getBounds().equals(
new ol.Extent(60.52843, 29.318572, 75.158028, 38.486282)))
.toBe(true);

var last = result[178];
expect(last).toBeA(ol.Feature);
expect(last.get('name')).toBe('Zimbabwe');
var lastGeom = last.getGeometry();
expect(lastGeom).toBeA(ol.geom.Polygon);
expect(lastGeom.getBounds().equals(
new ol.Extent(25.264226, -22.271612, 32.849861, -15.507787)))
.toBe(true);
});
});

});

});
Expand All @@ -152,4 +214,5 @@ goog.require('ol.geom.LinearRing');
goog.require('ol.geom.LineString');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.geom.SharedVertices');
goog.require('ol.parser.GeoJSON');

0 comments on commit b247031

Please sign in to comment.