[OpenLayers-Commits] r5121 - in sandbox/ahocevar/sldRenderer: examples lib/OpenLayers/Format
commits at openlayers.org
commits at openlayers.org
Tue Nov 6 09:49:15 EST 2007
Author: ahocevar
Date: 2007-11-06 09:49:13 -0500 (Tue, 06 Nov 2007)
New Revision: 5121
Added:
sandbox/ahocevar/sldRenderer/examples/walkthru.html
Modified:
sandbox/ahocevar/sldRenderer/examples/attribution.html
sandbox/ahocevar/sldRenderer/examples/click.html
sandbox/ahocevar/sldRenderer/examples/controls.html
sandbox/ahocevar/sldRenderer/examples/example.html
sandbox/ahocevar/sldRenderer/examples/fullScreen.html
sandbox/ahocevar/sldRenderer/examples/image-layer.html
sandbox/ahocevar/sldRenderer/examples/layerswitcher.html
sandbox/ahocevar/sldRenderer/examples/mvs.html
sandbox/ahocevar/sldRenderer/examples/overviewmap.html
sandbox/ahocevar/sldRenderer/examples/wmst.html
sandbox/ahocevar/sldRenderer/lib/OpenLayers/Format/WFS.js
Log:
Merging from r5107 to HEAD
Modified: sandbox/ahocevar/sldRenderer/examples/attribution.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/attribution.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/attribution.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -18,8 +18,8 @@
{'attribution': 'Provided by <a href="http://labs.metacarta.com/">MetaCarta</a>'});
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"},{attribution:"Provided by NASA"});
+ "http://t1.hypercube.telascience.org/cgi-bin/landsat7",
+ {layers: "landsat7"},{attribution:"Provided by Telascience"});
map.addLayers([ol_wms, jpl_wms]);
map.addControl(new OpenLayers.Control.LayerSwitcher());
Modified: sandbox/ahocevar/sldRenderer/examples/click.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/click.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/click.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -17,8 +17,8 @@
"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"});
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"});
jpl_wms.setVisibility(false);
Modified: sandbox/ahocevar/sldRenderer/examples/controls.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/controls.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/controls.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -27,8 +27,8 @@
{layers: 'basic'} );
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"});
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"});
var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo",
"http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
Modified: sandbox/ahocevar/sldRenderer/examples/example.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/example.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/example.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -59,8 +59,8 @@
resolutions: [0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.00137329101]
};
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"}, options2);
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"}, options2);
var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo",
"http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
Modified: sandbox/ahocevar/sldRenderer/examples/fullScreen.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/fullScreen.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/fullScreen.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -17,8 +17,8 @@
"http://labs.metacarta.com:80/wms/vmap0?", {layers: 'basic'});
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"});
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"});
var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo",
"http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
Modified: sandbox/ahocevar/sldRenderer/examples/image-layer.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/image-layer.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/image-layer.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -26,8 +26,8 @@
options);
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"}, options);
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"}, options);
map.addLayers([graphic, jpl_wms]);
map.addControl(new OpenLayers.Control.LayerSwitcher());
Modified: sandbox/ahocevar/sldRenderer/examples/layerswitcher.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/layerswitcher.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/layerswitcher.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -20,8 +20,8 @@
{layers: 'basic'}, {'displayInLayerSwitcher':false} );
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"}, {'isBaseLayer': false});
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"}, {'isBaseLayer': false});
var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo",
"http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
Modified: sandbox/ahocevar/sldRenderer/examples/mvs.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/mvs.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/mvs.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -88,10 +88,10 @@
case 'nasa':
theMVS.addLayer(
new OpenLayers.Layer.WMS("NASA Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
{"EXCEPTIONS" : "application/vnd.ogc.se_inimage",
"format" : "image/jpeg",
- layers:"modis,global_mosaic"}
+ layers:"landsat7"}
));
break;
case 'gmaps':
Modified: sandbox/ahocevar/sldRenderer/examples/overviewmap.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/overviewmap.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/overviewmap.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -1,47 +1,96 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Overview Map Example</title>
-<script src="../lib/OpenLayers.js" type="text/javascript"></script>
-<style>
-#map{
- width:100%;
- height:500px;
- border:1px solid;
-}
-</style>
-</head>
-<body>
- <div id="map"></div>
- <script defer="defer" type="text/javascript">
- var map = new OpenLayers.Map('map');
- // my city
- var constantina = new OpenLayers.LonLat(-5.6165,37.8623);
- var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
- var nasa_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi", {layers: "modis,global_mosaic"} );
+<html>
+ <head>
+ <title>Overview Map Example</title>
+ <script src="../lib/OpenLayers.js" type="text/javascript"></script>
+ <style>
+ #map1 {
+ width: 500px;
+ height: 300px;
+ border: 1px solid gray;
+ }
+ #map2 {
+ width: 500px;
+ height: 300px;
+ border: 1px solid gray;
+ }
+ </style>
+ </head>
+ <body>
+ <div id="map1"></div>
+ <p>The above map has an overview map control that is created with
+ the default options. Much like a regular map, the map contained by
+ the overview map control defaults to a geographic projection.</p>
+ <div id="map2"></div>
+ <p>The second map has an overview map control that is created with
+ non-default options. In this case, the mapOptions property of the
+ control has been set to use non-default projection related properties.
+ In addition, any other properties of the overview map control can be
+ set in this way.</p>
+ <script defer="defer" type="text/javascript">
+
+ // create the top map (with default overview map control)
+ var map1 = new OpenLayers.Map('map1');
+
+ var ol = new OpenLayers.Layer.WMS(
+ "OpenLayers WMS",
+ "http://labs.metacarta.com/wms/vmap0",
+ {layers: 'basic'}
+ );
+
+ var jpl = new OpenLayers.Layer.WMS(
+ "NASA Global Mosaic",
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"}
+ );
+
+ map1.addLayers([ol, jpl]);
+ map1.addControl(new OpenLayers.Control.LayerSwitcher());
+
+ // create an overview map control with the default options
+ var overview1 = new OpenLayers.Control.OverviewMap();
+ map1.addControl(overview1);
+
+ map1.setCenter(new OpenLayers.LonLat(0, 0), 2);
+
+ // expand the overview map control
+ overview1.maximizeControl();
+
+
+ // create the bottom map (with advanced overview map control)
+ var mapOptions = {
+ maxExtent: new OpenLayers.Bounds(33861, 717605, 330846, 1019656),
+ maxResolution: 296985/1024,
+ projection: "EPSG:2805",
+ units: "m"
+ };
- map.addLayers([
- nasa_wms,
- wms
- ]);
-
- map.addControl(new OpenLayers.Control.LayerSwitcher());
-
- var options = {
- layers: [wms.clone()],
- minRatio: 8,
- maxRatio: 128
- };
- var overview = new OpenLayers.Control.OverviewMap(options);
+ var map2 = new OpenLayers.Map('map2', mapOptions);
- map.addControl(overview);
-
- map.setCenter(constantina, 4);
-
- overview.maximizeControl();
- </script>
-</body>
+ var bos = new OpenLayers.Layer.WMS(
+ "Boston",
+ "http://boston.freemap.in/cgi-bin/mapserv",
+ {
+ map: '/www/freemap.in/boston/map/gmaps.map',
+ layers: 'border,water,roads,rapid_transit,buildings',
+ format: 'png'
+ }
+ );
+
+ map2.addLayers([bos]);
+ map2.addControl(new OpenLayers.Control.LayerSwitcher());
+
+ // create an overview map control with the default options
+ var controlOptions = {
+ mapOptions: mapOptions
+ }
+ var overview2 = new OpenLayers.Control.OverviewMap(controlOptions);
+ map2.addControl(overview2);
+
+ map2.setCenter(new OpenLayers.LonLat(182500, 868500), 3);
+
+ // expand the overview map control
+ overview2.maximizeControl();
+
+ </script>
+ </body>
</html>
Copied: sandbox/ahocevar/sldRenderer/examples/walkthru.html (from rev 5120, trunk/openlayers/examples/walkthru.html)
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/walkthru.html (rev 0)
+++ sandbox/ahocevar/sldRenderer/examples/walkthru.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -0,0 +1,96 @@
+<html>
+<head>
+<title>OpenLayers examples walkthrough</title>
+<style type="text/css">
+ a { color:blue; text-decoration: none; }
+ a:hover { text-decoration: underline; }
+</style>
+<base href="http://openlayers.org/dev/examples/">
+</head>
+<body style="font-family: sans-serif">
+<h1><pre style="font-size: larger"><ol></pre></h1>
+<p>API documentation: <a href="http://dev.openlayers.org/docs/">http://dev.openlayers.org/docs/</a></p>
+<p>Examples: <a href="http://dev.openlayers.org/examples/">http://openlayers.org/dev/examples/</a></p>
+<h2>Maps</h2>
+<ol>
+ <li><a href="lite.html">Basic example</a></li>
+ <li><a href="layerswitcher.html">Layer switcher (aka legend)</a></li>
+ <li><a href="example.html">Base layers versus overlays</a></li>
+ <li><a href="multiserver.html">Multiple WMS mirrors</a></li>
+ <li><a href="fullScreen.html">Full screen map</a></li>
+ <li><a href="wrapDateLine.html">Wrapping the date line</a></li>
+ <li><a href="projected-map.html">Other cartographic projections</a></li>
+ <li><a href="layer-opacity.html">Translucent overlays</a></li>
+</ol>
+
+<h2>Raster Layers</h2>
+<ol>
+ <li><a href="wms-untiled.html">Untiled WMS layer</a></li>
+ <li><a href="kamap.html">Ka-Map layer</a></li>
+ <li><a href="mapserver.html">MapServer layer</a></li>
+ <li><a href="worldwind.html">Worldwind layer</a></li>
+ <li><a href="tms.html">TMS layer</a></li>
+ <li><a href="image-layer.html">Image layer</a></li>
+ <li><a href="google.html">Google layer</a></li>
+ <li><a href="ve.html">VirtualEarth layer</a></li>
+ <li><a href="spherical-mercator.html">Spherical Mercator ("EPSG:900913")</a></li>
+ <li><a href="http://tilecache.org/">TileCache</a></li>
+</ol>
+
+<h2>Marker Layers</h2>
+<ol>
+ <li><a href="markers.html">Markers</a></li>
+ <li><a href="markerResize.html">Changing marker properties dynamically</a></li>
+ <li><a href="popups.html">Popups</a></li>
+ <li><a href="georss.html">GeoRSS</a> (<a href="georss.xml">example data</a>)</a></li>
+ <li><a href="georss-markers.html">GeoRSS with custom markers</a></li>
+ <li><a href="wfs.html">Point layer from WFS</a></li>
+ <li><a href="getfeatureinfo.html">WFS GetFeatureInfo example</a></li>
+</ol>
+
+<h2>Events and Controls</h2>
+<ol>
+ <li><a href="navtoolbar.html">Navigation tools on the map</a></li>
+ <li><a href="navtoolbar-outsidemap.html">Navigation toolbar off the map</a></li>
+ <li><a href="mouse-position.html">Tracking the mouse position</a></li>
+ <li><a href="overview.html">Overview map</a></li>
+ <li><a href="attribution.html">Layer attribution</a></li>
+ <li><a href="controls.html">Full range of controls</a></li>
+ <li><a href="custom-control.html">Custom controls #1</a></li>
+ <li><a href="custom-control.html">Custom controls #2</a></li>
+ <li><a href="custom-style.html">Custom control styles</a></li>
+ <li><a href="click.html">Trapping click events</a></li>
+ <li><a href="layerLoadMonitoring.html">Tracking map events</a></li>
+</ol>
+
+<h2>Vector Layers</h2>
+<ol>
+ <li><a href="vector-features.html">Generating features in JavaScript</a></li>
+ <li><a href="gml-layer.html">Loading features from GML</a></li>
+ <li><a href="kml-layer.html">Loading features from KML</a></li>
+ <li><a href="gml-serialize.html">Serializing features to GML</a></li>
+ <li><a href="vector-formats.html">Serializing to other formats</a></li>
+ <li><a href="select-feature.html">Selecting features</a></li>
+ <li><a href="select-feature-openpopup.html">Attaching popups to features</a></li>
+</ol>
+
+<h2>Editing Tools</h2>
+<ol>
+ <li><a href="draw-feature.html">Drawing features</a></li>
+ <li><a href="editingtoolbar.html">Editing toolbar</a> (<a href="editingtoolbar-outside.html">outside the map</a>)</li>
+ <li><a href="regular-polygons.html">Creating regular polygons</a></li>
+ <li><a href="modify-feature.html">Modifying features</a></li>
+ <li><a href="resize-features.html">Resizing features</a></li>
+ <li><a href="rotate-features.html">Rotating features</a></li>
+ <li><a href="wfs-t.html">Transactional WFS example</a></li>
+ <li><a href="http://featureserver.org/">FeatureServer</a></li>
+</ol>
+
+<h2>Testing</h2>
+<ol>
+ <li><a href="../tests/run-tests.html">Test.AnotherWay suite</a></li>
+</ol>
+
+<h1><pre style="font-size: larger"></ol></pre></h1>
+</body>
+</html>
Modified: sandbox/ahocevar/sldRenderer/examples/wmst.html
===================================================================
--- sandbox/ahocevar/sldRenderer/examples/wmst.html 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/examples/wmst.html 2007-11-06 14:49:13 UTC (rev 5121)
@@ -17,8 +17,8 @@
"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
- "http://wms.jpl.nasa.gov/wms.cgi",
- {layers: "modis,global_mosaic"});
+ "http://t1.hypercube.telascience.org/tiles/landsat7",
+ {layers: "landsat7"});
ia_wms = new OpenLayers.Layer.WMS("Nexrad","http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?",{layers:"nexrad-n0r-wmst",transparent:true,format:'image/png',time:"2005-08-29T13:00:00Z"});
Modified: sandbox/ahocevar/sldRenderer/lib/OpenLayers/Format/WFS.js
===================================================================
--- sandbox/ahocevar/sldRenderer/lib/OpenLayers/Format/WFS.js 2007-11-06 14:42:15 UTC (rev 5120)
+++ sandbox/ahocevar/sldRenderer/lib/OpenLayers/Format/WFS.js 2007-11-06 14:49:13 UTC (rev 5121)
@@ -155,8 +155,8 @@
* feature - {<OpenLayers.Feature.Vector>}
*/
remove: function(feature) {
- if (!feature.attributes.fid) {
- alert("Can't update a feature for which there is no FID.");
+ if (!feature.fid) {
+ alert("Can't delete a feature for which there is no FID.");
return false;
}
var deleteNode = document.createElementNS(this.featureNS, 'wfs:Delete');
@@ -164,7 +164,7 @@
var filterNode = document.createElementNS('http://www.opengis.net/ogc', 'ogc:Filter');
var filterIdNode = document.createElementNS('http://www.opengis.net/ogc', 'ogc:FeatureId');
- filterIdNode.setAttribute("fid", feature.attributes.fid);
+ filterIdNode.setAttribute("fid", feature.fid);
filterNode.appendChild(filterIdNode);
deleteNode.appendChild(filterNode);
More information about the Commits
mailing list