Add example, and use getFeatures in other examples

The new dedicated getfeatureinfo example shows how to combine feature info from a WMS and a vector layer. The other examples that previously used getFeatureInfo from vector layers now use the more appropriate getFeatures.
2013-07-31 17:47:16 +02:00
parent 4dd148a731
commit 5acff857e7
6 changed files with 146 additions and 31 deletions
--- a/examples/getfeatureinfo.html
+++ b/examples/getfeatureinfo.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
+    <link rel="stylesheet" href="../css/ol.css" type="text/css">
+    <link rel="stylesheet" href="../resources/bootstrap/css/bootstrap.min.css" type="text/css">
+    <link rel="stylesheet" href="../resources/layout.css" type="text/css">
+    <link rel="stylesheet" href="../resources/bootstrap/css/bootstrap-responsive.min.css" type="text/css">
+    <title>Vector layer example</title>
+  </head>
+  <body>
+
+    <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="./">OpenLayers 3 Examples</a>
+          <ul class="nav pull-right">
+            <li><iframe class="github-watch-button" src="http://ghbtns.com/github-btn.html?user=openlayers&repo=ol3&type=watch&count=true"
+  allowtransparency="true" frameborder="0" scrolling="0" height="20" width="90"></iframe></li>
+            <li><a href="https://twitter.com/share" class="twitter-share-button" data-count="none" data-hashtags="openlayers">&nbsp;</a></li>
+            <li><div class="g-plusone-wrapper"><div class="g-plusone" data-size="medium" data-annotation="none"></div></div></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+
+      <div class="row-fluid">
+        <div class="span12">
+          <div id="map" class="map"></div>
+        </div>
+      </div>
+
+      <div class="row-fluid">
+
+        <div class="span4">
+          <h4 id="title">GetFeatureInfo example</h4>
+          <p id="shortdesc">Example of a WMS layer and a vector layer, both configured to provide feature information on click.</p>
+          <div id="docs">
+            <p>See the <a href="getfeatureinfo.js" target="_blank">getfeatureinfo.js source</a> to see how this is done.</p>
+          </div>
+          <div id="tags">getfeatureinfo</div>
+        </div>
+        <div class="span4 offset4">
+          <div id="info" class="alert alert-success">
+            &nbsp;
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+
+    <script src="loader.js?id=getfeatureinfo" type="text/javascript"></script>
+    <script src="../resources/social-links.js" type="text/javascript"></script>
+
+  </body>
+</html>
--- a/examples/getfeatureinfo.js
+++ b/examples/getfeatureinfo.js
@@ -0,0 +1,59 @@
+goog.require('ol.Map');
+goog.require('ol.RendererHint');
+goog.require('ol.View2D');
+goog.require('ol.expr');
+goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Vector');
+goog.require('ol.parser.GeoJSON');
+goog.require('ol.source.TiledWMS');
+goog.require('ol.source.Vector');
+goog.require('ol.style.Polygon');
+goog.require('ol.style.Rule');
+goog.require('ol.style.Style');
+
+
+var wms = new ol.layer.TileLayer({
+  source: new ol.source.TiledWMS({
+    url: 'http://demo.opengeo.org/geoserver/wms',
+    params: {'LAYERS': 'ne:ne'}
+  })
+});
+
+var vector = new ol.layer.Vector({
+  source: new ol.source.Vector({
+    parser: new ol.parser.GeoJSON(),
+    url: 'data/countries.geojson'
+  }),
+  style: new ol.style.Style({rules: [
+    new ol.style.Rule({
+      symbolizers: [
+        new ol.style.Polygon({
+          strokeColor: '#bada55'
+        })
+      ]
+    })
+  ]}),
+  transformFeatureInfo: function(features) {
+    return features.length > 0 ?
+        features[0].getFeatureId() + ': ' + features[0].get('name') : '&nbsp;';
+  }
+});
+
+var map = new ol.Map({
+  layers: [wms, vector],
+  renderer: ol.RendererHint.CANVAS,
+  target: 'map',
+  view: new ol.View2D({
+    center: [0, 0],
+    zoom: 1
+  })
+});
+
+map.on(['click'], function(evt) {
+  map.getFeatureInfo({
+    pixel: evt.getPixel(),
+    success: function(featureInfoByLayer) {
+      document.getElementById('info').innerHTML = featureInfoByLayer.join('');
+    }
+  });
+});
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -15,14 +15,7 @@ var vector = new ol.layer.Vector({
  source: new ol.source.Vector({
    parser: new ol.parser.GPX(),
    url: 'data/gpx/yahoo.xml'
-  }),
-  transformFeatureInfo: function(features) {
-    var info = [];
-    for (var i = 0, ii = features.length; i < ii; ++i) {
-      info.push(features[i].get('name') + ': ' + features[i].get('type'));
-    }
-    return info.join(', ');
-  }
+  })
 });

 var map = new ol.Map({
@@ -36,11 +29,16 @@ var map = new ol.Map({
 });

 map.on(['click', 'mousemove'], function(evt) {
-  map.getFeatureInfo({
+  map.getFeatures({
    pixel: evt.getPixel(),
    layers: [vector],
-    success: function(featureInfo) {
-      document.getElementById('info').innerHTML = featureInfo[0] || '&nbsp;';
+    success: function(featuresByLayer) {
+      var features = featuresByLayer[0];
+      var info = [];
+      for (var i = 0, ii = features.length; i < ii; ++i) {
+        info.push(features[i].get('name') + ': ' + features[i].get('type'));
+      }
+      document.getElementById('info').innerHTML = info.join(', ') || '&nbsp;';
    }
  });
 });
--- a/examples/kml.js
+++ b/examples/kml.js
@@ -25,14 +25,7 @@ var vector = new ol.layer.Vector({
      maxDepth: 1, dimension: 2, extractStyles: true, extractAttributes: true
    }),
    url: 'data/kml/lines.kml'
-  }),
-  transformFeatureInfo: function(features) {
-    var info = [];
-    for (var i = 0, ii = features.length; i < ii; ++i) {
-      info.push(features[i].get('name'));
-    }
-    return info.join(', ');
-  }
+  })
 });

 var map = new ol.Map({
@@ -47,11 +40,16 @@ var map = new ol.Map({
 });

 map.on(['click', 'mousemove'], function(evt) {
-  map.getFeatureInfo({
+  map.getFeatures({
    pixel: evt.getPixel(),
    layers: [vector],
-    success: function(featureInfo) {
-      document.getElementById('info').innerHTML = featureInfo[0] || '&nbsp';
+    success: function(featuresByLayer) {
+      var features = featuresByLayer[0];
+      var info = [];
+      for (var i = 0, ii = features.length; i < ii; ++i) {
+        info.push(features[i].get('name'));
+      }
+      document.getElementById('info').innerHTML = info.join(', ') || '&nbsp';
    }
  });
 });
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -46,11 +46,7 @@ var vector = new ol.layer.Vector({
        })
      ]
    })
-  ]}),
-  transformFeatureInfo: function(features) {
-    return features.length > 0 ?
-        features[0].getFeatureId() + ': ' + features[0].get('name') : '&nbsp;';
-  }
+  ]})
 });

 var map = new ol.Map({
@@ -64,11 +60,14 @@ var map = new ol.Map({
 });

 map.on(['click', 'mousemove'], function(evt) {
-  map.getFeatureInfo({
+  map.getFeatures({
    pixel: evt.getPixel(),
    layers: [vector],
-    success: function(featureInfo) {
-      document.getElementById('info').innerHTML = featureInfo[0];
+    success: function(featuresByLayer) {
+      var features = featuresByLayer[0];
+      document.getElementById('info').innerHTML = features.length > 0 ?
+          features[0].getFeatureId() + ': ' + features[0].get('name') :
+          '&nbsp;';
    }
  });
 });
--- a/src/ol/source/wmssource.js
+++ b/src/ol/source/wmssource.js
@@ -87,7 +87,7 @@ ol.source.wms.getFeatureInfo = function(url, options, success, opt_error) {
      .replace(/LAYERS=([^&]+)/, 'LAYERS=$1&QUERY_LAYERS=$1');
  if (options.method == ol.source.WMSGetFeatureInfoMethod.IFRAME) {
    goog.global.setTimeout(function() {
-      success('<iframe seamless src="' + url + '"></iframe');
+      success('<iframe seamless src="' + url + '"></iframe>');
    }, 0);
  } else if (options.method == ol.source.WMSGetFeatureInfoMethod.XHR_GET) {
    goog.net.XhrIo.send(url, function(event) {