From: <aca...@us...> - 2007-07-09 12:37:00
|
Revision: 585 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=585&view=rev Author: acarboni Date: 2007-07-09 05:37:02 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Removed useless files Removed Paths: ------------- trunk/web/intermap/WEB-INF/lib/.cvsignore trunk/web/intermap/scripts/connectors/intermap.js.bak trunk/web/intermap/scripts/etj.js.bak trunk/web/intermap/scripts/gui.js.bak Deleted: trunk/web/intermap/WEB-INF/lib/.cvsignore =================================================================== --- trunk/web/intermap/WEB-INF/lib/.cvsignore 2007-07-09 12:36:31 UTC (rev 584) +++ trunk/web/intermap/WEB-INF/lib/.cvsignore 2007-07-09 12:37:02 UTC (rev 585) @@ -1 +0,0 @@ -intermap.jar Deleted: trunk/web/intermap/scripts/connectors/intermap.js.bak =================================================================== --- trunk/web/intermap/scripts/connectors/intermap.js.bak 2007-07-09 12:36:31 UTC (rev 584) +++ trunk/web/intermap/scripts/connectors/intermap.js.bak 2007-07-09 12:37:02 UTC (rev 585) @@ -1,408 +0,0 @@ - -/* TODO: adding to every function the "imc_" (InterMap Connector) prefix */ - -var activeLayerId = null; // active layer - -function imc_appendLayers() -{ - var url = '/intermap/srv/en/map.layers.getOrder'; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - onComplete: buildLayerList - } - ); -} - - -/***************************************************************************** - * * - * Layers * - * * - *****************************************************************************/ - -function updateInspector(layerId) -{ - var url = '/intermap/srv/en/map.layers.getInspectorData'; - var pars = 'id=' + layerId; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: updateInspectorControls, - onFailure: reportError - } - ); -} - -// start ajax transaction to set the layer order -function setLayersOrder(order) -{ - var url = '/intermap/srv/en/map.layers.setOrder'; - var pars = order.replace(new RegExp("\\[\\]", "g"), ""); // remove all [ and ] - jeeves doesn't accept in parameter name otherwise - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: refreshNeeded, - onFailure: reportError - } - ); -} - -function imc_zoomToLayer(layerId) -{ - deleteAoi(); - //unsetAoi(); - $('im_geonetRecords').className = 'hidden'; - - setStatus('busy'); - var url = '/intermap/srv/en/map.zoomToService'; - var pars = 'id=' + layerId; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: refreshNeeded, - onFailure: reportError - } - ); -} - -function toggleVisibility(id) { - var url = '/intermap/srv/en/map.layers.toggleVisibility'; - var pars = 'id=' + id; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: function(request) { setLayerVisibility(request, id); }, - onFailure: reportError - } - ); -} - -function showActiveLayerLegend(id) { - showLegend(activeLayerId); -} -function showLegend(id) { - window.open('/intermap/srv/en/map.service.getLegend?id=' + id, 'dialog', 'HEIGHT=300,WIDTH=400,scrollbars=yes,toolbar=yes,status=yes,menubar=yes,location=yes,resizable=yes'); -} - - -/***************************************************************************** - * * - * Delete layer * - * * - *****************************************************************************/ - -// start ajax transaction to delete a layer -function imc_deleteLayer(id) -{ - var url = '/intermap/srv/en/map.layers.deleteLayer'; - var pars = 'id=' + id ; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: refreshNeeded, - onFailure: reportError - } - ); -} - -/***************************************************************************** - * * - * Add layer * - * * - *****************************************************************************/ - -// start ajax transaction to delete a layer -function setAddLayersWindowContent() -{ - var url = '/intermap/srv/en/mapServers.listServers'; - - Position.clone('im_map', 'im_addLayers'); - var myAjax = new Ajax.Updater - ( - 'im_addLayers', - url, - { - method: 'get', - onFailure: reportError - } - ); -} - - -/***************************************************************************** - * * - * Layer transparency * - * * - *****************************************************************************/ - -function imc_setLayerTransparency(id, transparency) -{ - var url = '/intermap/srv/en/map.layers.setTransparency'; - var pars = 'id=' + id + '&transparency=' + transparency / 100.0; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: refreshNeeded, - onFailure: reportError - } - ); -} - - -/***************************************************************************** - * * - * Map operations (zoom, pan, identify) * - * * - *****************************************************************************/ - -// Starts ajax transaction to perform a map action (zoomin, zoomout) -function mapAction(xmin, ymin, xmax, ymax) -{ - var url = '/intermap/srv/en/map.action'; - var pars = 'maptool=' + currentTool + '&mapimgx=' + xmin + '&mapimgy=' + ymin + '&mapimgx2=' + xmax + '&mapimgy2=' + ymax; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: updateMapImage, - onFailure: reportError - } - ); -} - -function imc_minimapAction(tool, xmin, ymin, xmax, ymax, w, h) -{ - var url = '/intermap/srv/en/map.action'; - var pars = 'maptool=' + tool + '&mapimgx=' + xmin + '&mapimgy=' + ymin + '&mapimgx2=' + xmax + '&mapimgy2=' + ymax + "&width=" + w + "&height="+h; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: im_mm_updateMapImage, - onFailure: reportError - } - ); -} - - - -/***************************************************************************** - * * - * Area of interest * - * * - *****************************************************************************/ - -function setAoi(xmin, ymin, xmax, ymax) -{ - var url = '/intermap/srv/en/map.setAoi'; - var pars = 'minx=' + xmin + '&miny=' + ymin + '&maxx=' + xmax + '&maxy=' + ymax; - //alert(pars); // DEBUG - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - //onComplete: showResponse, - onFailure: reportError - } - ); -} - -function unsetAoi() -{ - var url = '/intermap/srv/en/map.unsetAoi'; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - //onComplete: showResponse, - onFailure: reportError - } - ); -} - - -/***************************************************************************** - * * - * Map refresh * - * * - *****************************************************************************/ - -function refreshButtonListener() -{ - setStatus('busy'); - - var url = '/intermap/srv/en/map.update'; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - onComplete: updateMapImage, - onFailure: reportError - } - ); -} - - -/***************************************************************************** - * * - * Full extent * - * * - *****************************************************************************/ - -function fullExtentButtonListener() -{ - setStatus('busy'); - - deleteAoi(); - - if (currentTool == 'zoomout' || currentTool == 'pan') setTool('zoomin'); - - var url = '/intermap/srv/en/map.fullExtent'; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - onComplete: updateMapImage, - onFailure: reportError - } - ); -} - -function imc_mm_fullExtentButtonListener() -{ - im_mm_setStatus('busy'); - - im_mm_deleteAoi(); - - if (im_mm_currentTool == 'zoomout' || im_mm_currentTool == 'pan') im_mm_setTool('zoomin'); - - var url = '/intermap/srv/en/map.fullExtent'; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - onComplete: im_mm_updateMapImage, - onFailure: reportError - } - ); -} - - - -/***************************************************************************** - * * - *****************************************************************************/ - - -function getGeonetData(xmin, ymin, xmax, ymax, from, to) // DEBUG -{ - var url = '/intermap/srv/en/geonet.getGeonetRecords'; - var pars = 'minx=' + xmin + '&miny=' + ymin + '&maxx=' + xmax + '&maxy=' + ymax + '&from=' + from + '&to=' + to; - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: presentGeonetResponse, - onFailure: reportError - } - ); -} - -function addLayer(baseUrl, serviceName) // DEBUG -{ - setStatus('busy'); - - var url = 'map.layers.add'; - var pars = 'url=' + baseUrl + '&service=' + serviceName; - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: layerAdded, - onFailure: reportError - } - ); -} - - - - - -function imc_toggleImageSize() -{ - deleteAoi(); - unsetAoi(); - $('im_geonetRecords').className = 'hidden'; - - setStatus('busy'); - var url = '/intermap/srv/en/map.toggleImageSize'; - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - onComplete: updateMapSize, - onFailure: reportError - } - ); -} - -function updateMapSize(req) -{ - $('im_mapImg').style.width = req.responseXML.getElementsByTagName('width')[0].firstChild.nodeValue; - $('im_mapImg').style.height = req.responseXML.getElementsByTagName('height')[0].firstChild.nodeValue; - $('im_map').style.width = req.responseXML.getElementsByTagName('width')[0].firstChild.nodeValue; - $('im_map').style.height = req.responseXML.getElementsByTagName('height')[0].firstChild.nodeValue; - - refreshButtonListener(); -} - -function imc_addService(url, service, type, callback) -{ - var url = '/intermap/srv/en/map.addServicesExt'; - - var pars = 'url=' + url + '&service=' + service + '&type=' + type; - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - - onComplete: callback, - onFailure: reportError - } - ); - -} - Deleted: trunk/web/intermap/scripts/etj.js.bak =================================================================== --- trunk/web/intermap/scripts/etj.js.bak 2007-07-09 12:36:31 UTC (rev 584) +++ trunk/web/intermap/scripts/etj.js.bak 2007-07-09 12:37:02 UTC (rev 585) @@ -1,86 +0,0 @@ - -var minLayersDivWidth = 236; - - -function im_init(mmr) -{ - setMapSize(400,300); -// var height = getWindowSize()[1]; // - Element.getHeight('banner'); -// $('im_layers').style.height = height + 'px'; - - - window.name = "InterMap"; - window.focus(); - - //Event.observe(document, 'mousedown', resizeLayersDivStart); - //new Draggable('im_resizeBar', {constraint:'horizontal',change:resizeLayersDiv}); - - Event.observe('im_map', 'mousedown', mousedownEventListener); - Event.observe('im_mm_map', 'mousedown', im_mm_mousedownEventListener); - - setTool('zoomin'); // set the default tool - im_mm_setTool('zoomin'); // set the default tool - - imc_appendLayers(); // append layers to list - //setLayersDivWidth(minLayersDivWidth); - - //Event.observe('geonetRecords', 'mouseover', function(){ $('geonetRecords').className = 'opaque'; }); - //Event.observe('geonetRecords', 'mouseout', function(){ $('geonetRecords').className = ''; }); - - // keyboard events - Event.observe(document, 'keypress', function(e) { keyPressed(e) }); - - im_mm_setTextControls($('northBL'), $('eastBL'), $('southBL'), $('westBL')) - - im_mm_init(mmr); -} - -function im_mm_init(minimapResponse) -{ - var mmurl = minimapResponse.getElementsByTagName('imgUrl')[0].textContent; - $('im_mm_image').src = mmurl; - - var extent=minimapResponse.getElementsByTagName('extent')[0]; - var minx = extent.getAttribute('minx'); - var maxx = extent.getAttribute('maxx'); - var miny = extent.getAttribute('miny'); - var maxy = extent.getAttribute('maxy'); - - var w = minimapResponse.getElementsByTagName('width')[0].textContent; - var h = minimapResponse.getElementsByTagName('height')[0].textContent; - - im_mm_setMapProp(maxy, maxx, miny, minx, w, h); - -/* $('northBL').value =miny; - $('southBL').value =maxy; - $('westBL').value =minx; - $('eastBL').value =maxx; -*/} - -function setMapSize(w, h) -{ - $('im_mapContainer').style.width = w+2; - $('im_mapContainer').style.height = h+2; - - $('im_map').style.width = w; //<xsl:value-of select="/root/response/mapRoot/response/imageWidth" /> + 'px'; - $('im_map').style.height = h; //<xsl:value-of select="/root/response/mapRoot/response/imageHeight" /> + 'px'; - - $('im_pleaseWait').style.width = w; -/* $('im_pleaseWait').style.height = h; - $('im_pleaseWait').style.top = h/2;*/ -} - - -function runIM_addService(url, service, type) -{ - imc_addService(url, service, type, function() {im_refreshLayerList()}); -} - - -function im_refreshLayerList() - -function runIM_selectService(url, type) -{ - -} - Deleted: trunk/web/intermap/scripts/gui.js.bak =================================================================== --- trunk/web/intermap/scripts/gui.js.bak 2007-07-09 12:36:31 UTC (rev 584) +++ trunk/web/intermap/scripts/gui.js.bak 2007-07-09 12:37:02 UTC (rev 585) @@ -1,1324 +0,0 @@ -var autoRefresh = true; - -var startOffsetX; -var startOffsetY; - -// Didn't find a way to do it with prototype -function getWindowSize() -{ - var width = 0, weight = 0; - if(typeof(window.innerWidth) == 'number') - { - // non IE - width = window.innerWidth; - weight = window.innerHeight; - } - else if (document.documentElement && (document.documentElement.clientWidth || document.documentElement.clientHeight)) - { - // IE 6+ in 'standards compliant mode' - width = document.documentElement.clientWidth; - weight = document.documentElement.clientHeight; - } - else if (document.body && (document.body.clientWidth || document.body.clientHeight)) - { - // IE 4 compatible - width = document.body.clientWidth; - weight = document.body.clientHeight; - } - - return [width, weight]; -} - -/*function resizeLayersDiv(handler) -{ - var x = Position.cumulativeOffset($('im_resizeBar'))[0]; - - if (x >= minLayersDivWidth) - { - setLayersDivWidth(x); - } - else - { - setLayersDivWidth(minLayersDivWidth); - } -} - -function setLayersDivWidth(x) -{ - $('im_layerList').style.width = x + 'px'; - $('im_layers').style.width = x + 'px'; - $('im_layersToolbar').style.width = x + 'px'; - $('im_inspector').style.width = x + 'px'; - $('im_resizeBar').style.left = x + 'px'; // not really clean (operates on the draggable itself) but ok for now - var t = x + 4 + 5 // 4 is the resize bar width... TODO: use functions - $('im_map').style.left = t + 'px'; -} -*/ -var currentTool; -function setTool(tool) { - deleteAoi(); - currentTool = tool; - $('intermap_root').className = tool; //document.body.className = tool; - if (tool != 'aoi') $('im_geonetRecords').className = 'im_hidden'; -} - -// Opens the print window -function print() { - window.open('{/root/gui/locService}/map.getPrintImage','print', width='620', height='620'); -} - - - -// Builds the layer list -function buildLayerList(req) -{ - var layers = req.responseXML.getElementsByTagName('layer'); - - // delete all layers from the list - var ul = $('im_layersDiv').getElementsByTagName('ul')[0]; - deleteChildNodes(ul); - - // add each layer to the list - for (var i = 0; i < layers.length; i++) - { - var title = document.createTextNode(layers[i].getAttribute('title')); - var id = layers[i].getAttribute('id'); - var transp = layers[i].getAttribute('transparency'); - appendToLayerList(ul, title, id, transp); - } - - // activate the first layer if none active - if (!activeLayerId) - activateMapLayer(layers[0].getAttribute('id')); -} - -// Appends a single layer to the layer list -function appendToLayerList(list, title, id, transp) // layer in a TABLEs layout -{ - var li = document.createElement('li'); - li.setAttribute('id', 'layerList_' + id); - - var toggleLayer = document.createElement('img'); - toggleLayer.className = 'layerButtonToggle'; - toggleLayer.setAttribute('src','/intermap/images/showLayer.png'); - toggleLayer.setAttribute('title','Toggle layer visibility'); // FIXME: i18n this string - toggleLayer.setAttribute('id','visibility_' + id); - - var delLayer = document.createElement('img'); - delLayer.className = 'layerButtonDelete'; - delLayer.setAttribute('src','/intermap/images/deleteLayer.png'); - delLayer.setAttribute('title','Remove layer'); // FIXME: i18n this string - delLayer.setAttribute('id','deleteLayer_' + id); - - var showLayerMD = document.createElement('img'); - showLayerMD.className = 'layerButtonShowMD'; - showLayerMD.setAttribute('src','/intermap/images/showmd.png'); - showLayerMD.setAttribute('title','Show metadata'); // FIXME: i18n this string - showLayerMD.setAttribute('id','showLayerMD_' + id); - - var legend = document.createElement('img'); - legend.className = 'layerLegend'; - legend.setAttribute('src','/intermap/images/legend.png'); - legend.setAttribute('title','Show legend'); // FIXME: i18n this string - legend.setAttribute('id','legend_' + id); - - var trans = document.createElement('select'); - trans.className = "layerSelectTransp"; - trans.id="im_transp_"+id; - - var opt = document.createElement('OPTION'); - opt.setAttribute("value", 100); - opt.innerHTML="opaque"; - trans.appendChild(opt); - - for (var t = 90; t >= 0; t-=10) { - var opt = document.createElement('OPTION'); - opt.setAttribute("value", t); - if(transp==t) - opt.setAttribute("selected", 'true'); - opt.innerHTML=t+"%"; - trans.appendChild(opt); - } - - // do layout - list.appendChild(li); - - - var table = document.createElement('table'); - li.appendChild(table); - - var trtitle = document.createElement('tr'); - table.appendChild(trtitle); - var tdtitle = document.createElement('td'); - trtitle.appendChild(tdtitle); - - tdtitle.appendChild(title); - - var trcontrols = document.createElement('tr'); - table.appendChild(trcontrols); - var tdcontrols = document.createElement('td'); - trcontrols.appendChild(tdcontrols); - - tdcontrols.appendChild(toggleLayer); - tdcontrols.appendChild(delLayer); - tdcontrols.appendChild(legend); - tdcontrols.appendChild(showLayerMD); - tdcontrols.appendChild(trans); - - - // add event observers (mousedown to select layer and dblclick to zoom to layer) - Event.observe('layerList_' + id, 'mousedown', function(e){ activateMapLayer(id); }); -// Event.observe('layerList_' + id, 'dblclick', function(e){ openInspector(id); }); - Event.observe('layerList_' + id, 'dblclick', function(e){ layerDblClickListener(id, e); }); - Event.observe('visibility_' + id, 'click', function(e){ visibilityButtonListener(id, e); }); - Event.observe('legend_' + id, 'click', function(e){ showLegend(id); }); - Event.observe('deleteLayer_' + id, 'click', function(e){ im_deleteLayer(id); }); - Event.observe('im_transp_' + id, 'change', function(e){ im_layerTransparencyChanged(id); }); -// TODO Event.observe('showLayerMD_' + id, 'click', function(e){ }); - - createSortable(); -} - - -// Makes the layer list sortable -function createSortable() -{ - Sortable.create ( - 'im_layerList', - { - dropOnEmpty:true,containment:['im_layerList'],constraint:false, - onUpdate:function(){ layersOrderChanged(Sortable.serialize('im_layerList')); } - } - ); -} - -// Opens the inspector -function openInspector(id) -{ - Element.show('im_inspector'); -} - -// Closes the inspector -function closeInspector() -{ - Element.hide('im_inspector'); -} - - -/***************************************************************************** - * - * Layers - * - *****************************************************************************/ - -function layerDblClickListener(id, e) -{ - deleteAoi(); - imc_zoomToLayer(id); -} - -function visibilityButtonListener(id, e) -{ - toggleVisibility(id); -} - -function setLayerVisibility(req, id) { - // get visibility value from response - var visibility = req.responseXML.getElementsByTagName('visible')[0].firstChild.nodeValue; - - // get the image element and set the source according to visibility value - var img = $('visibility_' + id); - if (visibility == 'true') - img.src = '/intermap/images/showLayer.png'; - else - img.src = '/intermap/images/hideLayer.png'; - - refreshNeeded(); -} - -function activateMapLayer(id) -{ - var mapLayer = $('layerList_' + id); - - disactivateAllMapLayers(); - mapLayer.className = 'im_activeLayer'; - - activeLayerId = id; - - updateInspector(id); -} - - -function updateInspectorControls(req) -{ - // transparency slider -// var offsetX = Position.cumulativeOffset($('transparencySlider'))[0]; - var transparency = parseFloat(req.responseXML.getElementsByTagName('transparency')[0].firstChild.nodeValue); - $('im_transparencyHandle').style.left = Math.round(transparency / 100 * 95) + 'px'; // handler width is 5px - - // transparency value - $('im_transparencyValue').innerHTML = transparency; -} - -function disactivateAllMapLayers() -{ -// var ul = $('layerList'); - var li = $('im_layersDiv').getElementsByTagName('li'); - var layers = $A(li); - layers.each ( - function(mapLayer) - { - mapLayer.className = 'im_inactiveLayer'; - } - ); -} - -// performs the operations needed when the user -// has changed the layer order -function layersOrderChanged(newOrder) -{ - setLayersOrder(newOrder); -} - - -/***************************************************************************** - * - * Delete layer - * - *****************************************************************************/ - -function deleteButtonListener() -{ - if (activeLayerId != null) - { - imc_deleteLayer(activeLayerId); - deleteLayerFromList(activeLayerId); - //activeLayerId = null; - } -} - -function im_deleteLayer(id) -{ - imc_deleteLayer(id); - deleteLayerFromList(id); -} - - -function deleteLayerFromList(id) -{ - var ul = $('im_layersDiv').getElementsByTagName('ul')[0]; - - var child = $('layerList_' + id); - - if (child != null) - { - if (id==activeLayerId) - { - // choose the layer to activate next - var nextActiveLayer; - if (child.nextSibling != null) - nextActiveLayer = (child.nextSibling) - else if (child.previousSibling != null) - nextActiveLayer = (child.previousSibling) - else nextActiveLayer = null; - - // activate the layer - if (nextActiveLayer != null) - { - var t = nextActiveLayer.getAttribute('id'); - var nextActiveLayerId = t.substr(t.indexOf('_') + 1); - activateMapLayer(nextActiveLayerId); - } - } - - ul.removeChild(child); - } -} - - -/***************************************************************************** - * - * Add layer - * - *****************************************************************************/ - -function addButtonListener() -{ - setStatus('idle'); - $('addLayers').className = 'im_visible'; - setAddLayersWindowContent(); -} - - -/***************************************************************************** - * - * Layer transparency - * - *****************************************************************************/ - -function transparencySliderMoved(transparency) -{ - if (activeLayerId != null) - { - imc_setLayerTransparency(activeLayerId, transparency); - } -} - - -function im_layerTransparencyChanged(id) -{ - var transp = $('im_transp_' + id).value; - imc_setLayerTransparency(id, transp); -} - -/***************************************************************************** - * - * Map operations (zoom, pan, identify) - * - *****************************************************************************/ - -var startX, startY; // start (mousedown) coordinates - -function mousedownEventListener(e) -{ - switch(currentTool) - { - case 'zoomin': - startZoombox(e); - break; - case 'zoomout': - startZoombox(e); - break; - case 'pan': - startDrag(e); - break; - case 'aoi': - startAoi(e); - break; - case 'identify': - identify(e); - break; - } -} - -// IDENTIFY - TODO: move some part intermap.js -function identify(e) -{ - Event.stop(e); // prevents from dragging the map image (on Firefox) - - // get map image offset - var offset = Position.cumulativeOffset($('im_mapImg')); - var offsetX = offset[0]; - var offsetY = offset[1]; - - // store starting cursor position - pointerX = Event.pointerX(e); - pointerY = Event.pointerY(e); - - var url = '/intermap/srv/en/map.identify'; - var t1 = pointerX - offsetX; - var t2 = pointerY - offsetY; - var pars = 'mapimgx=' + t1 + '&mapimgy=' + t2 + '&activeLayer=' + activeLayerId + "&format=" + "text%2Fhtml"; - - window.open(url + '?' + pars, "Query result", "width=600,height=400,scrollbars=yes,toolbar=no,status=yes,menubar=no,location=yes,resizable=yes"); -} - -// ZOOM -var zoombox; // zoombox div - -function startZoombox(e) -{ - Event.stop(e); // prevents from dragging the map image (on Firefox) - - // add mousemove and mouseup listeners - Event.observe(document, 'mousemove', resizeZoombox); - Event.observe(document, 'mouseup', stopZoombox); - - // store starting cursor position - startX = Event.pointerX(e); - startY = Event.pointerY(e); - - // dynamically create the zoombox div - zoombox = document.createElement('div') - zoombox.setAttribute('id', 'im_zoombox'); - drawZoombox(startX, startY, 0, 0); - document.body.appendChild(zoombox); -} - -// mousemove event listener -function resizeZoombox(e) -{ - Event.stop(e); // prevents from dragging the map image (on Explorer) - - // get the current cursor position - var pX = Event.pointerX(e); - var pY = Event.pointerY(e); - - // set the zoom box position and size - drawZoombox ( - Math.min(pX, startX), // left - Math.min(pY, startY), // top - Math.abs(pX - startX), // width - Math.abs(pY - startY) // height - ); -} - -// mouseup event listener -function stopZoombox(e) -{ - // get the current cursor position - var pX = Event.pointerX(e); - var pY = Event.pointerY(e); - - // get map image offset - var offset = Position.cumulativeOffset($('im_mapImg')); - var offsetX = offset[0]; - var offsetY = offset[1]; - - setStatus('busy'); - - mapAction( - Math.min(pX, startX) - offsetX, // xmin - Math.max(pY, startY) - offsetY, // ymax - Math.max(pX, startX) - offsetX, // xmax - Math.min(pY, startY) - offsetY // ymin - ); - - // remove listeners and div - Event.stopObserving(document, 'mousemove', resizeZoombox); - Event.stopObserving(document, 'mouseup', stopZoombox); - Element.remove($('im_zoombox')); -} - -// Draws the zoombox -function drawZoombox(left, top, width, height) -{ - zoombox.style.left = left + 'px'; - zoombox.style.top = top + 'px'; - zoombox.style.width = width + 'px'; - zoombox.style.height = height + 'px'; -} - -// DRAG -function startDrag(e) -{ - Event.stop(e); // prevents from dragging the map image (on Firefox) - - // get map initial image offset - var offset = Position.cumulativeOffset($('im_mapImg')); - startOffsetX = offset[0]; - startOffsetY = offset[1]; - - // add mousemove and mouseup listeners - Event.observe(document, 'mousemove', dragImage); - Event.observe(document, 'mouseup', stopDrag); - - // store starting cursor position - startX = Event.pointerX(e); - startY = Event.pointerY(e); -} - -function dragImage(e) -{ - window.status = Event.pointerX(e) + ' - ' + Event.pointerY(e); // DEBUG - - Event.stop(e); // prevents from dragging the map image (on Explorer) - - var vMapImg = $('im_mapImg'); - - // get map image offset - var offset = Position.cumulativeOffset(vMapImg); - var offsetX = offset[0]; - var offsetY = offset[1]; - - vMapImg.style.position = 'absolute'; - var t = Event.pointerX(e) - startX; - vMapImg.style.left = t + 'px'; - t = Event.pointerY(e) - startY; - vMapImg.style.top = t + 'px'; -} - -function stopDrag(e) -{ - // get map image offset - var offset = Position.cumulativeOffset($('im_mapImg')); - var offsetX = offset[0]; - var offsetY = offset[1]; - - // get the current cursor position - setStatus('busy'); - - move(startOffsetX - offsetX, offsetY - startOffsetY) - - Event.stopObserving(document, 'mousemove', dragImage); - Event.stopObserving(document, 'mouseup', stopDrag); -} - -function move(deltax, deltay) -{ - var url = '/intermap/srv/en/map.move'; - var pars = 'deltax=' + deltax + '&deltay=' + deltay; - - var myAjax = new Ajax.Request ( - url, - { - method: 'get', - parameters: pars, - onComplete: updateMapImage, - onFailure: reportError - } - ); -} - -// updates the map images -function updateMapImage(req) -{ - var vMapImg = $('im_mapImg'); - var vGhostImg = $('im_ghostImg'); - - // get the new values from response XML - var imageSrc = req.responseXML.getElementsByTagName('imgUrl')[0].firstChild.nodeValue; - var scale = req.responseXML.getElementsByTagName('scale')[0].firstChild.nodeValue; - - // update the map image - vMapImg.src = imageSrc; - - // set map image offset - vMapImg.style.left = '0'; - vMapImg.style.top = '0'; - if (ghostImg != null) - { - vGhostImg.src = imageSrc; - vGhostImg.style.left = '0'; - vGhostImg.style.top = '0'; - } - - // update the scale text - deleteChildNodes($('im_scale')); - $('im_scale').appendChild( document.createTextNode('1:' + scale)); - -// Event.observe(vMapImg, 'load', function(e) { setStatus('idle') }); // better behaviour but needs debugging on explorer (newer version of prototype?) - setStatus('idle'); -} - - -// AOI (Area Of Interest) -var aoi = null; -var ghostImg = null; -var dotUL, dotUR, dotBR, dotBL, dotUM, dotBM, dotMR, dotML; -var divUL, divUR, divBR, divBL, divUM, divBM, divMR, divML; -var aoiLeft, aoiRight, aoiTop, aoiBottom; -var dragUL, dragUR, dragBL, dragBR, dragUM, dragBM, dragML, dragMR; - -var mapImgOffsetX; -var mapImgOffsetY; - -// TODO: fa schifo -function startAoi(e) -{ - // TODO: all this staff is useless here - too much javascript - move HTML to XSL - Event.stop(e); // prevents from dragging the map image (on Firefox) - - // get map image offset - var offset = Position.cumulativeOffset($('im_mapImg')); - mapImgOffsetX = offset[0]; - mapImgOffsetY = offset[1]; - - // add mousemove and mouseup listeners - Event.observe(document, 'mousemove', resizeAoi); - Event.observe(document, 'mouseup', stopAoi); - - // store starting cursor position - startX = Event.pointerX(e); - startY = Event.pointerY(e); - - vMap = $('im_map'); - - // dynamically create the aoi div - aoi = document.createElement('div') - aoi.setAttribute('id', 'im_aoi'); - vMap.appendChild(aoi); - new Draggable('im_aoi', {change:dragAoi,starteffect:null,endeffect:null,zindex:21000}); // set aoi div draggable - - // draw hide mask (gray overlay over map image) - var hideMask = document.createElement('div'); - hideMask.setAttribute('id', 'im_hideMask'); - vMap.appendChild(hideMask); - Position.clone(vMap, hideMask); - - // create ghost image - ghostImg = document.createElement('img'); - ghostImg.setAttribute('id', 'im_ghostImg'); - aoi.appendChild(ghostImg); - ghostImg.setAttribute('src', $('im_mapImg').src); - - - // when user clicks outside the aoi a new aoi is drawn - Event.observe($('im_hideMask'), 'mousedown', restartAoi); - - // add resoze handles images - dotUL = document.createElement('img'); - dotUR = document.createElement('img'); - dotBL = document.createElement('img'); - dotBR = document.createElement('img'); - dotUM = document.createElement('img'); - dotBM = document.createElement('img'); - dotML = document.createElement('img'); - dotMR = document.createElement('img'); - - dotUL.setAttribute('src', '/intermap/images/dot.gif'); - dotUR.setAttribute('src', '/intermap/images/dot.gif'); - dotBL.setAttribute('src', '/intermap/images/dot.gif'); - dotBR.setAttribute('src', '/intermap/images/dot.gif'); - dotUM.setAttribute('src', '/intermap/images/dot.gif'); - dotBM.setAttribute('src', '/intermap/images/dot.gif'); - dotML.setAttribute('src', '/intermap/images/dot.gif'); - dotMR.setAttribute('src', '/intermap/images/dot.gif'); - - dotUL.className = 'im_resizeDot'; - dotUR.className = 'im_resizeDot'; - dotBL.className = 'im_resizeDot'; - dotBR.className = 'im_resizeDot'; - dotUM.className = 'im_resizeDot'; - dotBM.className = 'im_resizeDot'; - dotML.className = 'im_resizeDot'; - dotMR.className = 'im_resizeDot'; - - vMap.appendChild(dotUL); - vMap.appendChild(dotUR); - vMap.appendChild(dotBL); - vMap.appendChild(dotBR); - vMap.appendChild(dotUM); - vMap.appendChild(dotBM); - vMap.appendChild(dotML); - vMap.appendChild(dotMR); - - // add resize handles transparent divs - divUL = document.createElement('div'); - divUR = document.createElement('div'); - divBL = document.createElement('div'); - divBR = document.createElement('div'); - divUM = document.createElement('div'); - divBM = document.createElement('div'); - divML = document.createElement('div'); - divMR = document.createElement('div'); - - divUL.className = 'im_transparentDrag'; - divUR.className = 'im_transparentDrag'; - divBL.className = 'im_transparentDrag'; - divBR.className = 'im_transparentDrag'; - divUM.className = 'im_transparentDrag'; - divBM.className = 'im_transparentDrag'; - divML.className = 'im_transparentDrag'; - divMR.className = 'im_transparentDrag'; - - divUL.style.cursor = "nw-resize"; - divUR.style.cursor = "ne-resize"; - divBL.style.cursor = "sw-resize"; - divBR.style.cursor = "se-resize"; - divUM.style.cursor = "n-resize"; - divBM.style.cursor = "s-resize"; - divML.style.cursor = "w-resize"; - divMR.style.cursor = "e-resize"; - - vMap.appendChild(divUL); - vMap.appendChild(divUR); - vMap.appendChild(divBL); - vMap.appendChild(divBR); - vMap.appendChild(divUM); - vMap.appendChild(divBM); - vMap.appendChild(divML); - vMap.appendChild(divMR); - - dragUL = new Draggable(divUL, {change:dragULListener,starteffect:null,endeffect:null,zindex:32000}); - dragUR = new Draggable(divUR, {change:dragURListener,starteffect:null,endeffect:null,zindex:32000}); - dragBL = new Draggable(divBL, {change:dragBLListener,starteffect:null,endeffect:null,zindex:32000}); - dragBR = new Draggable(divBR, {change:dragBRListener,starteffect:null,endeffect:null,zindex:32000}); - dragUM = new Draggable(divUM, {change:dragUMListener,starteffect:null,endeffect:null,zindex:32000,constraint:'vertical'}); - dragBM = new Draggable(divBM, {change:dragBMListener,starteffect:null,endeffect:null,zindex:32000,constraint:'vertical'}); - dragML = new Draggable(divML, {change:dragMLListener,starteffect:null,endeffect:null,zindex:32000,constraint:'horizontal'}); - dragMR = new Draggable(divMR, {change:dragMRListener,starteffect:null,endeffect:null,zindex:32000,constraint:'horizontal'}); - - Draggables.addObserver(new divDragEndObserver(divUL)); - Draggables.addObserver(new divDragEndObserver(divUR)); - Draggables.addObserver(new divDragEndObserver(divBL)); - Draggables.addObserver(new divDragEndObserver(divBR)); - Draggables.addObserver(new divDragEndObserver(divUM)); - Draggables.addObserver(new divDragEndObserver(divBM)); - Draggables.addObserver(new divDragEndObserver(divML)); - Draggables.addObserver(new divDragEndObserver(divMR)); - - Draggables.addObserver(new divDragEndObserver(aoi)); - - Event.observe('im_aoi', 'dblclick', zoomToAoi); -} - -function zoomToAoi() { - var aoiOffset = Position.cumulativeOffset($('im_aoi')); - var left = aoiOffset[0]; - var top = aoiOffset[1]; - - var d = Element.getDimensions($('aoi')); - var width = d.width; - var height = d.height; - - // get map image offset - var mapImgOffset = Position.cumulativeOffset($('im_mapImg')); - var offsetX = mapImgOffset[0]; - var offsetY = mapImgOffset[1]; - - deleteAoi(); - unsetAoi(); - - currentToolT = currentTool; - currentTool = 'zoomin'; - - setStatus('busy'); - - mapAction( - left - offsetX, - top - offsetY + height, - left - offsetX + width, - top - offsetY - ); - - currentTool = currentToolT; -} - -var divDragEndObserver = Class.create(); -divDragEndObserver.prototype = { - initialize: function(element) { - this.element = $(element); - }, - - onEnd: function(eventName, draggable, event) { - if (Draggables.activeDraggable.element == this.element) - handleMouseupListener(); - } -} - -function handleMouseupListener() -{ - var aoiOffset = Position.cumulativeOffset(aoi); - var left = aoiOffset[0]; - var top = aoiOffset[1]; - - var d = Element.getDimensions(aoi); - var width = d.width; - var height = d.height; - - // get map image offset - var mapImgOffset = Position.cumulativeOffset($('im_mapImg')); - var offsetX = mapImgOffset[0]; - var offsetY = mapImgOffset[1]; - - setAoi( - left - offsetX, - top - offsetY + height, - left - offsetX + width, - top - offsetY - ); - - repositionHandleDivs(left, top, width, height); - - getGeonetData( - left - offsetX, - top - offsetY + height, - left - offsetX + width, - top - offsetY, - 1, - 10 - ); // DEBUG -} - -// deletes the aoi -// TODO: Remove event handlers too??? -function deleteAoi() -{ - if (aoi == null) return; - - Element.remove(aoi); - Element.remove($('im_hideMask')); - - Element.remove(dotUL); - Element.remove(dotUR); - Element.remove(dotBR); - Element.remove(dotBL); - Element.remove(dotUM); - Element.remove(dotBM); - Element.remove(dotMR); - Element.remove(dotML); - - Element.remove(divUL); - Element.remove(divUR); - Element.remove(divBR); - Element.remove(divBL); - Element.remove(divUM); - Element.remove(divBM); - Element.remove(divMR); - Element.remove(divML); - - aoi = null; - ghostImg = null; -} - -// called when the user clicks in the grayed area -function restartAoi(e) -{ - deleteAoi(); - startAoi(e); -} - -// TODO: Clean and optimize!!! -function dragULListener(e) -{ - var divBROffset = Position.cumulativeOffset(divBR); - var divULOffset = Position.cumulativeOffset(divUL); - - var width = divBROffset[0] - divULOffset[0]; - var height = divBROffset[1] - divULOffset[1]; - - width = (width > 5 ? width : 5); - height = (height > 5 ? height : 5); - - var top = divULOffset[1] + 3; - if (top > divBROffset[1] - 2) top = divBROffset[1] - 2; - var left = divULOffset[0] + 3; - if (left > divBROffset[0] - 2) left = divBROffset[0] - 2; - - drawAoi(left, top, width, height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -function dragBRListener(e) -{ - var divBROffset = Position.cumulativeOffset(divBR); - var divULOffset = Position.cumulativeOffset(divUL); - - var width = divBROffset[0] - divULOffset[0]; - var height = divBROffset[1] - divULOffset[1]; - - width = (width > 5 ? width : 5); - height = (height > 5 ? height : 5); - - drawAoi(divULOffset[0] + 3, divULOffset[1] + 3, width, height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -function dragURListener() -{ - var divUROffset = Position.cumulativeOffset(divUR); - var divBLOffset = Position.cumulativeOffset(divBL); - - var width = divUROffset[0] - divBLOffset[0]; - var height = divBLOffset[1] - divUROffset[1]; - - width = (width > 5 ? width : 5); - height = (height > 5 ? height : 5); - - var top = divUROffset[1] + 3; - if (top > divBLOffset[1] - 2) top = divBLOffset[1] - 2; - var left = divBLOffset[0] + 3; - - drawAoi(left, top, width, height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -function dragBLListener() -{ - var divUROffset = Position.cumulativeOffset(divUR); - var divBLOffset = Position.cumulativeOffset(divBL); - - var width = divUROffset[0] - divBLOffset[0]; - var height = divBLOffset[1] - divUROffset[1]; - - width = (width > 5 ? width : 5); - height = (height > 5 ? height : 5); - - var top = divUROffset[1] + 3; -// if (top > divBLOffset[1] - 2) top = divBLOffset[1] - 2; - var left = divBLOffset[0] + 3; - if (left > divUROffset[0] - 2) left = divUROffset[0] - 2; - - drawAoi(left, top, width, height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -function dragUMListener() -{ - var d = Element.getDimensions(aoi); - - var height = Position.cumulativeOffset(divBM)[1] - Position.cumulativeOffset(divUM)[1]; - height = (height > 5 ? height : 5); - - var top = Position.cumulativeOffset(divUM)[1] + 3; - if (top > Position.cumulativeOffset(divBM)[1] - 2) top = Position.cumulativeOffset(divBM)[1] - 2; - - drawAoi(Position.cumulativeOffset(divUL)[0] + 3, top , d.width, height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -function dragBMListener() -{ - var d = Element.getDimensions(aoi); - - var height = Position.cumulativeOffset(divBM)[1] - Position.cumulativeOffset(divUM)[1]; - height = (height > 5 ? height : 5); - - drawAoi(Position.cumulativeOffset(divUL)[0] + 3, Position.cumulativeOffset(divUM)[1] + 3, d.width, height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -function dragMLListener() -{ - var d = Element.getDimensions(aoi); - - var width = Position.cumulativeOffset(divMR)[0] - Position.cumulativeOffset(divML)[0]; - width = (width > 5 ? width : 5); - - var left = Position.cumulativeOffset(divML)[0] + 3; - if (left > Position.cumulativeOffset(divMR)[0] - 2) left = Position.cumulativeOffset(divMR)[0] - 2; - - drawAoi(left, Position.cumulativeOffset(divUL)[1] + 3, width, d.height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -function dragMRListener() -{ - var d = Element.getDimensions(aoi); - - var width = Position.cumulativeOffset(divMR)[0] - Position.cumulativeOffset(divML)[0]; - width = (width > 5 ? width : 5); - - drawAoi(Position.cumulativeOffset(divML)[0] + 3, Position.cumulativeOffset(divUL)[1] + 3, width, d.height); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -// aoi mousemove event listener -function resizeAoi(e) -{ - Event.stop(e); // prevents from dragging the map image (on Explorer) - - Position.clone($('im_mapImg'), $('im_ghostImg')); - - // get the current cursor position - var pX = Event.pointerX(e); - var pY = Event.pointerY(e); - - // set the zoom box position and size - drawAoi ( - Math.min(pX, startX), // left - Math.min(pY, startY), // top - Math.abs(pX - startX), // width - Math.abs(pY - startY) // height - ); - - Position.clone($('im_mapImg'), $('im_ghostImg')); -} - -// aoi mouseup event listener -function stopAoi(e) -{ - // remove listeners and div - Event.stopObserving(document, 'mousemove', resizeAoi); - Event.stopObserving(document, 'mouseup', stopAoi); - - // if area is 0 delete aoi - var d = Element.getDimensions(aoi); - if (d.width == 0 || d.height == 0) { - deleteAoi(); - unsetAoi(); - $('im_geonetRecords').className = 'im_hidden'; - } - // else set the aoi - else - handleMouseupListener(); -} - -// Draws the aoi -function drawAoi(left, top, width, height) -{ - aoi.style.left = left - mapImgOffsetX + 'px'; - aoi.style.top = top - mapImgOffsetY + 'px'; - aoi.style.width = width + 'px'; - aoi.style.height = height + 'px'; - - drawResizeHandles(left, top, width, height); -} - -function dragAoi() -{ - Position.clone($('im_mapImg'), $('im_ghostImg')) - - var offset = Position.cumulativeOffset(aoi); - var left = offset[0]; - var top = offset[1]; - - var d = Element.getDimensions(aoi); - var width = d.width; - var height = d.height; - - drawResizeHandles(left, top, width, height); -} - -function drawResizeHandles(left, top, width, height) -{ - var a = left - mapImgOffsetX - 3; - var b = top - mapImgOffsetY - 3; - var c = a + width; - var d = b + height; - - dotUL.style.left = a + 'px'; - dotUL.style.top = b + 'px'; - dotUR.style.left = c + 'px'; - dotUR.style.top = b + 'px'; - dotBL.style.left = a + 'px'; - dotBL.style.top = d + 'px'; - dotBR.style.left = c + 'px'; - dotBR.style.top = d + 'px'; - var t = a + width / 2; - dotUM.style.left = t + 'px'; - dotUM.style.top = b + 'px'; - dotBM.style.left = dotUM.style.left; - dotBM.style.top = d + 'px'; - dotML.style.left = a + 'px'; - t = b + height / 2; - dotML.style.top = t + 'px'; - dotMR.style.left = c + 'px'; - dotMR.style.top = dotML.style.top; -} - -function repositionHandleDivs(left, top, width, height) -{ - var a = left - mapImgOffsetX - 3; - var b = top - mapImgOffsetY - 3; - var c = a + width; - var d = b + height; - - divUL.style.left = a + 'px'; - divUL.style.top = b + 'px'; - divUR.style.left = c + 'px'; - divUR.style.top = b + 'px'; - divBL.style.left = a + 'px'; - divBL.style.top = d + 'px'; - divBR.style.left = c + 'px'; - divBR.style.top = d + 'px'; - var t = a + width / 2; - divUM.style.left = t + 'px'; - divUM.style.top = b + 'px'; - divBM.style.left = divUM.style.left; - divBM.style.top = d + 'px'; - divML.style.left = a + 'px'; - t = b + height / 2; - divML.style.top = t + 'px'; - divMR.style.left = c + 'px'; - divMR.style.top = divML.style.top; -} - -/***************************************************************************** - * - * Generic utility functions - * - *****************************************************************************/ - -function reportError(request) -{ - alert('Sorry. There was an error.'); - alert(request.responseXML); -} - -// shows the ajax response - useful for debugging -function showResponse(originalRequest) -{ - alert(originalRequest.responseText); -} - -// delete all child nodes -function deleteChildNodes(target) -{ - while (target.childNodes.length > 0) {target.removeChild(target.childNodes[target.childNodes.length - 1]);} -} - -function refreshNeeded() -{ - if (autoRefresh) - { - refreshButtonListener(); - } - else - { - setStatus('refresh'); - } -} - -function setStatus(status) -{ - var refreshButton = $('im_refreshButton'); - - switch(status) - { - case 'busy': // not allowed to refresh - wait for ajax transaction to finish - // disable zoom, pan... - - // if(!$('map')) break; // ETj - - Event.stopObserving('im_map', 'mousedown', mousedownEventListener); - Event.observe('im_map', 'mousedown', noOp); - - // change cursor - $('im_map').style.cursor = 'wait' - - // change refresh button status - refreshButton.className = 'im_disabled'; - refreshButton.disabled = true; - - $('im_pleaseWait').style.display = 'block'; - break; - case 'idle': // all operations allowed - // enable zoom, pan... - Event.stopObserving('im_map', 'mousedown', noOp); - Event.observe('im_map', 'mousedown', mousedownEventListener); - - // change refresh button status - $('im_map').style.cursor = 'crosshair' - refreshButton.className = 'im_disabled'; - refreshButton.disabled = true; - - $('im_pleaseWait').style.display = 'none'; - break; - case 'refresh': // refresh buton highlighted - means that refresh is needed after the user made some operations on layers - // change refresh button status - refreshButton.className = 'im_refresh'; - refreshButton.disabled = false; - break; - } -} - -// Just prevents the user to drag the image while trying to zoom -function noOp(e) -{ - Event.stop(e); // prevents from dragging the map image (on Firefox) -} - - - - - - - - - - - - - -function presentGeonetResponse(req) -{ - if( ! $('im_geonetRecords')) // ETj - return; - - var geonetDiv = $('im_geonetRecords'); - // delete all layers from the list - deleteChildNodes(geonetDiv); - - geonetDiv.className = ''; - - - // total number of records - var summary = req.responseXML.getElementsByTagName('summary'); - var count = summary[0].getAttribute('count'); - - // actual range - var from = summary[0].getAttribute('from'); - var to = summary[0].getAttribute('to'); - - newFrom = from + 1; - newTo = (parseInt(from) / 10 + 1) * 10; - - geonetDiv.appendChild(document.createTextNode(count + ' records found')); - geonetDiv.appendChild(document.createElement('br')); - geonetDiv.appendChild(document.createElement('br')); - - var metadata = req.responseXML.getElementsByTagName('metadata'); - - // add each record to the list - for (var i = 0; i < metadata.length; i++) - { - var title = document.createTextNode(' - ' + metadata[i].getAttribute('title')); - //var id = metadata[i].getAttribute('id'); - geonetDiv.appendChild(title); - geonetDiv.appendChild(document.createElement('br')); - - // append wms services - var services = metadata[i].getElementsByTagName('service'); - var ul; - if (services.length > 0) { - ul = document.createElement('ul'); - var li; - for (var j = 0; j < services.length; j++) - { - li = document.createElement('li'); - - var service = services[j]; - - var a = document.createElement('a'); - var serviceTitle = services[j].getElementsByTagName('title')[0].firstChild.nodeValue; - var baseUrl = service.getElementsByTagName('baseUrl')[0].firstChild.nodeValue; - var serviceName = service.getElementsByTagName('name')[0].firstChild.nodeValue; - - - //a.setAttribute('onClick', 'map.layers.add?url=' + baseUrl + '&service=' + serviceName); - a.setAttribute('onClick', 'javascript:addLayer(\'' + baseUrl + '\', \'' + serviceName+ '\')'); - - geonetDiv.appendChild(document.createElement('br')); - a.appendChild(document.createTextNode(serviceTitle)); - li.appendChild(a); - ul.appendChild(li); - } - geonetDiv.appendChild(ul); - } - } - - var a = document.createElement('a'); - a.setAttribute('onClick', 'javascript:alert(\'next\')'); // DEBUG - a.appendChild(document.createTextNode('next >>')); - geonetDiv.appendChild(a); -} - -function layerAdded(req) -{ - updateMapImage(req); - imc_appendLayers(); -} - -function resizeImage() -{ - imc_toggleImageSize(); -} - - - - -/***************************************************************************** - * - * Keyboard events - * - *****************************************************************************/ - -function keyPressed(e) -{ - - if (e.keyCode == 8) // backspace - { - deleteButtonListener(); - Event.stop(e); - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aca...@us...> - 2007-07-09 16:23:57
|
Revision: 592 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=592&view=rev Author: acarboni Date: 2007-07-09 09:23:55 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Removed *.tmp files Property Changed: ---------------- trunk/web/intermap/httpCache/ trunk/web/intermap/tmp/ Property changes on: trunk/web/intermap/httpCache ___________________________________________________________________ Name: svn:ignore + *.tmp Property changes on: trunk/web/intermap/tmp ___________________________________________________________________ Name: svn:ignore + *.tmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-08-21 17:15:39
|
Revision: 750 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=750&view=rev Author: e_tajariol Date: 2007-08-21 10:15:41 -0700 (Tue, 21 Aug 2007) Log Message: ----------- Add: refresh map. Modified Paths: -------------- trunk/web/intermap/xsl/index-embedded.xsl Added Paths: ----------- trunk/web/intermap/images/reload16x16.png Added: trunk/web/intermap/images/reload16x16.png =================================================================== (Binary files differ) Property changes on: trunk/web/intermap/images/reload16x16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/web/intermap/xsl/index-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/index-embedded.xsl 2007-08-21 16:43:48 UTC (rev 749) +++ trunk/web/intermap/xsl/index-embedded.xsl 2007-08-21 17:15:41 UTC (rev 750) @@ -28,8 +28,9 @@ <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" onClick="javascript:refreshNeeded()"><img src="{/root/gui/url}/images/reload16x16.png" title="Refresh map"/></td> <td class="im_tool" onClick="javascript:im_bm_toggleImageSize()">+/- map</td> - <td class="im_tool" id="im_tool_reset" onClick="javascript:im_reset();">Reset</td> + <td class="im_tool" id="im_tool_reset" onClick="javascript:im_reset();">Reset</td> </tr> </table> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-08-21 21:01:23
|
Revision: 754 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=754&view=rev Author: e_tajariol Date: 2007-08-21 14:01:11 -0700 (Tue, 21 Aug 2007) Log Message: ----------- Change: when adding layers, the serverlist is now computed on server side for better localization handling. Modified Paths: -------------- trunk/web/intermap/WEB-INF/config.xml trunk/web/intermap/scripts/im_ajax.js trunk/web/intermap/scripts/im_extras.js trunk/web/intermap/xml/user-profiles.xml Added Paths: ----------- trunk/web/intermap/xsl/im_list-servers-embedded.xsl Modified: trunk/web/intermap/WEB-INF/config.xml =================================================================== --- trunk/web/intermap/WEB-INF/config.xml 2007-08-21 20:58:50 UTC (rev 753) +++ trunk/web/intermap/WEB-INF/config.xml 2007-08-21 21:01:11 UTC (rev 754) @@ -200,6 +200,12 @@ <output sheet="im_list-servers.xsl" /> </service> + <service name="mapServers.listServers.embedded"> + <class name=".services.mapServers.ListServers" /> + + <output sheet="im_list-servers-embedded.xsl" /> + </service> + <service name="mapServers.listServers.xml"> <class name=".services.mapServers.ListServers" /> </service> Modified: trunk/web/intermap/scripts/im_ajax.js =================================================================== --- trunk/web/intermap/scripts/im_ajax.js 2007-08-21 20:58:50 UTC (rev 753) +++ trunk/web/intermap/scripts/im_ajax.js 2007-08-21 21:01:11 UTC (rev 754) @@ -501,20 +501,6 @@ ); } -function imc_loadMapServers( callback ) -{ - var myAjax = new Ajax.Request ( - '/intermap/srv/en/mapServers.listServers.xml', - { - method: 'get', - - onComplete: callback, - onFailure: reportError - } - ); - -} - function imc_loadServices( id, callback ) { var myAjax = new Ajax.Request ( Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2007-08-21 20:58:50 UTC (rev 753) +++ trunk/web/intermap/scripts/im_extras.js 2007-08-21 21:01:11 UTC (rev 754) @@ -14,14 +14,6 @@ */ function im_addLayer() { - imc_loadMapServers( im_mapServersLoaded ); -} - -/* -## Display the map servers and allow to select one of them -*/ -function im_mapServersLoaded(req) -{ // setup WB clearNode('im_whiteboard'); var WB = $('im_whiteboard'); @@ -34,60 +26,19 @@ Event.observe(closer, 'click', im_closeWhiteBoard); // fill contents - - var servers = req.responseXML.documentElement.getElementsByTagName('mapServers')[0].getElementsByTagName('server'); - var div = document.createElement('div'); // main box div.id = "im_serverList"; div.className = 'im_wbcontent'; WB.appendChild(div); - - var h1 = document.createElement('h1'); - h1.innterHTML = "Server list " ; //FIXME i18n me! - h1.id = "im_serverList_title"; - div.appendChild(h1); - - var ul = document.createElement('ul'); - ul.id = "im_serverList_list"; - div.appendChild(ul); - - $A(servers).each( - function(server) - { - var id=server.getAttribute('id'); - var name =server.getAttribute('name'); - - var li = document.createElement('li'); - ul.appendChild(li); - - var a = document.createElement('a'); - a.innerHTML = name; - a.id = "im_mapserver_" + id; - //a.setAttribute("onClick", "im_mapServerSelected("+id+",'"+name+"');"); - li.appendChild(a); - - Event.observe(li, 'click', function(){ im_mapServerSelected(id, name )} ); - } + + var myAjax = new Ajax.Updater ( + 'im_serverList', + '/intermap/srv/en/mapServers.listServers.embedded', + { + method: 'get', + onFailure: im_load_error + } ); - - // add a textbox to enter a server directly - var li = document.createElement('li'); - li.innerHTML = 'Other WMS server'; // FIXME i18n - ul.appendChild(li); - - var input = document.createElement('input'); - input.id= "im_wmsservername"; - input.className = 'content'; - input.setAttribute("type", "text"); - input.setAttribute("size", "40"); - li.appendChild(input); - - // connect button - var button = document.createElement('button'); - button.innerHTML = "Connect"; // FIXME i18n - div.appendChild(button); - - Event.observe(button, "click", function() { im_mapServerURL($('im_wmsservername').value);}); } /* @@ -332,15 +283,13 @@ function im_openPDF(req) { - var url = req.responseXML.documentElement.getElementsByTagName('url')[0].firstChild.nodeValue; -/* var url = req.responseXML.documentElement.getElementsByTagName('response')[0].getElementsByTagName('pdf')[0].getElementsByTagName('url')[0].textContent;*/ + var url = req.responseXML.documentElement.getElementsByTagName('url')[0].firstChild.nodeValue; window.open(url); $('im_requestpdf').show(); $('im_requestingpdf').hide(); $('im_builtpdf').show(); - } /******************************************************************** Modified: trunk/web/intermap/xml/user-profiles.xml =================================================================== --- trunk/web/intermap/xml/user-profiles.xml 2007-08-21 20:58:50 UTC (rev 753) +++ trunk/web/intermap/xml/user-profiles.xml 2007-08-21 21:01:11 UTC (rev 754) @@ -19,6 +19,7 @@ <allow service="mapContexts.get"/> <allow service="mapServers.listServers"/> <allow service="mapServers.listServers.xml"/> + <allow service="mapServers.listServers.embedded"/> <allow service="mapServers.getServices"/> <allow service="mapServers.getServices.embedded"/> <allow service="mapServers.getServicesExt"/> Added: trunk/web/intermap/xsl/im_list-servers-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/im_list-servers-embedded.xsl (rev 0) +++ trunk/web/intermap/xsl/im_list-servers-embedded.xsl 2007-08-21 21:01:11 UTC (rev 754) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + <xsl:template match="/"> + <div> + <h1 id = "im_serverList_title" class="padded"><xsl:value-of select="/root/gui/strings/mapServer" /></h1> + + <ul id = "im_serverList_list"> + <xsl:apply-templates select="/root/response/mapServers/server" /> + <li>Other WMS server + <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> + + </div> + </xsl:template> + + <!-- Servers --> + <xsl:template match="/root/response/mapServers/server"> + <xsl:variable name="action">im_mapServerSelected(<xsl:value-of select="@id" />,"<xsl:value-of select="@name" />");</xsl:variable> + <li id="im_mapserver_{@id}" onclick="{$action}"><a><xsl:value-of select="@name" /></a></li> + </xsl:template> + +</xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-09-07 16:50:29
|
Revision: 800 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=800&view=rev Author: e_tajariol Date: 2007-09-07 09:46:47 -0700 (Fri, 07 Sep 2007) Log Message: ----------- Improved readability of the "loading map" message. Modified Paths: -------------- trunk/web/intermap/intermap-embedded.css trunk/web/intermap/xsl/index-embedded.xsl Modified: trunk/web/intermap/intermap-embedded.css =================================================================== --- trunk/web/intermap/intermap-embedded.css 2007-09-07 16:03:11 UTC (rev 799) +++ trunk/web/intermap/intermap-embedded.css 2007-09-07 16:46:47 UTC (rev 800) @@ -637,9 +637,10 @@ font-size: 20pt; text-align: center; /* position: absolute; - top: 100px; visibility: hidden; */ + top: 50px; z-index: 33000; + background-color: #E7EDF5; } /* Modified: trunk/web/intermap/xsl/index-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/index-embedded.xsl 2007-09-07 16:03:11 UTC (rev 799) +++ trunk/web/intermap/xsl/index-embedded.xsl 2007-09-07 16:46:47 UTC (rev 800) @@ -73,6 +73,7 @@ <div id="im_map" style="position: absolute;"> <img id="im_mapImg" src="{/root/gui/url}/images/default_bigmap.gif" /> <!--<img id="im_mapImg" src="{//mapRoot/response/url}" />--> + <div id="im_pleaseWait" style="position: absolute; display:none; ">Loading map...</div> </div> <div id="im_scale" style="position: absolute;" > 1:? @@ -81,7 +82,6 @@ </xsl:variable> 1:<xsl:value-of select="format-number($scale, '###,###')" /> --> </div> - <div id="im_pleaseWait" style="position: absolute; display:none;">Loading map...</div> </td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-09-09 16:36:45
|
Revision: 802 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=802&view=rev Author: e_tajariol Date: 2007-09-09 09:36:46 -0700 (Sun, 09 Sep 2007) Log Message: ----------- Map can now be resized by dragging its lower-right corner. Old "resize map" button has been removed. Fix: The zoombox is now bound inside the map. Modified Paths: -------------- trunk/web/intermap/intermap-embedded.css trunk/web/intermap/scripts/etj.js trunk/web/intermap/scripts/im_bigmap.js trunk/web/intermap/scripts/im_layers.js trunk/web/intermap/xsl/index-embedded.xsl Added Paths: ----------- trunk/web/intermap/images/transpcorner.png Added: trunk/web/intermap/images/transpcorner.png =================================================================== (Binary files differ) Property changes on: trunk/web/intermap/images/transpcorner.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/web/intermap/intermap-embedded.css =================================================================== --- trunk/web/intermap/intermap-embedded.css 2007-09-07 17:31:51 UTC (rev 801) +++ trunk/web/intermap/intermap-embedded.css 2007-09-09 16:36:46 UTC (rev 802) @@ -616,6 +616,29 @@ font-size: 0px; } +div#im_bm_resizebox { + position: absolute; + border-style: dotted; + border-color: black; + border-width: 1px; + z-index: 3000; + cursor: se-resize; + padding: 0px; + margin: 0px; + font-size: 0px; +} + +img#im_bm_resizeGhost { + position: absolute; + z-index: 3000; + + filter:alpha (opacity=50); /* MS Internet Explorer */ + filter:progid:DXImageTransform.Microsoft.Alpha (style=0, opacity=50); /* MS IE proprietory */ + -moz-opacity: 0.5; /* Mozilla v1.6 and below */ + opacity: 0.5; /* CSS-3 Standards */ + -khtml-opacity:.5; /* Safari */ +} + div#im_layersToolbar { /*position: absolute;*/ border-width: 1px 0 0 0; Modified: trunk/web/intermap/scripts/etj.js =================================================================== --- trunk/web/intermap/scripts/etj.js 2007-09-07 17:31:51 UTC (rev 801) +++ trunk/web/intermap/scripts/etj.js 2007-09-09 16:36:46 UTC (rev 802) @@ -97,6 +97,7 @@ { Event.observe('im_map', 'mousedown', mousedownEventListener); Event.observe('im_mm_map', 'mousedown', im_mm_mousedownEventListener); + Event.observe('im_resize', 'mousedown', im_bm_resizeStart); setTool('zoomin'); // set the default tool imc_reloadLayers(); // append layers to list Modified: trunk/web/intermap/scripts/im_bigmap.js =================================================================== --- trunk/web/intermap/scripts/im_bigmap.js 2007-09-07 17:31:51 UTC (rev 801) +++ trunk/web/intermap/scripts/im_bigmap.js 2007-09-09 16:36:46 UTC (rev 802) @@ -193,7 +193,7 @@ // dynamically create the zoombox div zoombox = document.createElement('div') zoombox.setAttribute('id', 'im_zoombox'); - drawZoombox(startX, startY, 0, 0); + im_drawBox(zoombox, startX, startY, 0, 0); document.body.appendChild(zoombox); } @@ -206,8 +206,23 @@ var pX = Event.pointerX(e); var pY = Event.pointerY(e); + // get map image offset + var offset = Position.cumulativeOffset($('im_mapImg')); + var offsetX = offset[0]; + var offsetY = offset[1]; + + var w = $('im_mapImg').clientWidth; + var h = $('im_mapImg').clientHeight; + + // Prevents zoombox exiting from map area + pX = Math.max(pX, offsetX+2); + pY = Math.max(pY, offsetY+2); + + pX = Math.min(pX, offsetX + w ); + pY = Math.min(pY, offsetY + h ); + // set the zoom box position and size - drawZoombox ( + im_drawBox ( $('im_zoombox'), Math.min(pX, startX), // left Math.min(pY, startY), // top Math.abs(pX - startX), // width @@ -230,7 +245,6 @@ var w = $('im_mapImg').clientWidth; var h = $('im_mapImg').clientHeight; - setStatus('busy'); imc_bm_action(currentTool, @@ -247,7 +261,7 @@ Element.remove($('im_zoombox')); } -// Draws the zoombox +/*// Draws the zoombox function drawZoombox(left, top, width, height) { zoombox.style.left = left + 'px'; @@ -255,7 +269,7 @@ zoombox.style.width = width + 'px'; zoombox.style.height = height + 'px'; } - +*/ //================================================== // MOVE //================================================== @@ -840,6 +854,127 @@ divMR.style.top = divML.style.top; } +//================================================== +// RESIZE +//================================================== + +function im_bm_resizeStart(e) +{ + Event.stop(e); // prevents from dragging the map image (on Firefox) + + // add mousemove and mouseup listeners + Event.observe(document, 'mousemove', im_bm_resizeMove); + Event.observe(document, 'mouseup', im_bm_resizeStop); + + // get map image offset + var offset = Position.cumulativeOffset($('im_mapImg')); + var offsetX = offset[0]; + var offsetY = offset[1]; + + // store starting cursor position + startX = offsetX + 1; + startY = offsetY + 1; + + // dynamically create the zoombox div + var resizebox = document.createElement('div'); + resizebox.setAttribute('id', 'im_bm_resizebox'); + im_drawBox(resizebox, startX, startY, + $('im_mapImg').clientWidth, + $('im_mapImg').clientHeight); + document.body.appendChild(resizebox); + + // ghost image + var resizeGhost = document.createElement('img'); + resizeGhost.id = 'im_bm_resizeGhost'; + resizeGhost.src = $('im_mapImg').src; + im_drawBox(resizeGhost, startX, startY, + $('im_mapImg').clientWidth, + $('im_mapImg').clientHeight); + document.body.appendChild(resizeGhost); +} + +// +function im_bm_resizeMove(e) +{ + Event.stop(e); // prevents from dragging the map image (on Explorer) + + // get the current cursor position + var pX = Event.pointerX(e); + var pY = Event.pointerY(e); + + // get map image offset + var offset = Position.cumulativeOffset($('im_mapImg')); + var offsetX = offset[0]; + var offsetY = offset[1]; + + // Keeps map large enough + pX = Math.max(pX, offsetX+250); + pY = Math.max(pY, offsetY+200); + + var windowsize = getWindowSize(); + var winw = windowsize[0]; + var winh = windowsize[1]; + + // Keeps map inside portview + pX = Math.min(pX, winw - im_layer_width - 30); // 30 to stay comfortably within borders, padding and what else + pY = Math.min(pY, 800); + + // set the zoom box position and size + im_drawBox ($('im_bm_resizebox'), + offsetX +1, // left + offsetY +1, // top + Math.abs(pX - startX), // width + Math.abs(pY - startY) // height + ); + + // ghost image + im_drawBox( $('im_bm_resizeGhost'), + offsetX +1, // left + offsetY +1, // top + Math.abs(pX - startX), // width + Math.abs(pY - startY) // height + ); +} + +// mouseup event listener +function im_bm_resizeStop(e) +{ + // get the current cursor position + var pX = Event.pointerX(e); + var pY = Event.pointerY(e); + + // get map image offset + var offset = Position.cumulativeOffset($('im_mapImg')); + var offsetX = offset[0]; + var offsetY = offset[1]; + + var w = $('im_bm_resizebox').clientWidth; + var h = $('im_bm_resizebox').clientHeight; + + // remove listeners and div + Event.stopObserving(document, 'mousemove', im_bm_resizeMove); + Event.stopObserving(document, 'mouseup', im_bm_resizeStop); + Element.remove($('im_bm_resizeGhost')); + Element.remove($('im_bm_resizebox')); + + imc_updateBigMap( w, h, + im_bm_getURLbbox(), + false); + + // do a preventive resizing, so user will get the whole layout before the image gets loaded + im_bm_setSize(w, h); + +} + +// Draws the zoombox +function im_drawBox(box, left, top, width, height) +{ + box.style.left = left + 'px'; + box.style.top = top + 'px'; + box.style.width = width + 'px'; + box.style.height = height + 'px'; +} + /***************************************************************************** * * Generic utility functions @@ -969,7 +1104,7 @@ * Keyboard events * *****************************************************************************/ - +/* function keyPressed(e) { @@ -979,7 +1114,7 @@ Event.stop(e); } } - +*/ //================================================== // //================================================== Modified: trunk/web/intermap/scripts/im_layers.js =================================================================== --- trunk/web/intermap/scripts/im_layers.js 2007-09-07 17:31:51 UTC (rev 801) +++ trunk/web/intermap/scripts/im_layers.js 2007-09-09 16:36:46 UTC (rev 802) @@ -4,6 +4,8 @@ * *****************************************************************************/ +var im_layer_width = 176; + //## Builds the layer list function im_buildLayerList(req) { Modified: trunk/web/intermap/xsl/index-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/index-embedded.xsl 2007-09-07 17:31:51 UTC (rev 801) +++ trunk/web/intermap/xsl/index-embedded.xsl 2007-09-09 16:36:46 UTC (rev 802) @@ -29,7 +29,7 @@ <!-- <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" onClick="javascript:refreshNeeded()"><img src="{/root/gui/url}/images/reload16x16.png" title="Refresh map"/></td> - <td class="im_tool" onClick="javascript:im_bm_toggleImageSize()">+/- map</td> +<!-- <td class="im_tool" onClick="javascript:im_bm_toggleImageSize()">+/- map</td>--> <td class="im_tool" id="im_tool_reset" onClick="javascript:im_reset();">Reset</td> </tr> </table> @@ -73,6 +73,10 @@ <div id="im_map" style="position: absolute;"> <img id="im_mapImg" src="{/root/gui/url}/images/default_bigmap.gif" /> <!--<img id="im_mapImg" src="{//mapRoot/response/url}" />--> + <img id="im_resize" + 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> <div id="im_scale" style="position: absolute;" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <e_t...@us...> - 2007-09-19 14:23:24
|
Revision: 859 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=859&view=rev Author: e_tajariol Date: 2007-09-19 07:23:04 -0700 (Wed, 19 Sep 2007) Log Message: ----------- JS strings can now be localized. Modified Paths: -------------- trunk/web/intermap/loc/en/xml/strings.xml trunk/web/intermap/scripts/etj.js trunk/web/intermap/scripts/im_extras.js trunk/web/intermap/xsl/index-embedded.xsl Modified: trunk/web/intermap/loc/en/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/en/xml/strings.xml 2007-09-19 11:17:25 UTC (rev 858) +++ trunk/web/intermap/loc/en/xml/strings.xml 2007-09-19 14:23:04 UTC (rev 859) @@ -4,6 +4,7 @@ <activate>Activate</activate> <address>Address</address> <addService>Add more maps</addService> + <addLayer js="true">Add a new layer</addLayer> <bigger>Bigger map</bigger> <cancel>Cancel</cancel> <close>Close</close> @@ -22,9 +23,9 @@ <!-- <errorText>Sorry, error connecting to the map server</errorText> --> - <exportAsPDF>Export this map as a PDF</exportAsPDF> - <exportAsImage>Export this map as an image</exportAsImage> - <exportAsWMC>Save the Web Map Context</exportAsWMC> + <exportAsPDF js="true">Export this map as a PDF</exportAsPDF> + <exportAsImage js="true">Export this map as an image</exportAsImage> + <exportAsWMC js="true">Save the Web Map Context</exportAsWMC> <extents>Change the selected time (temporal data)</extents> <extentSelected>Selected time: </extentSelected> <featuresfound>features found</featuresfound> @@ -40,6 +41,7 @@ <keywords>Keywords:</keywords> <layerinfo>Layer info</layerinfo> <layers>Layers</layers> + <layersAdded js="true">Selected layers have been added</layersAdded> <layersHide>Hide layer list</layersHide> <layersShow>Show layer list</layersShow> <layerShowHide>Show or hide layer</layerShowHide> @@ -47,6 +49,8 @@ <listofmaps>List of maps</listofmaps> <listofmapservers>List of map servers</listofmapservers> <loadingMap>...Loading map...</loadingMap> + <loadingFrom js="true">Loading services from</loadingFrom> + <loadingFromWMS js="true">Loading services from given WMS server</loadingFromWMS> <manually>Create you own map</manually> <map>Map</map> <mapsfound>maps found</mapsfound> @@ -70,6 +74,7 @@ <removeLayer>Remove layer</removeLayer> <reset>Reset</reset> <sendByEmail>Send this map via e-mail</sendByEmail> + <sendMap js="true">Send this map context</sendMap> <setScale>--Set Scale--</setScale> <smaller>Smaller map</smaller> <specify>Specify if other:</specify> @@ -79,6 +84,7 @@ <title>InterMap opensource</title> <transparency>Set transparency</transparency> <up>Move layer up</up> + <wait js="true">Please wait...</wait> <wmsConfigForm>Layer properties</wmsConfigForm > <zoomIn>Zoom in</zoomIn> <zoomOut>Zoom out</zoomOut> Modified: trunk/web/intermap/scripts/etj.js =================================================================== --- trunk/web/intermap/scripts/etj.js 2007-09-19 11:17:25 UTC (rev 858) +++ trunk/web/intermap/scripts/etj.js 2007-09-19 14:23:04 UTC (rev 859) @@ -139,6 +139,19 @@ /******************************************************************** -*** LAYERS +*** UTILS ********************************************************************/ +function i18n(key) +{ + var v = $('i18n_'+key); + if(v) + { + if(v.value=='') + return '{'+key+'}'; + else + return v.value; + } + else + return '['+key+']'; +} Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2007-09-19 11:17:25 UTC (rev 858) +++ trunk/web/intermap/scripts/im_extras.js 2007-09-19 14:23:04 UTC (rev 859) @@ -19,7 +19,7 @@ clearNode('im_whiteboard'); var WB = $('im_whiteboard'); - var wbtitle = im_createWBTitle('Add a layer'); //FIXME i18n + var wbtitle = im_createWBTitle(i18n('addLayer')); //FIXME i18n WB.appendChild(wbtitle); var closer = im_getWBCloser(); @@ -51,11 +51,11 @@ clearNode(im); var t1 = Builder.node("p"); - t1.innerHTML = "...please wait..."; + t1.innerHTML = i18n("wait"); im.appendChild(t1); var t2 = document.createElement("p"); - t2.innerHTML = "Loading services from " +name; + t2.innerHTML = i18n("loadingFrom") + " " + name; im.appendChild(t2); imc_loadServerServices(id, im_servicesLoaded, "im_servicesSelected();"); @@ -91,7 +91,7 @@ im.appendChild(t1); var t2 = document.createElement("p"); - t2.innerHTML = "Loading services from given WMS server"; + t2.innerHTML = i18n("loadingFromWMS"); im.appendChild(t2); imc_loadURLServices(url, -2, im_servicesLoaded, "im_servicesSelected();" ); @@ -166,7 +166,7 @@ clearNode(im); var t1 = document.createElement("p"); - t1.innerHTML = "Selected layers have been added"; // fixme i18n + t1.innerHTML = i18n("layersAdded"); im.appendChild(t1); im_buildLayerList(req); // rebuild layers' list @@ -194,7 +194,7 @@ div.className = 'im_wbcontent'; $('im_whiteboard').appendChild(div); - var wbtitle = im_createWBTitle("Send this map's context"); //FIXME i18n + var wbtitle = im_createWBTitle(i18n("sendByEmail"); div.appendChild(wbtitle); var closer = im_getWBCloser(); @@ -202,7 +202,7 @@ Event.observe(closer, 'click', im_closeWhiteBoard); var h1 = document.createElement('h1'); - h1.innerHTML = "Send this map context" ; //FIXME i18n + h1.innerHTML = i18n("sendMap"); div.appendChild(h1); @@ -226,7 +226,7 @@ clearNode('im_whiteboard'); var WB = $('im_whiteboard'); - var wbtitle = im_createWBTitle("Export this map as PDF"); //FIXME i18n + var wbtitle = im_createWBTitle(i18n('exportAsPDF')); //FIXME i18n WB.appendChild(wbtitle); var closer = im_getWBCloser(); @@ -327,7 +327,7 @@ clearNode('im_whiteboard'); var WB = $('im_whiteboard'); - var wbtitle = im_createWBTitle("Export this map's Web Map Context"); //FIXME i18n + var wbtitle = im_createWBTitle(i18n("dummy")); WB.appendChild(wbtitle); var closer = im_getWBCloser(); Modified: trunk/web/intermap/xsl/index-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/index-embedded.xsl 2007-09-19 11:17:25 UTC (rev 858) +++ trunk/web/intermap/xsl/index-embedded.xsl 2007-09-19 14:23:04 UTC (rev 859) @@ -11,9 +11,10 @@ </info> <html> --> - - <div id="intermap_root"> <!-- class will be set to current tool --> - + <xsl:call-template name="localization"/> + + <div id="intermap_root"> <!-- class will be set to current tool --> + <table class="padded_content"> <tr height="30px"> <!-- TOOLBAR --> @@ -97,7 +98,7 @@ <!-- <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 style="padding:2px" onClick="im_openWMCform();" ><a><img src="{/root/gui/url}/images/im_exportPic.png" title="View context"/></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();"> @@ -148,5 +149,12 @@ </html>--> </xsl:template> + <xsl:template name="localization"> + <xsl:comment>These fields are needed for js on-the-fly translations</xsl:comment> + <xsl:for-each select="/root/gui/strings/*[@js='true']"> + <input type="hidden" id="i18n_{name(.)}" value="{.}" /> + </xsl:for-each> + <xsl:comment>End of i18n fields</xsl:comment> + </xsl:template> </xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tic...@us...> - 2007-09-19 14:44:34
|
Revision: 861 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=861&view=rev Author: ticheler Date: 2007-09-19 07:44:35 -0700 (Wed, 19 Sep 2007) Log Message: ----------- localization also for other languages (Spanish not translated yet) Modified Paths: -------------- trunk/web/intermap/loc/en/xml/strings.xml trunk/web/intermap/loc/es/xml/strings.xml trunk/web/intermap/loc/fr/xml/strings.xml trunk/web/intermap/scripts/im_extras.js Modified: trunk/web/intermap/loc/en/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/en/xml/strings.xml 2007-09-19 14:38:02 UTC (rev 860) +++ trunk/web/intermap/loc/en/xml/strings.xml 2007-09-19 14:44:35 UTC (rev 861) @@ -73,8 +73,7 @@ <refreshNotification>Please click the "Refresh" button under the layer list to see this change.</refreshNotification> <removeLayer>Remove layer</removeLayer> <reset>Reset</reset> - <sendByEmail>Send this map via e-mail</sendByEmail> - <sendMap js="true">Send this map context</sendMap> + <sendByEmail js="true">Send this map via e-mail</sendByEmail> <setScale>--Set Scale--</setScale> <smaller>Smaller map</smaller> <specify>Specify if other:</specify> Modified: trunk/web/intermap/loc/es/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/es/xml/strings.xml 2007-09-19 14:38:02 UTC (rev 860) +++ trunk/web/intermap/loc/es/xml/strings.xml 2007-09-19 14:44:35 UTC (rev 861) @@ -4,6 +4,7 @@ <activate>Activate</activate> <address>Address</address> <addService>Add more maps</addService> + <addLayer js="true">Add a new layer</addLayer> <bigger>Bigger map</bigger> <cancel>Cancel</cancel> <close>Close</close> @@ -22,15 +23,16 @@ <!-- <errorText>Sorry, error connecting to the map server</errorText> --> - <exportAsPDF>Export this map as a PDF</exportAsPDF> - <exportAsImage>Export this map as an image</exportAsImage> + <exportAsPDF js="true">Export this map as a PDF</exportAsPDF> + <exportAsImage js="true">Export this map as an image</exportAsImage> + <exportAsWMC js="true">Save the Web Map Context</exportAsWMC> <extents>Change the selected time (temporal data)</extents> <extentSelected>Selected time: </extentSelected> <featuresfound>features found</featuresfound> - <findMapsGeoNetwork>Find more maps through GeoNetwork</findMapsGeoNetwork> - <findMapsMapServers>Add more maps by connecting to other Web Map Servers</findMapsMapServers> + <findMapsGeoNetwork>Find more maps through GeoNetwork opensource</findMapsGeoNetwork> + <findMapsMapServers>Add more layers by connecting to other Web Map Servers</findMapsMapServers> <fullExtent>Zoom to the full map</fullExtent> - <gotoGeoNetwork>GeoNetwork</gotoGeoNetwork> + <gotoGeoNetwork>GeoNetwork opensource</gotoGeoNetwork> <gotoMapServers>Map Servers</gotoMapServers> <homepage>Home page:</homepage> <identify>Identify a feature on the map</identify> @@ -39,6 +41,7 @@ <keywords>Keywords:</keywords> <layerinfo>Layer info</layerinfo> <layers>Layers</layers> + <layersAdded js="true">Selected layers have been added</layersAdded> <layersHide>Hide layer list</layersHide> <layersShow>Show layer list</layersShow> <layerShowHide>Show or hide layer</layerShowHide> @@ -46,7 +49,9 @@ <listofmaps>List of maps</listofmaps> <listofmapservers>List of map servers</listofmapservers> <loadingMap>...Loading map...</loadingMap> - <manually>create you own map</manually> + <loadingFrom js="true">Loading services from</loadingFrom> + <loadingFromWMS js="true">Loading services from given WMS server</loadingFromWMS> + <manually>Create you own map</manually> <map>Map</map> <mapsfound>maps found</mapsfound> <metadata>Metadata</metadata> @@ -57,9 +62,9 @@ <oneService>One map found</oneService> <ok>Ok</ok> <oneFeature>One feature found</oneFeature> - <otherArcIMS>- Other ArcIMS server (specify below)</otherArcIMS> - <otherWMS>- Other WMS server (specify below)</otherWMS> - <pan>Mover</pan> + <otherArcIMS>- Other ArcIMS server </otherArcIMS> + <otherWMS>- Other WMS server </otherWMS> + <pan>Pan</pan> <position>Position:</position> <print>Print the map</print> <properties>Properties</properties> @@ -68,7 +73,7 @@ <refreshNotification>Please click the "Refresh" button under the layer list to see this change.</refreshNotification> <removeLayer>Remove layer</removeLayer> <reset>Reset</reset> - <sendByEmail>Send this map via e-mail</sendByEmail> + <sendByEmail js="true">Send this map via e-mail</sendByEmail> <setScale>--Set Scale--</setScale> <smaller>Smaller map</smaller> <specify>Specify if other:</specify> @@ -78,6 +83,7 @@ <title>InterMap opensource</title> <transparency>Set transparency</transparency> <up>Move layer up</up> + <wait js="true">Please wait...</wait> <wmsConfigForm>Layer properties</wmsConfigForm > <zoomIn>Zoom in</zoomIn> <zoomOut>Zoom out</zoomOut> Modified: trunk/web/intermap/loc/fr/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/fr/xml/strings.xml 2007-09-19 14:38:02 UTC (rev 860) +++ trunk/web/intermap/loc/fr/xml/strings.xml 2007-09-19 14:44:35 UTC (rev 861) @@ -4,6 +4,7 @@ <activate>Activater</activate> <address>Adresse</address> <addService>Ajouter une carte</addService> + <addLayer js="true">Add a new layer</addLayer> <bigger>Carte plus grande</bigger> <cancel>Annuler</cancel> <close>Fermer</close> @@ -22,8 +23,9 @@ <!-- <errorText>Sorry, error connecting to the map server</errorText> --> - <exportAsPDF>Export votre carte vers PDF</exportAsPDF> - <exportAsImage>Export votre carte vers une image</exportAsImage> + <exportAsPDF js="true">Export votre carte vers PDF</exportAsPDF> + <exportAsImage js="true">Export votre carte vers une image</exportAsImage> + <exportAsWMC js="true">Save the Web Map Context</exportAsWMC> <extents>Modifier la période sélectionnée (Donnée temporelle)</extents> <extentSelected>Temps sélectionné: </extentSelected> <featuresfound>Objet trouvé</featuresfound> @@ -39,6 +41,7 @@ <keywords>Mots-clés:</keywords> <layerinfo>Description du calque</layerinfo> <layers>Calques</layers> + <layersAdded js="true">Selected layers have been added</layersAdded> <layersHide>Cacher la liste de calques</layersHide> <layersShow>Afficher la liste de calques</layersShow> <layerShowHide>Afficher ou cacher la calque</layerShowHide> @@ -46,6 +49,8 @@ <listofmaps>Liste des cartes</listofmaps> <listofmapservers>Liste des géoservices</listofmapservers> <loadingMap>...Loading map...</loadingMap> + <loadingFrom js="true">Loading services from</loadingFrom> + <loadingFromWMS js="true">Loading services from given WMS server</loadingFromWMS> <manually>Créer votre carte</manually> <map>Carte</map> <mapsfound>cartes trouvées</mapsfound> @@ -68,7 +73,7 @@ <refreshNotification>Cliquer sur "Rafraîchir" pour voir les changements.</refreshNotification> <removeLayer>Supprimer le calque</removeLayer> <reset>Réinitialiser</reset> - <sendByEmail>Envoyer par e-mail</sendByEmail> + <sendByEmail js="true">Envoyer par e-mail</sendByEmail> <setScale>--Set Scale--</setScale> <smaller>Petite carte</smaller> <specify>Définir si autre :</specify> @@ -78,6 +83,7 @@ <title>InterMap opensource</title> <transparency>Définir la transparence</transparency> <up>Déplacer vers le haut</up> + <wait js="true">Please wait...</wait> <wmsConfigForm>Propriétés du calque</wmsConfigForm > <zoomIn>Zoom avant</zoomIn> <zoomOut>Zoom arrière</zoomOut> Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2007-09-19 14:38:02 UTC (rev 860) +++ trunk/web/intermap/scripts/im_extras.js 2007-09-19 14:44:35 UTC (rev 861) @@ -202,7 +202,7 @@ Event.observe(closer, 'click', im_closeWhiteBoard); var h1 = document.createElement('h1'); - h1.innerHTML = i18n("sendMap"); + h1.innerHTML = i18n("sendByEmail"); div.appendChild(h1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-11-09 00:12:34
|
Revision: 958 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=958&view=rev Author: e_tajariol Date: 2007-11-08 16:12:37 -0800 (Thu, 08 Nov 2007) Log Message: ----------- WMC features can now be called from buttons instead of menu (menu option is still available with minor editing). Added localization for some strings. Modified Paths: -------------- trunk/web/intermap/loc/en/xml/strings.xml trunk/web/intermap/scripts/im_extras.js trunk/web/intermap/xsl/im_wmc_form.xsl trunk/web/intermap/xsl/index-embedded.xsl Added Paths: ----------- trunk/web/intermap/images/fileopen.png trunk/web/intermap/images/filesave.png Added: trunk/web/intermap/images/fileopen.png =================================================================== (Binary files differ) Property changes on: trunk/web/intermap/images/fileopen.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/web/intermap/images/filesave.png =================================================================== (Binary files differ) Property changes on: trunk/web/intermap/images/filesave.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/web/intermap/loc/en/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/en/xml/strings.xml 2007-11-05 19:12:30 UTC (rev 957) +++ trunk/web/intermap/loc/en/xml/strings.xml 2007-11-09 00:12:37 UTC (rev 958) @@ -27,7 +27,6 @@ <exportAsPDF js="true">Export this map as a PDF</exportAsPDF> <exportAsImage js="true">Export this map as an image</exportAsImage> <exportAsWMC js="true">Save the Web Map Context</exportAsWMC> - <wmcmenu js="true">WMC Context menu</wmcmenu> <extents>Change the selected time (temporal data)</extents> <extentSelected>Selected time: </extentSelected> <featuresfound>features found</featuresfound> @@ -88,6 +87,14 @@ <transparency>Set transparency</transparency> <up>Move layer up</up> <wait js="true">Please wait...</wait> + <wmctitle js="true">WMC Context menu</wmctitle> + <wmctitlemail js="true">Send a WMC Context via e-mail</wmctitlemail> + <wmctitleupload js="true">Upload and set a context</wmctitleupload> + <wmcbuttonmain js="true">View context menu</wmcbuttonmain> + <wmcbuttonmail js="true">Send current context</wmcbuttonmail> + <wmcbuttonupload js="true">Upload a context</wmcbuttonupload> + <wmcbuttondownload js="true">Download current context</wmcbuttondownload> + <wmsConfigForm>Layer properties</wmsConfigForm > <zoomIn>Zoom in</zoomIn> <zoomOut>Zoom out</zoomOut> Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2007-11-05 19:12:30 UTC (rev 957) +++ trunk/web/intermap/scripts/im_extras.js 2007-11-09 00:12:37 UTC (rev 958) @@ -297,16 +297,21 @@ /******************************************************************** *** WMC ********************************************************************/ -/* -## Called by the bottom toolbar -*/ -function im_openWMCform() +/** + * Called by the bottom toolbar + * @param {String} type optional - may be 'mail' or 'upload' + */ +function im_openWMCform(type) { // setup WB clearNode('im_whiteboard'); var WB = $('im_whiteboard'); + + var i18nkey = "wmctitle"; + if(type) + i18nkey += type; - var wbtitle = im_createWBTitle(i18n("wmcmenu")); + var wbtitle = im_createWBTitle(i18n(i18nkey)); WB.appendChild(wbtitle); var closer = im_getWBCloser(); @@ -319,7 +324,9 @@ WB.appendChild(div); var pars="&width=" + im_extra_drivingMap.width + - "&height=" + im_extra_drivingMap.height; + "&height=" + im_extra_drivingMap.height; + if(type) + pars += "&type="+type; var myAjax = new Ajax.Updater ( 'im_wmcmenu', @@ -334,7 +341,7 @@ } /** -## Download WMC context. This is one-shot operation. +## Download WMC context. This is a one-shot operation. */ function im_downloadWMC() { Modified: trunk/web/intermap/xsl/im_wmc_form.xsl =================================================================== --- trunk/web/intermap/xsl/im_wmc_form.xsl 2007-11-05 19:12:30 UTC (rev 957) +++ trunk/web/intermap/xsl/im_wmc_form.xsl 2007-11-09 00:12:37 UTC (rev 958) @@ -3,6 +3,9 @@ <xsl:output method="html" /> <xsl:template match="/"> + <!-- =========================================== --> + <!-- USER MESSAGES --> + <!-- =========================================== --> <div id="im_wmc_msg"> <div id="im_wmc_msg_upload_start" style="display:none;"> The context file is uploading... @@ -24,84 +27,107 @@ An unexpected error has been encountered while processing the mail:<br/> </div> </div> - - + + <!-- =========================================== --> + <!-- CHOOSE FORM --> + <!-- =========================================== --> <div id="im_wmc_form"> - <ul> - <!-- =========================================== --> - <!-- DOWNLOAD WMC --> - <!-- =========================================== --> - <li> - <a onClick="im_downloadWMC();">Download WMC</a> - </li> - - <!-- =========================================== --> - <!-- UPLOAD WMC --> - <!-- =========================================== --> - <li> - <a onClick="$('im_uploadwmc').toggle();">Upload WMC...</a> - <div id="im_uploadwmc" style="display:none;"> - <form method="post" enctype="multipart/form-data" id="im_fuploadwmc" action="/intermap/srv/en/wmc.setContext"> <!--onsubmit="im_uploadWMC(false);">--> - <input type="hidden" id="im_fup_clearLayers" name="clearLayers" value="false"></input> - <table width="100%"> - <tr> - <td colspan="2" align="center"> - <input type="file" name="fname" id="fname" size="60"/> - </td> - </tr> - - <tr> - <td align="center"> - <button onClick="im_uploadWMC(true);" style="margin-bottom:5px;margin-top:5px;">Replace current layers</button> - </td> - <td align="center"> - <button onClick="im_uploadWMC(false);" style="margin-bottom:5px;margin-top:5px;">Add to current layers</button> - </td> - </tr> - </table> - </form> - </div> - - </li> - - <!-- =========================================== --> - <!-- SEND WMS AS E-MAIL --> - <!-- =========================================== --> - <li> - <a onClick="$('im_mailwmc').toggle();">Send WMC as mail...</a> - <div id="im_mailwmc" style="display:none;"> - <table width="100%"> - <tr> - <td>Title:</td> - <td width="100%"> - <input type="text" name="wmc_title" id="wmc_title" width="100%" size="70"></input> - </td> - </tr> - <tr> - <td>to:</td> - <td> - <input type="text" name="wmc_mailto" id="wmc_mailto" width="100%" size="40"></input> - </td> - </tr> - <tr> - <td>from:</td> - <td> - <input type="text" name="wmc_mailfrom" id="wmc_mailfrom" width="100%" size="40"></input> - </td> - </tr> - <tr style="padding-bottom:5px;"> - <td colspan="2" align="center"> - <button onClick="im_sendWMC();" style="margin-bottom:5px;margin-top:5px;">Send e-mail</button> - </td> - </tr> - - </table> - </div> - </li> - </ul> + <xsl:choose> + <xsl:when test="/root/request/type='mail'"> + <xsl:call-template name="mail"/> + </xsl:when> + <xsl:when test="/root/request/type='upload'"> + <xsl:call-template name="upload"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="main"/> + </xsl:otherwise> + </xsl:choose> </div> </xsl:template> + + + <xsl:template name="main"> + <ul> + <!-- DOWNLOAD WMC --> + <li> + <a onClick="im_downloadWMC();">Download WMC</a> + </li> + + <!-- UPLOAD WMC --> + <li> + <a onClick="$('im_uploadwmc').toggle();">Upload WMC...</a> + <div id="im_uploadwmc" style="display:none;"> + <xsl:call-template name="upload"/> + </div> + </li> + + <!-- SEND WMS AS E-MAIL --> + <li> + <a onClick="$('im_mailwmc').toggle();">Send WMC as mail...</a> + <div id="im_mailwmc" style="display:none;"> + <xsl:call-template name="mail"/> + </div> + </li> + </ul> + </xsl:template> + + <!-- =========================================== --> + <!-- UPLOAD WMC --> + <!-- =========================================== --> + <xsl:template name="upload"> + <form method="post" enctype="multipart/form-data" id="im_fuploadwmc" action="/intermap/srv/en/wmc.setContext"> <!--onsubmit="im_uploadWMC(false);">--> + <input type="hidden" id="im_fup_clearLayers" name="clearLayers" value="false"></input> + <table width="100%"> + <tr> + <td colspan="2" align="center"> + <input type="file" name="fname" id="fname" size="60"/> + </td> + </tr> + + <tr> + <td align="center"> + <button onClick="im_uploadWMC(true);" style="margin-bottom:5px;margin-top:5px;">Replace current layers</button> + </td> + <td align="center"> + <button onClick="im_uploadWMC(false);" style="margin-bottom:5px;margin-top:5px;">Add to current layers</button> + </td> + </tr> + </table> + </form> + </xsl:template> + + <!-- =========================================== --> + <!-- SEND WMS AS E-MAIL --> + <!-- =========================================== --> + <xsl:template name="mail"> + <table width="100%"> + <tr> + <td>Title:</td> + <td width="100%"> + <input type="text" name="wmc_title" id="wmc_title" width="100%" size="70"></input> + </td> + </tr> + <tr> + <td>to:</td> + <td> + <input type="text" name="wmc_mailto" id="wmc_mailto" width="100%" size="40"></input> + </td> + </tr> + <tr> + <td>from:</td> + <td> + <input type="text" name="wmc_mailfrom" id="wmc_mailfrom" width="100%" size="40"></input> + </td> + </tr> + <tr style="padding-bottom:5px;"> + <td colspan="2" align="center"> + <button onClick="im_sendWMC();" style="margin-bottom:5px;margin-top:5px;">Send e-mail</button> + </td> + </tr> + + </table> + </xsl:template> - </xsl:stylesheet> Modified: trunk/web/intermap/xsl/index-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/index-embedded.xsl 2007-11-05 19:12:30 UTC (rev 957) +++ trunk/web/intermap/xsl/index-embedded.xsl 2007-11-09 00:12:37 UTC (rev 958) @@ -118,7 +118,15 @@ <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_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/wmc.png" title="View context menu"/></a></td> + + <!-- WMC buttons: you can choose between the full WMC menu, or single buttons that address the single services in the menu --> + <!-- This is the menu --> + <!--<td style="padding:2px" onClick="im_openWMCform();" ><a><img src="{/root/gui/url}/images/wmc.png" title="{/root/gui/strings/wmcbuttonmain}"/></a></td>--> + <!-- Following are the standalone buttons --> + <td style="padding:2px" onClick="im_openWMCform('mail');" ><a><img src="{/root/gui/url}/images/im_mail.png" title="{/root/gui/strings/wmcbuttonmail}"/></a></td> + <td style="padding:2px" onClick="im_openWMCform('upload');" ><a><img src="{/root/gui/url}/images/fileopen.png" title="{/root/gui/strings/wmcbuttonupload}"/></a></td> + <td style="padding:2px" onClick="im_downloadWMC();" ><a><img src="{/root/gui/url}/images/filesave.png" title="{/root/gui/strings/wmcbuttondownload}"/></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();"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-11-13 01:29:10
|
Revision: 965 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=965&view=rev Author: e_tajariol Date: 2007-11-12 17:29:15 -0800 (Mon, 12 Nov 2007) Log Message: ----------- Service wmc.getContext renamed to context.cml. Modified Paths: -------------- trunk/web/intermap/WEB-INF/config.xml trunk/web/intermap/scripts/im_extras.js trunk/web/intermap/xml/user-profiles.xml Modified: trunk/web/intermap/WEB-INF/config.xml =================================================================== --- trunk/web/intermap/WEB-INF/config.xml 2007-11-13 01:26:09 UTC (rev 964) +++ trunk/web/intermap/WEB-INF/config.xml 2007-11-13 01:29:15 UTC (rev 965) @@ -506,7 +506,13 @@ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <service name="wmc.getContext" contentType="application/vnd.ogc.context+xml; charset=UTF-8"> + <!-- This service returns the WMC view context as an XML file. + We are using a non-standard service name because at the moment jeeves provides no facilities + to set a suggested filename to the user agent. + The service name will be used as suggested filename to store the information sent. + --> +<!-- <service name="wmc.getContext" contentType="application/vnd.ogc.context+xml; charset=UTF-8">--> + <service name="context.cml" contentType="application/vnd.ogc.context+xml; charset=UTF-8"> <class name=".services.wmc.GetWmcContext"/> <!-- contenttype is defined in 100 spec, but not in 110 --> <output sheet="im_wmc.xsl" contentType="application/vnd.ogc.context+xml; charset=UTF-8" /> Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2007-11-13 01:26:09 UTC (rev 964) +++ trunk/web/intermap/scripts/im_extras.js 2007-11-13 01:29:15 UTC (rev 965) @@ -348,7 +348,7 @@ var pars= "width=" + im_extra_drivingMap.width + "&height=" + im_extra_drivingMap.height; - window.open(getIMServiceURL('wmc.getContext') + '?'+pars); + window.open(getIMServiceURL('context.cml') + '?'+pars); } /** Modified: trunk/web/intermap/xml/user-profiles.xml =================================================================== --- trunk/web/intermap/xml/user-profiles.xml 2007-11-13 01:26:09 UTC (rev 964) +++ trunk/web/intermap/xml/user-profiles.xml 2007-11-13 01:29:15 UTC (rev 965) @@ -50,10 +50,11 @@ <allow service="wmc.setContext"/> <allow service="wmc.uploadContext"/> - <allow service="wmc.getContext"/> <allow service="wmc.setContextFromURL"/> <allow service="wmc.mailContext"/> <allow service="wmc.form"/> + <!-- <allow service="wmc.getContext"/>--> + <allow service="context.cml"/> <allow service="map.layers.add"/> <allow service="map.layers.deleteLayer"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-11-22 23:06:28
|
Revision: 974 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=974&view=rev Author: e_tajariol Date: 2007-11-22 15:06:29 -0800 (Thu, 22 Nov 2007) Log Message: ----------- Some cleanup in WMC configuration. Modified Paths: -------------- trunk/web/intermap/WEB-INF/config.xml Added Paths: ----------- trunk/web/intermap/xsl/copy_response.xsl Modified: trunk/web/intermap/WEB-INF/config.xml =================================================================== --- trunk/web/intermap/WEB-INF/config.xml 2007-11-22 22:49:13 UTC (rev 973) +++ trunk/web/intermap/WEB-INF/config.xml 2007-11-22 23:06:29 UTC (rev 974) @@ -38,10 +38,12 @@ </error> --> <!-- general error --> + <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> + - <error sheet="error.xsl"> +<!-- <error sheet="error.xsl"> <xml name="error" file="xml/error.xml" /> - </error> + </error>--> </default> @@ -491,7 +493,7 @@ <service name="wmc.uploadContext"> <class name=".services.wmc.UploadWmcContext"/> - <output sheet="copy.xsl" contentType="text/xml; charset=UTF-8"/> + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> </service> @@ -500,7 +502,7 @@ <service name="wmc.setContext"> <class name=".services.wmc.SetWmcContext"/> - <output sheet="copy.xsl" contentType="text/xml; charset=UTF-8"/> + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> </service> @@ -527,7 +529,7 @@ <param name="gnurl" value="http://localhost:8080/geonetwork/srv/en/main.home"/> <!-- THIS PARAM HAS TO BE CONFIGURED BY THE INSTALLER --> </class> - <output sheet="copy.xsl" contentType="text/xml; charset=UTF-8"/> + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> </service> @@ -535,8 +537,9 @@ <service name="wmc.setContextFromURL"> <class name=".services.wmc.SetWmcFromURL"/> - - <output forward="map.getMain"/> + + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> + <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> </service> <!-- ==================================== Added: trunk/web/intermap/xsl/copy_response.xsl =================================================================== --- trunk/web/intermap/xsl/copy_response.xsl (rev 0) +++ trunk/web/intermap/xsl/copy_response.xsl 2007-11-22 23:06:29 UTC (rev 974) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + <xsl:template match="/" > + <xsl:apply-templates select="/root/response"/> + </xsl:template> + + <xsl:template match="@*|node()" > + <xsl:copy > + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-11-22 23:10:26
|
Revision: 977 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=977&view=rev Author: e_tajariol Date: 2007-11-22 15:10:10 -0800 (Thu, 22 Nov 2007) Log Message: ----------- Added loadWMCfromURL feature. Modified Paths: -------------- trunk/web/intermap/scripts/im_standalone.js trunk/web/intermap/static/iframepoc.html Added Paths: ----------- trunk/web/intermap/static/context_australia.xml Modified: trunk/web/intermap/scripts/im_standalone.js =================================================================== --- trunk/web/intermap/scripts/im_standalone.js 2007-11-22 23:09:07 UTC (rev 976) +++ trunk/web/intermap/scripts/im_standalone.js 2007-11-22 23:10:10 UTC (rev 977) @@ -7,8 +7,18 @@ // //=================================================================== +//=================================================================== +// +// InterMap Entry Points +// +// External scripts can call the imep_* functions to update +// the intermap standalone map. +// +//=================================================================== + function imep_loadLayer(url, service) { + im_bm.setStatus('busy'); imc_addService(url, service, 2, function(req) { @@ -25,7 +35,40 @@ im_bm.rebuild(); } +function imep_loadWmcFromUrl(url) +{ + im_bm.setStatus('busy'); + imc_setContextFromURL(url, + function(req) + { + if(im_checkError(req)) + { + im_bm.setStatus('idle'); + im_showError(req); + return; + } + imc_reloadLayers(); + + var xml = req.responseXML; + + if(im_extra_afterWmcSet) + im_extra_afterWmcSet(xml); + + im_bm.setStatus('idle'); + } + ); + +} + + +//=================================================================== +// DEBUG +// +// Next lines will popup an alert window +// whenever a prototype error happens. +//=================================================================== + Ajax.Responders.register({ onException: function(req, e){ var qqq = document.createElement('div'); @@ -39,6 +82,12 @@ } }); +//=================================================================== +// +// Next lines define the standalone map behaviour +// according to the Intermap class in im_class.js +// +//=================================================================== //var intermap = new Intermap(400, 200, 'im_bm_image'); @@ -58,12 +107,17 @@ im_extra_drivingMap = im_bm; -im_extra_afterLayerUpdated = im_bm.rebuild.bindAsEventListener(im_bm); +im_extra_afterLayerUpdated = function() +{ + im_bm.rebuild(); +}.bindAsEventListener(im_bm); + im_extra_afterWmcSet = function(resp) { - im_bm.set_dom(resp); // ?? maybe we don't want to resize the map - im_bm.setBBox_dom(resp); + var xml = resp.responseXML; + im_bm.set_dom(xml); // ?? maybe we don't want to resize the map + im_bm.setBBox_dom(xml); }; Added: trunk/web/intermap/static/context_australia.xml =================================================================== --- trunk/web/intermap/static/context_australia.xml (rev 0) +++ trunk/web/intermap/static/context_australia.xml 2007-11-22 23:10:10 UTC (rev 977) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ViewContext version="1.1.0" id="14ee7f98-43a9-4d1b-876f-9f47105fbdfd"> + <General> + <Title>Intermap context 14ee7f98-43a9-4d1b-876f-9f47105fbdfd</Title> + <BoundingBox SRS="EPSG:4326" minx="96.10347" miny="-45.33496" maxx="169.47308" maxy="-8.650154"/> + <Window width="368" height="276"/> + </General> + + <LayerList> + <Layer queryable="true" hidden="false"> + <Name>BUILTUPA_1M:Foundation</Name> + <Title>Built-Up Areas</Title> + + <Server service="OGC:WMS" version="1.1.1" title="CubeSERV"> + <OnlineResource xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://demo.cubewerx.com/demo/cubeserv/cubeserv.cgi?"/> + </Server> + + <Abstract>VRF Narrative Table for "Built-Up Areas":

<P>This feature class, which contains built-up area area features (AL020), is
comprised of features that were classified as 'built-up areas' in Digital Chart
of the World, edition 1, July 1992.
</Abstract> + + <Extension> + <Transparency>0.4</Transparency> + </Extension> + </Layer> + + <Layer queryable="true" hidden="false"> + <Name>ETOPO2:Foundation</Name> + <Title>Global 2 Minute Elevations</Title> + + <Server service="OGC:WMS" version="1.1.1" title="CubeSERV"> + <OnlineResource xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://demo.cubewerx.com/demo/cubeserv/cubeserv.cgi?"/> + </Server> + + <Abstract>ETOPO2 was generated from a digital data base of land and sea-floor elevations on a 2-minute latitude/longitude grid. The data sources used to create the ETOPO2 data set were: Smith/Sandwell, GLOBE, DBDBV, IBCAO, and DBDB5</Abstract> + + <Extension> + <Transparency>0.4</Transparency> + </Extension> + </Layer> + + <Layer queryable="true" hidden="false"> + <Name>Bathymetry</Name> + <Title>Bathymetry</Title> + + <Server service="OGC:WMS" version="1.1.1" title="Demis World Map"> + <OnlineResource xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www2.demis.nl/wms/wms.asp?wms=WorldMap&"/> + </Server> + </Layer> + </LayerList> +</ViewContext> Modified: trunk/web/intermap/static/iframepoc.html =================================================================== --- trunk/web/intermap/static/iframepoc.html 2007-11-22 23:09:07 UTC (rev 976) +++ trunk/web/intermap/static/iframepoc.html 2007-11-22 23:10:10 UTC (rev 977) @@ -15,9 +15,9 @@ <script type="text/javascript"> function sample_loadWmcUrl() { - var text = document.getElementById('wmcurl').value; + var wmcurl = document.getElementById('wmcurl').value; -// window.frames.intermapIframe.imep_loadLayer(url, layer); // FF OK + window.frames.intermapIframe.imep_loadWmcFromUrl(wmcurl); } function sample_loadWmsLayer() @@ -30,7 +30,7 @@ // var p = f.document || f.contentWindow.document; // p.imep_loadLayer(url, layer); - window.frames.intermapIframe.imep_loadLayer(url, layer); // FF OK + window.frames.intermapIframe.imep_loadLayer(url, layer); // FF OK } function sample_gotoBBox() @@ -55,7 +55,7 @@ <td width="600px">col: 600px</td> <td> WMC url - <input type="text" id="wmcurl" value="http://devos.sapienzaconsulting.com/chameleon/geoportal/htdocs/contexts/esa_dis_cml_floods_india.xml"/> + <input type="text" id="wmcurl" value="http://localhost:8080/intermap/static/context_australia.xml"/> <a href="javascript:void(0);" onclick="sample_loadWmcUrl();">LOAD</a> <p/>WMS server url This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-11-27 22:15:05
|
Revision: 979 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=979&view=rev Author: e_tajariol Date: 2007-11-27 14:15:03 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Added skel service. Modified Paths: -------------- trunk/web/intermap/WEB-INF/config.xml trunk/web/intermap/xml/user-profiles.xml Modified: trunk/web/intermap/WEB-INF/config.xml =================================================================== --- trunk/web/intermap/WEB-INF/config.xml 2007-11-22 23:11:07 UTC (rev 978) +++ trunk/web/intermap/WEB-INF/config.xml 2007-11-27 22:15:03 UTC (rev 979) @@ -95,6 +95,11 @@ <!-- ====================================================================== --> <services package="org.wfp.vam.intermap"> + + <!-- Provides an HTML skeleton with no preloaded map image inside. --> + <service name="skel"> + <output sheet="index.xsl" /> + </service> <service name="main"> <class name=".services.map.Update" /> Modified: trunk/web/intermap/xml/user-profiles.xml =================================================================== --- trunk/web/intermap/xml/user-profiles.xml 2007-11-22 23:11:07 UTC (rev 978) +++ trunk/web/intermap/xml/user-profiles.xml 2007-11-27 22:15:03 UTC (rev 979) @@ -4,6 +4,7 @@ <profile name="Guest"> <allow service="main"/> + <allow service="skel"/> <allow service="map.getMain.embedded"/> <allow service="minimap.rebuild"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2007-11-27 22:22:17
|
Revision: 981 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=981&view=rev Author: e_tajariol Date: 2007-11-27 14:22:17 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Updates to the standalone map bootup flow. Updates to the addLayer function. Modified Paths: -------------- trunk/web/intermap/scripts/im_class.js trunk/web/intermap/scripts/im_standalone.js trunk/web/intermap/static/iframepoc.html Modified: trunk/web/intermap/scripts/im_class.js =================================================================== --- trunk/web/intermap/scripts/im_class.js 2007-11-27 22:19:32 UTC (rev 980) +++ trunk/web/intermap/scripts/im_class.js 2007-11-27 22:22:17 UTC (rev 981) @@ -68,11 +68,12 @@ */ Intermap.prototype.set_dom = function(response) { + this.setSize_dom(response); + var mmurl = response.getElementsByTagName('imgUrl')[0].firstChild.nodeValue; $(this.imageId).src = mmurl; this.setBBox_dom(response); - this.setSize_dom(response); }; /** Modified: trunk/web/intermap/scripts/im_standalone.js =================================================================== --- trunk/web/intermap/scripts/im_standalone.js 2007-11-27 22:19:32 UTC (rev 980) +++ trunk/web/intermap/scripts/im_standalone.js 2007-11-27 22:22:17 UTC (rev 981) @@ -16,10 +16,10 @@ // //=================================================================== -function imep_loadLayer(url, service) +function imep_loadLayer(url, service, doClearContext) { im_bm.setStatus('busy'); - imc_addService(url, service, 2, + imc_addService(url, service, 2, doClearContext, function(req) { im_buildLayerList(req); @@ -82,42 +82,74 @@ } }); -//=================================================================== -// -// Next lines define the standalone map behaviour -// according to the Intermap class in im_class.js -// -//=================================================================== -//var intermap = new Intermap(400, 200, 'im_bm_image'); - +/** + * This function is called by the onload property in the Intermap frame + */ function im_boot() { + setTool("zoomin"); + var size = getWindowSize(); - //alert("W:"+size[0]+" H:"+size[1]); + //alert("W:"+size[0]+" H:"+size[1]); + im_bm.setSize( size[0] - im_layer_width - 35, size[1] - 50); - im_bm.setSize( size[0] - im_layer_width - 35, size[1] - 50); - im_bm.rebuild(); - - imc_reloadLayers(); // append layers to list - - setTool("zoomin"); + var func = parent.imcb_getBootWmcUrl; + var wmcurl; + + if(typeof func == 'function') + { + wmcurl = func(); + + if(wmcurl) + { + imc_setContextFromURL(wmcurl, + function(req) + { + if(im_checkError(req)) + { + im_bm.setStatus('idle'); + im_showError(req); + return; + } + + imc_reloadLayers(); + + var xml = req.responseXML; + im_bm.set_dom(xml); + im_bm.setBBox_dom(xml); + + im_bm.setStatus('idle'); + } + ); + return; + } + } + + + im_bm.rebuild(imc_reloadLayers); im_bm.setStatus("idle"); } +//=================================================================== +// +// Next lines define the standalone map behaviour +// according to the Intermap class in im_class.js +// +//=================================================================== im_extra_drivingMap = im_bm; im_extra_afterLayerUpdated = function() { im_bm.rebuild(); -}.bindAsEventListener(im_bm); +}; //.bindAsEventListener(im_bm); im_extra_afterWmcSet = function(resp) { - var xml = resp.responseXML; - im_bm.set_dom(xml); // ?? maybe we don't want to resize the map - im_bm.setBBox_dom(xml); + //var xml = resp.responseXML; + im_bm.set_dom(resp); // ?? maybe we don't want to resize the map + im_bm.setBBox_dom(resp); }; Modified: trunk/web/intermap/static/iframepoc.html =================================================================== --- trunk/web/intermap/static/iframepoc.html 2007-11-27 22:19:32 UTC (rev 980) +++ trunk/web/intermap/static/iframepoc.html 2007-11-27 22:22:17 UTC (rev 981) @@ -6,13 +6,32 @@ body { background: black; color: #80c0c0; + } + + td { font-family:Verdana,Arial,Helvetica,sans-serif; font-size: 9pt; - } + } + input { + font-size: 9pt; + } + legend { + color: white; + font-family:Courier,sans-serif; + } + a { + color: orange; + float: right; + } + --> </style> <script type="text/javascript"> + + /** + * Sample function to show how imep_loadWmcFromUrl() can be used. + */ function sample_loadWmcUrl() { var wmcurl = document.getElementById('wmcurl').value; @@ -20,19 +39,26 @@ window.frames.intermapIframe.imep_loadWmcFromUrl(wmcurl); } + /** + * Sample function to show how imep_loadLayer() can be used. + */ function sample_loadWmsLayer() { var url = document.getElementById('wmsurl').value; var layer = document.getElementById('layername').value; + var clear = document.getElementById('clearcontext').checked; // var d = document; // var f = d.frames ? d.frames['intermapIframe'] : d.getElementById('intermapIframe'); // var p = f.document || f.contentWindow.document; // p.imep_loadLayer(url, layer); - window.frames.intermapIframe.imep_loadLayer(url, layer); // FF OK + window.frames.intermapIframe.imep_loadLayer(url, layer, clear); // FF OK } + /** + * Sample function to show how imep_setBBox() can be used. + */ function sample_gotoBBox() { var bbn = document.getElementById('bbn').value; @@ -42,6 +68,20 @@ window.frames.intermapIframe.imep_setBBox(bbn, bbe, bbs, bbw); // FF OK } + + /** + * InterMap CallBack function <p> + * + * If this function exists and returns a not null value, + * the returned value must be an URL to a WMC context document. + * This is the first context InterMap will load. + * + * @return {String} the URL of the WMC context file + */ + function imcb_getBootWmcUrl() + { + return "http://localhost:8080/intermap/static/context_australia.xml"; + } </script> @@ -53,23 +93,46 @@ <tr height="100px"> <td width="150px">row: 100px<br/>col: 150px</td> <td width="600px">col: 600px</td> - <td> - WMC url - <input type="text" id="wmcurl" value="http://localhost:8080/intermap/static/context_australia.xml"/> - <a href="javascript:void(0);" onclick="sample_loadWmcUrl();">LOAD</a> + <td rowspan="3"> + <fieldset> + <legend>imep_loadWmcFromUrl</legend> + WMC url + <input type="text" id="wmcurl" value="http://localhost:8080/intermap/static/context_australia.xml"/> + + <br/><a href="javascript:void(0);" onclick="sample_loadWmcUrl();">LOAD CONTEXT</a> + </fieldset> - <p/>WMS server url + <p/> +<!-- + WMS server url <input type="text" id="wmsurl" value="http://ssems1.esrin.esa.int/ionicweb/wfs/FLOODS_FREQ_UNEP"/> layer name - <input type="text" id="layername" value="global_floods_unep"/> - <a href="javascript:void(0);" onclick="sample_loadWmsLayer();">LOAD</a> + <input type="text" id="layername" value="global_floods_unep"/> +--> + <fieldset> + <legend>imep_loadLayer</legend> + WMS server URL + <input type="text" id="wmsurl" value="http://www2.demis.nl/wms/wms.asp?wms=WorldMap&"/> + <br/>Layer name + <input type="text" id="layername" value="Countries"/> + <br/>Clear context + <input type="checkbox" id="clearcontext" title="Clear context"/> + + <br/><a href="javascript:void(0);" onclick="sample_loadWmsLayer();">ADD LAYER</a> + </fieldset> + + <p/> - <p/>BBox - <br/>N<input type="text" id="bbn" value="-21.781"/> - E<input type="text" id="bbe" value="-53.65"/> - <br/>S<input type="text" id="bbs" value="-55.052"/> - W<input type="text" id="bbw" value="-73.582"/> - <a href="javascript:void(0);" onclick="sample_gotoBBox();">GOTO</a> + <fieldset> + <legend>imep_setBBox</legend> + N:<input type="text" id="bbn" value="-21.781"/> + E:<input type="text" id="bbe" value="-53.65"/> + <br/> + S:<input type="text" id="bbs" value="-55.052"/> + W:<input type="text" id="bbw" value="-73.582"/> + + <br/><a href="javascript:void(0);" onclick="sample_gotoBBox();">GOTO BBOX</a> + </fieldset> </td> </tr> @@ -78,14 +141,14 @@ <td> <iframe width="600" height="200" id="intermapIframe" name="intermapIframe" - src="/intermap/srv/en/main?width=200&height=100"/> + src="/intermap/srv/en/skel"/> </td> - <td></td> + </tr> <tr height="100px"> <td>H: 100px</td> <td></td> - <td></td> + </tr> </tbody> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2008-01-10 00:56:12
|
Revision: 1002 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1002&view=rev Author: e_tajariol Date: 2008-01-09 16:56:16 -0800 (Wed, 09 Jan 2008) Log Message: ----------- Preliminary support for geotagged markers. Modified Paths: -------------- trunk/web/intermap/intermap-embedded.css trunk/web/intermap/loc/en/xml/strings.xml trunk/web/intermap/scripts/im_bigmap.js trunk/web/intermap/scripts/im_extras.js trunk/web/intermap/xsl/index-embedded.xsl Added Paths: ----------- trunk/web/intermap/images/marker.png trunk/web/intermap/images/marker2.gif trunk/web/intermap/images/markerlist.png Added: trunk/web/intermap/images/marker.png =================================================================== (Binary files differ) Property changes on: trunk/web/intermap/images/marker.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/web/intermap/images/marker2.gif =================================================================== (Binary files differ) Property changes on: trunk/web/intermap/images/marker2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/web/intermap/images/markerlist.png =================================================================== (Binary files differ) Property changes on: trunk/web/intermap/images/markerlist.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/web/intermap/intermap-embedded.css =================================================================== --- trunk/web/intermap/intermap-embedded.css 2008-01-09 06:26:09 UTC (rev 1001) +++ trunk/web/intermap/intermap-embedded.css 2008-01-10 00:56:16 UTC (rev 1002) @@ -792,6 +792,7 @@ z-index: 20; } + div.im_wbcontent { padding: 3px; border: 1px #266397 solid; @@ -886,10 +887,32 @@ border: 1px solid #555555; background-color: white; - filter:alpha (opacity=50); /* MS Internet Explorer */ - filter:progid:DXImageTransform.Microsoft.Alpha (style=0, opacity=50); /* MS IE proprietory */ - -moz-opacity: 0.5; /* Mozilla v1.6 and below */ - opacity: 0.5; /* CSS-3 Standards */ - -khtml-opacity:.5; /* Safari */ + filter:alpha (opacity=70); /* MS Internet Explorer */ + filter:progid:DXImageTransform.Microsoft.Alpha (style=0, opacity=70); /* MS IE proprietory */ + -moz-opacity: 0.7; /* Mozilla v1.6 and below */ + opacity: 0.7; /* CSS-3 Standards */ + -khtml-opacity:.7; /* Safari */ -} \ No newline at end of file +} + +.upperright { + position: absolute; + top:1px; + right:3px; + width: 16px; + height: 16px; + cursor: pointer; + + z-index: 20; +} + +.lowerright { + position: absolute; + bottom:1px; + right:3px; + width: 16px; + height: 16px; + cursor: pointer; + + z-index: 20; +} Modified: trunk/web/intermap/loc/en/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/en/xml/strings.xml 2008-01-09 06:26:09 UTC (rev 1001) +++ trunk/web/intermap/loc/en/xml/strings.xml 2008-01-10 00:56:16 UTC (rev 1002) @@ -55,6 +55,8 @@ <manually>Create you own map</manually> <map>Map</map> <mapsfound>maps found</mapsfound> + <markerlistbutton>Marker list</markerlistbutton> + <markerlisttitle js="true">Marker list</markerlisttitle> <metadata>Metadata</metadata> <newMap>Create a new map</newMap> <noFeature>No features found</noFeature> Modified: trunk/web/intermap/scripts/im_bigmap.js =================================================================== --- trunk/web/intermap/scripts/im_bigmap.js 2008-01-09 06:26:09 UTC (rev 1001) +++ trunk/web/intermap/scripts/im_bigmap.js 2008-01-10 00:56:16 UTC (rev 1002) @@ -81,10 +81,7 @@ im_bm.beforeMouseDown = function(e) { - if($('im_marker_tmp')) - $('im_marker_tmp').remove(); - if($('im_markerbox_tmp')) - $('im_markerbox_tmp').remove(); + removeMarkerBox(); }; im_bm.unresolvedMouseDown = function(e) @@ -146,19 +143,25 @@ var lat = im_bm.y2lat(y); var lon = im_bm.x2lon(x); + if(lat<-90||lat>90||lon <-180||lon >180) + { + return; + } + + im_tmpMarker = new IMMarker(lat, lon, "unknown"); + var img = document.createElement("img"); - img.id='im_marker_tmp'; + img.id='im_marker_img_tmp'; img.className = 'im_marker'; img.src = '/intermap/images/marker.png'; // FIXME context + // FIXME the image should be centered on the mouse click img.style.left = pointerX; - img.style.top = pointerY; -/* img.style.position = "absolute"; - img.style.z-index = "10"; -*/ document.body.appendChild(img); + img.style.top = pointerY; + document.body.appendChild(img); var div = document.createElement("div"); - div.id="im_markerbox_tmp"; + div.id="im_marker_box_tmp"; div.className = "im_markerbox"; /* div.style.position = "absolute"; div.style.z-index = "10";*/ @@ -168,24 +171,166 @@ var x = offset[0]; var y = offset[1]; */ - div.style.left=(pointerX-100)+"px"; - div.style.top=(pointerY+20)+"px"; - div.style.width="200px"; - div.style.height="50px"; - -/* var img = document.createElement("img"); -// img.src = "intermap/images/waiting.gif"; - img.src = url; - img.alt = "Loading legend..." - img.style.position = "absolute"; - img.style.border="solid black 1px"; - div.appendChild(img); -*/ -/* Event.observe(div, 'click', hideLegend);*/ - + + var wbox = 200; // the width of the marker info box + var hbox = 50; // the height of the marker info box + + var horEdge = 10; // the horizontal distance the info box must have with the image borders + + var dybox = 20; // the y offset of the info box with respect to the marker + var dxbox = wbox/2; // the negative x offset of the info box with respect to the marker + + + // if the box runs out of lower border, draw it above the mark + if(y+dybox+hbox > im_bm.height) + { + dybox = -dybox-hbox; + } + + // if the box runs out of the right border, shift it to left + if(x - dxbox + wbox > im_bm.width - horEdge) + { + dxbox = x + wbox + horEdge - im_bm.width; + } + // if the box runs out of the right border, shift it to left + else if(x - dxbox < horEdge) + { + dxbox = x - horEdge; + } + + div.style.left = (pointerX-dxbox)+"px"; + div.style.top = (pointerY+dybox)+"px"; + div.style.width = wbox+"px"; + div.style.height = hbox+"px"; + + var rlat = Math.round(lat*10000)/10000; + var rlon = Math.round(lon*10000)/10000; + + div.innerHTML="Lat:"+rlat +" Lon:"+rlon; + + + // add text field + var text = document.createElement("input"); + text.id="im_marker_input_tmp"; + text.type = "text"; + div.appendChild(text); + text.focus(); + + // add closer button + var closer = document.createElement('div'); + closer.className = "upperright"; + //closer.id = "im_wbcloser"; + var img = document.createElement('img'); + img.title = i18n("close"); + img.src = "/intermap/images/close.png"; + closer.appendChild(img); + Event.observe(img, 'click', im_closeMarkerBox); + div.appendChild(closer); + + // add save button + var saver = document.createElement('div'); + saver.className = "lowerright"; + //closer.id = "im_wbcloser"; + var simg = document.createElement('img'); + simg.title = i18n("save"); + simg.src = "/intermap/images/filesave.png"; + saver.appendChild(simg); + Event.observe(simg, 'click', im_saveMarker); + div.appendChild(saver); + } +function im_closeMarkerBox(e) +{ + removeMarkerBox(); +} +function im_saveMarker(e) +{ + var tmpmarker = $('im_marker_img_tmp'); + + // fill in more values for marker + im_tmpMarker.title = $('im_marker_input_tmp').value; + var seq = im_markers.length; + im_tmpMarker.seq = seq; + im_markers[seq] = im_tmpMarker; + + im_drawMarkerImage(im_tmpMarker); + + removeMarkerBox(); +} + +function removeMarkerBox() +{ + if($('im_marker_img_tmp')) + $('im_marker_img_tmp').remove(); + if($('im_marker_box_tmp')) + $('im_marker_box_tmp').remove(); +} + +var im_markers = new Array(); +var im_tmpMarker; + +function IMMarker(lat, lon, title) +{ + this.lat = parseFloat(lat); + this.lon = parseFloat(lon); + this.title = title; +} + +IMMarker.prototype.lat; +IMMarker.prototype.lon; +IMMarker.prototype.title; +IMMarker.prototype.seq; + +function im_deleteAllMarkersImages() +{ + im_markers.each( + function(marker) + { + var seq = marker.seq; + var img = $("im_marker_"+seq); + if(img) + { + img.remove(); + } + } + ); +} + +function im_drawAllMarkersImages() +{ + im_markers.each(im_drawMarkerImage); +} + +function im_drawMarkerImage(marker) +{ + // get map image offset + var offset = Position.cumulativeOffset($(im_bm.imageId)); + var offsetX = offset[0]; + var offsetY = offset[1]; + + var y = im_bm.lat2y(marker.lat); + var x = im_bm.lon2x(marker.lon); + + if(y<0 || x<0 || y>$(im_bm.imageId).height || x>$(im_bm.imageId).width) + { + return; + } + + var img = document.createElement("img"); + img.id='im_marker_' + marker.seq; + img.className = 'im_marker'; + img.src = '/intermap/images/marker2.gif'; // FIXME + img.title = marker.title; + + // FIXME the image should be centered on the coords + img.style.left = x + offsetX; + img.style.top = y + offsetY; + + document.body.appendChild(img); +} + //================================================== // RESIZE //================================================== @@ -383,5 +528,8 @@ $('im_currentscale').innerHTML= '1:' + scale; $('im_setscale').selectedIndex = 0; + + im_deleteAllMarkersImages(); + im_drawAllMarkersImages(); }; Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2008-01-09 06:26:09 UTC (rev 1001) +++ trunk/web/intermap/scripts/im_extras.js 2008-01-10 00:56:16 UTC (rev 1002) @@ -491,7 +491,68 @@ } } +/******************************************************************** +*** Markers +********************************************************************/ +/* +## Called by the bottom toolbar +*/ +function im_markerList() +{ + // setup WB + clearNode('im_whiteboard'); + var WB = $('im_whiteboard'); + var wbtitle = im_createWBTitle(i18n("markerlisttitle")); + WB.appendChild(wbtitle); + + var closer = im_getWBCloser(); + WB.appendChild(closer); + Event.observe(closer, 'click', im_closeWhiteBoard); + + var div = document.createElement('div'); // main box + div.id = "im_markerlist"; + div.className = 'im_wbcontent'; + WB.appendChild(div); + + var ul = document.createElement('ul'); + div.appendChild(ul); + im_markers.each( + function(marker) + { + var li = document.createElement('li'); + ul.appendChild(li); + li.innerHTML="Title: " + marker.title; + var ull = document.createElement('ul'); + li.appendChild(ull); + var lilat = document.createElement('li'); + lilat.innerHTML = "Lat: " + marker.lat; + ull.appendChild(lilat); + var lilon = document.createElement('li'); + lilon.innerHTML = "Lon: " + marker.lon; + ull.appendChild(lilon); + } + ); + +/* + var pars="&width=" + im_extra_drivingMap.width + + "&height=" + im_extra_drivingMap.height; + if(type) + pars += "&type="+type; + + var myAjax = new Ajax.Updater ( + 'im_wmcmenu', + getIMServiceURL('wmc.form'), + { + method: 'get', + parameters: pars, + onFailure: im_load_error + } + ); +*/ + +} + /******************************************************************** *** Export image ********************************************************************/ Modified: trunk/web/intermap/xsl/index-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/index-embedded.xsl 2008-01-09 06:26:09 UTC (rev 1001) +++ trunk/web/intermap/xsl/index-embedded.xsl 2008-01-10 00:56:16 UTC (rev 1002) @@ -23,13 +23,12 @@ <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> -<!-- TODO <td class="im_tool" id="im_tool_mark" onClick="javascript:setTool('mark');"><img src="{/root/gui/url}/images/marker.png" title="{/root/gui/strings/marker}"/></td> --> + <td class="im_tool" id="im_tool_mark" onClick="javascript:setTool('mark');"><img src="{/root/gui/url}/images/marker.png" title="{/root/gui/strings/marker}"/></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');"><img src="{/root/gui/url}/images/info.png" title="{/root/gui/strings/identify}"/></td> <td width="100%" style="border-top:0px;"/> <!-- spacer --> <td class="im_tool" id="im_tool_refresh" onClick="javascript:im_bm_refresh()"><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="{/root/gui/strings/reset}"/></td> </tr> </table> @@ -72,13 +71,13 @@ <xsl:variable name="mapwidth"> <xsl:choose> <xsl:when test="/root/response/width"><xsl:value-of select="/root/response/width"/></xsl:when> - <xsl:otherwise>370</xsl:otherwise> + <xsl:otherwise>200</xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="mapheight"> <xsl:choose> <xsl:when test="/root/response/width"><xsl:value-of select="/root/response/height"/></xsl:when> - <xsl:otherwise>278</xsl:otherwise> + <xsl:otherwise>100</xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="mapsrc"> @@ -126,6 +125,7 @@ <td style="padding:2px" onClick="im_openWMCform('mail');" ><a><img src="{/root/gui/url}/images/im_mail.png" title="{/root/gui/strings/wmcbuttonmail}"/></a></td> <td style="padding:2px" onClick="im_openWMCform('upload');" ><a><img src="{/root/gui/url}/images/fileopen.png" title="{/root/gui/strings/wmcbuttonupload}"/></a></td> <td style="padding:2px" onClick="im_downloadWMC();" ><a><img src="{/root/gui/url}/images/filesave.png" title="{/root/gui/strings/wmcbuttondownload}"/></a></td> + <td style="padding:2px" onClick="im_markerList();" ><a><img src="{/root/gui/url}/images/markerlist.png" title="{/root/gui/strings/markerlistbutton}"/></a></td> <td width="100%" style="border-top:0px;"/> <!-- spacer --> <td class="im_tool" id="im_tool_scale"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2008-02-16 18:33:06
|
Revision: 1093 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1093&view=rev Author: e_tajariol Date: 2008-02-16 10:33:07 -0800 (Sat, 16 Feb 2008) Log Message: ----------- Added serverside markers support - config files. Modified Paths: -------------- trunk/web/intermap/WEB-INF/config.xml trunk/web/intermap/xml/user-profiles.xml Added Paths: ----------- trunk/web/intermap/xsl/im_get-markers.xsl Modified: trunk/web/intermap/WEB-INF/config.xml =================================================================== --- trunk/web/intermap/WEB-INF/config.xml 2008-02-16 18:27:04 UTC (rev 1092) +++ trunk/web/intermap/WEB-INF/config.xml 2008-02-16 18:33:07 UTC (rev 1093) @@ -563,6 +563,46 @@ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- ==================================== + MARKERS + ===================================== --> + + <service name="marker.add"> + <class name=".services.marker.Add"/> + + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> + <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> + </service> + + <service name="marker.delete"> + <class name=".services.marker.Delete"/> + + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> + <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> + </service> + + <service name="marker.get"> + <class name=".services.marker.Get"/> + + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> + <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> + </service> + + <service name="marker.present"> + <class name=".services.marker.Get"/> + + <output sheet="im_get-markers.xsl"/> + <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> + </service> + + <service name="marker.update"> + <class name=".services.marker.Update"/> + + <output sheet="copy_response.xsl" contentType="text/xml; charset=UTF-8"/> + <error sheet="copy_error.xsl" contentType="text/xml; charset=UTF-8"/> + </service> + + </services> <!-- ====================================================================== --> Modified: trunk/web/intermap/xml/user-profiles.xml =================================================================== --- trunk/web/intermap/xml/user-profiles.xml 2008-02-16 18:27:04 UTC (rev 1092) +++ trunk/web/intermap/xml/user-profiles.xml 2008-02-16 18:33:07 UTC (rev 1093) @@ -67,9 +67,16 @@ <allow service="map.layers.getInfo"/> <allow service="map.layers.getStyles"/> <allow service="map.layers.setStyle"/> - + <allow service="map.update"/> <allow service="geonet.getGeonetRecords"/> + + <allow service="marker.add"/> + <allow service="marker.get"/> + <allow service="marker.delete"/> + <allow service="marker.update"/> + <allow service="marker.present"/> + </profile> <!-- ====================================================================== --> Added: trunk/web/intermap/xsl/im_get-markers.xsl =================================================================== --- trunk/web/intermap/xsl/im_get-markers.xsl (rev 0) +++ trunk/web/intermap/xsl/im_get-markers.xsl 2008-02-16 18:33:07 UTC (rev 1093) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + <xsl:template match="/"> + + <xsl:if test="count(//marker)=0"> + <xsl:call-template name="empty"/> + </xsl:if> + <xsl:if test="count(//marker)=1"> + <xsl:apply-templates select="//marker" mode="single"/> + </xsl:if> + <xsl:if test="count(//marker)>1"> + <xsl:apply-templates select="//marker" /> + </xsl:if> + + + </xsl:template> + + + <!-- Markers --> + <xsl:template match="//marker"> + <div id="marker_{@id}" class="im_markerEntry" + onmouseover= "className = 'im_markerEntrySel' " + onmouseout= "className = 'im_markerEntry' " + onclick="im_selectMarkerFromList({@id})"> + + <xsl:variable name="currid"><xsl:value-of select="@id" /></xsl:variable> + <xsl:if test="//newLayer/@id=$currid"> + <xsl:attribute name="class" >im_newLayer</xsl:attribute> + </xsl:if> + + <b><xsl:value-of select="title"/></b> + <br/> + <i><xsl:value-of select="description"/></i> + <br/> + Lat: <xsl:value-of select="@lat"/> Lon: <xsl:value-of select="@lon"/> + </div> + </xsl:template> + + <xsl:template match="//marker" mode="single"> + <!-- =========================================== --> + <!-- USER MESSAGES --> + <!-- TODO i18n all messages --> + <!-- =========================================== --> + <div id="im_marker_msg"> + <div id="im_marker_msg_update_start" style="display:none;"> + Updating marker... + </div> + <div id="im_marker_msg_update_ok" style="display:none;"> + The marker has been updated + </div> + <div id="im_marker_msg_update_error" style="display:none;"> + An unexpected error has been encountered while performing the operation:<br/> + </div> + + <div id="im_marker_msg_delete_start" style="display:none;"> + Deleting marker... + </div> + <div id="im_marker_msg_delete_ok" style="display:none;"> + The marker has been deleted + </div> + <div id="im_marker_msg_delete_error" style="display:none;"> + An unexpected error has been encountered while performing the operation:<br/> + </div> + </div> + + + <table id="im_marker_form" width="100%"> + <tr> + <td>Title</td> + <td colspan="3"><input type="text" id="marker_title_{@id}" name="marker_title_{@id}" value="{title}" size="80"/></td> + </tr> + <tr> + <td>Desc</td> + <td colspan="3"><input type="text" id="marker_desc_{@id}" name="marker_desc_{@id}" value="{description}" size="80"/></td> + </tr> + <tr> + <td>Lat</td> + <td><input type="text" id="marker_lat_{@id}" name="marker_lat_{@id}" value="{@lat}" readonly="true"/></td> + <td>Lon</td> + <td><input type="text" id="marker_lon_{@id}" name="marker_lon_{@id}" value="{@lon}" readonly="true"/></td> + </tr> + <tr height="15px"> + <td colspan="4"> </td> + </tr> + <tr> + <td colspan="3"> + <button onClick="javascript:im_updateMarker({@id});" title="{/root/gui/strings/updateMarker}"><xsl:value-of select="/root/gui/strings/update"/></button> + </td> + + <td> + <img id="deleteMarker_{@id}" class="im_layerButton" + onclick="im_deleteMarker({@id})" + src="/intermap/images/deleteLayer.png" title="{/root/gui/strings/removeMarker}"/> + </td> + </tr> + </table> + </xsl:template> + + <xsl:template name="empty"> + <div> + <b>There are no markers defined.</b> + </div> + + </xsl:template> + +</xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2008-02-16 18:37:37
|
Revision: 1094 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1094&view=rev Author: e_tajariol Date: 2008-02-16 10:37:34 -0800 (Sat, 16 Feb 2008) Log Message: ----------- Improved clientside markers support. Modified Paths: -------------- trunk/web/intermap/intermap-embedded.css trunk/web/intermap/loc/en/xml/strings.xml trunk/web/intermap/scripts/im_bigmap.js trunk/web/intermap/scripts/im_extras.js Added Paths: ----------- trunk/web/intermap/scripts/im_markers.js Modified: trunk/web/intermap/intermap-embedded.css =================================================================== --- trunk/web/intermap/intermap-embedded.css 2008-02-16 18:33:07 UTC (rev 1093) +++ trunk/web/intermap/intermap-embedded.css 2008-02-16 18:37:34 UTC (rev 1094) @@ -895,6 +895,20 @@ } +.im_markerEntry +{ + /*border: 1px none;*/ + padding: 1px; + background-color: #e7edf5; +} + +.im_markerEntrySel +{ + border: 1px solid #555555; + background-color: #CCCCFF; + cursor: pointer; +} + .upperright { position: absolute; top:1px; Modified: trunk/web/intermap/loc/en/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/en/xml/strings.xml 2008-02-16 18:33:07 UTC (rev 1093) +++ trunk/web/intermap/loc/en/xml/strings.xml 2008-02-16 18:37:34 UTC (rev 1094) @@ -75,6 +75,7 @@ <refresh>Refresh</refresh> <refreshNotification>Please click the "Refresh" button under the layer list to see this change.</refreshNotification> <removeLayer>Remove layer</removeLayer> + <removeMarker>Remove marker</removeMarker> <reset>Reset</reset> <sendByEmail js="true">Send this map via e-mail</sendByEmail> <setScale>--Set Scale--</setScale> @@ -88,6 +89,8 @@ <titleShowStyles js="true">Available styles</titleShowStyles> <transparency>Set transparency</transparency> <up>Move layer up</up> + <update>Update</update> + <updateMarker>Update marker info</updateMarker> <wait js="true">Please wait...</wait> <wmctitle js="true">WMC Context menu</wmctitle> <wmctitlemail js="true">Send a WMC Context via e-mail</wmctitlemail> Modified: trunk/web/intermap/scripts/im_bigmap.js =================================================================== --- trunk/web/intermap/scripts/im_bigmap.js 2008-02-16 18:33:07 UTC (rev 1093) +++ trunk/web/intermap/scripts/im_bigmap.js 2008-02-16 18:37:34 UTC (rev 1094) @@ -124,213 +124,6 @@ "width=600,height=400,scrollbars=yes,toolbar=no,status=yes,menubar=no,location=yes,resizable=yes"); } -function im_setMark(e) -{ - Event.stop(e); // prevents from dragging the map image (on Firefox) - - // get map image offset - var offset = Position.cumulativeOffset($(im_bm.imageId)); - var offsetX = offset[0]; - var offsetY = offset[1]; - - // store starting cursor position - pointerX = Event.pointerX(e); - pointerY = Event.pointerY(e); - - var x = pointerX - offsetX; - var y = pointerY - offsetY; - - var lat = im_bm.y2lat(y); - var lon = im_bm.x2lon(x); - - if(lat<-90||lat>90||lon <-180||lon >180) - { - return; - } - - im_tmpMarker = new IMMarker(lat, lon, "unknown"); - - var img = document.createElement("img"); - img.id='im_marker_img_tmp'; - img.className = 'im_marker'; - img.src = '/intermap/images/marker.png'; // FIXME context - // FIXME the image should be centered on the mouse click - img.style.left = pointerX; - img.style.top = pointerY; - document.body.appendChild(img); - - - var div = document.createElement("div"); - div.id="im_marker_box_tmp"; - div.className = "im_markerbox"; -/* div.style.position = "absolute"; - div.style.z-index = "10";*/ - document.body.appendChild(div); - -/* var offset = Position.cumulativeOffset($(btn)); - var x = offset[0]; - var y = offset[1]; -*/ - - var wbox = 200; // the width of the marker info box - var hbox = 50; // the height of the marker info box - - var horEdge = 10; // the horizontal distance the info box must have with the image borders - - var dybox = 20; // the y offset of the info box with respect to the marker - var dxbox = wbox/2; // the negative x offset of the info box with respect to the marker - - - // if the box runs out of lower border, draw it above the mark - if(y+dybox+hbox > im_bm.height) - { - dybox = -dybox-hbox; - } - - // if the box runs out of the right border, shift it to left - if(x - dxbox + wbox > im_bm.width - horEdge) - { - dxbox = x + wbox + horEdge - im_bm.width; - } - // if the box runs out of the right border, shift it to left - else if(x - dxbox < horEdge) - { - dxbox = x - horEdge; - } - - div.style.left = (pointerX-dxbox)+"px"; - div.style.top = (pointerY+dybox)+"px"; - div.style.width = wbox+"px"; - div.style.height = hbox+"px"; - - var rlat = Math.round(lat*10000)/10000; - var rlon = Math.round(lon*10000)/10000; - - div.innerHTML="Lat:"+rlat +" Lon:"+rlon; - - - // add text field - var text = document.createElement("input"); - text.id="im_marker_input_tmp"; - text.type = "text"; - div.appendChild(text); - text.focus(); - - // add closer button - var closer = document.createElement('div'); - closer.className = "upperright"; - //closer.id = "im_wbcloser"; - var img = document.createElement('img'); - img.title = i18n("close"); - img.src = "/intermap/images/close.png"; - closer.appendChild(img); - Event.observe(img, 'click', im_closeMarkerBox); - div.appendChild(closer); - - // add save button - var saver = document.createElement('div'); - saver.className = "lowerright"; - //closer.id = "im_wbcloser"; - var simg = document.createElement('img'); - simg.title = i18n("save"); - simg.src = "/intermap/images/filesave.png"; - saver.appendChild(simg); - Event.observe(simg, 'click', im_saveMarker); - div.appendChild(saver); - -} - -function im_closeMarkerBox(e) -{ - removeMarkerBox(); -} - -function im_saveMarker(e) -{ - var tmpmarker = $('im_marker_img_tmp'); - - // fill in more values for marker - im_tmpMarker.title = $('im_marker_input_tmp').value; - var seq = im_markers.length; - im_tmpMarker.seq = seq; - im_markers[seq] = im_tmpMarker; - - im_drawMarkerImage(im_tmpMarker); - - removeMarkerBox(); -} - -function removeMarkerBox() -{ - if($('im_marker_img_tmp')) - $('im_marker_img_tmp').remove(); - if($('im_marker_box_tmp')) - $('im_marker_box_tmp').remove(); -} - -var im_markers = new Array(); -var im_tmpMarker; - -function IMMarker(lat, lon, title) -{ - this.lat = parseFloat(lat); - this.lon = parseFloat(lon); - this.title = title; -} - -IMMarker.prototype.lat; -IMMarker.prototype.lon; -IMMarker.prototype.title; -IMMarker.prototype.seq; - -function im_deleteAllMarkersImages() -{ - im_markers.each( - function(marker) - { - var seq = marker.seq; - var img = $("im_marker_"+seq); - if(img) - { - img.remove(); - } - } - ); -} - -function im_drawAllMarkersImages() -{ - im_markers.each(im_drawMarkerImage); -} - -function im_drawMarkerImage(marker) -{ - // get map image offset - var offset = Position.cumulativeOffset($(im_bm.imageId)); - var offsetX = offset[0]; - var offsetY = offset[1]; - - var y = im_bm.lat2y(marker.lat); - var x = im_bm.lon2x(marker.lon); - - if(y<0 || x<0 || y>$(im_bm.imageId).height || x>$(im_bm.imageId).width) - { - return; - } - - var img = document.createElement("img"); - img.id='im_marker_' + marker.seq; - img.className = 'im_marker'; - img.src = '/intermap/images/marker2.gif'; // FIXME - img.title = marker.title; - - // FIXME the image should be centered on the coords - img.style.left = x + offsetX; - img.style.top = y + offsetY; - - document.body.appendChild(img); -} - //================================================== // RESIZE //================================================== @@ -521,7 +314,7 @@ im_bm.afterImageRebuilt = function(req) { - // update the scale text + //--- update the scale text var scale = req.responseXML.getElementsByTagName('scale')[0].firstChild.nodeValue; deleteChildNodes($('im_scale')); $('im_scale').appendChild( document.createTextNode('1:' + scale)); @@ -529,7 +322,13 @@ $('im_currentscale').innerHTML= '1:' + scale; $('im_setscale').selectedIndex = 0; - im_deleteAllMarkersImages(); - im_drawAllMarkersImages(); + //--- update markers +// im_deleteAllMarkersImages(); // obsolete +// im_drawAllMarkersImages(); + + im_deleteClientMarkers(); + + var markerlist = req.responseXML.getElementsByTagName('markers')[0]; + im_createMarkersDom(markerlist); }; Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2008-02-16 18:33:07 UTC (rev 1093) +++ trunk/web/intermap/scripts/im_extras.js 2008-02-16 18:37:34 UTC (rev 1094) @@ -12,6 +12,9 @@ imc_addServices(url, services, type, im_servicesAdded); im_buildLayerList(req); // rebuild layers' list + im_deleteClientMarker(markerid); + im_retitleClientMarker(markerid, title) + im_extra_drivingMap : Intermap; must be set requires a div with id = "im_whiteboard" @@ -494,10 +497,11 @@ /******************************************************************** *** Markers ********************************************************************/ -/* -## Called by the bottom toolbar +/** + * Called by the bottom toolbar (id not set). +* Called from user interaction, clicking on a marker on the map (id set). */ -function im_markerList() +function im_markerList(id) { // setup WB clearNode('im_whiteboard'); @@ -514,45 +518,121 @@ div.id = "im_markerlist"; div.className = 'im_wbcontent'; WB.appendChild(div); - - var ul = document.createElement('ul'); - div.appendChild(ul); - im_markers.each( - function(marker) + + var par=""; + if(id) + { + par = "id=" + id; + } + + var myAjax = new Ajax.Updater ( + 'im_markerlist', + getIMServiceURL('marker.present'), { - var li = document.createElement('li'); - ul.appendChild(li); - li.innerHTML="Title: " + marker.title; - var ull = document.createElement('ul'); - li.appendChild(ull); - var lilat = document.createElement('li'); - lilat.innerHTML = "Lat: " + marker.lat; - ull.appendChild(lilat); - var lilon = document.createElement('li'); - lilon.innerHTML = "Lon: " + marker.lon; - ull.appendChild(lilon); - } + method: 'get', + parameters: par, + onFailure: im_load_error + } ); -/* - var pars="&width=" + im_extra_drivingMap.width + - "&height=" + im_extra_drivingMap.height; - if(type) - pars += "&type="+type; - +} + +/** + * Called from user interaction in markers' list. + * See im_get-markers.xsl + * + * @param {Object} id The marker's id + */ +function im_selectMarkerFromList(id) +{ var myAjax = new Ajax.Updater ( - 'im_wmcmenu', - getIMServiceURL('wmc.form'), + 'im_markerlist', + getIMServiceURL('marker.present'), { - method: 'get', - parameters: pars, + method: 'get', + parameters: 'id='+id, onFailure: im_load_error } ); -*/ +} + +function im_updateMarker(id) +{ + var title = $('marker_title_'+id).value; + var desc = $('marker_desc_'+id).value; + var pars = "id=" + id + +"&title=" + encodeURIComponent(title) + + "&desc=" + encodeURIComponent(desc); + + im_marker_showMessage("update", "start"); + + var myAjax = new Ajax.Request ( + getIMServiceURL('marker.update'), + { + method: 'post', + parameters: pars, + onSuccess: function(req) + { + var resp = req.responseXML.documentElement; + if(resp.tagName == "error") + { + var msg = resp.getElementsByTagName('message')[0].firstChild.nodeValue; + im_marker_showMessage("update", "error", msg); + } + else + { + im_marker_showMessage("update", "ok"); + im_retitleClientMarker(id, title) + } + }, + onFailure: function(req) + { + im_marker_showMessage("update", "error"); + } + } + ); + } +function im_deleteMarker(id) +{ + im_marker_showMessage("delete", "start"); + + var myAjax = new Ajax.Request ( + getIMServiceURL('marker.delete'), + { + method: 'post', + parameters: {id: id}, + onSuccess: function(req) + { + var resp = req.responseXML.documentElement; + if(resp.tagName == "error") + { + var msg = resp.getElementsByTagName('message')[0].firstChild.nodeValue; + im_marker_showMessage("delete", "error", msg); + } + else + { + im_marker_showMessage("delete", "ok"); + im_deleteClientMarker(id); + } + }, + onFailure: function(req) + { + im_marker_showMessage("delete", "error"); + } + } + ); + +} + +function im_marker_showMessage(task, status, more) +{ + im_showMessage('marker', task, status, more); +} + + /******************************************************************** *** Export image ********************************************************************/ Added: trunk/web/intermap/scripts/im_markers.js =================================================================== --- trunk/web/intermap/scripts/im_markers.js (rev 0) +++ trunk/web/intermap/scripts/im_markers.js 2008-02-16 18:37:34 UTC (rev 1094) @@ -0,0 +1,373 @@ +/******************************************************************** + * im_markers.js + * + * This file contains functions related to the marker feature. + * It must be included whenever bigmap.js is used. + * Note that some other markers related functions are in extras.js + * + *******************************************************************/ + +var im_mark_tmp_id = 0; + + function im_setMark(e) +{ + Event.stop(e); // prevents from dragging the map image (on Firefox) + + // get map image offset + var offset = Position.cumulativeOffset($(im_bm.imageId)); + var offsetX = offset[0]; + var offsetY = offset[1]; + + // store starting cursor position + pointerX = Event.pointerX(e); + pointerY = Event.pointerY(e); + + var x = pointerX - offsetX; + var y = pointerY - offsetY; + + var lat = im_bm.y2lat(y); + var lon = im_bm.x2lon(x); + + if(lat<-90||lat>90||lon <-180||lon >180) + { + return; + } + + im_tmpMarker = new IMMarker(lat, lon, "unknown"); + + var img = document.createElement("img"); + img.id='im_marker_img_tmp'; + img.className = 'im_marker'; + img.src = '/intermap/images/marker.png'; // FIXME context + // FIXME the image should be centered on the mouse click + img.style.left = pointerX; + img.style.top = pointerY; + document.body.appendChild(img); + + + var div = document.createElement("div"); + div.id="im_marker_box_tmp"; + div.className = "im_markerbox"; +/* div.style.position = "absolute"; + div.style.z-index = "10";*/ + document.body.appendChild(div); + +/* var offset = Position.cumulativeOffset($(btn)); + var x = offset[0]; + var y = offset[1]; +*/ + + var wbox = 200; // the width of the marker info box + var hbox = 50; // the height of the marker info box + + var horEdge = 10; // the horizontal distance the info box must have with the image borders + + var dybox = 20; // the y offset of the info box with respect to the marker + var dxbox = wbox/2; // the negative x offset of the info box with respect to the marker + + + // if the box runs out of lower border, draw it above the mark + if(y+dybox+hbox > im_bm.height) + { + dybox = -dybox-hbox; + } + + // if the box runs out of the right border, shift it to left + if(x - dxbox + wbox > im_bm.width - horEdge) + { + dxbox = x + wbox + horEdge - im_bm.width; + } + // if the box runs out of the right border, shift it to left + else if(x - dxbox < horEdge) + { + dxbox = x - horEdge; + } + + div.style.left = (pointerX-dxbox)+"px"; + div.style.top = (pointerY+dybox)+"px"; + div.style.width = wbox+"px"; + div.style.height = hbox+"px"; + + var rlat = Math.round(lat*10000)/10000; + var rlon = Math.round(lon*10000)/10000; + + div.innerHTML="Lat:"+rlat +" Lon:"+rlon; + + + // add text field + var text = document.createElement("input"); + text.id="im_marker_input_tmp"; + text.type = "text"; + div.appendChild(text); + text.focus(); + + // add closer button + var closer = document.createElement('div'); + closer.className = "upperright"; + //closer.id = "im_wbcloser"; + var img = document.createElement('img'); + img.title = i18n("close"); + img.src = "/intermap/images/close.png"; + closer.appendChild(img); + Event.observe(img, 'click', im_closeMarkerBox); + div.appendChild(closer); + + // add save button + var saver = document.createElement('div'); + saver.className = "lowerright"; + //closer.id = "im_wbcloser"; + var simg = document.createElement('img'); + simg.title = i18n("save"); + simg.src = "/intermap/images/filesave.png"; + saver.appendChild(simg); + Event.observe(simg, 'click', im_saveMarker); + div.appendChild(saver); + +} + +function im_closeMarkerBox(e) +{ + removeMarkerBox(); +} + +function im_saveMarker(e) +{ + var tmpmarker = $('im_marker_img_tmp'); + + // fill in more values for marker + im_tmpMarker.title = $('im_marker_input_tmp').value; + //im_mark_tmp_id + +// var seq = im_markers.length; +// im_tmpMarker.seq = seq; +// im_markers[seq] = im_tmpMarker; + + //im_drawMarkerImage(im_tmpMarker); + im_createMarker(im_mark_tmp_id, im_tmpMarker.lat, im_tmpMarker.lon, im_tmpMarker.title, true); + imc_saveMarker(im_mark_tmp_id, im_tmpMarker.lat, im_tmpMarker.lon, im_tmpMarker.title); + + im_mark_tmp_id++; + + removeMarkerBox(); +} + +function removeMarkerBox() +{ + if($('im_marker_img_tmp')) + $('im_marker_img_tmp').remove(); + if($('im_marker_box_tmp')) + $('im_marker_box_tmp').remove(); +} + +/** + * + * @param {IMMarker} marker + */ +function imc_saveMarker(tmp_id, lat, lon, title) +{ +// var par = "lat=" + lat +// + "&lon=" + lon +// + "&title=" + encodeURIComponent(title) +// + "&desc=" + encodeURIComponent("Description of " + title); +// + var myAjax = new Ajax.Request( + getIMServiceURL('marker.add'), + { + method: 'post', + parameters: {lat: lat, + lon: lon, + title: title, + desc: 'Description of '+title}, + onSuccess: function(req) + { + if(req.responseXML && req.responseXML.documentElement.tagName == "error") + { + var resp = req.responseXML.documentElement; + var msg = resp.getElementsByTagName('message')[0].firstChild.nodeValue; + alert(msg); + //div.innerHTML = msg; + return; + } + else if(req.responseXML) + { + var resp = req.responseXML.documentElement; + var id = resp.getElementsByTagName('added')[0].firstChild.nodeValue; + + im_concretizeTempMarker(tmp_id, id); + //marker.id = id; + //im_registerMarkerObserver(marker.seq, id); + //alert("Added marker #" + id); + } + }, + onFailure: function(req) + { + div.innerHTML = i18n('genericError'); + } + } + ); +} + + +/** holds the markers' id */ +var im_markarr = new Array(); + +var im_markers = new Array(); +var im_tmpMarker; + +function IMMarker(lat, lon, title) +{ + this.lat = parseFloat(lat); + this.lon = parseFloat(lon); + this.title = title; +} + +IMMarker.prototype.lat; +IMMarker.prototype.lon; +IMMarker.prototype.title; +/** Client-side identifier */ +IMMarker.prototype.seq; +/** Server-side identifier */ +IMMarker.prototype.id; + +function im_deleteAllMarkersImages() +{ + im_markers.each( + function(marker) + { + var seq = marker.seq; + var img = $("im_marker_"+seq); + if(img) + { + img.remove(); + } + } + ); +} + +function im_createMarkersDom(dommarkerlist) +{ + if(! dommarkerlist ) + { + return; + } + + if(dommarkerlist.hasChildNodes()) + { + var children = dommarkerlist.childNodes; + for (var i = 0; i < children.length; i++) + { + if(children[i].nodeType == Node.ELEMENT_NODE) + im_createMarkerDom(children[i]); + }; + }; +} + +function im_createMarkerDom(dommarker) +{ + var id = dommarker.getAttribute('id'); + var lat = dommarker.getAttribute('lat'); + var lon = dommarker.getAttribute('lon'); + + var title = "undef"; + var children = dommarker.childNodes; + for (var i = 0; i < children.length; i++) + { + if(children[i].nodeType == Node.ELEMENT_NODE && + children[i].tagName == "title") + title = children[i].firstChild.nodeValue; + } + + im_createMarker(id, lat, lon, title); +} + +function im_createMarker(id, lat, lon, title, btemp) +{ + if (btemp === null) + btemp = false; + + // get map image offset + var offset = Position.cumulativeOffset($(im_bm.imageId)); + var offsetX = offset[0]; + var offsetY = offset[1]; + + var y = im_bm.lat2y(lat); + var x = im_bm.lon2x(lon); + + if(y<0 || x<0 || y>$(im_bm.imageId).height || x>$(im_bm.imageId).width) + { + // should not happen: markers are filtered server-side + return; + } + + var img = document.createElement("img"); + img.id='im_marker_' + (btemp?"tmp_":"") + id; + img.className = 'im_marker'; + img.src = '/intermap/images/marker2.gif'; // FIXME + img.title = title; + + // FIXME the image should be centered on the coords + img.style.left = x + offsetX - img.width/2; + img.style.top = y + offsetY - img.height/2; + + document.body.appendChild(img); + + if(! btemp) + { + im_markarr[im_markarr.length] = id; + img.onclick = function(e){im_markerClicked(e, id);}; + } + +// if(marker.id) // already assigned? +// { +// im_registerMarkerObserver(marker.seq, marker.id); +// } +} + +function im_concretizeTempMarker(tempid, id) +{ + var imgoldid = 'im_marker_tmp_' + tempid; + var imgnewid = 'im_marker_' + id; + + var img = $(imgoldid); + img.id = imgnewid; + + im_markarr[im_markarr.length] = id; + img.onclick = function(e){im_markerClicked(e, id);}; +} + +function im_deleteClientMarkers() +{ + im_markarr.each(im_deleteClientMarker); + im_markarr = new Array(); +} + +function im_deleteClientMarker(markerid) +{ + if(markerid) // may have been deleted + { + var img = $("im_marker_" + markerid); + if(img) + { + img.remove(); + } + } +} + +function im_retitleClientMarker(markerid, title) +{ + if(markerid) // may have been deleted + { + var img = $("im_marker_" + markerid); + if(img) + { + img.title = title; + } + } +} + + +function im_markerClicked(e, id) +{ + Event.stop(e); // prevents from dragging the map image (on Firefox) + im_markerList(id); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tic...@us...> - 2008-02-21 14:53:06
|
Revision: 1126 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1126&view=rev Author: ticheler Date: 2008-02-21 06:52:50 -0800 (Thu, 21 Feb 2008) Log Message: ----------- Fix for the info request to a WMS service provided by Richard Walker Modified Paths: -------------- trunk/web/intermap/scripts/im_extras.js trunk/web/intermap/xsl/im_get-services-embedded.xsl trunk/web/intermap/xsl/im_get-services.xsl Modified: trunk/web/intermap/scripts/im_extras.js =================================================================== --- trunk/web/intermap/scripts/im_extras.js 2008-02-19 23:47:42 UTC (rev 1125) +++ trunk/web/intermap/scripts/im_extras.js 2008-02-21 14:52:50 UTC (rev 1126) @@ -8,6 +8,7 @@ requires: clearNode(node) + extractScripts() // from prototype.js getIMServiceURL(service) imc_addServices(url, services, type, im_servicesAdded); im_buildLayerList(req); // rebuild layers' list @@ -143,9 +144,13 @@ function im_servicesLoaded(req) { - // Dinamically generate content + // Dynamically generate content var im = $('im_serverList'); - im.innerHTML =req.responseText; + im.innerHTML =req.responseText; + var reqScripts = req.responseText.extractScripts(); + // Only evaluate the first script + if (reqScripts.length > 0) + eval(reqScripts[0]); } /* Modified: trunk/web/intermap/xsl/im_get-services-embedded.xsl =================================================================== --- trunk/web/intermap/xsl/im_get-services-embedded.xsl 2008-02-19 23:47:42 UTC (rev 1125) +++ trunk/web/intermap/xsl/im_get-services-embedded.xsl 2008-02-21 14:52:50 UTC (rev 1126) @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- requires unescapeHTML() from prototype.js --> +<!-- only the first script tag will be evaluated by im_servicesLoaded() --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"> <!-- Main template --> @@ -10,7 +13,7 @@ <script language="javascript"> //function getWmsLayerInfo(name) { getWmsLayerInfo = function(name) { - window.open('<xsl:value-of select="/root/gui/locService" />/map.service.wmsLayerInfo?url=<xsl:value-of select="/root/response/url"/>&name=' + name, 'dialog', 'HEIGHT=300,WIDTH=400,scrollbars=yes,toolbar=no,status=no,menubar=no,location=no,resizable=yes'); + window.open(('<xsl:value-of select="/root/gui/locService" />/map.service.wmsLayerInfo?url=<xsl:value-of select="/root/response/url"/>&name=' + name).unescapeHTML(), 'dialog', 'HEIGHT=300,WIDTH=400,scrollbars=yes,toolbar=no,status=no,menubar=no,location=no,resizable=yes').focus(); } </script> Modified: trunk/web/intermap/xsl/im_get-services.xsl =================================================================== --- trunk/web/intermap/xsl/im_get-services.xsl 2008-02-19 23:47:42 UTC (rev 1125) +++ trunk/web/intermap/xsl/im_get-services.xsl 2008-02-21 14:52:50 UTC (rev 1126) @@ -15,7 +15,7 @@ <script language="JavaScript" src="../../scripts/intermap.js"/> <script language="javascript"> function getWmsLayerInfo(name) { - window.open('<xsl:value-of select="/root/gui/locService" />/map.service.wmsLayerInfo?url=<xsl:value-of select="/root/response/url"/>&name=' + name, 'dialog', 'HEIGHT=300,WIDTH=400,scrollbars=yes,toolbar=no,status=no,menubar=no,location=no,resizable=yes'); + window.open(('<xsl:value-of select="/root/gui/locService" />/map.service.wmsLayerInfo?url=<xsl:value-of select="/root/response/url"/>&name=' + name).unescapeHTML(), 'dialog', 'HEIGHT=300,WIDTH=400,scrollbars=yes,toolbar=no,status=no,menubar=no,location=no,resizable=yes').focus(); } </script> </head> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <e_t...@us...> - 2008-02-22 00:13:48
|
Revision: 1142 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1142&view=rev Author: e_tajariol Date: 2008-02-21 16:13:53 -0800 (Thu, 21 Feb 2008) Log Message: ----------- Localized many fixed strings. Modified Paths: -------------- trunk/web/intermap/loc/en/xml/strings.xml trunk/web/intermap/xsl/im_get-layer-styles.xsl trunk/web/intermap/xsl/im_get-markers.xsl trunk/web/intermap/xsl/im_wmc_form.xsl Modified: trunk/web/intermap/loc/en/xml/strings.xml =================================================================== --- trunk/web/intermap/loc/en/xml/strings.xml 2008-02-22 00:06:40 UTC (rev 1141) +++ trunk/web/intermap/loc/en/xml/strings.xml 2008-02-22 00:13:53 UTC (rev 1142) @@ -56,7 +56,12 @@ <map>Map</map> <mapsfound>maps found</mapsfound> <markerlistbutton>Marker list</markerlistbutton> - <markerlisttitle js="true">Marker list</markerlisttitle> + <markerlisttitle js="true">Marker list</markerlisttitle> + <markerUpdating>Updating marker...</markerUpdating> + <markerUpdated>The marker has been updated</markerUpdated> + <markerDeleting>Deleting marker...</markerDeleting> + <markerDeleted>The marker has been deleted</markerDeleted> + <markerNone>There are no markers defined.</markerNone> <metadata>Metadata</metadata> <newMap>Create a new map</newMap> <noFeature>No features found</noFeature> @@ -88,6 +93,7 @@ <title>InterMap opensource</title> <titleShowStyles js="true">Available styles</titleShowStyles> <transparency>Set transparency</transparency> + <unexpectedError>An unexpected error has been encountered while performing the operation:</unexpectedError> <up>Move layer up</up> <update>Update</update> <updateMarker>Update marker info</updateMarker> @@ -99,10 +105,28 @@ <wmcbuttonmail js="true">Send current context</wmcbuttonmail> <wmcbuttonupload js="true">Upload a context</wmcbuttonupload> <wmcbuttondownload js="true">Download current context</wmcbuttondownload> + + <wmcUploading>The context file is uploading...</wmcUploading> + <wmcUploaded>The context has been uploaded </wmcUploaded> + <wmcUploadingError>An unexpected error has been encountered while uploading the context:</wmcUploadingError> + <wmcMailBuilding>The mail is being built...</wmcMailBuilding> + <wmcMailSent>The mail has been successfully sent</wmcMailSent> + <wmcMailError>An unexpected error has been encountered while processing the mail:</wmcMailError> + <wmcUploadReplace>Replace current layers</wmcUploadReplace> + <wmcUploadAdd>Add to current layers</wmcUploadAdd> + <wmcMailSend>Send e-mail</wmcMailSend> <wmsConfigForm>Layer properties</wmsConfigForm > <zoomIn>Zoom in</zoomIn> <zoomOut>Zoom out</zoomOut> <zoomLayer>Zoom to layer</zoomLayer> <getFeatures>GET FEATURES</getFeatures> + + <styleSetting>Setting the style...</styleSetting> + <styleSet>The style has been successfully set.</styleSet> + <styleSetError>An unexpected error has been encountered:</styleSetError> + <layerInfo>Layer Info:</layerInfo> + <associatedStyles>Associated styles:</associatedStyles> + <setStyle>Set styles</setStyle> + </strings> Modified: trunk/web/intermap/xsl/im_get-layer-styles.xsl =================================================================== --- trunk/web/intermap/xsl/im_get-layer-styles.xsl 2008-02-22 00:06:40 UTC (rev 1141) +++ trunk/web/intermap/xsl/im_get-layer-styles.xsl 2008-02-22 00:13:53 UTC (rev 1142) @@ -5,25 +5,26 @@ <xsl:template match="/"> <div id="im_style_msg"> <div id="im_style_msg_set_start" style="display:none;"> - Setting the style... + <xsl:copy-of select="/root/gui/strings/styleSetting"/> + </div> <div id="im_style_msg_set_ok" style="display:none;"> - The style has been successfully set. + <xsl:copy-of select="/root/gui/strings/styleSet"/> </div> <div id="im_style_msg_set_error" style="display:none;"> - An unexpected error has been encountered:<br/> + <xsl:copy-of select="/root/gui/strings/styleSetError"/><br/> </div> </div> <div id="im_style_form"> - <b>Layer Info:</b> + <b><xsl:copy-of select="/root/gui/strings/layerInfo"/></b> <xsl:apply-templates select="/root/response/layer"/> <br/> - <b>Associated styles:</b> + <b><xsl:copy-of select="/root/gui/strings/associatedStyles"/></b> <xsl:apply-templates select="/root/response/style"/> <xsl:if test="count(/root/response/style)>1"> - <button onClick="im_setStyle({/root/response/layer/id});" style="margin-bottom:5px;margin-top:5px;">Set style</button> + <button onClick="im_setStyle({/root/response/layer/id});" style="margin-bottom:5px;margin-top:5px;"><xsl:copy-of select="/root/gui/strings/setStyle"/></button> </xsl:if> </div> Modified: trunk/web/intermap/xsl/im_get-markers.xsl =================================================================== --- trunk/web/intermap/xsl/im_get-markers.xsl 2008-02-22 00:06:40 UTC (rev 1141) +++ trunk/web/intermap/xsl/im_get-markers.xsl 2008-02-22 00:13:53 UTC (rev 1142) @@ -40,27 +40,26 @@ <xsl:template match="//marker" mode="single"> <!-- =========================================== --> <!-- USER MESSAGES --> - <!-- TODO i18n all messages --> <!-- =========================================== --> <div id="im_marker_msg"> <div id="im_marker_msg_update_start" style="display:none;"> - Updating marker... + <xsl:copy-of select="/root/gui/strings/markerUpdating"/> </div> <div id="im_marker_msg_update_ok" style="display:none;"> - The marker has been updated + <xsl:copy-of select="/root/gui/strings/markerUpdated"/> </div> <div id="im_marker_msg_update_error" style="display:none;"> - An unexpected error has been encountered while performing the operation:<br/> + <xsl:copy-of select="/root/gui/strings/unexpectedError"/><br/> </div> <div id="im_marker_msg_delete_start" style="display:none;"> - Deleting marker... + <xsl:copy-of select="/root/gui/strings/markerDeleting"/> </div> <div id="im_marker_msg_delete_ok" style="display:none;"> - The marker has been deleted + <xsl:copy-of select="/root/gui/strings/markerDeleted"/> </div> <div id="im_marker_msg_delete_error" style="display:none;"> - An unexpected error has been encountered while performing the operation:<br/> + <xsl:copy-of select="/root/gui/strings/unexpectedError"/><br/> </div> </div> @@ -99,7 +98,7 @@ <xsl:template name="empty"> <div> - <b>There are no markers defined.</b> + <b><xsl:copy-of select="/root/gui/strings/markerNone"/></b> </div> </xsl:template> Modified: trunk/web/intermap/xsl/im_wmc_form.xsl =================================================================== --- trunk/web/intermap/xsl/im_wmc_form.xsl 2008-02-22 00:06:40 UTC (rev 1141) +++ trunk/web/intermap/xsl/im_wmc_form.xsl 2008-02-22 00:13:53 UTC (rev 1142) @@ -8,23 +8,23 @@ <!-- =========================================== --> <div id="im_wmc_msg"> <div id="im_wmc_msg_upload_start" style="display:none;"> - The context file is uploading... + <xsl:copy-of select="/root/gui/strings/wmcUploading"/> </div> <div id="im_wmc_msg_upload_ok" style="display:none;"> - The context has been uploaded + <xsl:copy-of select="/root/gui/strings/wmcUploading"/> </div> <div id="im_wmc_msg_upload_error" style="display:none;"> - An unexpected error has been encountered while uploading the context:<br/> + <xsl:copy-of select="/root/gui/strings/wmcUploadingError"/><br/> </div> <div id="im_wmc_msg_mail_start" style="display:none;"> - The mail is being build... + <xsl:copy-of select="/root/gui/strings/wmcMailBuilding"/> </div> <div id="im_wmc_msg_mail_ok" style="display:none;"> - The mail has been successfully sent + <xsl:copy-of select="/root/gui/strings/wmcMailSent"/> </div> <div id="im_wmc_msg_mail_error" style="display:none;"> - An unexpected error has been encountered while processing the mail:<br/> + <xsl:copy-of select="/root/gui/strings/wmcMailError"/><br/> </div> </div> @@ -88,10 +88,14 @@ <tr> <td align="center"> - <button onClick="im_uploadWMC(true);" style="margin-bottom:5px;margin-top:5px;">Replace current layers</button> + <button onClick="im_uploadWMC(true);" style="margin-bottom:5px;margin-top:5px;"> + <xsl:copy-of select="/root/gui/strings/wmcUploadReplace"/> + </button> </td> <td align="center"> - <button onClick="im_uploadWMC(false);" style="margin-bottom:5px;margin-top:5px;">Add to current layers</button> + <button onClick="im_uploadWMC(false);" style="margin-bottom:5px;margin-top:5px;"> + <xsl:copy-of select="/root/gui/strings/wmcUploadAdd"/> + </button> </td> </tr> </table> @@ -130,7 +134,9 @@ </tr> --> <tr style="padding-bottom:5px;"> <td colspan="2" align="center"> - <button onClick="im_sendWMC();" style="margin-bottom:5px;margin-top:5px;">Send e-mail</button> + <button onClick="im_sendWMC();" style="margin-bottom:5px;margin-top:5px;"> + <xsl:copy-of select="/root/gui/strings/wmcMailSend"/> + </button> </td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |