Changeset 779 for tapas

Timestamp:

04/01/14 16:56:38 (10 years ago)

Author:

rboipsl

Message:

Dernière version rboipsl

Location:

tapas

Files:

• domain/interface/com/ether/tapas/Preference.java (modified) (2 diffs)
• persistence/implementation/com/ether/dao/Observatory.hbm.xml (modified) (1 diff)
• persistence/implementation/com/ether/dao/ObservatoryDAOImpl.java (modified) (3 diffs)
• persistence/interface/com/ether/dao/ObservatoryDAO.java (modified) (1 diff)
• service/implementation/com/ether/TapasServiceImpl.java (modified) (5 diffs)
• service/interface/com/ether/TapasService.java (modified) (1 diff)
• web/init_en.jsp (modified) (2 diffs)
• web/init_fr.jsp (modified) (2 diffs)
• web/project/formTapas.jsp (modified) (2 diffs)
• web/project/formTapas_script.jsp (modified) (25 diffs)
• web/resources/css/tapas.css (modified) (3 diffs)
• web/resources/images/logo_acri.jpg (added)
• web/resources/js/calendar/anytime.js (modified) (13 diffs)
• web/resources/js/classesForJQuery/LoginButton.js (modified) (2 diffs)
• web/resources/jsp/dataProtocol_en.jsp (modified) (1 diff)
• web/resources/jsp/dataProtocol_fr.jsp (modified) (1 diff)
• web/src/com/ether/Controller.java (modified) (1 diff)
• web/src/messages_en.properties (modified) (1 diff)
• web/src/messages_fr.properties (modified) (1 diff)

tapas/domain/interface/com/ether/tapas/Preference.java

@@ -77 +77 @@
 
     @NotNull
+    public Pair<String, String> getCh4Extinction()
+    {
+        return _ch4Extinction;
+    }
+
+    public void setCh4Extinction( @NotNull final Pair<String, String> ch4Extinction )
+    {
+        _ch4Extinction = ch4Extinction;
+    }
+
+    @NotNull
+    public Pair<String, String> getN2oExtinction()
+    {
+        return _n2oExtinction;
+    }
+
+    public void setN2oExtinction( @NotNull final Pair<String, String> n2oExtinction )
+    {
+        _n2oExtinction = n2oExtinction;
+    }
+
+    @NotNull
     public Pair<String, String> getBervCorrection()
     {
@@ -100 +122 @@
     private Pair<String, String> _co2Extinction;
     @NotNull
+    private Pair<String, String> _ch4Extinction;
+    @NotNull
+    private Pair<String, String> _n2oExtinction;
+    @NotNull
     private Pair<String, String> _bervCorrection;
 }

tapas/persistence/implementation/com/ether/dao/Observatory.hbm.xml

@@ -4 +4 @@
 <hibernate-mapping default-cascade="save-update" auto-import="false">
 
-        <class name="com.ether.tapas.Observatory" table="observatory">
+        <!--<class name="com.ether.tapas.Observatory" table="observatory_complet">-->
+    <class name="com.ether.tapas.Observatory" table="observatory_intermediaire">
 
                 <id name="id">

tapas/persistence/implementation/com/ether/dao/ObservatoryDAOImpl.java

@@ -3 +3 @@
 import com.ether.PersistenceException;
 import com.ether.tapas.Observatory;
+import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.jetbrains.annotations.NotNull;
@@ -40 +42 @@
             throws PersistenceException
     {
-        final DetachedCriteria criteria = DetachedCriteria.forClass( Observatory.class );
+        final DetachedCriteria criteria = DetachedCriteria.forClass( Observatory.class )
+            //.add( (Criterion) Order.asc( "name" ) );
+            .addOrder( Order.asc( "name" ) );
         return selectAllByCriteria( Observatory.class, criteria );
     }
@@ -52 +56 @@
         return selectByCriteria( Observatory.class, criteria );
     }
+
+    @Nullable
+    public Observatory getObservatoryByName( @NotNull final String name)
+            throws PersistenceException
+    {
+        final DetachedCriteria criteria = DetachedCriteria.forClass( Observatory.class )
+                    .add( Restrictions.eq( "name", name ));
+        return selectByCriteria( Observatory.class, criteria );
+    }
 }

tapas/persistence/interface/com/ether/dao/ObservatoryDAO.java

@@ -22 +22 @@
     @Nullable
     Observatory getObservatoryById(@NotNull final long id) throws PersistenceException;
+
+    @Nullable
+    Observatory getObservatoryByName(@NotNull final String name) throws PersistenceException;
+
 }

tapas/service/implementation/com/ether/TapasServiceImpl.java

@@ -44 +44 @@
     public void createXMLRequest( @NotNull final Tapas fTapas, @NotNull final Properties prop )
             throws ServiceException
