[OpenLayers-Commits] r12375 - in addins/InlineXhtml/trunk: examples
lib/OpenLayers/Layer lib/OpenLayers/Layer/WMS lib/OpenLayers/Tile
commits-20090109 at openlayers.org
commits-20090109 at openlayers.org
Sat Sep 17 00:33:29 EDT 2011
Author: hhudson
Date: 2011-09-16 21:33:28 -0700 (Fri, 16 Sep 2011)
New Revision: 12375
Modified:
addins/InlineXhtml/trunk/examples/example1.htm
addins/InlineXhtml/trunk/examples/example2.htm
addins/InlineXhtml/trunk/examples/example3.htm
addins/InlineXhtml/trunk/examples/example4.htm
addins/InlineXhtml/trunk/examples/example5.htm
addins/InlineXhtml/trunk/examples/example6.htm
addins/InlineXhtml/trunk/examples/example6_layer1.xml
addins/InlineXhtml/trunk/examples/example7.htm
addins/InlineXhtml/trunk/examples/example7_layer1.htm
addins/InlineXhtml/trunk/lib/OpenLayers/Layer/InlineXhtml.js
addins/InlineXhtml/trunk/lib/OpenLayers/Layer/ScalableInlineXhtml.js
addins/InlineXhtml/trunk/lib/OpenLayers/Layer/WMS/InlineXhtml.js
addins/InlineXhtml/trunk/lib/OpenLayers/Tile/InlineXhtml.js
Log:
Update InlineXhtml examples for IE9. Update copyright.
Modified: addins/InlineXhtml/trunk/examples/example1.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example1.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example1.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,12 +1,14 @@
+<!DOCTYPE html>
<html>
- <head>
- <script src="http://openlayers.org/api/OpenLayers.js"></script>
- <script src="../lib/OpenLayers/Tile/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js"></script>
+ <head>
+ <title>InlineXhtml Example 1</title>
+ <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Tile/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js" type="text/javascript"></script>
- <script type="text/javascript">
+ <script type="text/javascript">
var map; //OpenLayers.Map
var state_labels;
@@ -15,11 +17,7 @@
function init()
{
map = new OpenLayers.Map ("map", {
- controls:[
- new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PanZoomBar(),
- new OpenLayers.Control.LayerSwitcher(),
- new OpenLayers.Control.Attribution()]
+ controls:[ new OpenLayers.Control.LayerSwitcher() ]
} );
var states_wms = new OpenLayers.Layer.WMS.InlineXhtml(
@@ -44,7 +42,7 @@
</script>
- <script>
+ <script type="text/javascript">
function togglePointerEvents(cb) {
if (cb.checked) {
state_labels.div.style.pointerEvents = 'none';
@@ -64,8 +62,7 @@
<span style="font-size: smaller;">Set "State labels" pointerEvents='none'</span>
</div>
- <div id="map" style="width: 560; height: 460; float:left; background: lightblue; border: 1px black solid"></div>
+ <div id="map" style="width: 560px; height: 460px; float:left; background: lightblue; border: 1px black solid"></div>
<div id="info1">
</body>
-</html>
-
+</html>
\ No newline at end of file
Modified: addins/InlineXhtml/trunk/examples/example2.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example2.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example2.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
<html>
<head>
- <script src="http://openlayers.org/api/OpenLayers.js"></script>
- <script src="../lib/OpenLayers/Tile/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js"></script>
+ <title>InlineXhtml Example 2</title>
+ <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Tile/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -23,7 +25,7 @@
var ol_wms = new OpenLayers.Layer.WMS(
"OpenLayers WMS",
- "http://labs.metacarta.com/wms/vmap0",
+ "http://vmap0.tiles.osgeo.org/wms/vmap0",
{layers: 'basic'},
{isBaseLayer: true}
);
@@ -47,7 +49,6 @@
<h1>InlineXhtml Example 2</h1>
Australia States - a (scalable) svg layer.
<br/>
- <div id="map" style="width: 560; height: 460; float:left; border: 1px black solid"></div>
+ <div id="map" style="width: 560px; height: 460px; float:left; border: 1px black solid"></div>
</body>
</html>
-
Modified: addins/InlineXhtml/trunk/examples/example3.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example3.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example3.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
<html>
<head>
- <script src="http://openlayers.org/api/OpenLayers.js"></script>
- <script src="../lib/OpenLayers/Tile/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js"></script>
+ <title>InlineXhtml Example 3</title>
+ <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Tile/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -23,7 +25,7 @@
var ol_wms = new OpenLayers.Layer.WMS(
"OpenLayers WMS",
- "http://labs.metacarta.com/wms/vmap0",
+ "http://vmap0.tiles.osgeo.org/wms/vmap0",
{layers: 'basic'},
{isBaseLayer: true}
);
@@ -47,7 +49,6 @@
<h1>InlineXhtml Example 3</h1>
Australia States - a non-interactive (scalable) svg layer.
<br/>
- <div id="map" style="width: 560; height: 460; float:left; border: 1px black solid"></div>
+ <div id="map" style="width: 560px; height: 460px; float:left; border: 1px black solid"></div>
</body>
</html>
-
Modified: addins/InlineXhtml/trunk/examples/example4.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example4.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example4.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
<html>
<head>
- <script src="http://openlayers.org/api/OpenLayers.js"></script>
- <script src="../lib/OpenLayers/Tile/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js"></script>
+ <title>InlineXhtml Example 4</title>
+ <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Tile/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -15,7 +17,7 @@
map = new OpenLayers.Map ("map", {
controls:[
- new OpenLayers.Control.MousePosition(),
+ new OpenLayers.Control.MousePosition(),
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.PanZoomBar(),
new OpenLayers.Control.LayerSwitcher(),
@@ -50,7 +52,7 @@
This SVG layer was exported from openstreetmap.org as a Mapnik SVG image and
to make it scalable, the original "width" and "height" attributes
have been removed from the outermost svg element.
- <div id="map" style="width: 500; height: 400; border: 1px black solid"></div>
+ <div id="map" style="width: 500px; height: 400px; border: 1px black solid"></div>
</body>
</html>
Modified: addins/InlineXhtml/trunk/examples/example5.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example5.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example5.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,12 +1,13 @@
+<!DOCTYPE html>
<html>
<head>
+ <title>InlineXhtml Example 5</title>
+ <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Tile/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js" type="text/javascript"></script>
- <script src="http://openlayers.org/api/OpenLayers.js"></script>
- <script src="../lib/OpenLayers/Tile/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js"></script>
-
<script type="text/javascript">
var map; //OpenLayers.Map
@@ -26,18 +27,18 @@
} );
var ol_wms = new OpenLayers.Layer.WMS(
- "OpenLayers WMS",
- "http://labs.metacarta.com/wms/vmap0",
- {layers: 'basic'},
- {isBaseLayer: true}
- );
+ "OpenLayers WMS",
+ "http://vmap0.tiles.osgeo.org/wms/vmap0",
+ {layers: 'basic'},
+ {isBaseLayer: true}
+ );
- var states_wms = new OpenLayers.Layer.WMS.InlineXhtml(
+ var states_wms = new OpenLayers.Layer.WMS.InlineXhtml(
"US states",
"http://demo.opengeo.org/geoserver/wms",
{layers: 'topp:states', format: 'image/svg+xml'},
{isBaseLayer: false, visibility: true, opacity: '0.6'}
- );
+ );
map.addLayers([ol_wms, states_wms]);
Modified: addins/InlineXhtml/trunk/examples/example6.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example6.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example6.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,12 +1,13 @@
+<!DOCTYPE html>
<html>
<head>
+ <title>InlineXhtml Example 6</title>
+ <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Tile/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js" type="text/javascript"></script>
- <script src="http://openlayers.org/api/OpenLayers.js"></script>
- <script src="../lib/OpenLayers/Tile/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js"></script>
-
<script type="text/javascript">
var map; //OpenLayers.Map
@@ -40,7 +41,6 @@
<h1>InlineXhtml Example 6</h1>
XHTML Interactivity test case 1.
<br/>
- <div id="map" style="width: 560; height: 460; float:left; border: 1px black solid"></div>
+ <div id="map" style="width: 560px; height: 460px; float:left; border: 1px black solid"></div>
</body>
</html>
-
Modified: addins/InlineXhtml/trunk/examples/example6_layer1.xml
===================================================================
--- addins/InlineXhtml/trunk/examples/example6_layer1.xml 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example6_layer1.xml 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
-XHTML Interactivy test case 1.
+XHTML Interactivity test case 1.
This is an XHTML fragment with inline SVG.
-->
-<div xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMidYMid meet" viewBox="0 0 600 600" overflow="visible">
+<div xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="width:100%; height:100%">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMidYMid meet" viewBox="0 0 600 600" overflow="visible" zoomAndPan="magnify">
<script type="text/ecmascript">
//<![CDATA[
function show_info(element) {
Modified: addins/InlineXhtml/trunk/examples/example7.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example7.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example7.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,12 +1,13 @@
+<!DOCTYPE html>
<html>
<head>
+ <title>InlineXhtml Example 7</title>
+ <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Tile/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/InlineXhtml.js" type="text/javascript"></script>
+ <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js" type="text/javascript"></script>
- <script src="http://openlayers.org/api/OpenLayers.js"></script>
- <script src="../lib/OpenLayers/Tile/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/WMS/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/InlineXhtml.js"></script>
- <script src="../lib/OpenLayers/Layer/ScalableInlineXhtml.js"></script>
-
<script type="text/javascript">
var map; //OpenLayers.Map
@@ -40,7 +41,6 @@
<h1>InlineXhtml Example 7</h1>
HTML5 Interactivity test case 1.
<br/>
- <div id="map" style="width: 560; height: 460; float:left; border: 1px black solid"></div>
+ <div id="map" style="width: 560px; height: 460px; float:left; border: 1px black solid"></div>
</body>
</html>
-
Modified: addins/InlineXhtml/trunk/examples/example7_layer1.htm
===================================================================
--- addins/InlineXhtml/trunk/examples/example7_layer1.htm 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/examples/example7_layer1.htm 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,10 +1,10 @@
<!--
-HTML5 Interactivy test case 1.
+HTML5 Interactivity test case 1.
This is an HTML5 fragment with inline SVG.
Note that this file is not strict XML (there are missing closing SVG tags) also tags case are mixed, no xmlns namespaces, unquoted attributes, etc.
-->
-<DIV>
-<SVG version=1.1 preserveAspectRatio="xMidYMid meet" viewBox="0 0 600 600" overflow="visible">
+<DIV style="width:100%; height:100%">
+<SVG version=1.1 preserveAspectRatio="xMidYMid meet" viewBox="0 0 600 600" overflow="visible" zoomAndPan="magnify">
<script type="text/ecmascript">
//<![CDATA[
function show_info(element) {
Modified: addins/InlineXhtml/trunk/lib/OpenLayers/Layer/InlineXhtml.js
===================================================================
--- addins/InlineXhtml/trunk/lib/OpenLayers/Layer/InlineXhtml.js 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/lib/OpenLayers/Layer/InlineXhtml.js 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,10 +1,11 @@
-/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD
- * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
+ * full list of contributors). Published under the Clear BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
* full text of the license. */
/**
-* @requires OpenLayers/Layer/Grid.js
+ * @requires OpenLayers/Layer/Grid.js
* @requires OpenLayers/Tile/InlineXhtml.js
*/
Modified: addins/InlineXhtml/trunk/lib/OpenLayers/Layer/ScalableInlineXhtml.js
===================================================================
--- addins/InlineXhtml/trunk/lib/OpenLayers/Layer/ScalableInlineXhtml.js 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/lib/OpenLayers/Layer/ScalableInlineXhtml.js 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,6 +1,8 @@
-/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD
- * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
+ * full list of contributors). Published under the Clear BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
* full text of the license. */
+
/**
* @requires OpenLayers/Layer.js
@@ -315,4 +317,4 @@
},
CLASS_NAME: "OpenLayers.Layer.ScalableInlineXhtml"
-});
\ No newline at end of file
+});
Modified: addins/InlineXhtml/trunk/lib/OpenLayers/Layer/WMS/InlineXhtml.js
===================================================================
--- addins/InlineXhtml/trunk/lib/OpenLayers/Layer/WMS/InlineXhtml.js 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/lib/OpenLayers/Layer/WMS/InlineXhtml.js 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,5 +1,6 @@
-/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD
- * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
+ * full list of contributors). Published under the Clear BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
* full text of the license. */
Modified: addins/InlineXhtml/trunk/lib/OpenLayers/Tile/InlineXhtml.js
===================================================================
--- addins/InlineXhtml/trunk/lib/OpenLayers/Tile/InlineXhtml.js 2011-09-17 00:52:04 UTC (rev 12374)
+++ addins/InlineXhtml/trunk/lib/OpenLayers/Tile/InlineXhtml.js 2011-09-17 04:33:28 UTC (rev 12375)
@@ -1,5 +1,6 @@
-/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD
- * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
+ * full list of contributors). Published under the Clear BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
* full text of the license. */
More information about the Commits
mailing list