Don't rely on goog.net.XhrIo in vector-layer example

This commit is contained in:
Frederic Junod
2013-11-12 15:42:23 +01:00
committed by Tom Payne
parent 946234ba27
commit 77b7abb96a

View File

@@ -1,8 +1,6 @@
// NOCOMPILE // NOCOMPILE
// FIXME don't rely on goog.* functions // FIXME don't rely on goog.* functions
goog.require('goog.asserts');
goog.require('goog.functions'); goog.require('goog.functions');
goog.require('goog.net.XhrIo');
goog.require('ol.Map'); goog.require('ol.Map');
goog.require('ol.RendererHint'); goog.require('ol.RendererHint');
goog.require('ol.View2D'); goog.require('ol.View2D');
@@ -29,31 +27,26 @@ var map = new ol.Map({
var vectorSource = new ol.source.Vector(); var vectorSource = new ol.source.Vector();
goog.net.XhrIo.send('data/countries.geojson', function(event) { $.get('data/countries.geojson', function(data) {
var xhrIo = /** @type {goog.net.XhrIo} */ (event.target); var format = new ol.format.GeoJSON();
if (xhrIo.isSuccess()) { var transformFn = ol.proj.getTransform('EPSG:4326', 'EPSG:3857');
var format = new ol.format.GeoJSON(); format.readString(data, function(feature) {
var object = xhrIo.getResponseJson(); var geometry = feature.getGeometry();
goog.asserts.assert(goog.isDefAndNotNull(object)); geometry.transform(transformFn);
var transformFn = ol.proj.getTransform('EPSG:4326', 'EPSG:3857'); feature.setGeometry(geometry);
format.readObject(object, function(feature) { vectorSource.addFeature(feature);
var geometry = feature.getGeometry(); });
geometry.transform(transformFn); map.getLayers().push(new ol.layer.Vector({
feature.setGeometry(geometry); source: vectorSource,
vectorSource.addFeature(feature); styleFunction: goog.functions.constant({
}); fill: {
map.getLayers().push(new ol.layer.Vector({ color: 'rgba(255, 255, 255, 0.6)'
source: vectorSource, },
styleFunction: goog.functions.constant({ stroke: {
fill: { color: '#319FD3'
color: 'rgba(255, 255, 255, 0.6)' }
}, })
stroke: { }));
color: '#319FD3'
}
})
}));
}
}); });
var displayFeatureInfo = function(pixel) { var displayFeatureInfo = function(pixel) {