diff --git a/examples/topojson.js b/examples/topojson.js index ce10ebd9f0..4b1e0adacd 100644 --- a/examples/topojson.js +++ b/examples/topojson.js @@ -4,7 +4,6 @@ goog.require('ol.View2D'); goog.require('ol.layer.TileLayer'); goog.require('ol.layer.Vector'); goog.require('ol.parser.TopoJSON'); -goog.require('ol.proj'); goog.require('ol.source.MapQuestOpenAerial'); goog.require('ol.source.Vector'); goog.require('ol.style.Polygon'); @@ -18,7 +17,8 @@ var raster = new ol.layer.TileLayer({ var vector = new ol.layer.Vector({ source: new ol.source.Vector({ - projection: ol.proj.get('EPSG:4326') + url: 'data/topojson/world-110m.json', + parser: new ol.parser.TopoJSON() }), style: new ol.style.Style({rules: [ new ol.style.Rule({ @@ -26,7 +26,7 @@ var vector = new ol.layer.Vector({ new ol.style.Polygon({ strokeColor: '#bada55', strokeWidth: 2, - opacity: 0.75 + opacity: 0.9 }) ] }) @@ -43,30 +43,3 @@ var map = new ol.Map({ }) }); -map.on(['click', 'mousemove'], function(evt) { - map.getFeatureInfo({ - pixel: evt.getPixel(), - layers: [vector], - success: function(featureInfo) { - document.getElementById('info').innerHTML = featureInfo[0]; - } - }); -}); - - -var parser = new ol.parser.TopoJSON(); -var url = 'data/topojson/world-110m.json'; -var xhr = new XMLHttpRequest(); -xhr.open('GET', url, true); - - -/** - * onload handler for the XHR request. - */ -xhr.onload = function() { - if (xhr.status == 200) { - var projection = map.getView().getProjection(); - vector.parseFeatures(xhr.responseText, parser, projection); - } -}; -xhr.send();