Adaptation a l'arrivée des technos de couvertures

src/data/ISP.java

@@ -14,10 +14,11 @@ public class ISP implements AffichableSurIRC {
 	private String date_added;
 	private String last_update;
 	private ISPdata data;
+	private CoveredAreas [] coveredAreas;
 	
 	
 	
-	public ISP(String name, int id, boolean isFFDNMember, String date_added, String last_update, ISPdata data) {
+	public ISP(String name, int id, boolean isFFDNMember, String date_added, String last_update, ISPdata data, CoveredAreas [] ca) {
 		super();
 		this.name = name;
 		this.id = id;
@@ -25,6 +26,7 @@ public class ISP implements AffichableSurIRC {
 		this.date_added = date_added;
 		this.last_update = last_update;
 		this.data = data;
+		this.coveredAreas = ca;
 	}
 	
 	public String getShortestName() {
@@ -174,4 +176,9 @@ public class ISP implements AffichableSurIRC {
 		return data.getShortname();
 	}
 
+	public CoveredAreas[] getCoveredAreas() {
+		return coveredAreas;
+	}
+
+	
 }

src/data/ISPDAO.java

@@ -17,6 +17,7 @@ import java.util.Scanner;
 
 import javax.net.ssl.HttpsURLConnection;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -140,7 +141,8 @@ public class ISPDAO {
 		ISPdata ispData = new ISPdata(jsonObj.getJSONObject("ispformat"));
 		String date_added = getDateAdded(jsonObj);
 		String last_update = getDateUpdated(jsonObj);
-		ISP isp = new ISP(name, id, member, date_added, last_update, ispData);
+		CoveredAreas[] ca = getCoveredAreas(jsonObj);
+		ISP isp = new ISP(name, id, member, date_added, last_update, ispData,ca);
 		return isp;
 		}else {
 			if(Main.isDebug()) {
@@ -218,6 +220,30 @@ public class ISPDAO {
 		return res;
 	}
 	
+	private CoveredAreas [] getCoveredAreas(JSONObject json) {
+		CoveredAreas [] res=null;
+		try {
+			JSONArray ja = json.getJSONArray("coveredAreas");
+			res = new CoveredAreas [ja.length()];
+			for(int i=0;i<ja.length();i++) {
+				JSONObject jo = ja.getJSONObject(i);
+				JSONArray tech= jo.getJSONArray("technologies");
+				String name = jo.getString("name");
+				List<TechnoCoverage> technos = new ArrayList<>();
+				for(int j=0;j<tech.length();j++) {
+					technos.add(TechnoCoverage.getFromString(tech.getString(j)));
+				}
+				res[i]=new CoveredAreas(name, technos);				
+				
+				
+			}
+			return res;
+		}catch(JSONException jo) {
+			return null;
+		}
+		
+	}
+	
 	
 	/**
 	 *TODO : implements this in Isp

src/data/ISPdata.java

@@ -18,6 +18,7 @@ public class ISPdata {
 	private String email;
 	private String creationDate;
 	private String joinDate;
+	
 
 
 

src/main/Cache.java

@@ -183,6 +183,14 @@ public class Cache implements AffichableSurIRC {
 	}
 	
 	
+	public ISP getISPWithGeoZone(String s) {
+		for(ISP i: cache) {
+			
+		}
+		
+		return null;
+		
+	}
 	
 	
 }