-    {
+   {
 
         final String servicePath = prop.getProperty( "service_path" );
@@ -125 +125 @@
             preferences.addContent( co2e );
 
-            //berv correction
-            final Element bervCorr = new Element( "berv_correction" );
+            //ch4
+            final Element ch4e = new Element( "ch4_extinction" );
             validR = new Attribute( "valid", "YES,NO" );
-            bervCorr.setAttribute( validR );
-            bervCorr.setText( iRequest.getPreference().getBervCorrection().getSecondValue() );
-            preferences.addContent( bervCorr );
+            ch4e.setAttribute( validR );
+            ch4e.setText( iRequest.getPreference().getCh4Extinction().getSecondValue() );
+            preferences.addContent( ch4e );
+
+            //no2
+            final Element n2oe = new Element( "n2o_extinction" );
+            validR = new Attribute( "valid", "YES,NO" );
+            n2oe.setAttribute( validR );
+            n2oe.setText( iRequest.getPreference().getN2oExtinction().getSecondValue() );
+            preferences.addContent( n2oe );
 
 
@@ -158 +165 @@
             try
             {
-                obs = _observatoryDAO.selectByPrimaryKey( iRequest.getObservation().getObservatory().getId() );
+                //obs = _observatoryDAO.selectByPrimaryKey( iRequest.getObservation().getObservatory().getId() );
+                obs = _observatoryDAO.getObservatoryByName( iRequest.getObservation().getObservatory().getName() );
             }
             catch( PersistenceException e )
@@ -280 +288 @@
             instrument.addContent( samplingRatio );
 
+            //berv correction
+            //final Element bervCorr = new Element( "berv_correction" );
+            final Element bervCorr = new Element( "appli_berv" );
+            validR = new Attribute( "valid", "YES,NO" );
+            bervCorr.setAttribute( validR );
+            bervCorr.setText( iRequest.getPreference().getBervCorrection().getSecondValue() );
+            instrument.addContent( bervCorr );
+
+
             request.addContent( observation );
 
@@ -629 +646 @@
 
 
+    // recuperation infos observatoire avec le nom
+    @Nullable
+    @Transactional(readOnly = true)
+    public Observatory getObservatoryByName( @NotNull final String name )
+            throws ServiceException
+    {
+        try
+        {
+            return _observatoryDAO.getObservatoryByName( name );
+        }
+        catch( PersistenceException e )
+        {
+            throw new ServiceException( ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND, e );
+        }
+    }
+
+
     @Required
     public void setObservatoryDAO( final ObservatoryDAO observatoryDAO )

tapas/service/interface/com/ether/TapasService.java

@@ -32 +32 @@
     public Observatory getObservatoryById(@NotNull final long id) throws ServiceException;
 
+    public Observatory getObservatoryByName(@NotNull final String name) throws ServiceException;
+
     public Long getNumRequest() throws ServiceException;
 

tapas/web/init_en.jsp

@@ -70 +70 @@
 <br><br>
 <u>Selection of atmospheric constituents:</u><br>
-The user may select the transmission computation within the following list:
+The user may select the transmission computation within the following list:<br>
 - Rayleigh extinction, O2, Ozone, H2O. In the future, NO2 and NO3 from a climatology established from GOMOS /ENVISAT measurements may also be available.
 
-The user may also select the option in which the transmissions are calculated separately for each constituent, for a better identification of observed lines. The total transmission is then the multiplication of all individual transmissions. It also may be useful to get the H2O transmission separately, because the quantity of H2O may be adjusted by a power law of the transmission, TX(H2O), where X is the adjusting factor. Such a formula must be applied, in principle only with the highest possible resolution, and after that the user may convolute by the spectrometer PSF spectral profile PSF.
+The user may also select the option in which the transmissions are calculated separately for each constituent, for a better identification of observed lines. The total transmission is then the multiplication of all individual transmissions. It also may be useful to get the H2O transmission separately, because the quantity of H2O may be adjusted by a power law of the transmission, T<SUP>x</SUP>(H2O), where X is the adjusting factor. Such a formula must be applied, in principle only with the highest possible resolution, and after that the user may convolute by the spectrometer ILSF spectral profile ILSF. However, for weak lines (say, less than 30% absorption at resolution 40,000), applying the formula T<SUP>x</SUP> to the convoluted spectrum gives a reasonable approximation.
 <br>
 <br>
@@ -113 +113 @@
 
 <br><br>
-         <u>Acknowledgements</u><br>This work is being supported by CNES (Centre National des Etudes Spatiales) and CNRS (Centre National de la Recherche Scientifique).<br>TAPAS is a service maintained by ETHER data center. ETHER acknowledges for TAPAS the use of HITRAN data base and the LBLRTM radiative transfer code, the use of ECMWF data and the ETHER data center.
+         <u>Acknowledgements</u><br>This work is being supported by CNES (Centre National des Etudes Spatiales) and CNRS (Centre National de la Recherche Scientifique).<br>TAPAS is a service maintained by ETHER data center. ETHER acknowledges for TAPAS the use of HITRAN data base and the LBLRTM radiative transfer code, the use of ECMWF data and the ETHER data center. We acknowledge useful discussions with Iouli Gordon and Larry Rothman.
 
 
-                            <br>
-         <table cellpadding=4 cellspacing=6 align="center">
+                            <br><br>
+         <table cellpadding=4 cellspacing=6 align="center" bgcolor="white" width="700" height="60">
 
          <tr>
             <td><a target="_blank" href="http://www.cnes.fr"><img border="1" width=70 src="resources/images/logo_cnes.png"></a></td>
+            <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td>
+            <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td>
             <td><a target="_blank" href="http://www.latmos.ipsl.fr"><img border="1" width=100 src="resources/images/logo_latmos.png"></a></td>
-            <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td>
-            <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td>
             <td><a target="_blank" href="http://gepi.obspm.fr"><img border="1" width=140 src="resources/images/logo_gepi.jpg"></a></td>
+            <td><a target="_blank" href="http://www.acri-st.fr"><img border="0" width=100 src="resources/images/logo_acri.jpg"></a></td>
          </tr>
              </table>

tapas/web/init_fr.jsp

@@ -71 +71 @@
 <br><br>
 <u>Choix des composants atmosphériques:</u><br>
-L'utilisateur peut sélectionner le calcul de la transmission par la liste suivante : - Rayleigh extinction, O2, Ozone, H2O. À l'avenir, NO2 et NO3 d'une climatologie établie à partir des mesures GOMOS / ENVISAT peuvent également être disponibles.
-L'utilisateur peut également sélectionner l'option dont les transmissions sont calculées séparément pour chaque constituant, pour une meilleure identification des raies observées. La transmission totale est alors la multiplication de toutes les transmissions individuelles. Il peut également être utile pour obtenir la transmission H2O séparément, car la quantité de H2O peut être réglée par une loi de puissance de la transmission, TX (H2O), où X est le facteur d'ajustement. Une telle formule doit être appliquée en principe uniquement avec la résolution la plus élevée possible, et ensuite l'utilisateur peut convoluer par le spectromÚtre PSF profil spectral PSF.
+L'utilisateur peut sélectionner le calcul de la transmission par la liste suivante :<br>- Rayleigh extinction, O2, Ozone, H2O. À l'avenir, NO2 et NO3 d'une climatologie établie à partir des mesures GOMOS / ENVISAT peuvent également être disponibles.
+L'utilisateur peut également sélectionner l'option dont les transmissions sont calculées séparément pour chaque constituant, pour une meilleure identification des raies observées. La transmission totale est alors la multiplication de toutes les transmissions individuelles. Il peut également être utile pour obtenir la transmission H2O séparément, car la quantité de H2O peut être réglée par une loi de puissance de la transmission, T<SUP>x</SUP> (H2O), où X est le facteur d'ajustement. Une telle formule doit être appliquée en principe uniquement avec la résolution la plus élevée possible, et ensuite l'utilisateur peut convoluer par le spectromÚtre  ILSF spectrale ILSF de profil. Cependant, pour les lignes faibles (disons, moins de 30% d'absorption à une résolution de 40.000), en appliquant la formule T<SUP>x</SUP> au spectre donne une approximation raisonnable.
 <br>
 <br>
@@ -113 +113 @@
 <br><br>
          <u>Remerciements</u><br>Ce travail est soutenu par le CNES (Centre National des Etudes Spatiales) et le CNRS (Centre National de la Recherche Scientifique).
-         <br> TAPAS est un service géré par le centre de données Ether. Ether remercie pour TAPAS l'utilisation de la base de données HITRAN et le code de transfert radiatif LBLRTM, l'utilisation des données du ECMWF et le centre de données Ether.
+         <br> TAPAS est un service géré par le centre de données Ether. Ether remercie pour TAPAS l'utilisation de la base de données HITRAN et le code de transfert radiatif LBLRTM, l'utilisation des données du ECMWF et le centre de données Ether. Nous remercions Iouli Gordon et Larry Rothman pour nos discussions enrichissantes.
 
 
                             <br>
-         <table cellpadding=4 cellspacing=6 align="center">
+         <table cellpadding=4 cellspacing=6 align="center" bgcolor="white" width="700" height="60">
 
          <tr>
             <td><a target="_blank" href="http://www.cnes.fr"><img border="1" width=70 src="resources/images/logo_cnes.png"></a></td>
+            <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td>
+            <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td>
             <td><a target="_blank" href="http://www.latmos.ipsl.fr"><img border="1" width=100 src="resources/images/logo_latmos.png"></a></td>
-            <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td>
-            <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td>
             <td><a target="_blank" href="http://gepi.obspm.fr"><img border="1" width=140 src="resources/images/logo_gepi.jpg"></a></td>
+            <td><a target="_blank" href="http://www.acri-st.fr"><img border="0" width=100 src="resources/images/logo_acri.jpg"></a></td>
          </tr>
              </table>

tapas/web/project/formTapas.jsp

@@ -16 +16 @@
         <ether:htmlCss cssFile="calendar/anytime"/>
         <ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/>
+
     </tiles:put>
 
     <tiles:put name="insertJsOrJsp" type="string">
         <ether:htmlJs jsFile="library/jquery.json-2.3"/>
+        <ether:htmlJs jsFile="library/js/jquery-ui-1.8.16.custom.min.js"/>
+        <!--<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>-->
         <ether:htmlJs jsFile="classesForJQuery/Select"/>
         <ether:htmlJs jsFile="classesForJQuery/Loading"/>
@@ -93 +96 @@
             tapasTexts["label.eco2"] = "<spring:message code="label.eco2"/>";
             tapasTexts["label.eo3"] = "<spring:message code="label.eo3"/>";
+            tapasTexts["label.ech4"] = "<spring:message code="label.ech4"/>";
+            tapasTexts["label.en2o"] = "<spring:message code="label.en2o"/>";
             tapasTexts["text.select"] = "<spring:message code="text.select"/>";
             tapasTexts["text.toselect"] = "<spring:message code="text.toselect"/>";

tapas/web/project/formTapas_script.jsp

@@ -1 @@
-
+<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>
 <script type="text/javascript">
 
@@ -22 +22 @@
         this.select_io3eList = new Object();
         this.select_ico2eList = new Object();
+        this.select_ich4eList = new Object();
+        this.select_in2oeList = new Object();
         this.select_irextinctionList = new Object();
         this.select_ibervCList = new Object();
@@ -188 +190 @@
         if (event.length > 0) input.bind( event, [this, champ], this.angleChoice );
 
-        td1.html( texte );
+
         td1.attr( {class:"containerLabel"} );
 
@@ -204 +206 @@
 
         if (info && (inputId.match(re1) || inputId.match(re2))) {
-            var mt="-4px";
-            var ml="";
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-252px";
-                else ml="-244px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-227px";
-                else ml="-223px";
-            }
 
             var img = $( document.createElement( "img" ) );
@@ -226 +217 @@
             a.append(img);
             div.append(a);
-            div.attr( "style","margin-left:"+ml+";margin-top:"+mt);
-
+
+
+            td1.append( a );
+            td1.append( texte );
             tr.append( div );
 
-            /*td2.attr( {colspan:3} );
-            tr.append( td2 );
-            tr.append( div );*/
         }
         else if (info) {
@@ -242 +232 @@
             img.bind("click",[inputId,450,100,this],this.onClickInfos);
             a.append(img);
-            td3.append(a);
+            td1.append(a);
+            td1.append( texte );
 
         }
@@ -280 +271 @@
         input2.attr( {id: inputId2,class:"containerText",size:11} );
 
-        td1.html( texte1 );
+
         td3.html( texte2 );
         td5.html( textesup );
@@ -290 +281 @@
         img.bind("click",["spectral_range",450,100,this],this.onClickInfos);
         a.append(img);
-        td5.append(a);
+        td1.append(a);
+         td1.append( texte1 );
 
         //img.onclick(this.onClickInfos("spectral_range",1200,440));
@@ -318 +310 @@
         var td1 = $( document.createElement( "td" ) );
         var td2 = $( document.createElement( "td" ) );
+        var td3 = $( document.createElement( "td" ) );
         var input = $( document.createElement( "input" ) );
-        var champ="", ml="", mt="-4px";
+        var champ="";
 
         var div = $( document.createElement( "div" ) );
 
+
         input.attr( {id: inputId} );
 
-        td1.html( texte );
-        td1.attr( {class:"containerLabel"} );
-        tr.append( td1 );
-
-
-                 // alert(inputId);
+        // alert(inputId);
         if( 'format' == type ) {
             this.displaySelect( td2, inputId, index, this.jSonFileFormats, this.selectFileFormatsList, false, null );
             info = true;
             champ = "iformat_";
-            ml="-2px";
-            mt="-4px";
-        }
-
+
+        }
         else
         if( 'yesno' == type )
@@ -350 +337 @@
             else if( (/^(ico2e_[1-9]+)$/.test( inputId )  ) )
                 this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_ico2eList, false, "yesNos" );
+            else if( (/^(ich4e_[1-9]+)$/.test( inputId )  ) )
+                this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_ich4eList, false, "yesNos" );
+            else if( (/^(in2oe_[1-9]+)$/.test( inputId )  ) )
+                this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_in2oeList, false, "yesNos" );
             else if( (/^(irextinction_[1-9]+)$/.test( inputId )  ) ) {
 
@@ -355 +346 @@
                 info = true;
                 champ=inputId;
-                if (this.language == "en") ml="-11px";
-                else ml="-13px";
-
             }
             else if( (/^(ibervC_[1-9]+)$/.test( inputId )  ) ) {
@@ -363 +351 @@
                 info = true;
                 champ=inputId;
-                if (this.language == "en") ml="-11px";
-                else ml="-13px";
             }
         }
         else if( 'observatories' == type ) {
-            this.displaySelect( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" );
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-162px";
-                else ml="-116px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-123px";
-                else ml="-84px";
-            }
+
+            this.displaySelect1( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" );
+            //this.displaySelect( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" );
 
             champ="iobservatory_";
@@ -386 +365 @@
 
             champ = "ispectral_choice_";
-
-           if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-162px";
-                else ml="-116px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-123px";
-                else ml="-84px";
-            }
-
         }
         else if( 'ilsf' == type ) {
@@ -401 +370 @@
             info = true;
             champ = "ifunction_";
-            if (this.language == "en") ml="-192px";
-            else ml="-172px";
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-192px";
-                else ml="-172px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-149px";
-                else ml="-134px";
-            }
-
         }
         else if( 'climatoReference' == type ) {
@@ -418 +375 @@
             info = true;
             champ = "icr_";
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-170px";
-                else ml="-162px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-127px";
-                else ml="-124px";
-            }
-
-        }
-
+        }
+
+        td1.attr( {class:"containerLabel"} );
+        tr.append( td1 );
 
 
@@ -442 +391 @@
             a.append(img);
             div.append(a);
