[metacat-cvs] metacat/src/spatial/rendering/mapbuilder/lib/widget GetFeatureInfo.js
John Harris
harris at ecoinformatics.org
Wed Nov 9 11:20:29 PST 2005
harris 05/11/09 11:20:29
Modified: src/spatial metacat_spatialresolver.jsp
src/spatial/rendering/mapbuilder available_layers.html
available_layers_config.xml
available_layers_model.xml index.html
template_metacat.xml
src/spatial/rendering/mapbuilder/lib/tool GetFeatureInfo.xsl
src/spatial/rendering/mapbuilder/lib/widget
GetFeatureInfo.js
Log:
Removed all hard links, and put the jsp page in the same context as the geoserver.
Revision Changes Path
1.3 +2 -1 metacat/src/spatial/metacat_spatialresolver.jsp
Index: metacat_spatialresolver.jsp
===================================================================
RCS file: /cvs/metacat/src/spatial/metacat_spatialresolver.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metacat_spatialresolver.jsp 31 Oct 2005 17:26:34 -0000 1.2
+++ metacat_spatialresolver.jsp 9 Nov 2005 19:20:29 -0000 1.3
@@ -1,8 +1,8 @@
<!--
* '$RCSfile: metacat_spatialresolver.jsp,v $'
* '$Author: harris $'
- * '$Date: 2005/10/31 17:26:34 $'
- * '$Revision: 1.2 $'
+ * '$Date: 2005/11/09 19:20:29 $'
+ * '$Revision: 1.3 $'
*
*
* This program is free software; you can redistribute it and/or modify
@@ -38,6 +38,7 @@
String _request = request.getParameter("REQUEST");
_request = (_request!=null)? _request.trim() : "";
+ System.out.println("request param: >>" + _request);
System.out.println("uri: >>" + request.getRequestURI());
System.out.println("request string: >>" + request.getQueryString()+" \n");
@@ -71,7 +72,7 @@
in.close();
} else {
System.out.println(" -- not a metacat query");
- String _url = "http://sulphur.homelinux.com:9999/geoserver/wms?"+ request.getQueryString();
+ String _url = "/geoserver/wms?"+ request.getQueryString();
System.out.println("redirecting to: " + _url);
response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
1.3 +3 -3 metacat/src/spatial/rendering/mapbuilder/available_layers.html
Index: available_layers.html
===================================================================
RCS file: /cvs/metacat/src/spatial/rendering/mapbuilder/available_layers.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- available_layers.html 31 Oct 2005 19:40:51 -0000 1.2
+++ available_layers.html 9 Nov 2005 19:20:29 -0000 1.3
@@ -9,9 +9,9 @@
<link rel="stylesheet" href="../../../../style.css" type="text/css">
<link rel="stylesheet" href="../../lib/skin/default/html.css" type="text/css">
-<link href="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
-<script src="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
-<script src="http://metacat.nceas.ucsb.edu/knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
+<link href="./knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
+<script src="./knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
+<script src="./knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
function submitform(action,form_ref) {
form_ref.action.value=action;
form_ref.sessionid.value="";
1.3 +1 -1 metacat/src/spatial/rendering/mapbuilder/available_layers_config.xml
Index: available_layers_config.xml
===================================================================
RCS file: /cvs/metacat/src/spatial/rendering/mapbuilder/available_layers_config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- available_layers_config.xml 31 Oct 2005 19:40:51 -0000 1.2
+++ available_layers_config.xml 9 Nov 2005 19:20:29 -0000 1.3
@@ -6,7 +6,7 @@
page.
Licence: GPL as per: http://www.gnu.org/copyleft/gpl.html
- $Id: available_layers_config.xml,v 1.2 2005/10/31 19:40:51 harris Exp $
+ $Id: available_layers_config.xml,v 1.3 2005/11/09 19:20:29 harris Exp $
-->
<!--
All static images should be relative to this URL.
@@ -46,7 +46,7 @@
</Context>
<Context id="locator">
- <defaultModelUrl>metacat.xml</defaultModelUrl>
+ <defaultModelUrl>available_layers_model.xml</defaultModelUrl>
<widgets>
<MapPane id="locatorWidget">
<htmlTagId>locatorMap</htmlTagId>
1.2 +5 -5 metacat/src/spatial/rendering/mapbuilder/available_layers_model.xml
Index: available_layers_model.xml
===================================================================
RCS file: /cvs/metacat/src/spatial/rendering/mapbuilder/available_layers_model.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- available_layers_model.xml 31 Oct 2005 17:26:34 -0000 1.1
+++ available_layers_model.xml 9 Nov 2005 19:20:29 -0000 1.2
@@ -66,7 +66,7 @@
<Layer queryable="1" hidden="0">
<Server service="OGC:WMS" version="1.1.1"
title="esri places">
- <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
+ <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
</Server>
<Name>topp:RIVERS</Name>
<Title>esri world rivers</Title>
@@ -79,7 +79,7 @@
<Layer queryable="1" hidden="0">
<Server service="OGC:WMS" version="1.1.1"
title="esri places">
- <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
+ <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
</Server>
<Name>topp:country</Name>
<Title>esri world countries</Title>
@@ -92,7 +92,7 @@
<Layer queryable="1" hidden="0">
<Server service="OGC:WMS" version="1.1.1"
title="esri places">
- <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
+ <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
</Server>
<Name>topp:places</Name>
<Title>esri usa places</Title>
@@ -105,7 +105,7 @@
<Layer queryable="1" hidden="0">
<Server service="OGC:WMS" version="1.1.1"
title="esri places">
- <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
+ <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
</Server>
<Name>topp:CITIES</Name>
<Title>esri world cities places</Title>
@@ -118,7 +118,7 @@
<Layer queryable="1" hidden="0">
<Server service="OGC:WMS" version="1.1.1"
title="esri places">
- <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
+ <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
</Server>
<Name>topp:latlong</Name>
<Title>esri world latlong</Title>
1.6 +3 -3 metacat/src/spatial/rendering/mapbuilder/index.html
Index: index.html
===================================================================
RCS file: /cvs/metacat/src/spatial/rendering/mapbuilder/index.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.html 31 Oct 2005 19:40:51 -0000 1.5
+++ index.html 9 Nov 2005 19:20:29 -0000 1.6
@@ -9,9 +9,9 @@
<link rel="stylesheet" href="../../../../style.css" type="text/css">
<link rel="stylesheet" href="../../lib/skin/default/html.css" type="text/css">
-<link href="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
-<script src="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
-<script src="http://metacat.nceas.ucsb.edu/knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
+<link href="./knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
+<script src="./knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
+<script src="./knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
function submitform(action,form_ref) {
form_ref.action.value=action;
form_ref.sessionid.value="";
1.7 +0 -0 metacat/src/spatial/rendering/mapbuilder/template_metacat.xml
Index: template_metacat.xml
===================================================================
RCS file: /cvs/metacat/src/spatial/rendering/mapbuilder/template_metacat.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template_metacat.xml 31 Oct 2005 19:40:51 -0000 1.6
+++ template_metacat.xml 9 Nov 2005 19:20:29 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!-- $Id: template_metacat.xml,v 1.6 2005/10/31 19:40:51 harris Exp $ -->
+<!-- $Id: template_metacat.xml,v 1.7 2005/11/09 19:20:29 harris Exp $ -->
<gml:featureMember xmlns:topp="http://www.openplans.org/topp" xmlns:gml="http://www.opengis.net/gml">
<topp:metacat_testdata>
<topp:the_geom>
1.4 +1 -2 metacat/src/spatial/rendering/mapbuilder/lib/tool/GetFeatureInfo.xsl
Index: GetFeatureInfo.xsl
===================================================================
RCS file: /cvs/metacat/src/spatial/rendering/mapbuilder/lib/tool/GetFeatureInfo.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetFeatureInfo.xsl 31 Oct 2005 17:26:34 -0000 1.3
+++ GetFeatureInfo.xsl 9 Nov 2005 19:20:29 -0000 1.4
@@ -5,7 +5,7 @@
Author: Nedjo
Licence: LGPL as specified in http://www.gnu.org/copyleft/lesser.html .
-$Id: GetFeatureInfo.xsl,v 1.3 2005/10/31 17:26:34 harris Exp $
+$Id: GetFeatureInfo.xsl,v 1.4 2005/11/09 19:20:29 harris Exp $
$Name: $
-->
<xsl:stylesheet version="1.0" xmlns:wmc="http://www.opengis.net/context" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -57,8 +57,7 @@
<xsl:otherwise>?</xsl:otherwise>
</xsl:choose>
</xsl:variable>
-
- http://sulphur.homelinux.com:7000/cgs/metacat_spatialresolver.jsp<xsl:value-of select="$firstJoin"/>VERSION=<xsl:value-of select="$version"/>&REQUEST=GetFeatureInfo&SRS=<xsl:value-of select="$srs"/>&BBOX=<xsl:value-of select="$bbox"/>&WIDTH=<xsl:value-of select="$width"/>&HEIGHT=<xsl:value-of select="$height"/>&LAYERS=<xsl:value-of select="$queryLayer"/>&FORMAT=<xsl:value-of select="$infoFormat"/>&FEATURE_COUNT=<xsl:value-of select="$featureCount"/>&QUERY_LAYERS=<xsl:value-of select="$queryLayer"/>&X=<xsl:value-of select="$xCoord"/>&Y=<xsl:value-of select="$yCoord"/>
+/geoserver/metacat_spatialresolver.jsp<xsl:value-of select="$firstJoin"/>VERSION=<xsl:value-of select="$version"/>&REQUEST=GetFeatureInfo&SRS=<xsl:value-of select="$srs"/>&BBOX=<xsl:value-of select="$bbox"/>&WIDTH=<xsl:value-of select="$width"/>&HEIGHT=<xsl:value-of select="$height"/>&LAYERS=<xsl:value-of select="$queryLayer"/>&FORMAT=<xsl:value-of select="$infoFormat"/>&FEATURE_COUNT=<xsl:value-of select="$featureCount"/>&QUERY_LAYERS=<xsl:value-of select="$queryLayer"/>&X=<xsl:value-of select="$xCoord"/>&Y=<xsl:value-of select="$yCoord"/>
<!-- Print the URL -->
<!--<xsl:value-of select="$baseUrl"/><xsl:value-of select="$firstJoin"/>VERSION=<xsl:value-of select="$version"/>&REQUEST=GetFeatureInfo&SRS=<xsl:value-of select="$srs"/>&BBOX=<xsl:value-of select="$bbox"/>&WIDTH=<xsl:value-of select="$width"/>&HEIGHT=<xsl:value-of select="$height"/>&LAYERS=<xsl:value-of select="$queryLayer"/>&FORMAT=<xsl:value-of select="$infoFormat"/>&FEATURE_COUNT=<xsl:value-of select="$featureCount"/>&QUERY_LAYERS=<xsl:value-of select="$queryLayer"/>&X=<xsl:value-of select="$xCoord"/>&Y=<xsl:value-of select="$yCoord"/>
--> </xsl:if>
1.7 +0 -0 metacat/src/spatial/rendering/mapbuilder/lib/widget/GetFeatureInfo.js
Index: GetFeatureInfo.js
===================================================================
RCS file: /cvs/metacat/src/spatial/rendering/mapbuilder/lib/widget/GetFeatureInfo.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetFeatureInfo.js 31 Oct 2005 19:40:51 -0000 1.6
+++ GetFeatureInfo.js 9 Nov 2005 19:20:29 -0000 1.7
@@ -1,7 +1,7 @@
/*
License: LGPL as per: http://www.gnu.org/copyleft/lesser.html
Dependancies: Context
-$Id: GetFeatureInfo.js,v 1.6 2005/10/31 19:40:51 harris Exp $
+$Id: GetFeatureInfo.js,v 1.7 2005/11/09 19:20:29 harris Exp $
*/
// Ensure this object's dependancies are loaded.
More information about the Metacat-cvs
mailing list