Merge remote-tracking branch 'upstream/master' into webgl-point

Conflicts: src/ol/style/circlestyle.js src/ol/style/regularshapestyle.js test/spec/ol/style/regularshapestyle.test.js
2014-12-04 12:57:46 +01:00
parent b2e419654b dcd81ab4b3
commit 87bb1b956b
47 changed files with 1117 additions and 174 deletions
--- a/examples/epsg-4326.js
+++ b/examples/epsg-4326.js
@@ -9,7 +9,7 @@ goog.require('ol.source.TileWMS');
 var layers = [
  new ol.layer.Tile({
    source: new ol.source.TileWMS({
-      url: 'http://demo.opengeo.org/geoserver/wms',
+      url: 'http://demo.boundlessgeo.com/geoserver/wms',
      params: {
        'LAYERS': 'ne:NE1_HR_LC_SR_W_DR'
      }
--- a/examples/getfeatureinfo-image.js
+++ b/examples/getfeatureinfo-image.js
@@ -5,7 +5,7 @@ goog.require('ol.source.ImageWMS');


 var wmsSource = new ol.source.ImageWMS({
-  url: 'http://demo.opengeo.org/geoserver/wms',
+  url: 'http://demo.boundlessgeo.com/geoserver/wms',
  params: {'LAYERS': 'ne:ne'},
  serverType: 'geoserver'
 });
--- a/examples/getfeatureinfo-tile.js
+++ b/examples/getfeatureinfo-tile.js
@@ -5,7 +5,7 @@ goog.require('ol.source.TileWMS');


 var wmsSource = new ol.source.TileWMS({
-  url: 'http://demo.opengeo.org/geoserver/wms',
+  url: 'http://demo.boundlessgeo.com/geoserver/wms',
  params: {'LAYERS': 'ne:ne'},
  serverType: 'geoserver'
 });
--- a/examples/layer-extent.html
+++ b/examples/layer-extent.html
@@ -0,0 +1,68 @@
+<!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>Limited Layer Extent</title>
+  </head>
+  <body>
+
+    <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="./"><img src="../resources/logo.png"> OpenLayers 3 Examples</a>
+        </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="span12">
+          <h4 id="title">Limited layer extent</h4>
+          <p id="shortdesc">Restricting layer rendering to a limited extent.</p>
+          <div id="docs">
+            <p>
+              This example uses the <code>layer.setExtent()</code> method to
+              modify the extent of the overlay layer.  Use the controls below
+              to limit rendering based on an extent.
+            </p>
+            <p>
+              <div class="btn-group">
+                <button type="button" class="btn btn-default" id="northwest">northwest</button>
+                <button type="button" class="btn btn-default" id="northeast">northeast</button>
+                <button type="button" class="btn btn-default" id="southeast">southeast</button>
+                <button type="button" class="btn btn-default" id="southwest">southwest</button>
+                <button type="button" class="btn btn-default" id="world">world</button>
+              </div>
+            </p>
+            <p>
+              See the <a href="layer-extent.js" target="_blank">layer-extent.js
+              source</a> for details on how this is done.
+            </p>
+          </div>
+          <div id="tags">extent, tilejson</div>
+        </div>
+
+      </div>
+
+    </div>
+
+    <script src="../resources/jquery.min.js" type="text/javascript"></script>
+    <script src="../resources/example-behaviour.js" type="text/javascript"></script>
+    <script src="loader.js?id=layer-extent" type="text/javascript"></script>
+
+  </body>
+</html>
--- a/examples/layer-extent.js
+++ b/examples/layer-extent.js
@@ -0,0 +1,50 @@
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Tile');
+goog.require('ol.proj');
+goog.require('ol.source.TileJSON');
+
+function transform(extent) {
+  return ol.proj.transformExtent(extent, 'EPSG:4326', 'EPSG:3857');
+}
+
+var extents = {
+  northwest: transform([-180, 0, 0, 85]),
+  northeast: transform([0, 0, 180, 85]),
+  southeast: transform([0, -85, 180, 0]),
+  southwest: transform([-180, -85, 0, 0]),
+  world: transform([-180, -85, 180, 85])
+};
+
+var base = new ol.layer.Tile({
+  source: new ol.source.TileJSON({
+    url: 'http://api.tiles.mapbox.com/v3/' +
+        'mapbox.world-black.jsonp',
+    crossOrigin: 'anonymous'
+  })
+});
+
+var overlay = new ol.layer.Tile({
+  extent: extents.northwest,
+  source: new ol.source.TileJSON({
+    url: 'http://api.tiles.mapbox.com/v3/' +
+        'mapbox.world-glass.jsonp',
+    crossOrigin: 'anonymous'
+  })
+});
+
+var map = new ol.Map({
+  layers: [base, overlay],
+  renderer: exampleNS.getRendererFromQueryString(),
+  target: 'map',
+  view: new ol.View({
+    center: [0, 0],
+    zoom: 1
+  })
+});
+
+for (var key in extents) {
+  document.getElementById(key).onclick = function(event) {
+    overlay.setExtent(extents[event.target.id]);
+  };
+}
--- a/examples/regularshape.html
+++ b/examples/regularshape.html
@@ -0,0 +1,51 @@
+<!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>Regular Shape example</title>
+  </head>
+  <body>
+
+    <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="./"><img src="../resources/logo.png"> OpenLayers 3 Examples</a>
+        </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="span12">
+          <h4 id="title">Regular Shape example</h4>
+          <p id="shortdesc">Example of some Regular Shape styles.</p>
+          <div id="docs">
+            <p>See the <a href="regularshape.js" target="_blank">regularshape.js source</a> to see how this is done.</p>
+          </div>
+          <div id="tags">vector, symbol, regularshape, style, square, cross, star, triangle, x</div>
+        </div>
+
+      </div>
+
+    </div>
+
+    <script src="../resources/jquery.min.js" type="text/javascript"></script>
+    <script src="../resources/example-behaviour.js" type="text/javascript"></script>
+    <script src="loader.js?id=regularshape" type="text/javascript"></script>
+
+  </body>
+</html>
--- a/examples/regularshape.js
+++ b/examples/regularshape.js
@@ -0,0 +1,100 @@
+goog.require('ol.Feature');
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.geom.Point');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+goog.require('ol.style.Fill');
+goog.require('ol.style.RegularShape');
+goog.require('ol.style.Stroke');
+goog.require('ol.style.Style');
+
+
+var stroke = new ol.style.Stroke({color: 'black', width: 2});
+var fill = new ol.style.Fill({color: 'red'});
+
+var styles = {
+  'square': [new ol.style.Style({
+    image: new ol.style.RegularShape(
+        /** @type {olx.style.RegularShapeOptions} */({
+          fill: fill,
+          stroke: stroke,
+          points: 4,
+          radius: 10,
+          angle: Math.PI / 4
+        }))
+  })],
+  'triangle': [new ol.style.Style({
+    image: new ol.style.RegularShape(
+        /** @type {olx.style.RegularShapeOptions} */({
+          fill: fill,
+          stroke: stroke,
+          points: 3,
+          radius: 10,
+          angle: 0
+        }))
+  })],
+  'star': [new ol.style.Style({
+    image: new ol.style.RegularShape(
+        /** @type {olx.style.RegularShapeOptions} */({
+          fill: fill,
+          stroke: stroke,
+          points: 5,
+          radius: 10,
+          radius2: 4,
+          angle: 0
+        }))
+  })],
+  'cross': [new ol.style.Style({
+    image: new ol.style.RegularShape(
+        /** @type {olx.style.RegularShapeOptions} */({
+          fill: fill,
+          stroke: stroke,
+          points: 4,
+          radius: 10,
+          radius2: 0,
+          angle: 0
+        }))
+  })],
+  'x': [new ol.style.Style({
+    image: new ol.style.RegularShape(
+        /** @type {olx.style.RegularShapeOptions} */({
+          fill: fill,
+          stroke: stroke,
+          points: 4,
+          radius: 10,
+          radius2: 0,
+          angle: Math.PI / 4
+        }))
+  })]
+};
+
+
+var styleKeys = ['x', 'cross', 'star', 'triangle', 'square'];
+var count = 250;
+var features = new Array(count);
+var e = 4500000;
+for (var i = 0; i < count; ++i) {
+  var coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e];
+  features[i] = new ol.Feature(new ol.geom.Point(coordinates));
+  features[i].setStyle(styles[styleKeys[Math.floor(Math.random() * 5)]]);
+}
+
+var source = new ol.source.Vector({
+  features: features
+});
+
+var vectorLayer = new ol.layer.Vector({
+  source: source
+});
+
+var map = new ol.Map({
+  layers: [
+    vectorLayer
+  ],
+  target: 'map',
+  view: new ol.View({
+    center: [0, 0],
+    zoom: 2
+  })
+});
--- a/examples/tissot.js
+++ b/examples/tissot.js
@@ -20,7 +20,7 @@ var map4326 = new ol.Map({
  layers: [
    new ol.layer.Tile({
      source: new ol.source.TileWMS({
-        url: 'http://demo.opengeo.org/geoserver/wms',
+        url: 'http://demo.boundlessgeo.com/geoserver/wms',
        params: {
          'LAYERS': 'ne:NE1_HR_LC_SR_W_DR'
        }
@@ -41,7 +41,7 @@ var map3857 = new ol.Map({
  layers: [
    new ol.layer.Tile({
      source: new ol.source.TileWMS({
-        url: 'http://demo.opengeo.org/geoserver/wms',
+        url: 'http://demo.boundlessgeo.com/geoserver/wms',
        params: {
          'LAYERS': 'ne:NE1_HR_LC_SR_W_DR'
        }
--- a/examples/vector-wfs.js
+++ b/examples/vector-wfs.js
@@ -13,7 +13,7 @@ goog.require('ol.tilegrid.XYZ');
 var vectorSource = new ol.source.ServerVector({
  format: new ol.format.GeoJSON(),
  loader: function(extent, resolution, projection) {
-    var url = 'http://demo.opengeo.org/geoserver/wfs?service=WFS&' +
+    var url = 'http://demo.boundlessgeo.com/geoserver/wfs?service=WFS&' +
        'version=1.1.0&request=GetFeature&typename=osm:water_areas&' +
        'outputFormat=text/javascript&format_options=callback:loadFeatures' +
        '&srsname=EPSG:3857&bbox=' + extent.join(',') + ',EPSG:3857';
--- a/examples/wms-image.js
+++ b/examples/wms-image.js
@@ -13,7 +13,7 @@ var layers = [
  new ol.layer.Image({
    extent: [-13884991, 2870341, -7455066, 6338219],
    source: new ol.source.ImageWMS({
-      url: 'http://demo.opengeo.org/geoserver/wms',
+      url: 'http://demo.boundlessgeo.com/geoserver/wms',
      params: {'LAYERS': 'topp:states'},
      serverType: 'geoserver'
    })
--- a/examples/wms-tiled.js
+++ b/examples/wms-tiled.js
@@ -12,7 +12,7 @@ var layers = [
  new ol.layer.Tile({
    extent: [-13884991, 2870341, -7455066, 6338219],
    source: new ol.source.TileWMS(/** @type {olx.source.TileWMSOptions} */ ({
-      url: 'http://demo.opengeo.org/geoserver/wms',
+      url: 'http://demo.boundlessgeo.com/geoserver/wms',
      params: {'LAYERS': 'topp:states', 'TILED': true},
      serverType: 'geoserver'
    }))