-            div.attr( "style","margin-left:"+ml+";margin-top:"+mt);
-
-            td2.attr( {colspan:3} );
+
+
+            td2.attr( {colspan:5} );
+            td1.append( a );
+            td1.append( texte );
+
             tr.append( td2 );
-            tr.append( div );
+
         }
         else {
+            td1.append( texte );
             td2.attr( {colspan:3} );
             tr.append( td2 );
@@ -760 +713 @@
                     //$( "#tab_request" + i ).html( "toto");
                     $( "#tab_request" + i ).attr( {name:z} );
-                    $( "#tab_request" + i ).attr( {id:"tab_request" + z} );       this.angleChoice
+                    $( "#tab_request" + i ).attr( {id:"tab_request" + z} );       //this.angleChoice
                     $( "#tabObservation_" + i ).attr( {id:"tabObservation_" + z} );
 //                    $( "#select_iobservatory_" + i ).attr( {id:"select_iobservatory_" + z} );
@@ -801 +754 @@
                     this.select_ico2eList[i] = null;
 
+                    this.select_ich4eList[z] = this.select_ich4eList[i];
+                    this.select_ich4eList[i] = null;
+
+                    this.select_in2oeList[z] = this.select_in2oeList[i];
+                    this.select_in2oeList[i] = null;
+
                     this.select_ibervCList[z] = this.select_ibervCList[i];
                     this.select_ibervCList[i] = null;
@@ -895 +854 @@
     },
 
