--- ECHO_content/ECHO_collection.py	2004/05/07 16:52:04	1.69
+++ ECHO_content/ECHO_collection.py	2004/05/07 18:04:29	1.72
@@ -683,21 +683,27 @@ class ECHO_collection(Folder, Persistent
     
     def createJavaScript(self):
         """CreateJava"""
-        #ret=javaScriptMain
-        ret=""
+        ret=javaScriptMain
 
         dynamical="\n"
         for ob in self.getGraphicCoords():
 	    if ob[4][4] == "":	
-	        #dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
+	        dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
+	    else:
+		dynamical+="""Coords.push(new Coord('%s', Img, %s));//%s\n"""%(ob[1],ob[0],ob[4][4])
+		dynamical+="ShowArrow(new getObj('i.%s'),Img,%s);\n"%(ob[1],ob[0])
+	ret+=javaHandler%dynamical
+        return ret
+
+    def createJSAreas(self):
+        """CreateJava"""
+        dynamical="\n"
+        for ob in self.getGraphicCoords():
+	    if ob[5] == "area":	
 	        dynamical+="""addArea('%s', 'overview', %s, 'area');\n"""%(ob[1],ob[0])
 	    else:
 	        dynamical+="""addArea('%s', 'overview', %s, 'arrow');\n"""%(ob[1],ob[0])
-		#dynamical+="""Coords.push(new Coord('%s', Img, %s));//%s\n"""%(ob[1],ob[0],ob[4][4])
-		#dynamical+="ShowArrow(new getObj('i.%s'),Img,%s);\n"%(ob[1],ob[0])
-	#ret+=javaHandler%dynamical
-        ret+=dynamical
-        return ret
+        return dynamical
     
     security.declarePublic('getCreditObject')
     def getCreditObject(self,name):
@@ -844,7 +850,7 @@ class ECHO_collection(Folder, Persistent
 		    return "#dddddd"
 	    
     def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None):
-        """Änderung der Properties"""
+        """Aenderung der Properties"""
 
         self.secondaryLink=secondaryLink
         self.secondaryLinkTitle=secondaryLinkTitle
@@ -936,13 +942,21 @@ class ECHO_collection(Folder, Persistent
                     if len(coordtemp)>3:
                         coord=coordtemp[0:4]
                         label=""
+			vc=""
                         if hasattr(object,'label') and not object.label=="":
                             label=object.label
                         elif hasattr(object,'title') and not object.title=="":
                             label=object.title
                         else:
                             label=object.getId()
-                        ids.append([string.join(coord,", "),object.getId(),label,object,coordtemp,object.viewClassification])
+			if object.viewClassification != "":
+			    vc=object.viewClassification
+			else:
+			    if len(coordtemp) > 4 and coordtemp[4] != "":
+				vc="view point"
+			    else:
+				vc="area"
+                        ids.append([string.join(coord,", "),object.getId(),label,object,coordtemp,vc])
         return ids