Index: /trunk/models/swisstopo/user_content.txt =================================================================== --- /trunk/models/swisstopo/user_content.txt (revision 26) +++ /trunk/models/swisstopo/user_content.txt (revision 27) @@ -221,48 +221,25 @@ 166 Hsur301003 2 50 rivière Fluss 0 167 Hsur3 0 50 Border of Surface_Water_PLG Border of Surface_Water_PLG 0 -168 Vlit402006 0 29 brèche Brekzie -169 Vlit402007 0 29 poudingue Konglomerat -170 Vlit402009 0 29 grès, indifférencié Sandstein, undifferenziert -171 Vlit402018 0 29 grès à galets Geröll führender Sandstein -172 Vlit402021 0 29 grès à nummulites Nummulitensandstein -173 Vlit402022 0 29 grès coquillier Muschelsandstein -174 Vlit402026 0 29 argilite Tonstein -175 Vlit402027 0 29 marne Mergelstein -176 Vlit402034 0 29 calcaire, indifférencié Kalkstein, undifferenziert -177 Vlit402035 0 29 calcaire siliceux Kieselkalk -178 Vlit402041 0 29 calcaire bréchique Kalkbrekzie -179 Vlit402043 0 29 calcaire à nummulites Nummulitenkalk -180 Vlit402047 0 29 calcaire d'eau douce Süsswasserkalk -181 Vlit402049 0 29 dolomie Dolomit -182 Vlit402052 0 29 radiolarite Radiolarit -183 Vlit402056 0 29 charbon, indifférencié Kohle, undifferenziert -184 Vlit402059 0 29 anthracite Anthrazit -185 Vlit402061 0 29 oolite ferrugineuse Eisenoolith -186 Vlit402063 0 29 roche phosphatée, indifférenciée phosphoritreiches Gestein, undifferenziert -187 Vlit402071 0 29 anhydrite Anhydrit -188 Vlit402072 0 29 gypse Gips -189 Vlit402073 0 29 sel Steinsalz -190 Vlit402094 0 29 calcrète Krustenkalk -191 Vlit403026 0 29 roche filonienne, indifférenciée Ganggestein, undifferenziert -192 Vlit403027 0 29 microgranite Mikrogranit -193 Vlit403029 0 29 pegmatite Pegmatit -194 Vlit403030 0 29 aplite Aplit -195 Vlit403033 0 29 lamprophyre Lamprophyr -196 Vlit403039 0 29 roche effusive, indifférenciée Ergussgestein, undifferenziert -197 Vlit403041 0 29 rhyolite Rhyolith -198 Vlit403053 0 29 roche pyroclastique, indifférenciée pyroklastisches Gestein, undifferenziert -199 Vlit403060 0 29 roche volcano-sédimentaire, indifférenciée Tuffit, undifferenziert -200 Vlit403066 0 29 bentonite Bentonit -201 Vlit404005 0 29 kakirite, indifférenciée Kakirit, undifferenziert -202 Vlit404010 0 29 cataclasite, indifférenciée Kataklasit, undifferenziert -203 Vlit404018 0 29 mylonite, indifférenciée Mylonit, undifferenziert -204 Vlit404023 0 29 phyllonite Phyllonit -205 Vlit404025 0 29 pseudotachylite Pseudotachylit -206 Vlit404056 0 29 roche à calcsilicates Kalksilikatfels -207 Vlit404057 0 29 marbre Marmor -208 Vlit404062 0 29 amphibolite Amphibolit -209 Vlit404067 0 29 hornfels Hornfels -210 Vlit404070 0 29 skarn Skarn -211 Vlit404071 0 29 greisen Greisen +168 Vlit402006 0 29 brèche Brekzie 0 +169 Vlit402007 0 29 poudingue Konglomerat 0 +170 Vlit402009 0 29 grès, indifférencié Sandstein, undifferenziert 0 +171 Vlit402018 0 29 grès à galets Geröll führender Sandstein 0 +172 Vlit402021 0 29 grès à nummulites Nummulitensandstein 0 +173 Vlit402022 0 29 grès coquillier Muschelsandstein 0 +174 Vlit402026 0 29 argilite Tonstein 0 +175 Vlit402027 0 29 marne Mergelstein 0 +176 Vlit402034 0 29 calcaire, indifférencié Kalkstein, undifferenziert 0 +177 Vlit402035 0 29 calcaire siliceux Kieselkalk 0 +178 Vlit402041 0 29 calcaire bréchique Kalkbrekzie 0 +179 Vlit402043 0 29 calcaire à nummulites Nummulitenkalk 0 +180 Vlit402047 0 29 calcaire d'eau douce Süsswasserkalk 0 +181 Vlit402056 0 29 charbon, indifférencié Kohle, undifferenziert 0 +182 Vlit402059 0 29 anthracite Anthrazit 0 +183 Vlit402061 0 29 oolite ferrugineuse Eisenoolith 0 +184 Vlit402063 0 29 roche phosphatée, indifférenciée phosphoritreiches Gestein, undifferenziert 0 +185 Vlit402094 0 29 calcrète Krustenkalk 0 +186 Vlit403053 0 29 roche pyroclastique, indifférenciée pyroklastisches Gestein, undifferenziert 0 +187 Vlit403060 0 29 roche volcano-sédimentaire, indifférenciée Tuffit, undifferenziert 0 +188 Vlit403066 0 29 bentonite Bentonit 0 attributs @@ -379,5 +356,5 @@ 16 3 Main_Com 110 Rbed311003 roche sédimentaire indifférenciée Sedimentgestein undifferenziert 16 3 Main_Com 111 Rbed311004 argillite Tonstein -16 3 Main_Com 112 Rbed311022 marne Mergelstein +16 3 Main_Com 112 Rbed311010 marne Mergelstein 16 3 Main_Com 113 Rbed311005 roche calcaire Kalkstein 16 3 Main_Com 114 Rbed311006 roche dolomitique Dolomitstein Index: /trunk/tutorial/model_tutorial.tex =================================================================== --- /trunk/tutorial/model_tutorial.tex (revision 26) +++ /trunk/tutorial/model_tutorial.tex (revision 27) @@ -36,8 +36,8 @@ \begin{figure} [htbp] - \centering - \includegraphics[width=1\textwidth]{img/workflow.pdf} - \caption{Conceptual workflow} - \label{fig:conceptual-workflow} + \centering + \includegraphics[width=1\textwidth]{img/workflow.pdf} + \caption{Conceptual workflow} + \label{fig:conceptual-workflow} \end{figure} @@ -45,7 +45,7 @@ \section{Data needed} -In order work, TmDmCreator needs the following files: +For proper operation, TmDmCreator requires the following files: %\begin{itemize} - \begin{description*} +\begin{description*} \item[base\_structure.sql]\hfill \\ contains the necessary SQL code base for all ToolMap projects. This file should normally not be edited by users \item[user\_structure.sql]\hfill \\ contains the SQL structure describing the layers attributes @@ -74,8 +74,8 @@ \begin{figure} [hbp] - \centering - \includegraphics[width=.6\textwidth]{img/layers.png} - \caption{List of layers as shown in user\_content.txt} - \label{fig:layers} + \centering + \includegraphics[width=.6\textwidth]{img/layers.png} + \caption{List of layers as shown in user\_content.txt} + \label{fig:layers} \end{figure} @@ -97,8 +97,8 @@ \begin{figure} [hbp] - \centering - \includegraphics[height=.9\textheight]{img/objects.png} - \caption{Objects structure as described in user\_content.txt} - \label{fig:objects} + \centering + \includegraphics[height=.9\textheight]{img/objects.png} + \caption{Objects structure as described in user\_content.txt} + \label{fig:objects} \end{figure} @@ -111,41 +111,45 @@ -- layer_at1 -- CREATE TABLE `layer_at1` ( - `OBJECT_ID` int(10) unsigned NOT NULL, - -- add user attributes here -- - PRIMARY KEY (`OBJECT_ID`), - KEY `LAYER_ATX_FKIndex1` (`OBJECT_ID`) +`OBJECT_ID` int(10) unsigned NOT NULL, +-- add user attributes here -- +PRIMARY KEY (`OBJECT_ID`), +KEY `LAYER_ATX_FKIndex1` (`OBJECT_ID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; \end{lstlisting} This code is the basic template for creating an attribute table. The number after layer\_at (see line 2) indicates the layer index and refers to the LAYER\_INDEX column in user\_content.txt. In our example layer\_at1 describe the attributes for the layer Boreholes\_PT. User attributes can then be added on line 4 of this template. Below are described the five attributes that can be used in a ToolMap data model as well as the corresponding SQL code + + \subsubsection {Enumeration} \label{sec:enumeration} - \crealplisting{SQL} - \begin{lstlisting} - `D_C_UNDERG` int(11) DEFAULT NULL COMMENT 'ENUMERATION', - \end{lstlisting} - If you add such fields, then you must also fill the list of supported values (see section~\ref{sec:attribute-values}). - \subsubsection {Text} - \begin{lstlisting} - `DESCRIPT` varchar(255) DEFAULT NULL, - \end{lstlisting} - The number next to the keyword varchar indicates the maximum text length. - \subsubsection {Integer} - \begin{lstlisting} - `NUM_REF` int(11) DEFAULT NULL, - \end{lstlisting} - There is no special option for integer fields - \subsubsection {Float} +\crealplisting{SQL} +\begin{lstlisting} +`D_C_UNDERG` int(11) DEFAULT NULL COMMENT 'ENUMERATION', +\end{lstlisting} +If you add such fields, then you must also fill the list of supported values (see section~\ref{sec:attribute-values}). +\subsubsection {Text} +\begin{lstlisting} +`DESCRIPT` varchar(255) DEFAULT NULL, +\end{lstlisting} +The number next to the keyword varchar indicates the maximum text length. +\subsubsection {Integer} +\begin{lstlisting} +`NUM_REF` int(11) DEFAULT NULL, +\end{lstlisting} +There is no special option for integer fields - \begin{lstlisting} - `TEMP` decimal(5,2) DEFAULT NULL, - \end{lstlisting} - The two digits next to the keyword decimal indicate the field precision and scale. In this example, 5 is the precision and 2 is the scale. The precision represents the number of significant digits that are stored for values, and the scale represents the number of digits that can be stored following the decimal point. In this case, values that can be stored range from -999.99 to 999.99. - \subsubsection {Date} - \begin{lstlisting} - `REF_DATE` date DEFAULT NULL, - \end{lstlisting} - There is no special option for date fields +\subsubsection {Float} + +\begin{lstlisting} +`TEMP` decimal(5,2) DEFAULT NULL, +\end{lstlisting} +The two digits next to the keyword decimal indicate the field precision and scale. In this example, 5 is the precision and 2 is the scale. The precision represents the number of significant digits that are stored for values, and the scale represents the number of digits that can be stored following the decimal point. In this case, values that can be stored range from -999.99 to 999.99. +\subsubsection {Date} + +\begin{lstlisting} +`REF_DATE` date DEFAULT NULL, +\end{lstlisting} +There is no special option for date fields @@ -165,8 +169,8 @@ \begin{figure} [htbp] - \centering - \includegraphics[width=.9\textwidth]{img/attributs.png} - \caption{Attributes section structure} - \label{fig:attributs} + \centering + \includegraphics[width=.9\textwidth]{img/attributs.png} + \caption{Attributes section structure} + \label{fig:attributs} \end{figure}