+    createAutoCompleteMenuForRegions: function()
+    {
+
+        $( "#select_iobservatory_"+this.nbRequest ).autocomplete( {
+            source: this.listObs,
+            appendTo: "#regionContent"+this.nbRequest,
+            minLength: 0,
+            autoFocus: true,
+            autoSelect: true,
+            select: jQuery.proxy( function( event, ui )
+            {
+                this.regionLabel = ui.item.value;
+            }, this )
+        } ).focus( function( event )
+        {
+            $( this ).autocomplete( "search", "" );
+        } );
+
+        //$( "#regionTags" ).focus();
+    },
+
+
+// OTHERS ********************************************************
+    // General method to display select
+    displaySelect1: function( container, id, index, jsonList, selectList, nullValueIsNeeded, contentManage )
+    {
+        //alert("ok");
+        var iselect = $( document.createElement( "select" ) );
+        var option = document.createElement("option");
+
+        var paramSelect = new Object();
+        paramSelect.id = "select_" + id;
+        paramSelect.parent = container;
+
+        var observatoryArray=new Array();
+        this.listObs=new Array();
+
+
+        //var bob =$('<div id="region" class="containerField"><div class="containerTitle"><div class="containerTitleText">Region</div><div class="containerTitleClose"><img src="img/close.png"></div></div><div class="containerRegion"><input id="regionTags" size="23"/></div><div id="regionContent"></div></div> ');
+        var bob =$('<div class="containerField"><input id="select_'+id+'" size="42"/></div><div id="regionContent'+this.nbRequest+'" class="regionContent"></div> ');
+
+        //alert('<div class=containerField><input id=select_'+id+' size=23/></div><div id=regionContent></div> ');
+
+        //var select = new Select( paramSelect );
+        //iselect.options.add("1","1");
+        //if( nullValueIsNeeded )                          Select1
+
+        var option = new Option();
+        option.text = "-- " + tapasTexts["text.select"] + " --";
+        option.value = "-1";
+        iselect.append( option );
+
+        jQuery.each( jsonList, jQuery.proxy( function ( i, jsonElement )
+        {
+                //ajouter fonction
+
+                /*var option = new Option();
+                option.text = jsonElement.name;
+                option.value = jsonElement.id;*/
+                //observatoryArray.push(jsonElement.name);
+                this.listObs.push(jsonElement.name);
+                //console.log(option.value+"-"+option.text);
+                //iselect.append(option);
+
+
+        }, this ) );
+        //iselect.selectFirst( false );
+        /*selectList[index] = select;*/
+        //container.append(iselect);
+        container.append(bob);
+        selectList[index]="select_"+id;
+
+    },
+
+
     showErrors: function( result )
     {
@@ -967 +1001 @@
         this.createTrList( tapasTexts["label.eo2"], "io2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
         this.createTrList( tapasTexts["label.eco2"], "ico2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.ech4"], "ich4e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.en2o"], "in2oe_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
         this.createTrList( tapasTexts["label.berv"], "ibervC_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
 
@@ -993 +1029 @@
         this.createTr( tapasTexts["label.iza"], "iza_" + this.nbRequest, tabObservation, "[0,90] &deg;","keypress","za","2",true );
 
+        this.createAutoCompleteMenuForRegions();
 
         this.initRequestFields();
@@ -1036 +1073 @@
             preference.co2Extinction.secondValue = this.select_ico2eList[i].getValue();
 
+            preference.ch4Extinction = new Object();
+            preference.ch4Extinction.firstValue = this.select_ich4eList[i].getValuesInString();
+            preference.ch4Extinction.secondValue = this.select_ich4eList[i].getValue();
+
+            preference.n2oExtinction = new Object();
+            preference.n2oExtinction.firstValue = this.select_in2oeList[i].getValuesInString();
+            preference.n2oExtinction.secondValue = this.select_in2oeList[i].getValue();
+
             preference.bervCorrection = new Object();
             preference.bervCorrection.firstValue = this.select_ibervCList[i].getValuesInString();
@@ -1043 +1088 @@
             // OBSERVATION
             var observatory = new Object();
-            observatory.id = this.selectObservatoriesList[i].getValue();
+            //observatory.id = "European Southern Obs R La Serena Cerro La Silla";//this.selectObservatoriesList[i].getValue();
+            //observatory.id = this.selectObservatoriesList[i].getValue();
+            //observatory.id = 2;
+            observatory.name = $("#select_iobservatory_"+i).val();
 
             // Los
@@ -1124 +1172 @@
             var testOk2=false;
             var testOk3=false;
-            var testOk = isSup( this.selectObservatoriesList[i].getValue(), 0 );
-            if( !testOk )
+            //var testOk = isSup( this.selectObservatoriesList[i].getValue(), 0 );
+            var testOk = isEmpty($( "#select_iobservatory_" + i ).val()) || this.listObs.indexOf($( "#select_iobservatory_" + i ).val())<0;
+            //alert(testOk);
+            if( testOk )
             {
                 this.divE.html( chaine + tapasTexts["label.observatory"] + " : " + tapasTexts["text.toselect"] );
@@ -1305 +1355 @@
             this.select_io2eList[indice].select(this.select_io2eList[indice-1].getValue(),false);
             this.select_ico2eList[indice].select(this.select_ico2eList[indice-1].getValue(),false);
+            this.select_ich4eList[indice].select(this.select_ich4eList[indice-1].getValue(),false);
+            this.select_in2oeList[indice].select(this.select_in2oeList[indice-1].getValue(),false);
             this.select_ibervCList[indice].select(this.select_ibervCList[indice-1].getValue(),false);
 

tapas/web/resources/css/tapas.css

@@ -58 +58 @@
     padding-left: 30px;
     margin-left: -10px;
-    padding-bottom: 30px;
+    padding-bottom: 11px;
     width:650px;
 }
@@ -314 +314 @@
 }
 
+.containerFieldO {
+    font-size: 32px;
+        color: #999999;
+        padding-left: 0px;
+        font-weight: bold;
+
+}
+
 .containerCenter {
     -moz-border-radius-topright: 0;
@@ -532 +540 @@
 
 }
+
+.regionContent ul {
+    height: 150px;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+
+.regionContent ul li a {
+    color: #778899;
+    text-align:left;
+    font-size:10px;
+
+}

tapas/web/resources/js/calendar/anytime.js

@@ -213 +213 @@
 //      ['Sun','Mon','Tue','Wed','Thu','Fri','Sat']
 //      Note that if the firstDOW option is passed to AnyTime.picker() (see
-//      AnyTime.picker()), this array should nonetheless begin with the 
+//      AnyTime.picker()), this array should nonetheless begin with the
 //      desired abbreviation for Sunday.
 //
@@ -279 +279 @@
 //        %: - the timezone offset, with a sign, in hours and minutes, in
 //          four-digit, 24-hour format with a colon delimiter (for example,
-//          +05:30).  This is similar to the %z format used by Java.  
+//          +05:30).  This is similar to the %z format used by Java.
 //          To remember the difference between %: and %;, it might be helpful
 //          to remember that a colon (:) has a period (.) on the bottom and
@@ -286 +286 @@
 //          %: might be a longer string than %; (I know it's a stretch, but
 //          it's easier than looking it up every time)!
-//      
+//
 //        %- - the timezone offset, with a sign, in hours and minutes, in
 //          three-or-four-digit, 24-hour format with no delimiter (for
@@ -296 +296 @@
 //
 //        %@ - the timezone offset label.  By default, this will be the
-//          string "UTC" followed by the offset, with a sign, in hours and  
+//          string "UTC" followed by the offset, with a sign, in hours and
 //          minutes, in four-digit, 24-hour format with a colon delimiter
 //          (for example, UTC+05:30).  However, if Any+Time(TM) has been
@@ -355 +355 @@
 //    utcParseOffsetCapture - if true, any parsed string is always treated as
 //      though it represents local time, and any offset specified by the string
-//      (or utcParseOffsetAssume) is captured for return by the 
+//      (or utcParseOffsetAssume) is captured for return by the
 //      getUtcParseOffsetCaptured() method.  If the %@ format specifier is
 //      used, the sub-index of any matched label is also captured for return
@@ -361 +361 @@
 //      AnyTime.picker can edit the time as specified (without conversion to
 //      local time) and then convert the edited time to a different time zone
-//      (as selected using the picker). 
+//      (as selected using the picker).
 //=============================================================================
 
@@ -1031 +1031 @@
 
         //-------------------------------------------------------------------------
-        //  AnyTime.Converter.setUtcFormatOffsetAlleged()  sets the offset from 
+        //  AnyTime.Converter.setUtcFormatOffsetAlleged()  sets the offset from
         //  UTC, in minutes, to claim that a Date object represents during
         //  formatting, even though it is formatted using local time.  This merely
@@ -1141 +1141 @@
         })( this ); // AnyTime.Converter construction
 
