From: <tic...@us...> - 2007-09-18 20:46:49
|
Revision: 849 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=849&view=rev Author: ticheler Date: 2007-09-18 13:46:49 -0700 (Tue, 18 Sep 2007) Log Message: ----------- Localized strings where they were still static other small improvements mapServers.xml with local GeoServer layers for installer Modified Paths: -------------- trunk/web/intermap/WEB-INF/mapServers.xml trunk/web/intermap/xsl/im_get-layers-embedded.xsl trunk/web/intermap/xsl/im_list-servers-embedded.xsl trunk/web/intermap/xsl/index-embedded.xsl Added Paths: ----------- trunk/web/intermap/WEB-INF/mapServers.xml_with_geoserver Modified: trunk/web/intermap/WEB-INF/mapServers.xml =================================================================== --- trunk/web/intermap/WEB-INF/mapServers.xml 2007-09-18 20:44:53 UTC (rev 848) +++ trunk/web/intermap/WEB-INF/mapServers.xml 2007-09-18 20:46:49 UTC (rev 849) @@ -30,12 +30,10 @@ <server type="2" name="NASA Earth Observations (NEO) WMS"> <url>http://neowms.sci.gsfc.nasa.gov/wms/wms</url> </server> - -<!-- - <server type="2" name="Digital Earth"> - <url>http://globe.digitalearth.gov/viz-bin/wmt.cgi</url> + <server type="2" name="Landsat 7"> + <url>http://hypercube.telascience.org/cgi-bin/landsat7</url> </server> - <server type="2" name="Elevation data (SRTM) - USGS CEOS - OGC WMS"> +<!-- <server type="2" name="Elevation data (SRTM) - USGS CEOS - OGC WMS"> <url>http://gisdata.usgs.net/servlet/com.esri.wms.Esrimap/USGS_EDC_Elev_STM</url> </server> <server type="2" name="ESRI Geography Network - OGC WMS"> @@ -71,12 +69,12 @@ <mapContexts> <default name="World + Africa national boundaries -- DUMMY NAME:not used"> - <server url="http://localhost:8080/geoserver/wms" type="2" > +<!-- <server url="http://localhost:8080/geoserver/wms" type="2" > <layer name="gn:world"></layer> </server> <server url="http://localhost:8080/geoserver/wms" type="2" > <layer name="gn:gboundaries"></layer> - </server> + </server> --> <!-- <server url="http://www2.demis.nl/mapserver/request.asp" type="2" > <layer name="Topography"></layer> </server> @@ -87,14 +85,17 @@ <layer name="Coastlines"></layer> </server> --> - -<!-- <server url="http://193.43.36.137/ows/12279" type="2"> - <layer name="world_country_boundary" /> + <server url="http://wms.telascience.org/cgi-bin/bmng_wms_t" type="2"> + <layer name="world_topo_bathy" /> </server> - <server url="http://193.43.36.137/ows/1" type="2"> - <layer name="national_boundaries_africa" /> - </server> ---> </default> + <server url="http://www2.demis.nl/mapserver/request.asp" type="2" > + <layer name="Borders"></layer> + </server> + <server url="http://www2.demis.nl/mapserver/request.asp" type="2" > + <layer name="Coastlines"></layer> + </server> + + </default> <context name="World - Landsat 7 Global Mosaic (pan sharpened) with simplified national boundaries"> <server url="http://onearth.jpl.nasa.gov/wms.cgi" type="2"> <layer name="global_mosaic" /> Added: trunk/web/intermap/WEB-INF/mapServers.xml_with_geoserver =================================================================== --- trunk/web/intermap/WEB-INF/mapServers.xml_with_geoserver (rev 0) +++ trunk/web/intermap/WEB-INF/mapServers.xml_with_geoserver 2007-09-18 20:46:49 UTC (rev 849) @@ -0,0 +1,163 @@ +<?xml version="1.0"?> + +<!-- Map servers + You can add / change the list of avaialble Web Map Servers here + Add any OGC WMS or ESRI ArcIMS compliant server below using the same format as the provided examples below + OGC WMS servers are known as type 2 + ESRI ArcIMS servers are known as type 1 +--> +<config> + <mapServers> + <!--<server type="2" name="FAO Geonetwork - World OpenGIS WMS"> + <url>http://www.fao.org/geonetwork/wms/WMSServlet/world</url> + </server> + <server type="2" name="FAO Geonetwork - Africa OpenGIS WMS"> + <url>http://www.fao.org/geonetwork/wms/WMSServlet/africa</url> + </server> + <server type="2" name="FAO Geonetwork - South America OpenGIS WMS"> + <url>http://www.fao.org/geonetwork/wms/WMSServlet/southamerica</url> + </server> + <server type="2" name="FAO Geonetwork - Asia OpenGIS WMS"> + <url>http://www.fao.org/geonetwork/wms/WMSServlet/asia</url> + </server> + <server type="2" name="FAO GeoNetwork - Tsunami 2004 WMS"> + <url>http://tecproda01.fao.org/cgi-bin/tsunami</url> + </server> --> + <server type="2" name="NASA JPL OneEarth Web Mapping Server (WMS)"> + <url>http://wms.jpl.nasa.gov/wms.cgi</url> + </server> + + <server type="2" name="NASA Earth Observations (NEO) WMS"> + <url>http://neowms.sci.gsfc.nasa.gov/wms/wms</url> + </server> + +<!-- + <server type="2" name="Digital Earth"> + <url>http://globe.digitalearth.gov/viz-bin/wmt.cgi</url> + </server> + <server type="2" name="Elevation data (SRTM) - USGS CEOS - OGC WMS"> + <url>http://gisdata.usgs.net/servlet/com.esri.wms.Esrimap/USGS_EDC_Elev_STM</url> + </server> + <server type="2" name="ESRI Geography Network - OGC WMS"> + <url>http://www.geographynetwork.com/servlet/com.esri.wms.Esrimap</url> + </server> + <server type="2" name="Asia-Pacific Natural Hazards Information Network - ArcIMS WMS"> + <url>http://www.pdc.org/servlet/com.esri.wms.Esrimap</url> + </server> + <server type="2" name="ER_TSUNAMI_INUNDATION_Z44 - USGS - OGC WMS"> + <url>http://edcw2ks51.cr.usgs.gov/servlet/com.esri.wms.Esrimap</url> + </server> +--> + <server type="2" name="CCRS - Cubewerx"> + <url>http://ceoware2.ccrs.nrcan.gc.ca/cubewerx/cubeserv/cubeserv.cgi</url> + </server> + <server type="2" name="DEMIS World Map Server"> + <url>http://www2.demis.nl/mapserver/request.asp</url> + </server> +<!-- + <server type="2" name="MERIS data - ESRIN (WMS) - 1"> + <url>http://mapserv2.esrin.esa.it/ionicweb/map/GAEL_WORLD_MARCH</url> + </server> +--> + <server type="2" name="Demo Cubewerx (WMS) - 2"> + <url>http://demo.cubewerx.com/demo/cubeserv/cubeserv.cgi</url> + </server> + <!-- + <server type="2" name="SETSAN"> + <url>http://www.setsan.org.mz/ogcwms/servlet/com.esri.ogc.wms.WMSServlet?SERVICENAME=wms</url> + </server> + --> + </mapServers> + + <mapContexts> + <default name="World + Africa national boundaries -- DUMMY NAME:not used"> + <server url="http://localhost:8080/geoserver/wms" type="2" > + <layer name="gn:world"></layer> + </server> + <server url="http://localhost:8080/geoserver/wms" type="2" > + <layer name="gn:gboundaries"></layer> + </server> +<!-- <server url="http://www2.demis.nl/mapserver/request.asp" type="2" > + <layer name="Topography"></layer> + </server> + <server url="http://www2.demis.nl/mapserver/request.asp" type="2" > + <layer name="Borders"></layer> + </server> + <server url="http://www2.demis.nl/mapserver/request.asp" type="2" > + <layer name="Coastlines"></layer> + </server> --> + + +<!-- <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + <server url="http://193.43.36.137/ows/1" type="2"> + <layer name="national_boundaries_africa" /> + </server> +--> </default> + <context name="World - Landsat 7 Global Mosaic (pan sharpened) with simplified national boundaries"> + <server url="http://onearth.jpl.nasa.gov/wms.cgi" type="2"> + <layer name="global_mosaic" /> + </server> + <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + <context name="World - Landsat 7 Global Mosaic (not pan sharpened)"> + <server url="http://onearth.jpl.nasa.gov/wms.cgi" type="2"> + <layer name="global_mosaic_base" /> + </server> + <server url="http://193.43.36.137/ows/12279 with simplified national boundaries" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + <context name="World - Soil Map of the World with simplified national boundaries"> + <server url="http://193.43.36.137/ows/6095" type="2"> + <layer name="world_soilmap" /> + </server> + <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + <context name="World - The Land Cover of the World in the Year 2000 with simplified national boundaries"> + <server url="http://193.43.36.137/ows/6531" type="2"> + <layer name="global_land_cover_2000" /> + </server> + <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + <context name="World - Global Map Irrigated Areas with simplified national boundaries"> + <server url="http://193.43.36.137/ows/5020" type="2"> + <layer name="irrigated_areas" /> + </server> + <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + <context name="World - MODIS TERRA daily composite with simplified national boundaries"> + <server url="http://onearth.jpl.nasa.gov/wms.cgi" type="2"> + <layer name="daily_terra" /> + </server> + <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + <context name="World - MODIS AQUA daily composite with simplified national boundaries"> + <server url="http://onearth.jpl.nasa.gov/wms.cgi" type="2"> + <layer name="daily_aqua" /> + </server> + <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + <context name="World - 1km elevation, seamless SRTM land elevation and ocean depth with simplified national boundaries"> + <server url="http://onearth.jpl.nasa.gov/wms.cgi" type="2"> + <layer name="srtmplus" /> + </server> + <server url="http://193.43.36.137/ows/12279" type="2"> + <layer name="world_country_boundary" /> + </server> + </context> + </mapContexts> +</config> Modified: trunk/web/intermap/xsl/im_get-layers-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/im_get-layers-embedded.xsl 2007-09-18 20:44:53 UTC (rev 848) +++ trunk/web/intermap/xsl/im_get-layers-embedded.xsl 2007-09-18 20:46:49 UTC (rev 849) @@ -31,16 +31,16 @@ <td height="35px" class="im_layerControl"> <img id="visibility_{@id}" class="im_layerControl" onclick="toggleVisibility({@id})" - src="/intermap/images/showLayer.png" title="Toggle layer visibility"></img> + src="/intermap/images/showLayer.png" title="{/root/gui/strings/layerShowHide}"></img> <xsl:if test="position()>1"> <img id="im_layerUp_{@id}" class="im_layerControl" onclick="im_layerMoveUp({@id})" - src="/intermap/images/im_moveup.gif" title="Move layer up"/> + src="/intermap/images/im_moveup.gif" title="{/root/gui/strings/up}"/> </xsl:if> <xsl:if test="position() < last()"> <img id="im_layerDown_{@id}" class="im_layerControl" onclick="im_layerMoveDown({@id})" - src="/intermap/images/im_movedown.gif" title="Move layer down"/> + src="/intermap/images/im_movedown.gif" title="{/root/gui/strings/down}"/> </xsl:if> </td> @@ -54,15 +54,15 @@ <xsl:if test="last()>1"> <!-- we need at least one layer, so last one is not removeable --> <img id="deleteLayer_{@id}" class="im_layerButton" onclick="im_deleteLayer({@id})" - src="/intermap/images/deleteLayer.png" title="Remove layer"/> + src="/intermap/images/deleteLayer.png" title="{/root/gui/strings/removeLayer}"/> </xsl:if> <img id="legend_{@id}" class="im_layerButton" onclick="showLegend({@id})" - src="/intermap/images/legend.png" title="Show legend"/> + src="/intermap/images/legend.png" title="{/root/gui/strings/legend}"/> <img id="showLayerMD_{@id}" class="im_layerButton" - src="/intermap/images/metadata.png" title="Show layer information"/> + src="/intermap/images/metadata.png" title="{/root/gui/strings/metadata}"/> <select id="im_transp_{@id}" class="layerSelectTransp" - onchange="im_layerTransparencyChanged({@id})" > + onchange="im_layerTransparencyChanged({@id})" title="{/root/gui/strings/transparency}"> <xsl:call-template name="fillTransparencyOptions"> <xsl:with-param name="transparency"><xsl:value-of select="@transparency" /></xsl:with-param> </xsl:call-template> Modified: trunk/web/intermap/xsl/im_list-servers-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/im_list-servers-embedded.xsl 2007-09-18 20:44:53 UTC (rev 848) +++ trunk/web/intermap/xsl/im_list-servers-embedded.xsl 2007-09-18 20:46:49 UTC (rev 849) @@ -7,13 +7,13 @@ <ul id = "im_serverList_list"> <xsl:apply-templates select="/root/response/mapServers/server" /> - <li>Other WMS server + <li><xsl:value-of select="/root/gui/strings/otherWMS" /> <input type="text" size="40" id="im_wmsservername" class="content"></input> </li> </ul> <xsl:variable name="action">im_mapServerURL($('im_wmsservername').value);</xsl:variable> - <button onclick="{$action}">Connect</button> + <button onclick="{$action}"><xsl:value-of select="/root/gui/strings/connect" /></button> </div> </xsl:template> Modified: trunk/web/intermap/xsl/index-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/index-embedded.xsl 2007-09-18 20:44:53 UTC (rev 848) +++ trunk/web/intermap/xsl/index-embedded.xsl 2007-09-18 20:46:49 UTC (rev 849) @@ -20,17 +20,17 @@ <td> <table id="im_toolbar" class="padded_content"> <tr id="im_toolSelector"> <!--class="im_tool"--> - <td class="im_tool" id="im_tool_fullextent" onClick="javascript:im_bm_fullExtent()"><img src="{/root/gui/url}/images/zoomfull.png" title="Zoom to full map extent"/></td> - <td class="im_tool" id="im_tool_zoomin" onClick="javascript:setTool('zoomin');" ><img src="{/root/gui/url}/images/zoomin.png" title="Zoom in"/></td> - <td class="im_tool" id="im_tool_zoomout" onClick="javascript:setTool('zoomout');"><img src="{/root/gui/url}/images/zoomout.png" title="Zoom out"/></td> - <td class="im_tool" id="im_tool_pan" onClick="javascript:setTool('pan');"><img src="{/root/gui/url}/images/pan.png" title="Pan"/></td> + <td class="im_tool" id="im_tool_fullextent" onClick="javascript:im_bm_fullExtent()"><img src="{/root/gui/url}/images/zoomfull.png" title="{/root/gui/strings/fullExtent}"/></td> + <td class="im_tool" id="im_tool_zoomin" onClick="javascript:setTool('zoomin');" ><img src="{/root/gui/url}/images/zoomin.png" title="{/root/gui/strings/zoomIn}"/></td> + <td class="im_tool" id="im_tool_zoomout" onClick="javascript:setTool('zoomout');"><img src="{/root/gui/url}/images/zoomout.png" title="{/root/gui/strings/zoomOut}"/></td> + <td class="im_tool" id="im_tool_pan" onClick="javascript:setTool('pan');"><img src="{/root/gui/url}/images/pan.png" title="{/root/gui/strings/pan}"/></td> <!-- <td class="im_tool" id="im_tool_zoomsel" onClick="javascript:imc_zoomToLayer(activeLayerId)"><img src="{/root/gui/url}/images/zoomsel.png" title="Zoom to selected layer extent"/></td> --> <!-- <td class="im_tool" id="im_tool_aoi" onClick="javascript:setTool('aoi')"><img src="{/root/gui/url}/images/im_aoi16x16.png" title="Select an Area Of Interest"/></td> --> <!-- <td class="im_tool" id="im_tool_identify" onClick="javascript:setTool('identify');">Identify</td> --> <td width="100%" style="border-top:0px;"/> <!-- spacer --> - <td class="im_tool" id="im_tool_refresh" onClick="javascript:refreshNeeded()"><img src="{/root/gui/url}/images/reload.png" title="Refresh map"/></td> + <td class="im_tool" id="im_tool_refresh" onClick="javascript:refreshNeeded()"><img src="{/root/gui/url}/images/reload.png" title="{/root/gui/strings/refresh}"/></td> <!-- <td class="im_tool" onClick="javascript:im_bm_toggleImageSize()">+/- map</td>--> - <td class="im_tool" id="im_tool_reset" onClick="javascript:im_reset();"><img src="{/root/gui/url}/images/reset.png" title="Reset map"/></td> + <td class="im_tool" id="im_tool_reset" onClick="javascript:im_reset();"><img src="{/root/gui/url}/images/reset.png" title="{/root/gui/strings/reset}"/></td> </tr> </table> </td> @@ -77,7 +77,7 @@ src="{/root/gui/url}/images/transpcorner.png" style="z-index:1000; position:absolute; bottom:0px; right:0px; cursor:se-resize" alt="resize"/> - <div id="im_pleaseWait" style="position: absolute; display:none; ">Loading map...</div> + <div id="im_pleaseWait" style="position: absolute; display:none; "><xsl:value-of select="/root/gui/strings/loadingMap" /></div> </div> <div id="im_scale" style="position: absolute;" > 1:? @@ -93,15 +93,15 @@ <td> <table id="im_subtoolbar" class="padded_content"> <tr> - <td style="padding:2px"><a onClick="im_addLayer();"><img src="{/root/gui/url}/images/im_addLayer.png" title="Add a layer to this map"/></a></td> - <!-- <td style="padding:2px" onClick="im_sendMail();" ><a><img src="{/root/gui/url}/images/im_mail.png" title="Send this map via e-mail"/></a></td> --> - <td style="padding:2px" onClick="im_openPDFform();" ><a><img src="{/root/gui/url}/images/acroread.png" title="Export this map as a PDF"/></a></td> - <!-- <td style="padding:2px" onClick="im_openPictureForm();" ><a><img src="{/root/gui/url}/images/im_exportPic.png" title="Export this map as an image"/></a></td> --> -<!-- <td style="padding:2px" onClick="im_openWMCform();" ><a><img src="{/root/gui/url}/images/im_exportPic.png" title="View context"/></a></td>--> + <td style="padding:2px"><a onClick="im_addLayer();"><img src="{/root/gui/url}/images/im_addLayer.png" title="{/root/gui/strings/findMapsMapServers}"/></a></td> + <!-- <td style="padding:2px" onClick="im_sendMail();" ><a><img src="{/root/gui/url}/images/im_mail.png" title="{/root/gui/strings/sendByEmail}"/></a></td> --> + <td style="padding:2px" onClick="im_openPDFform();" ><a><img src="{/root/gui/url}/images/acroread.png" title="{/root/gui/strings/exportAsPDF}"/></a></td> + <!-- <td style="padding:2px" onClick="im_openPictureForm();" ><a><img src="{/root/gui/url}/images/im_exportPic.png" title="{/root/gui/strings/exportAsImage}"/></a></td> --> +<!-- <td style="padding:2px" onClick="im_openWMCform();" ><a><img src="{/root/gui/url}/images/im_exportPic.png" title="{/root/gui/strings/exportAsWMC}"/></a></td>--> <td width="100%" style="border-top:0px;"/> <!-- spacer --> <td class="im_tool" id="im_tool_scale"> <select name="im_setscale" id="im_setscale" onchange="javascript:im_bm_setScale();"> - <option id="im_currentscale" value="">1:?</option> + <option id="im_currentscale" value=""><xsl:value-of select="/root/gui/strings/setScale" /></option> <option value="50000000">1:50.000.000</option> <option value="10000000">1:10.000.000</option> <option value="5000000">1:5.000.000</option> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |