?? ?

2008-03-31 2bcf5a6ff5b8ea1799afd9b30f602a6670e6794c

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/ElementTypeCriterion.java

@@ -2,12 +2,16 @@

import com.ximple.io.dgn7.Element;

import java.util.ArrayList;

public class ElementTypeCriterion implements Comparable
{
    private int elementTypeId;
    private int elementType;
    private ArrayList<Integer> elementTypeArray  ;

    public ElementTypeCriterion()
    {
            elementTypeArray = new ArrayList<Integer>();
    }

    public int compareTo(Object o)
@@ -15,19 +19,30 @@
        if (o instanceof Element)
        {
            Element elm = (Element) o;
            if (elm.getElementType().id == elementTypeId)

            for(Integer etype : getElementTypeArray())
            {
             if (elm.getElementType().id == etype.intValue())
                return 0;
            }

        }
        return -1;
    }

    public int getElementTypeId()
    public int getElementType()
    {
        return elementTypeId;
        return elementType;
    }

    public void setElementTypeId(int elementTypeId)
     public ArrayList<Integer> getElementTypeArray()
    {
        this.elementTypeId = elementTypeId;
        return elementTypeArray;
    }

    public void setElementType(int itype)
    {
        this.elementType =  itype ;
        this.elementTypeArray.add(itype);
    }
}

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompIdDispatchableFilter.java

@@ -15,7 +15,6 @@
    private int tid;
    private int cid;
    private CreateFeatureTypeStrategy createStrategy;
    private ArrayList<java.lang.Integer> elemtypeArray = new ArrayList<java.lang.Integer>();

    public TypeCompIdDispatchableFilter()
    {
@@ -51,11 +50,6 @@
        this.cid = cid;
    }

    public void setElemtypeArray(java.lang.Integer etype)
    {
        this.elemtypeArray.add(etype);
    }

    public CreateFeatureTypeStrategy getCreateStrategy()
    {
        return createStrategy;
@@ -67,24 +61,14 @@
    }



    //§PÂ_¬O§_²Å©M±ø¥ó
    public boolean isDispatchable(Element element)
    {
        FrammeAttributeData featureLinkage = getFeatureLinkage(element);
        if( featureLinkage != null && tid == featureLinkage.getFsc() && (cid == featureLinkage.getComponentID()))
        {
           for (Integer itype : this.elemtypeArray)
           {
               if(itype.intValue() == element.getElementType().id)
               {
                  return true ;
               }
           }

          return false ;
        }

        return false ;
        return featureLinkage != null && tid == featureLinkage.getFsc() &&
                (cid == featureLinkage.getComponentID()) &&
                (compareType(element) == 0);
    }

    public Feature execute(Element element)

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompLevelIdDispatchableFilter.java

@@ -75,8 +75,7 @@
        FrammeAttributeData featureLinkage = getFeatureLinkage(element);
        return featureLinkage != null && tid == featureLinkage.getFsc() &&
                (cid == featureLinkage.getComponentID()) &&
                (lid == element.getLevelIndex()) &&
                (getElmtype() == element.getElementType().id);
                (lid == element.getLevelIndex()) && (compareType(element) == 0);
    }

    public Feature execute(Element element)

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeIdDispatchableFilter.java

@@ -51,7 +51,7 @@
    {
        FrammeAttributeData featureLinkage = getFeatureLinkage(element);
        return featureLinkage != null && tid == featureLinkage.getFsc() &&
                (getElmtype() == element.getElementType().id);
                (compareType(element) == 0);
    }

    public Feature execute(Element element)

 xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/filter/ElementDispatcherRules.xml