-    }; // AnyTime.Converter = 
+    }; // AnyTime.Converter =
 
 //=============================================================================
@@ -1237 +1237 @@
 //      value for Sunday.
 //
-//    hideInput - if true, the <input> is "hidden" (the picker appears in 
+//    hideInput - if true, the <input> is "hidden" (the picker appears in
 //      its place). This actually sets the border, height, margin, padding
 //      and width of the field as small as possivle, so it can still get focus.
@@ -2012 +2012 @@
                         oH = oHmax;
                         this.oBody.height( oH - (title.AnyTime_height( true ) + oBHS) );
-                        this.oBody.width( this.oBody.width() + 20 ); // add nominal px for scrollbar 
+                        this.oBody.width( this.oBody.width() + 20 ); // add nominal px for scrollbar
                         this.oDiv.width( this.oDiv.width() + 20 );
                         if( __msie6 || __msie7 ) // IE bugs!
@@ -2169 +2169 @@
             //  the div is clicked (shorter delays don't always work!)  To prevent
             //  problems cause by scrollbar focus (except in FF), focus is
-            //  force-restored if the offset div is visible. 
+            //  force-restored if the offset div is visible.
             //---------------------------------------------------------------------
 
@@ -2336 +2336 @@
             //  * Ctrl+Home moves focus to the first day of the year.
             //  * Ctrl+End moves focus to the last day of the year.
