Merge remote-tracking branch 'openlayers/master' into vector-api

2014-01-02 18:28:30 +01:00
parent 8fb44e024b 94c22055be
commit 2342f83a48
12 changed files with 389 additions and 19 deletions
--- a/examples/zoomify.html
+++ b/examples/zoomify.html
@@ -0,0 +1,50 @@
+<!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>Zoomify 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">Zoomify example</h4>
+          <p id="shortdesc">Example of a Zoomify source.</p>
+          <div id="docs">
+            <p>See the <a href="zoomify.js" target="_blank">zoomify.js source</a> to see how this is done.</p>
+          </div>
+          <div id="tags">zoomify</div>
+        </div>
+
+      </div>
+
+    </div>
+
+    <script src="loader.js?id=zoomify" type="text/javascript"></script>
+    <script src="../resources/example-behaviour.js" type="text/javascript"></script>
+
+  </body>
+</html>
--- a/examples/zoomify.js
+++ b/examples/zoomify.js
@@ -0,0 +1,52 @@
+goog.require('ol.Map');
+goog.require('ol.RendererHints');
+goog.require('ol.View2D');
+goog.require('ol.layer.Tile');
+goog.require('ol.proj');
+goog.require('ol.proj.Projection');
+goog.require('ol.proj.Units');
+goog.require('ol.source.Zoomify');
+
+// This server does not support CORS, and so is incompatible with WebGL.
+//var imgWidth = 8001;
+//var imgHeight = 6943;
+//var url = 'http://mapy.mzk.cz/AA22/0103/';
+//var crossOrigin = undefined;
+
+var imgWidth = 9911;
+var imgHeight = 6100;
+var url = 'http://vips.vtech.fr/cgi-bin/iipsrv.fcgi?zoomify=' +
+        '/mnt/MD1/AD00/plan_CHU-4HD-01/FOND.TIF/';
+var crossOrigin = 'anonymous';
+
+var imgCenter = [imgWidth / 2, - imgHeight / 2];
+
+// Maps always need a projection, but Zoomify layers are not geo-referenced, and
+// are only measured in pixels.  So, we create a fake projection that the map
+// can use to properly display the layer.
+var proj = new ol.proj.Projection({
+  code: 'ZOOMIFY',
+  units: ol.proj.Units.PIXELS,
+  extent: [0, 0, imgWidth, imgHeight]
+});
+
+var source = new ol.source.Zoomify({
+  url: url,
+  size: [imgWidth, imgHeight],
+  crossOrigin: crossOrigin
+});
+
+var map = new ol.Map({
+  layers: [
+    new ol.layer.Tile({
+      source: source
+    })
+  ],
+  renderers: ol.RendererHints.createFromQueryData(),
+  target: 'map',
+  view: new ol.View2D({
+    projection: proj,
+    center: imgCenter,
+    zoom: 0
+  })
+});