Geoservice preliminary colors

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoService.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoService.java
index ba5445ed1add6cbc6b8e1584dcf378af67a8d5ca..98bae9abaa3e8cab1d819673a4142625f6e8a6f9 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoService.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoService.java
@@ -26,6 +26,7 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.description.Distribution;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;\r
+import eu.etaxonomy.cdm.model.description.PresenceTerm;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
 \r
@@ -54,7 +55,14 @@ public class EditGeoService {
         */\r
        //TODO move to an other place -> e.g. service layer\r
        @Transient\r
-       public static String getEditGeoServiceUrlParameterString(Set<Distribution> distributions, Map<PresenceAbsenceTermBase<?>, Color> presenceAbsenceTermColors, int width, int height, String bbox, String backLayer){\r
+       public static String getEditGeoServiceUrlParameterString(\r
+                       Set<Distribution> distributions, \r
+                       Map<PresenceAbsenceTermBase<?>,Color> presenceAbsenceTermColors, \r
+                       int width, \r
+                       int height, \r
+                       String bbox, \r
+                       String backLayer){\r
+               \r
                String result = "";\r
                String layer = ""; \r
                String areaData = "";\r
@@ -67,7 +75,8 @@ public class EditGeoService {
 \r
                \r
                if (presenceAbsenceTermColors == null) {\r
-                       presenceAbsenceTermColors = new HashMap<PresenceAbsenceTermBase<?>, Color>(); \r
+                       //presenceAbsenceTermColors = new HashMap<PresenceAbsenceTermBase<?>, Color>();\r
+                       presenceAbsenceTermColors = makeDefaultColorMap();\r
                }\r
 \r
                //List<String> layerStrings = new ArrayList<String>(); \r
@@ -183,6 +192,18 @@ public class EditGeoService {
                return result;\r
        }\r
        \r
+       private static Map<PresenceAbsenceTermBase<?>,Color> makeDefaultColorMap(){\r
+               Map<PresenceAbsenceTermBase<?>,Color> result = new HashMap<PresenceAbsenceTermBase<?>, Color>();\r
+               result.put(PresenceTerm.NATIVE(), Color.RED);\r
+               result.put(PresenceTerm.CULTIVATED(), Color.BLUE);\r
+               result.put(PresenceTerm.INTRODUCED(), Color.GREEN);\r
+               result.put(PresenceTerm.INTRODUCED_ADVENTITIOUS(), Color.YELLOW);\r
+               result.put(PresenceTerm.INTRODUCED_CULTIVATED(), Color.MAGENTA);\r
+               result.put(PresenceTerm.INTRODUCED_NATURALIZED(), Color.ORANGE);\r
+               result.put(PresenceTerm.NATIVE_DOUBTFULLY_NATIVE(), Color.PINK);\r
+               return result;\r
+       }\r
+       \r
        \r
        private static String getAreaAbbrev(Distribution distribution){\r
                NamedArea area = distribution.getArea();\r
@@ -237,6 +258,8 @@ public class EditGeoService {
        }\r
        \r
        \r
+       \r
+       \r
        /**\r
         * @param args\r
         */\r

diff --git a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java
index 54a5a9b4065e4f1565a6e4165d14f34295bf50bf..7d632f45e01c1f0075c3bb50b7fbad2505667723 100644 (file)
--- a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java
+++ b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java
@@ -80,7 +80,7 @@ public class EditGeoServiceTest {
                distributions.add(Distribution.NewInstance(TdwgArea.getAreaByTdwgAbbreviation("IND-AP"), PresenceTerm.PRESENT()));\r
                Map<PresenceAbsenceTermBase<?>, Color> presenceAbsenceColorMap = new HashMap<PresenceAbsenceTermBase<?>, Color>();\r
                presenceAbsenceColorMap.put(PresenceTerm.PRESENT(), Color.BLUE);\r
-               presenceAbsenceColorMap.put(PresenceTerm.INTRODUCED(), Color.RED);\r
+               presenceAbsenceColorMap.put(PresenceTerm.INTRODUCED(), Color.BLACK);\r
                presenceAbsenceColorMap.put(PresenceTerm.CULTIVATED(), Color.YELLOW);\r
                presenceAbsenceColorMap.put(AbsenceTerm.ABSENT(), Color.DARK_GRAY);\r
                String backLayer ="";\r