-            //  * Esc closes a DatePicker that is opened as a Popup.  
+            //  * Esc closes a DatePicker that is opened as a Popup.
             //
             //  The following actions (for multiple-date selection) are NOT
             //  supported:
-            //  * Shift+Arrow performs continous selection.  
+            //  * Shift+Arrow performs continous selection.
             //  * Ctrl+Space multiple selection of certain days.
             //
@@ -2350 +2350 @@
             //  * RightArrow moves focus right or down to next value or field.
             //  * UpArrow moves focus up or left to previous value or field.
-            //  * DownArrow moves focus down or right to next value or field 
+            //  * DownArrow moves focus down or right to next value or field
             //  * PageUp moves focus to the current value in the previous units
             //    (for example, from ten-minutes to hours or one-minutes to
             //    ten-minutes or months to years).
             //  * PageDown moves focus to the current value in the next units
-            //    (for example, from hours to ten-minutes or ten-minutes to 
+            //    (for example, from hours to ten-minutes or ten-minutes to
             //    one-minutes or years to months).
             //  * Home moves the focus to the first unit button.

tapas/web/resources/js/classesForJQuery/LoginButton.js

@@ -228 +228 @@
     {
         this.errors = jQuery.parseJSON( result ).errors;
-        this.setJSONUser( null != jQuery.parseJSOetherN( result ).jSONUser ? jQuery.parseJSON( result ).jSONUser : false );
+        this.setJSONUser( null != jQuery.parseJSON( result ).jSONUser ? jQuery.parseJSON( result ).jSONUser : false );
         if( null == this.errors )
             this.updateLoginOrLogout();
@@ -252 +252 @@
             this.anotherOnClickLogout();
 
-        document.location.href = "project?methodName=home";
+        document.location.href = "project?methodName=home_en";
 
     },