@@ -29,23 +29,25 @@
      <set-properties-rule/>
      <bean-property-setter-rule pattern="name"/>
      <bean-property-setter-rule pattern="description"/>
      <bean-property-setter-rule pattern="elmtype"/>
       <!-- <bean-property-setter-rule pattern="elmtype"/> -->
      <bean-property-setter-rule pattern="tid"/>
      <bean-property-setter-rule pattern="cid"/>
        <pattern value="elmtype">
            <set-next-rule methodname="setElemtypeArray"  paramtype="java.lang.Integer"/>
            <set-properties-rule/>
        </pattern>
        <pattern value="LineCreateStrategy">
      <pattern value="elementCriterion">
        <object-create-rule classname="com.ximple.eofms.filter.ElementTypeCriterion"/>
        <set-next-rule methodname="addCriterion" paramtype="com.ximple.eofms.filter.ElementTypeCriterion"/>
        <set-properties-rule/>
       <bean-property-setter-rule pattern="elementType"/>
      </pattern>
      <pattern value="LineCreateStrategy">
            <object-create-rule classname="com.ximple.eofms.filter.CreateLineStringStrategy"/>
            <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
            <set-properties-rule/>
        </pattern>
        <pattern value="TextCreateStrategy">
      </pattern>
      <pattern value="TextCreateStrategy">
            <object-create-rule classname="com.ximple.eofms.filter.CreateTextStrategy"/>
            <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
            <set-properties-rule/>
        </pattern>
      </pattern>
    </pattern>
    <pattern value="TypeCompLevelFilter">
      <object-create-rule classname="com.ximple.eofms.filter.TypeCompLevelIdDispatchableFilter"/>

 xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml

@@ -5,274 +5,357 @@
    <tid>106</tid>
    <cid>0</cid>
    <description>¥D°ªÀ£½u</description>
    <elmtype>12</elmtype>
    <elementCriterion>
      <elementType>12</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-402.C-0">
    <tid>402</tid>
    <cid>0</cid>
    <description>Åܹq©Ò</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-402.C-1">
    <tid>402</tid>
    <cid>1</cid>
    <description>Åܹq©Òµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-402.C-2">
    <tid>402</tid>
    <cid>2</cid>
    <description>Åܹq©Ò¤¤¤åµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-411.C-0">
    <tid>411</tid>
    <cid>0</cid>
    <description>°t¹q³õ</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-411.C-1">
    <tid>411</tid>
    <cid>1</cid>
    <description>°t¹q³õµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-411.C-2">
    <tid>411</tid>
    <cid>2</cid>
    <description>°t¹q³õ-1/600</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-411.C-3">
    <tid>411</tid>
    <cid>3</cid>
    <description>°t¹q³õµù°O-1/600</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-407.C-0">
    <tid>407</tid>
    <cid>0</cid>
    <description>¹q±ì</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-407.C-1">
    <tid>407</tid>
    <cid>1</cid>
    <description>¹q±ìµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-407.C-2">
    <tid>407</tid>
    <cid>2</cid>
    <description>¹q±ì-1/600</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-407.C-3">
    <tid>407</tid>
    <cid>3</cid>
    <description>¹q±ì-1/600µù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-114.C-0">
    <tid>114</tid>
    <cid>0</cid>
    <description>¶}Ãö</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-114.C-1">
    <tid>114</tid>
    <cid>1</cid>
    <description>¶}Ãö°j¸ôµù°O</description>
    <elmtype>17</elmtype>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-114.C-2">
    <tid>114</tid>
    <cid>2</cid>
    <description>¶}Ãö¤p¬P¸¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-114.C-3">
    <tid>114</tid>
    <cid>3</cid>
    <description>¶}Ãö¤j¬P¸¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-122.C-0">
    <tid>122</tid>
    <cid>0</cid>
    <description>ª½±µ³s±µ</description>
    <elmtype>4</elmtype>
    <elementCriterion>
      <elementType>4</elementType>
      <elementType>17</elementType>  
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-122.C-1">
    <tid>122</tid>
    <cid>1</cid>
    <description>ª½±µ³s±µµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-107.C-0">
    <tid>107</tid>
    <cid>0</cid>
    <description>°ªÀ£¥Î¤á</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-107.C-2">
    <tid>107</tid>
    <cid>2</cid>
    <description>°ªÀ£¥Î¤á¤¤¤åµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-117.C-0">
    <tid>117</tid>
    <cid>0</cid>
    <description>TieÅÜÀ£¾¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-105.C-0">
    <tid>105</tid>
    <cid>0</cid>
    <description>ª½¸ô±µÀY</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-105.C-1">
    <tid>105</tid>
    <cid>1</cid>
    <description>ª½¸ô±µÀYµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-101.C-0">
    <tid>101</tid>
    <cid>0</cid>
    <description>¶×¬y±Æ</description>
    <elmtype>4</elmtype>
    <elementCriterion>
      <elementType>4</elementType>
      <elementType>12</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-120.C-0">
    <tid>120</tid>
    <cid>0</cid>
    <description>¸`ÂI</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-150.C-0">
    <tid>150</tid>
    <cid>0</cid>
    <description>¨â¸ô¶}Ãö</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-130.C-0">
    <tid>130</tid>
    <cid>0</cid>
    <description>¾É½u¥æ¤e</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-131.C-0">
    <tid>131</tid>
    <cid>0</cid>
    <description>¾É½uÅܧó</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-109.C-0">
    <tid>109</tid>
    <cid>0</cid>
    <description>¸õ½u³s±µ</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-116.C-0">
    <tid>116</tid>
    <cid>0</cid>
    <description>°ªÀ£²×ºÝ</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-108.C-0">
    <tid>108</tid>
    <cid>0</cid>
    <description>Â_¸ô¾¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-108.C-1">
    <tid>108</tid>
    <cid>1</cid>
    <description>Â_¸ô¾¹µù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-119.C-0">
    <tid>119</tid>
    <cid>0</cid>
    <description>¹qÅæ</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-115.C-0">
    <tid>115</tid>
    <cid>0</cid>
    <description>ÅÜÀ£¾¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-115.C-1">
    <tid>115</tid>
    <cid>1</cid>
    <description>ÅÜÀ£¾¹µù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-102.C-0">
    <tid>102</tid>
    <cid>0</cid>
    <description>¹q®e¾¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-100.C-0">
    <tid>100</tid>
    <cid>0</cid>
    <description>Á×¹p¾¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-140.C-0">
    <tid>140</tid>
    <cid>0</cid>
    <description>°ªÀ£½u¸ô</description>
    <elmtype>12</elmtype>
    <elementCriterion>
      <elementType>12</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-151.C-0">
    <tid>150</tid>
    <cid>0</cid>
    <description>±`³¬¶}Ãö</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <!-- Low Voltage Features -->
