Changeset 70 for ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/presentation/traducteur/TraducteurCarte.java
- Timestamp:
- 04/26/10 19:12:49 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/presentation/traducteur/TraducteurCarte.java
r68 r70 2 2 3 3 import java.text.NumberFormat; 4 import java.util.Calendar; 5 import java.util.GregorianCalendar; 4 6 import java.util.HashMap; 5 7 import java.util.Map; … … 15 17 16 18 public Map<String, String> tradCritere2Stat(CritereBean critereBean, CarteBean carteBean) { 17 Map<String, String> critere = new HashMap<String, String>();19 Map<String, String> critere = new HashMap<String, String>(); 18 20 19 if (critereBean == null) { 20 LoggerPerso.log(TraducteurCarte.class, LoggerPerso.WARN, "criterebean null"); 21 if (critereBean == null) { 22 LoggerPerso.log(TraducteurCarte.class, LoggerPerso.WARN, "criterebean null"); 23 return critere; 24 } 25 26 String northbcN = carteBean.getZone_demandee().getNorthbcN().replace(",","."); 27 String southbcN = carteBean.getZone_demandee().getSouthbcN().replace(",","."); 28 String eastbcN = carteBean.getZone_demandee().getEastbcN().replace(",","."); 29 String westbcN = carteBean.getZone_demandee().getWestbcN().replace(",","."); 30 31 critere.put("lat-max", northbcN); 32 critere.put("lat-min", southbcN); 33 critere.put("lon-max", eastbcN); 34 critere.put("lon-min", westbcN); 35 // critere.put("lat-max", "90"); 36 // critere.put("lat-min", "-90"); 37 // critere.put("lon-max", "180"); 38 // critere.put("lon-min", "-180"); 39 critere.put("beg-date", critereBean.getBegDate()); 40 critere.put("end-date", critereBean.getEndDate()); 41 ////system.out.println("TraducteurCarte::" + critere); 21 42 return critere; 22 43 } 44 45 public Map<String, String> tradCritere2Total(CritereBean critereBean, CarteBean carteBean) { 46 Map<String, String> critere = new HashMap<String, String>(); 23 47 24 String northbcN = carteBean.getZone_affichee().getNorthbcN().replace(",","."); 25 String southbcN = carteBean.getZone_affichee().getSouthbcN().replace(",","."); 26 String eastbcN = carteBean.getZone_affichee().getEastbcN().replace(",","."); 27 String westbcN = carteBean.getZone_affichee().getWestbcN().replace(",","."); 48 if (critereBean == null) { 49 LoggerPerso.log(TraducteurCarte.class, LoggerPerso.WARN, "criterebean null"); 50 return critere; 51 } 52 String northbcN = carteBean.getZone_demandee().getNorthbcN().replace(",","."); 53 String southbcN = carteBean.getZone_demandee().getSouthbcN().replace(",","."); 54 String eastbcN = carteBean.getZone_demandee().getEastbcN().replace(",","."); 55 String westbcN = carteBean.getZone_demandee().getWestbcN().replace(",","."); 28 56 29 critere.put("lat-max", northbcN); 30 critere.put("lat-min", southbcN); 31 critere.put("lon-max", eastbcN); 32 critere.put("lon-min", westbcN); 33 critere.put("beg-date", critereBean.getBegDate()); 34 critere.put("end-date", critereBean.getEndDate()); 35 ////system.out.println("TraducteurCarte::" + critere); 36 return critere; 57 critere.put("lat-max", northbcN); 58 critere.put("lat-min", southbcN); 59 critere.put("lon-max", eastbcN); 60 critere.put("lon-min", westbcN); 61 // critere.put("lat-max", "90"); 62 // critere.put("lat-min", "-90"); 63 // critere.put("lon-max", "180"); 64 // critere.put("lon-min", "-180"); 65 String begDate, endDate; 66 if (carteBean.getTotal().equals("totalDay")) { 67 begDate = critereBean.getDay(); 68 endDate = critereBean.getDay(); 69 } else if (carteBean.getTotal().equals("totalPeriod")) { 70 begDate = critereBean.getBegDate(); 71 endDate = critereBean.getEndDate(); 72 } else if (carteBean.getTotal().equals("totalYear")) { 73 begDate = critereBean.getYear()+"-01-01"; 74 endDate = critereBean.getYear()+"-12-31"; 75 } else { 76 begDate = critereBean.getMonth()+"-01"; 77 Calendar cal = new GregorianCalendar(critereBean.getYear().intValue(), Integer.parseInt(critereBean.getMonth().substring(5))-1, 1); 78 int jourMax = cal.getActualMaximum(Calendar.DAY_OF_MONTH); 79 endDate = critereBean.getMonth()+"-"+jourMax; 80 } 81 critere.put("beg-date", begDate); 82 critere.put("end-date", endDate); 83 return critere; 37 84 } 38 39 85 40 86 public Map<String, String> tradCritere2StatReinit(CritereBean critereBean, CarteBean carteBean) { … … 48 94 numberFormat = NumberFormat.getNumberInstance(); 49 95 numberFormat.setMaximumFractionDigits(2); 50 //LoggerPerso.log(TraducteurCarte.class, LoggerPerso.DEBUG, "!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!lat-max "+ numberFormat.format(Double.toString(critereBean.getNorthbc())));96 //LoggerPerso.log(TraducteurCarte.class, LoggerPerso.DEBUG, "!!!!lat-max "+ numberFormat.format(Double.toString(critereBean.getNorthbc()))); 51 97 52 98 String northbcN = getNorthbcN(critereBean.getNorthbc()).replace(",","."); … … 65 111 critere.put("lon-min", Double.toString(critereBean.getWestbc())) ;*/ 66 112 67 //LoggerPerso.log(TraducteurCarte.class, LoggerPerso.DEBUG, "!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!lat-max "+ numberFormat.format(Double.toString(critereBean.getNorthbc())));113 //LoggerPerso.log(TraducteurCarte.class, LoggerPerso.DEBUG, "!!!!lat-max "+ numberFormat.format(Double.toString(critereBean.getNorthbc()))); 68 114 69 115 … … 72 118 ////system.out.println("TraducteurCarte::" + critere); 73 119 return critere; 120 } 121 122 public Map<String, String> tradCritere2TotalReinit(CritereBean critereBean, CarteBean carteBean) { 123 Map<String, String> critere = new HashMap<String, String>(); 124 125 if (critereBean == null) { 126 LoggerPerso.log(TraducteurCarte.class, LoggerPerso.WARN, "criterebean null"); 127 return critere; 74 128 } 129 130 numberFormat = NumberFormat.getNumberInstance(); 131 numberFormat.setMaximumFractionDigits(2); 132 133 String northbcN = getNorthbcN(critereBean.getNorthbc()).replace(",","."); 134 String southbcN = getSouthbcN(critereBean.getSouthbc()).replace(",","."); 135 String eastbcN = getEastbcN(critereBean.getEastbc()).replace(",","."); 136 String westbcN = getWestbcN(critereBean.getWestbc()).replace(",","."); 137 138 critere.put("lat-max", northbcN) ; 139 critere.put("lat-min", southbcN) ; 140 critere.put("lon-max", eastbcN) ; 141 critere.put("lon-min", westbcN) ; 142 143 String begDate, endDate; 144 if (carteBean.getTotal().equals("totalDay")) { 145 begDate = critereBean.getDay(); 146 endDate = critereBean.getDay(); 147 } else if (carteBean.getTotal().equals("totalPeriod")) { 148 begDate = critereBean.getBegDate(); 149 endDate = critereBean.getEndDate(); 150 } else if (carteBean.getTotal().equals("totalYear")) { 151 begDate = critereBean.getYear()+"-01-01"; 152 endDate = critereBean.getYear()+"-12-31"; 153 } else { 154 begDate = critereBean.getMonth()+"-01"; 155 Calendar cal = new GregorianCalendar(critereBean.getYear().intValue(), Integer.parseInt(critereBean.getMonth().substring(5))-1, 1); 156 int jourMax = cal.getActualMaximum(Calendar.DAY_OF_MONTH); 157 endDate = critereBean.getMonth()+"-"+jourMax; 158 } 159 critere.put("beg-date", begDate); 160 critere.put("end-date", endDate); 161 return critere; 162 } 75 163 76 164 public String getEastbcN(Double eastbc) {
Note: See TracChangeset
for help on using the changeset viewer.