tapas/web/resources/jsp/dataProtocol_en.jsp

@@ -2 +2 @@
 <BR/>
 By using TAPAS, the user takes full responsibility of whatever may happen as a result of its use. The organizations establishing and maintaining the TAPAS web site and services should not be hold responsible for any inconvenient that may result in the use of TAPAS.
-Most of the discrepancies between actual observations and the predictions of the simulated transmission noted during the validation period can be assigned to 4 main causes :
+Most of the discrepancies between actual observations and the predictions of the simulated transmission noted during the validation period can be assigned to 4 main causes :<br>
 - highly saturated regions of absorption, where the transmission is actually 0 or very small.<br>
 - an instrument PSF which differs from the user-defined Gaussian, either because of an incorrect choice of PFS width, or because the true PSF is not Gaussian. The actual PSF of an instrument may evolve along the spectrum.<br>
 - an incorrect wavelength calibration of the instrument.<br>
 - a difference of H2O content between the meteorological estimate and the reality.<br>
+- the continuum absorption of O2 (collision induced absorption), which is now available in the HITRAN data base, is not yet implemented in TAPAS.
 
 

tapas/web/resources/jsp/dataProtocol_fr.jsp

@@ -1 +1 @@
 <div class="title1">TAPAS Protocole de données</div>
-<BR/>
+<br/>
 En utilisant TAPAS, l'utilisateur assume l'entiÚre responsabilité de tout ce qui peut se produire en raison de son utilisation. Les organisations qui maintiennent le site Web TAPAS et les services associés ne pourront pas être tenus responsable pour tout inconvénient qui pourrait résulter de l'utilisation de TAPAS.
 La plupart des écarts entre les observations réelles et les prévisions de la transmission simulée notée au cours de la période de validation provient de 4 causes principales :<br>
-- Les régions fortement saturéesen absorption, où la transmission est en fait 0 ou trÚs faible <br>
+- Les régions fortement saturées en absorption, où la transmission est en fait 0 ou trÚs faible <br>
 - Un instrument qui diffÚre de la fonction gaussienne définie par l'utilisateur, soit en raison d'un mauvais choix de largeur PFS, soit parce que le vrai PSF n'est pas gaussien. Le PSF réelle d'un instrument est susceptible d'évoluer le long du spectre. <br>
 - Un étalonnage de longueur d'ondes incorrect de l'instrument. <br>
-- Une différence de teneur en H2O entre l'estimation météorologique et la réalité.
-<BR/>
+- Une différence de teneur en H2O entre l'estimation météorologique et la réalité.<br>
+- L'absorption continue de O2 (absorption induite par collision), qui est maintenant disponible dans la base de données HITRAN, n'est pas encore implémentée dans TAPAS.
+<br/>
 <a href="project?methodName=downloadFileDataProtocolFr">
     <button class="dataProtocolDownloadButton">Télécharger</button>

tapas/web/src/com/ether/Controller.java

@@ -234 +234 @@
     private static final Log LOGGER = LogFactory.getLog( Controller.class );
 
-    private static final String VIEW_INDEX = "init";
+    private static final String VIEW_INDEX = "init_en";
     private static final String VIEW_FORM_TAPAS = "project/formTapas";
 }

tapas/web/src/messages_en.properties

@@ -28 +28 @@
 label.eco2=CO2 extinction
 label.eo3=O3 extinction
+label.ech4=CH4 extinction
+label.en2o=N2O extinction
 
 text.validnum=shoud be numeric

tapas/web/src/messages_fr.properties

@@ -27 +27 @@
 label.eco2=Extinction CO2
 label.eo3=Extinction O3
+label.ech4=CH4 extinction
+label.en2o=N2O extinction
 
 label.observatory=Observatoire