ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #796 from tschaub/geojson-rename

Browse Source 
Use .geojson extension for GeoJSON
This commit is contained in:
Tim Schaub
2013-06-18 15:54:47 -07:00
parent bf9b0b4dd2 2ee0805075
commit 56c2b85fce
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/data/countries.json → examples/data/countries.geojson
View File
examples/vector-layer.js
+1 -1
View File
@@ -57,7 +57,7 @@ map.on(['click', 'mousemove'], function(evt) {
var geojson = new ol.parser.GeoJSON(); var geojson = new ol.parser.GeoJSON();
var url = 'data/countries.json'; var url = 'data/countries.geojson';
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); xhr.open('GET', url, true);
test/spec/ol/parser/geojson.test.js
+4 -4
View File
@@ -190,8 +190,8 @@ describe('ol.parser.GeoJSON', function() {
expect(secondGeom).to.be.a(ol.geom.LineString); expect(secondGeom).to.be.a(ol.geom.LineString);
}); });
it('parses countries.json', function(done) { it('parses countries.geojson', function(done) {
afterLoadText('spec/ol/parser/geojson/countries.json', function(text) { afterLoadText('spec/ol/parser/geojson/countries.geojson', function(text) {
var result = parser.read(text); var result = parser.read(text);
expect(result.length).to.be(179); expect(result.length).to.be(179);
@@ -218,8 +218,8 @@ describe('ol.parser.GeoJSON', function() {
}); });
}); });
it('parses countries.json with shared vertices', function() { it('parses countries.geojson with shared vertices', function() {
afterLoadText('spec/ol/parser/geojson/countries.json', function(text) { afterLoadText('spec/ol/parser/geojson/countries.geojson', function(text) {
var pointVertices = new ol.geom.SharedVertices(); var pointVertices = new ol.geom.SharedVertices();
var lineVertices = new ol.geom.SharedVertices(); var lineVertices = new ol.geom.SharedVertices();
var polygonVertices = new ol.geom.SharedVertices(); var polygonVertices = new ol.geom.SharedVertices();
test/spec/ol/parser/geojson/countries.json → test/spec/ol/parser/geojson/countries.geojson
View File