[fusion-commits] r1671 - in trunk: . layers/Generic lib

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-11-19 10:53:40 -0500 (Wed, 19 Nov 2008)
New Revision: 1671

Modified:
   trunk/build.xml
   trunk/layers/Generic/Generic.js
   trunk/lib/ApplicationDefinition.js
   trunk/parseAppDef.xsl
Log:
re #140: update of build.xml to reflect new directory structure for compressed builds


Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-11-18 20:45:38 UTC (rev 1670)
+++ trunk/build.xml	2008-11-19 15:53:40 UTC (rev 1671)
@@ -195,7 +195,7 @@
 <!-- =================== concat build ================================== -->
   <target description="concatenate core files into a single file" name="concat" depends="prepare">
     <echo message="concatenating core files"/>
-    <delete dir="${buildOutput}.js"/>
+    <delete file="${buildOutput}.js"/>
     
     <!-- Fusion looks for it's own script name to set paths for other widgets
         so replace the value to look for with the sfName used to create the file-->
@@ -220,6 +220,7 @@
         />
         <fileset dir="${build.home}/text" includes="**/*.json"/>
         <filelist dir="${build.home}" files="configHeader.json config.json"/>
+        <filelist dir="${build.home}/layers" files="Layers.js"/>
     </concat>
     
     <replace file="${buildOutput}.js" token="lib/fusion" value="lib/${sfName}"/>
@@ -233,7 +234,7 @@
     <!-- merge everything into a single file -->
     <concat destfile="${buildOutput}.js" outputencoding="UTF-8" append="true">
         <fileset dir="${build.home}/widgets" includes="**/*.js"/>
-        <fileset dir="${build.home}" includes="layers/**"/>
+        <fileset dir="${build.home}/layers" includes="**/*.js" excludes="Layers.js"/>
     </concat>
   </target>
 

Modified: trunk/layers/Generic/Generic.js
===================================================================
--- trunk/layers/Generic/Generic.js	2008-11-18 20:45:38 UTC (rev 1670)
+++ trunk/layers/Generic/Generic.js	2008-11-19 15:53:40 UTC (rev 1671)
@@ -1,5 +1,5 @@
 /**
- * Fusion.Maps.Generic
+ * Fusion.Layers.Generic
  *
  * $Id: Generic.js 1590 2008-10-10 14:01:27Z madair $
  *
@@ -24,9 +24,9 @@
  */
 
 /***************************************************************************
-* Class: Fusion.Maps.Generic
+* Class: Fusion.Layers.Generic
 *
-* Implements the map widget for Generic mapping services.
+* Implements the map layer for Generic mapping services.
 */
 
 Fusion.Layers.Generic = OpenLayers.Class(Fusion.Layers, {

Modified: trunk/lib/ApplicationDefinition.js
===================================================================
--- trunk/lib/ApplicationDefinition.js	2008-11-18 20:45:38 UTC (rev 1670)
+++ trunk/lib/ApplicationDefinition.js	2008-11-19 15:53:40 UTC (rev 1671)
@@ -526,7 +526,9 @@
             }
             break;
           default:
-            Fusion.require('layers/Generic/Generic.js');
+            if ( !Fusion.Layers[this.type] ) {
+              Fusion.require('layers/Generic/Generic.js');
+            }
             break;
         }
     }

Modified: trunk/parseAppDef.xsl
===================================================================
--- trunk/parseAppDef.xsl	2008-11-18 20:45:38 UTC (rev 1670)
+++ trunk/parseAppDef.xsl	2008-11-19 15:53:40 UTC (rev 1671)
@@ -55,7 +55,15 @@
   </xsl:template>
   
   <xsl:template match="MapGroup/Map">
-    <xsl:value-of select="Type"/>/<xsl:value-of select="Type"/>.js 
+    <xsl:variable name="layerType">
+      <xsl:choose>
+        <xsl:when test="Type='MapGuide' or Type='MapServer'">
+          <xsl:value-of select="Type"/>
+        </xsl:when>
+        <xsl:otherwise>Generic</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    layers/<xsl:value-of select="$layerType"/>/<xsl:value-of select="$layerType"/>.js 
   </xsl:template>
   
   <xsl:template name="removeDuplicates"> <!-- tokenize a string -->