@@ -280,112 +363,144 @@
    <tid>200</tid>
    <cid>0</cid>
    <description>§CÀ£¸`ÂI</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-201.C-0">
    <tid>201</tid>
    <cid>0</cid>
    <description>±µ¤á½u</description>
    <elmtype>12</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-201.C-1">
    <tid>201</tid>
    <cid>1</cid>
    <description>±µ¤á½uµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-201.C-2">
    <tid>201</tid>
    <cid>2</cid>
    <description>±µ¤á½uªø«×µù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-202.C-0">
    <tid>202</tid>
    <cid>0</cid>
    <description>±µ¤áÂI</description>
    <elmtype>17</elmtype>
   <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-202.C-1">
    <tid>202</tid>
    <cid>1</cid>
    <description>±µ¤áÂIªùµPµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-203.C-0">
    <tid>203</tid>
    <cid>0</cid>
    <description>¸ô¿O³d¥ô¤À¬ÉÂI</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-203.C-1">
    <tid>203</tid>
    <cid>1</cid>
    <description>¸ô¿O³d¥ô¤À¬ÉÂIµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-204.C-0">
    <tid>204</tid>
    <cid>0</cid>
    <description>§CÀ£¸õ½u</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-205.C-0">
    <tid>205</tid>
    <cid>0</cid>
    <description>§CÀ£¾É½u</description>
    <elmtype>12</elmtype>
    <elementCriterion>
      <elementType>12</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-205.C-1">
    <tid>205</tid>
    <cid>1</cid>
    <description>§CÀ£¾É½uµù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-205.C-2">
    <tid>205</tid>
    <cid>2</cid>
    <description>§CÀ£¾É½uªø«×µù°O</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementType>7</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-206.C-0">
    <tid>206</tid>
    <cid>0</cid>
    <description>§CÀ£»»±±½c</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-207.C-0">
    <tid>207</tid>
    <cid>0</cid>
    <description>§CÀ£Äµ³ø¾¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-208.C-0">
    <tid>208</tid>
    <cid>0</cid>
    <description>§CÀ£²×ºÝ</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-209.C-0">
    <tid>209</tid>
    <cid>0</cid>
    <description>§CÀ£¥æ³q¸¹»x</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-210.C-0">
@@ -399,14 +514,18 @@
    <tid>210</tid>
    <cid>1</cid>
    <description>§CÀ£¦a¤U¾É½u¥´ÂI²Å¸¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
   <TypeCompFilter name="FSC-210.C-2">
    <tid>210</tid>
    <cid>2</cid>
    <description>§CÀ£¦a¤U¾É½uªø«×µù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-210.C-3">
@@ -420,7 +539,9 @@
    <tid>210</tid>
    <cid>4</cid>
    <description>§CÀ£¦a¤U¾É½uµù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>

@@ -428,21 +549,27 @@
    <tid>211</tid>
    <cid>0</cid>
    <description>§CÀ£¬[ªÅ±µ¤á½u</description>
    <elmtype>4</elmtype>
    <elementCriterion>
      <elementType>4</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-211.C-1">
    <tid>211</tid>
    <cid>1</cid>
    <description>§CÀ£¬[ªÅ±µ¤á½u</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-211.C-2">
    <tid>211</tid>
    <cid>2</cid>
    <description>§CÀ£¬[ªÅ±µ¤á½uªø«×µù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>

@@ -450,21 +577,27 @@
    <tid>212</tid>
    <cid>0</cid>
    <description>§CÀ£¬[ªÅ³s±µ±µ¤á½u</description>
    <elmtype>4</elmtype>
    <elementCriterion>
      <elementType>4</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-212.C-1">
    <tid>212</tid>
    <cid>1</cid>
    <description>§CÀ£¬[ªÅ³s±µ±µ¤á½uµù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-212.C-2">
    <tid>212</tid>
    <cid>2</cid>
    <description>§CÀ£¬[ªÅ³s±µ±µ¤á½uªø«×µù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>

@@ -472,21 +605,27 @@
    <tid>213</tid>
    <cid>0</cid>
    <description>§CÀ£¦a¤U³s±µ±µ¤á½u</description>
    <elmtype>4</elmtype>
    <elementCriterion>
      <elementType>4</elementType>
    </elementCriterion>
    <LineCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-213.C-1">
    <tid>213</tid>
    <cid>1</cid>
    <description>§CÀ£¦a¤U³s±µ±µ¤á½uµù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompFilter name="FSC-213.C-2">
    <tid>213</tid>
    <cid>2</cid>
    <description>§CÀ£¦a¤U³s±µ±µ¤á½uªø«×µù°O</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>

@@ -494,7 +633,9 @@
    <tid>215</tid>
    <cid>0</cid>
    <description>§CÀ£¦Û°Ê­t¸ü¤Á´«¶}Ãö</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>

@@ -502,7 +643,9 @@
    <tid>216</tid>
    <cid>0</cid>
    <description>¦a¤U§CÀ£ºÊµø¾¹</description>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>

@@ -510,7 +653,10 @@
    <tid>999</tid>
    <cid>0</cid>
    <description>µù°O</description>
    <elmtype>4</elmtype>
    <elementCriterion>
      <elementType>4</elementType>
      <elementType>17</elementType>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>


 xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml

@@ -13,14 +13,19 @@
    <tid>107</tid>
    <cid>11</cid>
    <description>DemoFilter for DemoFeature</description>
    <elmtype>7</elmtype>
    <elementCriterion>
      <elementtype>7</elementtype>
    </elementCriterion>
    <TextCreateStrategy/>
  </TypeCompFilter>
  <TypeCompLevelFilter name="DemoFeature3">
    <tid>108</tid>
    <cid>2</cid>
    <lid>34</lid>
    <elmtype>17</elmtype>
    <elementCriterion>
      <elementtype>7</elementtype>
      <elementtype>17</elementtype>
    </elementCriterion>
    <description>DemoFilter for DemoFeature</description>
    <TextCreateStrategy-None/>
  </TypeCompLevelFilter>