Index: src/spatial/metacat_spatialresolver.jsp
===================================================================
--- src/spatial/metacat_spatialresolver.jsp (revision 2698)
+++ src/spatial/metacat_spatialresolver.jsp (revision 2699)
@@ -35,15 +35,20 @@
System.out.println("**************** metacat_spatialresolver.jsp*****************\n");
- String _request = request.getParameter("REQUEST");
- _request = (_request!=null)? _request.trim() : "";
+ String _request = request.getParameter("REQUEST");
+ _request = (_request!=null)? _request.trim() : "";
- System.out.println("uri: " + request.getRequestURI());
- System.out.println("request string: " + request.getQueryString());
+ System.out.println("uri: >>" + request.getRequestURI());
+ System.out.println("request string: >>" + request.getQueryString()+" \n");
- //URLConnection _conn = new URLConnection("http://geonumericsolutions.com");
- URL url = new URL("http://nebulous.msi.ucsb.edu:8080/geoserver/wms?"+request.getQueryString());
+ // connect to the metacat spatial option, request the info using the wms getFeatureId call
+ // parse the response for the url to the metacat document and then redirect there. The query
+ // should look like
+ // VERSION=1.1.1&REQUEST=GetFeatureInfo&SRS=EPSG:4326&BBOX=-143.09099999999998,19.856,-96.79899999999999,43.002&WIDTH=600&HEIGHT=300&LAYERS=topp:RIVERS&FORMAT=text/html&FEATURE_COUNT=1&QUERY_LAYERS=topp:RIVERS&X=328&Y=218
+
+ if ( request.getQueryString().indexOf("metacat_testdata") > -1 ) {
+ URL url = new URL("http://nebulous.msi.ucsb.edu:8080/geoserver/wms?"+request.getQueryString());
URLConnection c = url.openConnection();
BufferedReader in = new BufferedReader(
new InputStreamReader(
@@ -64,8 +69,16 @@
response.setHeader("Location",newLocn);
}
in.close();
-
+ } else {
+ System.out.println(" -- not a metacat query");
+ String _url = "http://sulphur.homelinux.com:9999/geoserver/wms?"+ request.getQueryString();
+
+ System.out.println("redirecting to: " + _url);
+ response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
+ response.setHeader("Location",_url);
+ }
+
%>
Index: src/spatial/rendering/mapbuilder/available_layers.html
===================================================================
--- src/spatial/rendering/mapbuilder/available_layers.html (nonexistent)
+++ src/spatial/rendering/mapbuilder/available_layers.html (revision 2699)
@@ -0,0 +1,75 @@
+
+
+
+
+
+Metacat Spatial Option Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Metacat Spatial Option Demo
+
+
+
+
+
+
Property changes on: src/spatial/rendering/mapbuilder/available_layers.html
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: src/spatial/rendering/mapbuilder/available_layers_config.xml
===================================================================
--- src/spatial/rendering/mapbuilder/available_layers_config.xml (nonexistent)
+++ src/spatial/rendering/mapbuilder/available_layers_config.xml (revision 2699)
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+ available_layers_model.xml
+
+
+ mainMapPane
+ mainMapContainer
+
+
+ mainMapPane
+ ../../lib/widget/GmlRenderer.xsl
+ #FF0000
+ 1
+ 15
+ mainMapContainer
+
+
+ mainMap
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ metacat.xml
+
+
+ locatorMap
+ mainMap
+ locatorContainer
+ 180
+
+
+ locatorMap
+ ../../lib/widget/GmlRenderer.xsl
+ #FF0000
+ 1
+ 15
+ locatorContainer
+
+
+
+
+
+ mainMap
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:gml='http://www.opengis.net/gml' xmlns:wfs='http://www.opengis.net/wfs' xmlns:topp='http://www.openplans.org/topp'
+
+
+ mainMapPane
+ mainMap
+ mainMapContainer
+ #FF0000
+ 1
+ 10
+
+
+
+
+
+
+
+
+ mainButtonBar
+ mainMap
+ mainAoi
+ RadioButton
+ true
+ /images/ZoomInEnable.gif
+ /images/ZoomInDisable.gif
+ click and drag to zoom in
+ cliquer et faire glisser la souris pour agrandir
+
+
+ mainButtonBar
+ mainMap
+ mainAoi
+ RadioButton
+ /images/ZoomOutEnable.gif
+ /images/ZoomOutDisable.gif
+ click to zoom out
+ cliquer pour rée
+
+
+ mainButtonBar
+ mainMap
+ mainDragPan
+ RadioButton
+ /images/PanEnable.gif
+ /images/PanDisable.gif
+ click and drag to pan
+ cliquer et faire glisser la souris pour voir un autre parti de la carte
+
+
+ mainButtonBar
+ mainMap
+ Button
+ /images/ResetExtentDisable.gif
+ reset the map to full extent
+ redonner la carte ses dimensions complèts
+
+
+ mainButtonBar
+ mainMouseClick
+ RadioButton
+ /images/EditPointEnable.gif
+ /images/EditPointDisable.gif
+ click on map to create a point feature
+ click on map to create a point feature
+ featureCollection
+ transaction
+ ../../../../wfs
+ /gml:featureMember/topp:metacat_testdata/topp:the_geom/gml:Point/gml:coordinates
+ /gml:featureMember/topp:metacat_testdata/topp:ID
+ template_metacat.xml
+ mainMap
+
+
+
+ mainButtonBar
+ mainMap
+
+ mainMap
+
+ mainAoi
+
+ RadioButton
+ /images/QueryEnable.gif
+ /images/QueryDisable.gif
+
+
+ mainButtonBar
+ mainMap
+ mainAoi
+ RadioButton
+ /images/SetAoiEnable.gif
+ /images/SetAoiDisable.gif
+
+
+
+ ../../lib/skin/default
+
+ ../../proxy.jsp
+
+
+
Property changes on: src/spatial/rendering/mapbuilder/available_layers_config.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: src/spatial/rendering/mapbuilder/lib/widget/GetFeatureInfo.js
===================================================================
--- src/spatial/rendering/mapbuilder/lib/widget/GetFeatureInfo.js (revision 2698)
+++ src/spatial/rendering/mapbuilder/lib/widget/GetFeatureInfo.js (revision 2699)
@@ -69,10 +69,11 @@
urlNode=objRef.xsl.transformNodeToObject(objRef.context.doc);
//alert(selectedLayer);
url=urlNode.documentElement.firstChild.nodeValue;
- //alert("GetFeatureInfo .. : \n url="+url);
+ //alert("selected GetFeatureInfo .. : \n url="+url);
+ alert("selected GetFeatureInfo .. : \n queryLayer="+selectedLayer);
if (objRef.infoFormat=="text/html"){
- window.open(url,'queryWin','height=400,width=500,scrollbars=yes');
+ window.open(url,'queryWin','height=600,width=800,scrollbars=yes');
}
}
}
Index: src/spatial/rendering/mapbuilder/metacat.xml
===================================================================
--- src/spatial/rendering/mapbuilder/metacat.xml (revision 2698)
+++ src/spatial/rendering/mapbuilder/metacat.xml (revision 2699)
@@ -17,6 +17,7 @@
Low resolution.
+
image/gif
+
+
+
+
+
+
+ topp:places
+ esri places
+ EPSG:4326
+
+ image/png
+
+
Index: src/spatial/rendering/mapbuilder/available_layers_model.xml
===================================================================
--- src/spatial/rendering/mapbuilder/available_layers_model.xml (nonexistent)
+++ src/spatial/rendering/mapbuilder/available_layers_model.xml (revision 2699)
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+ metacat data
+
+ metacat
+ EML
+
+ Low resolution.
+
+
+
+
+
+
+
+
+ topp:metacat_testdata
+ metacat documents
+ EPSG:4326
+
+ image/png
+
+
+
+
+
+
+
+
+
+
+
+
+
+ topp:RIVERS
+ esri world rivers
+ EPSG:4326
+
+ image/png
+
+
+
+
+
+
+
+ topp:country
+ esri world countries
+ EPSG:4326
+
+ image/png
+
+
+
+
+
+
+
+ topp:places
+ esri usa places
+ EPSG:4326
+
+ image/png
+
+
+
+
+
+
+
+ topp:CITIES
+ esri world cities places
+ EPSG:4326
+
+ image/png
+
+
+
+
+
+
+
+ topp:latlong
+ esri world latlong
+ EPSG:4326
+
+ image/png
+
+
+
+
+
+
Property changes on: src/spatial/rendering/mapbuilder/available_layers_model.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property