[Mapbender-commits] r2814 - trunk/mapbender/resources/db
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Aug 15 05:41:36 EDT 2008
Author: christoph
Date: 2008-08-15 05:41:36 -0400 (Fri, 15 Aug 2008)
New Revision: 2814
Modified:
trunk/mapbender/resources/db/schema_2.5.dia
Log:
changed primary in wfs_element
added unique index on fkey_featuretype_id, element_id
Modified: trunk/mapbender/resources/db/schema_2.5.dia
===================================================================
--- trunk/mapbender/resources/db/schema_2.5.dia 2008-08-15 09:19:18 UTC (rev 2813)
+++ trunk/mapbender/resources/db/schema_2.5.dia 2008-08-15 09:41:36 UTC (rev 2814)
@@ -1386,13 +1386,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O11">
<dia:attribute name="obj_pos">
- <dia:point val="31,-39"/>
+ <dia:point val="34,-33"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="30.95,-39.05;46.95,-34.15"/>
+ <dia:rectangle val="33.95,-33.05;49.95,-28.15"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="31,-39"/>
+ <dia:point val="34,-33"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="15.9"/>
@@ -1586,13 +1586,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O12">
<dia:attribute name="obj_pos">
- <dia:point val="31,-30"/>
+ <dia:point val="55,-27"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="30.95,-30.05;44.85,-11.55"/>
+ <dia:rectangle val="54.95,-27.05;68.85,-8.55"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="31,-30"/>
+ <dia:point val="55,-27"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="13.800000000000001"/>
@@ -2243,13 +2243,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O13">
<dia:attribute name="obj_pos">
- <dia:point val="49,-30"/>
+ <dia:point val="34,-23"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="48.95,-30.05;60.05,-23.55"/>
+ <dia:rectangle val="33.95,-23.05;45.05,-16.55"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="49,-30"/>
+ <dia:point val="34,-23"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="11"/>
@@ -2555,19 +2555,21 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O14">
<dia:attribute name="obj_pos">
- <dia:point val="44.8504,-20.8"/>
+ <dia:point val="54.9496,-17.8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="44.8004,-24.35;67.3,-20.285"/>
+ <dia:rectangle val="44.25,-21.05;58.85,-17.285"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="44.8504,-20.8"/>
- <dia:point val="54.5,-20.8"/>
- <dia:point val="54.5,-23.6"/>
+ <dia:point val="54.9496,-17.8"/>
+ <dia:point val="49.9748,-17.8"/>
+ <dia:point val="49.9748,-20.3"/>
+ <dia:point val="45,-20.3"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
+ <dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
<dia:boolean val="true"/>
@@ -2616,24 +2618,22 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O12" connection="50"/>
- <dia:connection handle="1" to="O13" connection="6"/>
+ <dia:connection handle="1" to="O13" connection="11"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O15">
<dia:attribute name="obj_pos">
- <dia:point val="38.95,-34.2"/>
+ <dia:point val="49.9,-29.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.15,-34.25;50.7,-29.25"/>
+ <dia:rectangle val="49.85,-30.585;74.7,-26.25"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="38.95,-34.2"/>
- <dia:point val="38.95,-32.1"/>
- <dia:point val="37.9,-32.1"/>
- <dia:point val="37.9,-30"/>
+ <dia:point val="49.9,-29.5"/>
+ <dia:point val="61.9,-29.5"/>
+ <dia:point val="61.9,-27"/>
</dia:attribute>
<dia:attribute name="orth_orient">
- <dia:enum val="1"/>
<dia:enum val="0"/>
<dia:enum val="1"/>
</dia:attribute>
@@ -2683,22 +2683,22 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="6"/>
+ <dia:connection handle="0" to="O11" connection="13"/>
<dia:connection handle="1" to="O12" connection="1"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Class" version="0" id="O16">
<dia:attribute name="obj_pos">
- <dia:point val="1,-39"/>
+ <dia:point val="1,-34"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="0.95,-39.05;14.85,-34.95"/>
+ <dia:rectangle val="0.95,-34.05;12.05,-29.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="1,-39"/>
+ <dia:point val="1,-34"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="13.800000000000001"/>
+ <dia:real val="11"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="4"/>
@@ -2819,7 +2819,7 @@
<dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#0 NOT NULL#</dia:string>
+ <dia:string>#0#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -2869,18 +2869,20 @@
<dia:point val="-47,-28.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-50.8807,-37.05;1.75,-27.785"/>
+ <dia:rectangle val="-50.7,-37.8;19.3,-27.785"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="-47,-28.3"/>
- <dia:point val="-50.8307,-28.3"/>
- <dia:point val="-50.8307,-36.3"/>
- <dia:point val="1,-36.3"/>
+ <dia:point val="-48,-28.3"/>
+ <dia:point val="-48,-37"/>
+ <dia:point val="6.5,-37"/>
+ <dia:point val="6.5,-34"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
+ <dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="autorouting">
<dia:boolean val="false"/>
@@ -2929,23 +2931,25 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O1" connection="3"/>
- <dia:connection handle="1" to="O16" connection="10"/>
+ <dia:connection handle="1" to="O16" connection="1"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O18">
<dia:attribute name="obj_pos">
- <dia:point val="31,-34.7"/>
+ <dia:point val="41.95,-28.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="14.05,-37.05;31.05,-34.185"/>
+ <dia:rectangle val="11.25,-31.25;44.25,-26.6"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="31,-34.7"/>
- <dia:point val="19,-34.7"/>
- <dia:point val="19,-36.3"/>
- <dia:point val="14.8,-36.3"/>
+ <dia:point val="41.95,-28.2"/>
+ <dia:point val="41.95,-27"/>
+ <dia:point val="19,-27"/>
+ <dia:point val="19,-30.5"/>
+ <dia:point val="12,-30.5"/>
</dia:attribute>
<dia:attribute name="orth_orient">
+ <dia:enum val="1"/>
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
@@ -2996,8 +3000,8 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="14"/>
- <dia:connection handle="1" to="O16" connection="11"/>
+ <dia:connection handle="0" to="O11" connection="6"/>
+ <dia:connection handle="1" to="O16" connection="13"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Class" version="0" id="O19">
@@ -4759,13 +4763,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O25">
<dia:attribute name="obj_pos">
- <dia:point val="105,-48"/>
+ <dia:point val="98,-54"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="104.95,-48.05;122.35,-25.55"/>
+ <dia:rectangle val="97.95,-54.05;115.35,-31.55"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="105,-48"/>
+ <dia:point val="98,-54"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="17.300000000000001"/>
@@ -5465,14 +5469,14 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O26">
<dia:attribute name="obj_pos">
- <dia:point val="31,-38.3"/>
+ <dia:point val="34,-31.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.0997,-84.15;34.6997,-37.785"/>
+ <dia:rectangle val="20.0997,-84.15;34.6997,-30.585"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="31,-38.3"/>
- <dia:point val="28,-38.3"/>
+ <dia:point val="34,-31.1"/>
+ <dia:point val="28,-31.1"/>
<dia:point val="28,-83.4"/>
<dia:point val="33.9497,-83.4"/>
</dia:attribute>
@@ -5527,7 +5531,7 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="3"/>
+ <dia:connection handle="0" to="O11" connection="8"/>
<dia:connection handle="1" to="O24" connection="32"/>
</dia:connections>
</dia:object>
@@ -5667,13 +5671,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O29">
<dia:attribute name="obj_pos">
- <dia:point val="79,-41"/>
+ <dia:point val="80,-44"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="78.95,-41.05;90.05,-37.75"/>
+ <dia:rectangle val="79.95,-44.05;91.05,-40.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="79,-41"/>
+ <dia:point val="80,-44"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="11"/>
@@ -5821,24 +5825,26 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O30">
<dia:attribute name="obj_pos">
- <dia:point val="46.9,-38.3"/>
+ <dia:point val="49.9,-32.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="46.9,-39.385;79.0707,-37.3825"/>
+ <dia:rectangle val="49.85,-47.8;98.3,-31.785"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="46.9,-38.3"/>
- <dia:point val="46.9,-38.3"/>
- <dia:point val="79,-38.3"/>
- <dia:point val="79,-38.3"/>
+ <dia:point val="49.9,-32.3"/>
+ <dia:point val="78,-32.3"/>
+ <dia:point val="78,-47"/>
+ <dia:point val="85.5,-47"/>
+ <dia:point val="85.5,-44"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
+ <dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
@@ -5884,21 +5890,21 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O11" connection="4"/>
- <dia:connection handle="1" to="O29" connection="10"/>
+ <dia:connection handle="1" to="O29" connection="1"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O31">
<dia:attribute name="obj_pos">
- <dia:point val="105,-42.9"/>
+ <dia:point val="98,-48.9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="102.7,-43.985;152.75,-10.5825"/>
+ <dia:rectangle val="95.7,-49.985;144.75,-15.5825"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="105,-42.9"/>
- <dia:point val="102.941,-42.9"/>
- <dia:point val="102.941,-11.5"/>
- <dia:point val="152,-11.5"/>
+ <dia:point val="98,-48.9"/>
+ <dia:point val="96,-48.9"/>
+ <dia:point val="96,-16.5"/>
+ <dia:point val="144,-16.5"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -5952,18 +5958,18 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O25" connection="16"/>
- <dia:connection handle="1" to="O41" connection="12"/>
+ <dia:connection handle="1" to="O41" connection="22"/>
</dia:connections>
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O32">
<dia:attribute name="obj_pos">
- <dia:point val="105,-19"/>
+ <dia:point val="98,-25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="104.95,-19.95;145.2,-16.75"/>
+ <dia:rectangle val="97.95,-25.95;138.2,-22.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="105,-19"/>
+ <dia:point val="98,-25"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="40.149999999999999"/>
@@ -5992,7 +5998,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="105.3,-17.3575"/>
+ <dia:point val="98.3,-23.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -6005,13 +6011,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O33">
<dia:attribute name="obj_pos">
- <dia:point val="105,-15"/>
+ <dia:point val="98,-21"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="104.95,-15.95;132.25,-12.75"/>
+ <dia:rectangle val="97.95,-21.95;125.25,-18.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="105,-15"/>
+ <dia:point val="98,-21"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="27.200000000000003"/>
@@ -6040,7 +6046,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="105.3,-13.3575"/>
+ <dia:point val="98.3,-19.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -6053,13 +6059,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O34">
<dia:attribute name="obj_pos">
- <dia:point val="105,-24"/>
+ <dia:point val="98,-30"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="104.95,-24.95;133.65,-20.95"/>
+ <dia:rectangle val="97.95,-30.95;126.65,-26.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="105,-24"/>
+ <dia:point val="98,-30"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="28.600000000000001"/>
@@ -6089,7 +6095,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="105.3,-22.3575"/>
+ <dia:point val="98.3,-28.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -6102,13 +6108,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O35">
<dia:attribute name="obj_pos">
- <dia:point val="1,-34"/>
+ <dia:point val="-1,-29"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="0.95,-34.05;15.9,-29.95"/>
+ <dia:rectangle val="-1.05,-29.05;13.9,-24.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="1,-34"/>
+ <dia:point val="-1,-29"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="14.85"/>
@@ -6282,13 +6288,13 @@
<dia:point val="-9.35,-26.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-12.85,-32.85;1.75,-25.785"/>
+ <dia:rectangle val="-14.85,-27.85;-0.25,-25.785"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="-9.35,-26.3"/>
- <dia:point val="-4.175,-26.3"/>
- <dia:point val="-4.175,-32.1"/>
- <dia:point val="1,-32.1"/>
+ <dia:point val="-5.175,-26.3"/>
+ <dia:point val="-5.175,-27.1"/>
+ <dia:point val="-1,-27.1"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -6347,16 +6353,16 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O37">
<dia:attribute name="obj_pos">
- <dia:point val="31,-34.2"/>
+ <dia:point val="49.9,-28.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.1,-35.285;31.05,-30.3825"/>
+ <dia:rectangle val="13.1,-29.785;52.2,-24.5825"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="31,-34.2"/>
- <dia:point val="19,-34.2"/>
- <dia:point val="19,-31.3"/>
- <dia:point val="15.85,-31.3"/>
+ <dia:point val="49.9,-28.7"/>
+ <dia:point val="52,-28.7"/>
+ <dia:point val="52,-25.5"/>
+ <dia:point val="13.85,-25.5"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -6409,8 +6415,8 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="5"/>
- <dia:connection handle="1" to="O35" connection="11"/>
+ <dia:connection handle="0" to="O11" connection="15"/>
+ <dia:connection handle="1" to="O35" connection="13"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Class" version="0" id="O38">
@@ -6819,14 +6825,14 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O39">
<dia:attribute name="obj_pos">
- <dia:point val="31,-37.1"/>
+ <dia:point val="34,-30.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.15,-98.05;34.75,-36.585"/>
+ <dia:rectangle val="20.15,-98.05;34.75,-29.785"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="31,-37.1"/>
- <dia:point val="26,-37.1"/>
+ <dia:point val="34,-30.3"/>
+ <dia:point val="26,-30.3"/>
<dia:point val="26,-97.3"/>
<dia:point val="34,-97.3"/>
</dia:attribute>
@@ -6881,7 +6887,7 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="8"/>
+ <dia:connection handle="0" to="O11" connection="10"/>
<dia:connection handle="1" to="O38" connection="10"/>
</dia:connections>
</dia:object>
@@ -6955,13 +6961,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O41">
<dia:attribute name="obj_pos">
- <dia:point val="152,-15"/>
+ <dia:point val="144,-24"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,-15.05;167.25,-2.95"/>
+ <dia:rectangle val="143.95,-24.05;159.25,-11.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,-15"/>
+ <dia:point val="144,-24"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="15.199999999999999"/>
@@ -7362,13 +7368,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O42">
<dia:attribute name="obj_pos">
- <dia:point val="152,-43"/>
+ <dia:point val="131,-48"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,-43.05;167.95,-35.75"/>
+ <dia:rectangle val="130.95,-48.05;146.95,-40.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,-43"/>
+ <dia:point val="131,-48"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="15.9"/>
@@ -7631,16 +7637,16 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O43">
<dia:attribute name="obj_pos">
- <dia:point val="122.3,-43.7"/>
+ <dia:point val="115.3,-49.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="122.25,-44.785;152.75,-37.7825"/>
+ <dia:rectangle val="115.25,-50.785;131.7,-43.4825"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="122.3,-43.7"/>
- <dia:point val="137.15,-43.7"/>
- <dia:point val="137.15,-38.7"/>
- <dia:point val="152,-38.7"/>
+ <dia:point val="115.3,-49.7"/>
+ <dia:point val="122,-49.7"/>
+ <dia:point val="122,-44.4"/>
+ <dia:point val="130.95,-44.4"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -7648,7 +7654,7 @@
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
@@ -7694,26 +7700,24 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O25" connection="15"/>
- <dia:connection handle="1" to="O42" connection="14"/>
+ <dia:connection handle="1" to="O42" connection="22"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O44">
<dia:attribute name="obj_pos">
- <dia:point val="46.9,-35.5"/>
+ <dia:point val="49.9,-31.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="46.85,-36.585;79.75,-34.3825"/>
+ <dia:rectangle val="49.85,-37.55;98.3,-30.585"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="46.9,-35.5"/>
- <dia:point val="62.95,-35.5"/>
- <dia:point val="62.95,-35.3"/>
- <dia:point val="79,-35.3"/>
+ <dia:point val="49.9,-31.1"/>
+ <dia:point val="85.5,-31.1"/>
+ <dia:point val="85.5,-36.8"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
- <dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
<dia:boolean val="true"/>
@@ -7761,22 +7765,22 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="13"/>
- <dia:connection handle="1" to="O65" connection="3"/>
+ <dia:connection handle="0" to="O11" connection="9"/>
+ <dia:connection handle="1" to="O65" connection="6"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O45">
<dia:attribute name="obj_pos">
- <dia:point val="105,-44.5"/>
+ <dia:point val="98,-50.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="89.25,-45.585;105.05,-37.3825"/>
+ <dia:rectangle val="90.25,-51.585;104.85,-40.3825"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="105,-44.5"/>
- <dia:point val="100.89,-44.5"/>
- <dia:point val="100.89,-38.3"/>
- <dia:point val="90,-38.3"/>
+ <dia:point val="98,-50.5"/>
+ <dia:point val="95,-50.5"/>
+ <dia:point val="95,-41.3"/>
+ <dia:point val="91,-41.3"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -7835,16 +7839,16 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O46">
<dia:attribute name="obj_pos">
- <dia:point val="173,-58"/>
+ <dia:point val="160,-62"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="172.95,-58.05;188.25,-53.15"/>
+ <dia:rectangle val="159.95,-62.05;172.1,-57.15"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="173,-58"/>
+ <dia:point val="160,-62"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="15.199999999999999"/>
+ <dia:real val="12.050000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="4.8000000000000007"/>
@@ -7942,13 +7946,13 @@
<dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#0 NOT NULL#</dia:string>
+ <dia:string>#0#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
- <dia:enum val="2"/>
+ <dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -8027,7 +8031,73 @@
</dia:attribute>
</dia:composite>
</dia:attribute>
- <dia:attribute name="operations"/>
+ <dia:attribute name="operations">
+ <dia:composite type="umloperation">
+ <dia:attribute name="name">
+ <dia:string>#wfs_element_idx#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>#btree#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#unique index#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="inheritance_type">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="query">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="parameters">
+ <dia:composite type="umlparameter">
+ <dia:attribute name="name">
+ <dia:string>#fkey_featuretype_id#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="kind">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite type="umlparameter">
+ <dia:attribute name="name">
+ <dia:string>#element_id#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="kind">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
@@ -8035,22 +8105,24 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O47">
<dia:attribute name="obj_pos">
- <dia:point val="159.95,-43"/>
+ <dia:point val="146.9,-44.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="159.15,-56.9;173.75,-42.2"/>
+ <dia:rectangle val="146.15,-58.45;160.75,-43.985"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="159.95,-43"/>
- <dia:point val="159.95,-56.1"/>
- <dia:point val="173,-56.1"/>
+ <dia:point val="146.9,-44.5"/>
+ <dia:point val="154,-44.5"/>
+ <dia:point val="154,-57.7"/>
+ <dia:point val="160,-57.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
@@ -8095,8 +8167,8 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O42" connection="1"/>
- <dia:connection handle="1" to="O46" connection="8"/>
+ <dia:connection handle="0" to="O42" connection="13"/>
+ <dia:connection handle="1" to="O46" connection="14"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Class" version="0" id="O48">
@@ -8104,13 +8176,13 @@
<dia:point val="34,-112"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.95,-112.05;48.55,-107.95"/>
+ <dia:rectangle val="33.95,-112.05;45.4,-107.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="34,-112"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="14.5"/>
+ <dia:real val="11.35"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="4"/>
@@ -8208,7 +8280,7 @@
<dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#0 NOT NULL#</dia:string>
+ <dia:string>#0#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -8231,7 +8303,7 @@
<dia:string>#varchar(50)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#'' NOT NULL#</dia:string>
+ <dia:string>#''#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -8254,7 +8326,7 @@
<dia:string>#varchar(100)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#'' NOT NULL#</dia:string>
+ <dia:string>#''#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -8281,13 +8353,13 @@
<dia:point val="73,-122.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="47.7993,-123.385;73.05,-109.082"/>
+ <dia:rectangle val="44.6495,-123.385;73.05,-109.082"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="73,-122.3"/>
<dia:point val="63,-122.3"/>
<dia:point val="63,-110"/>
- <dia:point val="48.5493,-110"/>
+ <dia:point val="45.3995,-110"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -8349,13 +8421,13 @@
<dia:point val="34,-107"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.95,-107.05;46.8,-103.75"/>
+ <dia:rectangle val="33.95,-107.05;43.65,-103.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="34,-107"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="12.75"/>
+ <dia:real val="9.5999999999999996"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.2000000000000002"/>
@@ -8453,7 +8525,7 @@
<dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#0 NOT NULL#</dia:string>
+ <dia:string>#0#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -8476,7 +8548,7 @@
<dia:string>#varchar(50)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#'' NOT NULL#</dia:string>
+ <dia:string>#''#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -8503,13 +8575,13 @@
<dia:point val="73,-117.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="46.0489,-118.585;73.05,-104.483"/>
+ <dia:rectangle val="42.8986,-118.585;73.05,-104.483"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="73,-117.5"/>
<dia:point val="67,-117.5"/>
<dia:point val="67,-105.4"/>
- <dia:point val="46.7989,-105.4"/>
+ <dia:point val="43.6486,-105.4"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -8571,13 +8643,13 @@
<dia:point val="34,-116"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.95,-116.05;50.65,-112.75"/>
+ <dia:rectangle val="33.95,-116.05;46.8,-112.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="34,-116"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="16.600000000000001"/>
+ <dia:real val="12.75"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.2000000000000002"/>
@@ -8675,7 +8747,7 @@
<dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#0 NOT NULL#</dia:string>
+ <dia:string>#0#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -8698,7 +8770,7 @@
<dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#NOT NULL#</dia:string>
+ <dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -8725,13 +8797,13 @@
<dia:point val="73,-127.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="49.8992,-128.185;73.05,-113.483"/>
+ <dia:rectangle val="46.0499,-128.185;73.05,-113.483"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="73,-127.1"/>
<dia:point val="58,-127.1"/>
<dia:point val="58,-114.4"/>
- <dia:point val="50.6492,-114.4"/>
+ <dia:point val="46.7999,-114.4"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -9035,13 +9107,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O56">
<dia:attribute name="obj_pos">
- <dia:point val="173,-46"/>
+ <dia:point val="160,-50"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="172.95,-46.95;224.4,-43.75"/>
+ <dia:rectangle val="159.95,-50.95;211.4,-47.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="173,-46"/>
+ <dia:point val="160,-50"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="51.350000000000001"/>
@@ -9070,7 +9142,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="173.3,-44.3575"/>
+ <dia:point val="160.3,-48.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -9083,13 +9155,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O57">
<dia:attribute name="obj_pos">
- <dia:point val="173,-42"/>
+ <dia:point val="160,-46"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="172.95,-42.95;205.85,-39.75"/>
+ <dia:rectangle val="159.95,-46.95;192.85,-43.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="173,-42"/>
+ <dia:point val="160,-46"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="32.800000000000004"/>
@@ -9118,7 +9190,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="173.3,-40.3575"/>
+ <dia:point val="160.3,-44.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -9131,13 +9203,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O58">
<dia:attribute name="obj_pos">
- <dia:point val="173,-51"/>
+ <dia:point val="160,-55"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="172.95,-51.95;208.65,-47.95"/>
+ <dia:rectangle val="159.95,-55.95;195.65,-51.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="173,-51"/>
+ <dia:point val="160,-55"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="35.600000000000001"/>
@@ -9167,7 +9239,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="173.3,-49.3575"/>
+ <dia:point val="160.3,-53.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -9180,13 +9252,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O59">
<dia:attribute name="obj_pos">
- <dia:point val="152,-29"/>
+ <dia:point val="131,-34"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,-29.95;209,-26.75"/>
+ <dia:rectangle val="130.95,-34.95;188,-31.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,-29"/>
+ <dia:point val="131,-34"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="56.950000000000003"/>
@@ -9215,7 +9287,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="152.3,-27.3575"/>
+ <dia:point val="131.3,-32.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -9228,13 +9300,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O60">
<dia:attribute name="obj_pos">
- <dia:point val="152,-25"/>
+ <dia:point val="131,-30"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,-25.95;189.05,-22.75"/>
+ <dia:rectangle val="130.95,-30.95;168.05,-27.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,-25"/>
+ <dia:point val="131,-30"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="37"/>
@@ -9263,7 +9335,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="152.3,-23.3575"/>
+ <dia:point val="131.3,-28.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -9276,13 +9348,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O61">
<dia:attribute name="obj_pos">
- <dia:point val="152,-34"/>
+ <dia:point val="131,-39"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,-34.95;191.85,-30.95"/>
+ <dia:rectangle val="130.95,-39.95;170.85,-35.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,-34"/>
+ <dia:point val="131,-39"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="39.800000000000004"/>
@@ -9312,7 +9384,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="152.3,-32.3575"/>
+ <dia:point val="131.3,-37.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -9470,13 +9542,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O65">
<dia:attribute name="obj_pos">
- <dia:point val="79,-36"/>
+ <dia:point val="80,-40"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="78.95,-36.05;90.05,-32.75"/>
+ <dia:rectangle val="79.95,-40.05;91.05,-36.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="79,-36"/>
+ <dia:point val="80,-40"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="11"/>
@@ -9624,16 +9696,16 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O66">
<dia:attribute name="obj_pos">
- <dia:point val="152,-9.9"/>
+ <dia:point val="144,-14.9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="89.25,-36.05;152.05,-9.385"/>
+ <dia:rectangle val="90.25,-40.05;144.05,-14.385"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="152,-9.9"/>
- <dia:point val="100.94,-9.9"/>
- <dia:point val="100.94,-35.3"/>
- <dia:point val="90,-35.3"/>
+ <dia:point val="144,-14.9"/>
+ <dia:point val="95,-14.9"/>
+ <dia:point val="95,-39.3"/>
+ <dia:point val="91,-39.3"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -9686,27 +9758,29 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O41" connection="16"/>
+ <dia:connection handle="0" to="O41" connection="26"/>
<dia:connection handle="1" to="O65" connection="4"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O67">
<dia:attribute name="obj_pos">
- <dia:point val="152,-37.1"/>
+ <dia:point val="131,-42.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="138.15,-38.185;152.75,-12.1825"/>
+ <dia:rectangle val="125.9,-43.185;164.4,-23.25"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="152,-37.1"/>
- <dia:point val="147.465,-37.1"/>
- <dia:point val="147.465,-13.1"/>
- <dia:point val="152,-13.1"/>
+ <dia:point val="131,-42.1"/>
+ <dia:point val="129,-42.1"/>
+ <dia:point val="129,-26"/>
+ <dia:point val="151.6,-26"/>
+ <dia:point val="151.6,-24"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
+ <dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="autorouting">
<dia:boolean val="false"/>
@@ -9755,7 +9829,7 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O42" connection="18"/>
- <dia:connection handle="1" to="O41" connection="8"/>
+ <dia:connection handle="1" to="O41" connection="1"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Class" version="0" id="O68">
@@ -10029,13 +10103,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O69">
<dia:attribute name="obj_pos">
- <dia:point val="34,-63"/>
+ <dia:point val="34,-56"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.95,-63.05;45.05,-54.95"/>
+ <dia:rectangle val="33.95,-56.05;45.05,-47.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="34,-63"/>
+ <dia:point val="34,-56"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="11"/>
@@ -10321,13 +10395,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O70">
<dia:attribute name="obj_pos">
- <dia:point val="126,-82"/>
+ <dia:point val="126,-87"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-82.05;139.15,-78.75"/>
+ <dia:rectangle val="125.95,-87.05;139.15,-83.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-82"/>
+ <dia:point val="126,-87"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="13.1"/>
@@ -11573,14 +11647,14 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O79">
<dia:attribute name="obj_pos">
- <dia:point val="125.95,-80.4"/>
+ <dia:point val="125.95,-85.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="97.5,-81.485;126,-72.1825"/>
+ <dia:rectangle val="97.5,-86.485;126,-72.1825"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="125.95,-80.4"/>
- <dia:point val="112.1,-80.4"/>
+ <dia:point val="125.95,-85.4"/>
+ <dia:point val="112.1,-85.4"/>
<dia:point val="112.1,-73.1"/>
<dia:point val="98.25,-73.1"/>
</dia:attribute>
@@ -11641,13 +11715,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O80">
<dia:attribute name="obj_pos">
- <dia:point val="126,-106"/>
+ <dia:point val="126,-112"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-106.05;137.4,-95.55"/>
+ <dia:rectangle val="125.95,-112.05;137.4,-101.55"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-106"/>
+ <dia:point val="126,-112"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="11.35"/>
@@ -12002,13 +12076,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O81">
<dia:attribute name="obj_pos">
- <dia:point val="126,-89"/>
+ <dia:point val="126,-95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-89.95;165.5,-86.75"/>
+ <dia:rectangle val="125.95,-95.95;165.5,-92.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-89"/>
+ <dia:point val="126,-95"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="39.450000000000003"/>
@@ -12037,7 +12111,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="126.3,-87.3575"/>
+ <dia:point val="126.3,-93.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -12050,13 +12124,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O82">
<dia:attribute name="obj_pos">
- <dia:point val="126,-85"/>
+ <dia:point val="126,-91"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-85.95;151.5,-82.75"/>
+ <dia:rectangle val="125.95,-91.95;151.5,-88.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-85"/>
+ <dia:point val="126,-91"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="25.450000000000003"/>
@@ -12085,7 +12159,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="126.3,-83.3575"/>
+ <dia:point val="126.3,-89.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -12098,13 +12172,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O83">
<dia:attribute name="obj_pos">
- <dia:point val="126,-94"/>
+ <dia:point val="126,-100"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-94.95;157.8,-90.95"/>
+ <dia:rectangle val="125.95,-100.95;157.8,-96.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-94"/>
+ <dia:point val="126,-100"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="31.75"/>
@@ -12134,7 +12208,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="126.3,-92.3575"/>
+ <dia:point val="126.3,-98.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -12147,13 +12221,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O84">
<dia:attribute name="obj_pos">
- <dia:point val="126,-117"/>
+ <dia:point val="126,-123"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-117.05;141.6,-107.35"/>
+ <dia:rectangle val="125.95,-123.05;141.6,-113.35"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-117"/>
+ <dia:point val="126,-123"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="15.550000000000001"/>
@@ -12254,7 +12328,7 @@
<dia:string>#varchar(255)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#'' NOT NULL#</dia:string>
+ <dia:string>#''#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -12277,7 +12351,7 @@
<dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
- <dia:string>#0 NOT NULL#</dia:string>
+ <dia:string>#0#</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
@@ -12488,13 +12562,13 @@
<dia:point val="90.3503,-115.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="90.3003,-116.485;126.75,-114.182"/>
+ <dia:rectangle val="90.3003,-121.85;126.75,-114.885"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="90.3503,-115.4"/>
<dia:point val="108.175,-115.4"/>
- <dia:point val="108.175,-115.1"/>
- <dia:point val="126,-115.1"/>
+ <dia:point val="108.175,-121.1"/>
+ <dia:point val="126,-121.1"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -12776,13 +12850,13 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O87">
<dia:attribute name="obj_pos">
- <dia:point val="-47.0503,-20.6"/>
+ <dia:point val="-47.0504,-20.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="-60.85,-122.05;-46.25,-20.085"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="-47.0503,-20.6"/>
+ <dia:point val="-47.0504,-20.6"/>
<dia:point val="-56.2733,-20.6"/>
<dia:point val="-56.2733,-121.3"/>
<dia:point val="-47,-121.3"/>
@@ -12912,14 +12986,14 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O89">
<dia:attribute name="obj_pos">
- <dia:point val="31,-35.5"/>
+ <dia:point val="34,-28.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-34.6011,-58.15;31.05,-34.985"/>
+ <dia:rectangle val="-34.6011,-58.15;34.05,-28.185"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="31,-35.5"/>
- <dia:point val="21.1025,-35.5"/>
+ <dia:point val="34,-28.7"/>
+ <dia:point val="21.1025,-28.7"/>
<dia:point val="21.1025,-57.4"/>
<dia:point val="-33.8511,-57.4"/>
</dia:attribute>
@@ -12974,7 +13048,7 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="12"/>
+ <dia:connection handle="0" to="O11" connection="14"/>
<dia:connection handle="1" to="O68" connection="22"/>
</dia:connections>
</dia:object>
@@ -13374,13 +13448,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O94">
<dia:attribute name="obj_pos">
- <dia:point val="78,-25"/>
+ <dia:point val="78,-30"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="77.95,-25.05;92.2,-8.15"/>
+ <dia:rectangle val="77.95,-30.05;92.2,-13.15"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="78,-25"/>
+ <dia:point val="78,-30"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="14.15"/>
@@ -13919,16 +13993,16 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O95">
<dia:attribute name="obj_pos">
- <dia:point val="152,-8.3"/>
+ <dia:point val="144,-13.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="91.4,-9.45;152.05,-7.7825"/>
+ <dia:rectangle val="91.4,-14.385;144.05,-12.2825"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="152,-8.3"/>
- <dia:point val="122.075,-8.3"/>
- <dia:point val="122.075,-8.7"/>
- <dia:point val="92.15,-8.7"/>
+ <dia:point val="144,-13.3"/>
+ <dia:point val="94,-13.3"/>
+ <dia:point val="94,-13.2"/>
+ <dia:point val="92.15,-13.2"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -13936,7 +14010,7 @@
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
@@ -13981,19 +14055,19 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O41" connection="20"/>
- <dia:connection handle="1" to="O94" connection="45"/>
+ <dia:connection handle="0" to="O41" connection="30"/>
+ <dia:connection handle="1" to="O94" connection="7"/>
</dia:connections>
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O96">
<dia:attribute name="obj_pos">
- <dia:point val="78,-1"/>
+ <dia:point val="78,-6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="77.95,-1.95;136.4,1.25"/>
+ <dia:rectangle val="77.95,-6.95;136.4,-3.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="78,-1"/>
+ <dia:point val="78,-6"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="58.350000000000001"/>
@@ -14022,7 +14096,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="78.3,0.6425"/>
+ <dia:point val="78.3,-4.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -14035,13 +14109,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O97">
<dia:attribute name="obj_pos">
- <dia:point val="78,3"/>
+ <dia:point val="78,-2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="77.95,2.05;118.9,5.25"/>
+ <dia:rectangle val="77.95,-2.95;118.9,0.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="78,3"/>
+ <dia:point val="78,-2"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="40.850000000000001"/>
@@ -14070,7 +14144,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="78.3,4.6425"/>
+ <dia:point val="78.3,-0.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -14083,13 +14157,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O98">
<dia:attribute name="obj_pos">
- <dia:point val="78,-6"/>
+ <dia:point val="78,-11"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="77.95,-6.95;120.3,-2.95"/>
+ <dia:rectangle val="77.95,-11.95;120.3,-7.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="78,-6"/>
+ <dia:point val="78,-11"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="42.25"/>
@@ -14119,7 +14193,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="78.3,-4.3575"/>
+ <dia:point val="78.3,-9.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -14132,13 +14206,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O99">
<dia:attribute name="obj_pos">
- <dia:point val="126,-60"/>
+ <dia:point val="131,-64"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-60.05;140.55,-56.75"/>
+ <dia:rectangle val="130.95,-64.05;145.55,-60.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-60"/>
+ <dia:point val="131,-64"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="14.5"/>
@@ -14286,13 +14360,13 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O100">
<dia:attribute name="obj_pos">
- <dia:point val="126,-55"/>
+ <dia:point val="131,-57"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-55.05;143,-50.15"/>
+ <dia:rectangle val="130.95,-57.05;148,-52.15"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-55"/>
+ <dia:point val="131,-57"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="16.949999999999999"/>
@@ -14486,16 +14560,16 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O101">
<dia:attribute name="obj_pos">
- <dia:point val="152,-40.3"/>
+ <dia:point val="131,-46.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="142.2,-53.05;156.8,-39.785"/>
+ <dia:rectangle val="117.15,-53.45;131.75,-45.585"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="152,-40.3"/>
- <dia:point val="147.475,-40.3"/>
- <dia:point val="147.475,-52.3"/>
- <dia:point val="142.95,-52.3"/>
+ <dia:point val="131,-46.1"/>
+ <dia:point val="125,-46.1"/>
+ <dia:point val="125,-52.7"/>
+ <dia:point val="131,-52.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -14503,7 +14577,7 @@
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
@@ -14548,28 +14622,30 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O42" connection="10"/>
- <dia:connection handle="1" to="O100" connection="11"/>
+ <dia:connection handle="0" to="O42" connection="8"/>
+ <dia:connection handle="1" to="O100" connection="14"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O102">
<dia:attribute name="obj_pos">
- <dia:point val="113.65,-48"/>
+ <dia:point val="115.3,-51.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="112.15,-53.1;126.75,-47.2"/>
+ <dia:rectangle val="115.25,-55.05;131.75,-50.785"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="113.65,-48"/>
- <dia:point val="113.65,-52.3"/>
- <dia:point val="126,-52.3"/>
+ <dia:point val="115.3,-51.3"/>
+ <dia:point val="122,-51.3"/>
+ <dia:point val="122,-54.3"/>
+ <dia:point val="131,-54.3"/>
</dia:attribute>
<dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
@@ -14614,19 +14690,19 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O25" connection="1"/>
+ <dia:connection handle="0" to="O25" connection="11"/>
<dia:connection handle="1" to="O100" connection="10"/>
</dia:connections>
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O103">
<dia:attribute name="obj_pos">
- <dia:point val="152,4"/>
+ <dia:point val="144,-5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,3.05;199.2,6.25"/>
+ <dia:rectangle val="143.95,-5.95;191.2,-2.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,4"/>
+ <dia:point val="144,-5"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="47.149999999999999"/>
@@ -14655,7 +14731,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="152.3,5.6425"/>
+ <dia:point val="144.3,-3.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -14668,13 +14744,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O104">
<dia:attribute name="obj_pos">
- <dia:point val="152,8"/>
+ <dia:point val="144,-1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,7.05;184.5,10.25"/>
+ <dia:rectangle val="143.95,-1.95;176.5,1.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,8"/>
+ <dia:point val="144,-1"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="32.450000000000003"/>
@@ -14703,7 +14779,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="152.3,9.6425"/>
+ <dia:point val="144.3,0.6425"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -14716,13 +14792,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O105">
<dia:attribute name="obj_pos">
- <dia:point val="152,-1"/>
+ <dia:point val="144,-10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="151.95,-1.95;185.9,2.05"/>
+ <dia:rectangle val="143.95,-10.95;177.9,-6.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="152,-1"/>
+ <dia:point val="144,-10"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="33.850000000000001"/>
@@ -14752,7 +14828,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="152.3,0.6425"/>
+ <dia:point val="144.3,-8.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -14765,16 +14841,16 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O106">
<dia:attribute name="obj_pos">
- <dia:point val="152,-42.3"/>
+ <dia:point val="146.9,-46.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="139.75,-58.05;154.35,-41.785"/>
+ <dia:rectangle val="144.75,-62.85;159.35,-45.585"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="152,-42.3"/>
- <dia:point val="150,-42.3"/>
- <dia:point val="150,-57.3"/>
- <dia:point val="140.5,-57.3"/>
+ <dia:point val="146.9,-46.1"/>
+ <dia:point val="151,-46.1"/>
+ <dia:point val="151,-62.1"/>
+ <dia:point val="145.5,-62.1"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -14827,22 +14903,22 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O42" connection="3"/>
- <dia:connection handle="1" to="O99" connection="11"/>
+ <dia:connection handle="0" to="O42" connection="9"/>
+ <dia:connection handle="1" to="O99" connection="9"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O107">
<dia:attribute name="obj_pos">
- <dia:point val="139.1,-80.1"/>
+ <dia:point val="126,-84.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="139.05,-81.185;175.1,-58.3825"/>
+ <dia:rectangle val="117.15,-85.385;131.75,-61.1825"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="139.1,-80.1"/>
- <dia:point val="175,-80.1"/>
- <dia:point val="175,-59.3"/>
- <dia:point val="140.5,-59.3"/>
+ <dia:point val="126,-84.3"/>
+ <dia:point val="122,-84.3"/>
+ <dia:point val="122,-62.1"/>
+ <dia:point val="131,-62.1"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -14895,28 +14971,30 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O70" connection="9"/>
- <dia:connection handle="1" to="O99" connection="4"/>
+ <dia:connection handle="0" to="O70" connection="10"/>
+ <dia:connection handle="1" to="O99" connection="8"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="1" id="O108">
<dia:attribute name="obj_pos">
- <dia:point val="31,-39"/>
+ <dia:point val="34,-32.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.15,-60.3;34.75,-38.2"/>
+ <dia:rectangle val="20.15,-53.25;34.75,-31.785"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="31,-39"/>
- <dia:point val="31,-59.5"/>
- <dia:point val="34,-59.5"/>
+ <dia:point val="34,-32.3"/>
+ <dia:point val="30,-32.3"/>
+ <dia:point val="30,-52.5"/>
+ <dia:point val="34,-52.5"/>
</dia:attribute>
<dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
@@ -14961,7 +15039,7 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="0"/>
+ <dia:connection handle="0" to="O11" connection="3"/>
<dia:connection handle="1" to="O69" connection="12"/>
</dia:connections>
</dia:object>
@@ -14970,12 +15048,12 @@
<dia:point val="53,-71.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.75,-72.585;53.05,-62.25"/>
+ <dia:rectangle val="38.75,-72.585;53.05,-55.25"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="53,-71.5"/>
<dia:point val="39.5,-71.5"/>
- <dia:point val="39.5,-63"/>
+ <dia:point val="39.5,-56"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -15036,13 +15114,13 @@
<dia:point val="-47,-81"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-47.05,-81.05;-33.15,-74.55"/>
+ <dia:rectangle val="-47.05,-81.05;-33.85,-74.55"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="-47,-81"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="13.800000000000001"/>
+ <dia:real val="13.1"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="6.4000000000000004"/>
@@ -15183,7 +15261,7 @@
<dia:string>#fkey_layer_id#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#varchar(50)#</dia:string>
+ <dia:string>#integer#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>#NOT NULL#</dia:string>
@@ -15492,16 +15570,16 @@
</dia:object>
<dia:object type="UML - Association" version="1" id="O115">
<dia:attribute name="obj_pos">
- <dia:point val="31,-36.3"/>
+ <dia:point val="34,-29.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-33.95,-77.45;31.05,-35.785"/>
+ <dia:rectangle val="-34.65,-77.45;34.05,-28.985"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="31,-36.3"/>
- <dia:point val="23,-36.3"/>
+ <dia:point val="34,-29.5"/>
+ <dia:point val="23,-29.5"/>
<dia:point val="23,-76.7"/>
- <dia:point val="-33.2,-76.7"/>
+ <dia:point val="-33.9,-76.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -15554,7 +15632,7 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="10"/>
+ <dia:connection handle="0" to="O11" connection="12"/>
<dia:connection handle="1" to="O110" connection="15"/>
</dia:connections>
</dia:object>
@@ -15563,13 +15641,13 @@
<dia:point val="53,-73.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-33.95,-79.05;53.05,-72.585"/>
+ <dia:rectangle val="-34.65,-79.05;53.05,-72.585"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="53,-73.1"/>
<dia:point val="24,-73.1"/>
<dia:point val="24,-78.3"/>
- <dia:point val="-33.2,-78.3"/>
+ <dia:point val="-33.9,-78.3"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -15773,13 +15851,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O120">
<dia:attribute name="obj_pos">
- <dia:point val="34,-48"/>
+ <dia:point val="34,-41"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.95,-48.95;74.9,-45.75"/>
+ <dia:rectangle val="33.95,-41.95;74.9,-38.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="34,-48"/>
+ <dia:point val="34,-41"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="40.850000000000001"/>
@@ -15808,7 +15886,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34.3,-46.3575"/>
+ <dia:point val="34.3,-39.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -15821,13 +15899,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O121">
<dia:attribute name="obj_pos">
- <dia:point val="34,-44"/>
+ <dia:point val="34,-37"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.95,-44.95;61.25,-41.75"/>
+ <dia:rectangle val="33.95,-37.95;61.25,-34.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="34,-44"/>
+ <dia:point val="34,-37"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="27.200000000000003"/>
@@ -15856,7 +15934,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34.3,-42.3575"/>
+ <dia:point val="34.3,-35.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -15869,13 +15947,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O122">
<dia:attribute name="obj_pos">
- <dia:point val="34,-53"/>
+ <dia:point val="34,-46"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.95,-53.95;66.85,-49.95"/>
+ <dia:rectangle val="33.95,-46.95;66.85,-42.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="34,-53"/>
+ <dia:point val="34,-46"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="32.800000000000004"/>
@@ -15905,7 +15983,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34.3,-51.3575"/>
+ <dia:point val="34.3,-44.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -15918,13 +15996,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O123">
<dia:attribute name="obj_pos">
- <dia:point val="126,-72"/>
+ <dia:point val="126,-77"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-72.95;171.8,-69.75"/>
+ <dia:rectangle val="125.95,-77.95;171.8,-74.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-72"/>
+ <dia:point val="126,-77"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="45.75"/>
@@ -15953,7 +16031,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="126.3,-70.3575"/>
+ <dia:point val="126.3,-75.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -15966,13 +16044,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O124">
<dia:attribute name="obj_pos">
- <dia:point val="126,-68"/>
+ <dia:point val="126,-73"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-68.95;157.45,-65.75"/>
+ <dia:rectangle val="125.95,-73.95;157.45,-70.75"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-68"/>
+ <dia:point val="126,-73"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="31.400000000000002"/>
@@ -16001,7 +16079,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="126.3,-66.3575"/>
+ <dia:point val="126.3,-71.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -16014,13 +16092,13 @@
</dia:object>
<dia:object type="UML - SmallPackage" version="0" id="O125">
<dia:attribute name="obj_pos">
- <dia:point val="126,-77"/>
+ <dia:point val="126,-82"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="125.95,-77.95;158.85,-73.95"/>
+ <dia:rectangle val="125.95,-82.95;158.85,-78.95"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="126,-77"/>
+ <dia:point val="126,-82"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="32.800000000000004"/>
@@ -16050,7 +16128,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="126.3,-75.3575"/>
+ <dia:point val="126.3,-80.3575"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
More information about the Mapbender_commits
mailing list