[Sammoa-commits] r342 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application: . map

1 Aug 2012

Author: tchemit
Date: 2012-08-01 18:34:48 +0200 (Wed, 01 Aug 2012)
New Revision: 342

Url: http://forge.codelutin.com/repositories/revision/sammoa/342

Log:
refs #1203: Export SHP (add service part layout), with no implementation for the moment


Added:
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapModel.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java
Modified:
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java
===================================================================

--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java	2012-08-01 16:33:52 UTC (rev 341)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java	2012-08-01 16:34:48 UTC (rev 342)
@@ -29,6 +29,7 @@
 import fr.ulr.sammoa.application.audio.AudioRecorderDefault;
 import fr.ulr.sammoa.application.gps.GpsConfig;
 import fr.ulr.sammoa.application.gps.GpsHandler;
+import fr.ulr.sammoa.application.map.ExportMapService;
 import fr.ulr.sammoa.persistence.SammoaPersistence;
 
 import java.lang.reflect.Constructor;
@@ -42,7 +43,7 @@
 public class SammoaContext {
 
     protected static SammoaContext instance;
-    
+
     protected SammoaConfig config;
 
     protected SammoaPersistence persistence;
@@ -51,6 +52,8 @@
 
     protected ReferentialService referentialService;
 
+    protected ExportMapService exportMapService;
+
     protected AudioRecorder audioRecorder;
 
     protected GpsHandler gpsHandler;
@@ -90,7 +93,7 @@
             Class<? extends GpsHandler> gpsHandlerClass = gpsConfig.getGpsHandlerClass();
             try {
 
-                Constructor<? extends GpsHandler> constructor = 
+                Constructor<? extends GpsHandler> constructor =
                         gpsHandlerClass.getConstructor(GpsConfig.class);
 
                 gpsHandler = constructor.newInstance(gpsConfig);
@@ -107,7 +110,7 @@
         }
         return gpsHandler;
     }
-    
+
     public FlightService getFlightService() {
         if (flightService == null) {
             flightService = new FlightService(this);
@@ -122,6 +125,13 @@
         return referentialService;
     }
 
+    public ExportMapService getExportMapService() {
+        if (exportMapService == null) {
+            exportMapService = new ExportMapService(this);
+        }
+        return exportMapService;
+    }
+
     public void open() {
         persistence.open(
                 config.getApplicationConfig().getFlatOptions(),

Added: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapModel.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapModel.java	                        (rev 0)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapModel.java	2012-08-01 16:34:48 UTC (rev 342)
@@ -0,0 +1,113 @@
+package fr.ulr.sammoa.application.map;
+
+import com.google.common.collect.Lists;
+import fr.ulr.sammoa.persistence.Campaign;
+import fr.ulr.sammoa.persistence.RouteType;
+import fr.ulr.sammoa.persistence.Species;
+import fr.ulr.sammoa.persistence.Strate;
+import fr.ulr.sammoa.persistence.StringRef;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Model of export map UI.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.5
+ */
+public class ExportMapModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static ExportMapModel newModel(File exportDirectory,
+                                          String exportFilename,
+                                          Campaign campaign,
+                                          Date beginDate,
+                                          Date endDate,
+                                          List<Strate> strates,
+                                          List<RouteType> routeTypes,
+                                          List<Species> species,
+                                          List<StringRef> speciesTypes) {
+        ExportMapModel result = new ExportMapModel();
+        result.exportDirectory=exportDirectory;
+        result.exportFilename=exportFilename;
+        result.campaign = campaign;
+        result.beginDate = beginDate;
+        result.endDate = endDate;
+        result.strates = strates;
+        result.routeTypes = routeTypes;
+        result.species = species;
+        result.speciesTypes = speciesTypes;
+
+        return result;
+    }
+
+    protected Campaign campaign;
+
+    protected Date beginDate;
+
+    protected Date endDate;
+
+    protected List<Strate> strates;
+
+    protected List<RouteType> routeTypes;
+
+    protected List<Species> species;
+
+    protected List<StringRef> speciesTypes;
+
+    protected File exportDirectory;
+    protected String exportFilename;
+
+    public File getExportDirectory() {
+        return exportDirectory;
+    }
+
+    public String getExportFilename() {
+        return exportFilename;
+    }
+
+    public Campaign getCampaign() {
+        return campaign;
+    }
+
+    public Date getBeginDate() {
+        return beginDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public List<Strate> getStrates() {
+        if (strates == null) {
+            strates = Lists.newArrayList();
+        }
+        return strates;
+    }
+
+    public List<RouteType> getRouteTypes() {
+        if (routeTypes == null) {
+            routeTypes = Lists.newArrayList();
+        }
+        return routeTypes;
+    }
+
+    public List<Species> getSpecies() {
+        if (species == null) {
+            species = Lists.newArrayList();
+        }
+        return species;
+    }
+
+    public List<StringRef> getSpeciesTypes() {
+        if (speciesTypes == null) {
+            speciesTypes = Lists.newArrayList();
+        }
+        return speciesTypes;
+    }
+
+}


Property changes on: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapModel.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java	                        (rev 0)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java	2012-08-01 16:34:48 UTC (rev 342)
@@ -0,0 +1,41 @@
+package fr.ulr.sammoa.application.map;
+
+import fr.ulr.sammoa.application.SammoaConfig;
+import fr.ulr.sammoa.application.SammoaContext;
+import fr.ulr.sammoa.persistence.SammoaPersistence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+/**
+ * Export map service
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.5
+ */
+public class ExportMapService {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(ExportMapService.class);
+
+    protected SammoaContext context;
+
+    protected SammoaConfig config;
+
+    protected SammoaPersistence persistence;
+
+    public ExportMapService(SammoaContext context) {
+        this.context = context;
+        this.persistence = context.getPersistence();
+        this.config = context.getConfig();
+    }
+
+    public void exportEffortsMap(ExportMapModel dataModel) {
+
+    }
+
+    public void exportObservationsMap(ExportMapModel dataModel) {
+
+    }
+}


Property changes on: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

    

[Sammoa-commits] r342 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application: . map

tchemit＠users.forge.codelutin.com