[Cmap-cvs] cmap PolishFormat.cpp,1.39,1.40

[Denis P. <dy...@us...>]

Update of /cvsroot/cmap/cmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23158

Modified Files:
	PolishFormat.cpp 
Log Message:
Output attributes when -atr is specified in
format understandable by mp2mp.
Do not output DirIndicator for roads.

Index: PolishFormat.cpp
===================================================================
RCS file: /cvsroot/cmap/cmap/PolishFormat.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- PolishFormat.cpp	5 Nov 2004 05:09:42 -0000	1.39
+++ PolishFormat.cpp	26 Aug 2005 03:35:50 -0000	1.40
@@ -484,16 +484,15 @@
 
     // Âûâîä àòðèáóòîâ
     if (comm_atr != 0) {
-      fprintf (outIMG, "; %s NUM_OBJ %i %s\n",
-               obj[NumObj].Cod, NumObj, FileIMG);
-      fprintf (outIMG, "; ");
+      fprintf (outIMG, "; CODE=%s\n", obj[NumObj].Cod);
+      fprintf (outIMG, "; NUM_OBJ=%i\n", NumObj);
+      fprintf (outIMG, "; FILE=%s\n", FileIMG);
       for (int i1 = 1; i1 < 100; i1++) {
         if (obj[NumObj].atr_cod[i1] != 0) {
           DosToWin(atr_name, (BYTE *)obj[NumObj].atr_cod[i1]);
-          fprintf (outIMG, "(%i) %s ", i1, atr_name);
+          fprintf (outIMG, "; X%i=%s\n", i1, atr_name);
         }
       }
-      fprintf (outIMG, "\n");
     }
 
     if (comm_rus == 0)
@@ -649,8 +648,8 @@
           fprintf(outIMG, "Label=%s\n", eng_name);
         }
       }
-      if (Type_line >= 0x01 && Type_line <= 0x06)
-        fprintf (outIMG, "DirIndicator=1\n");
+//      if (Type_line >= 0x01 && Type_line <= 0x06)
+//        fprintf (outIMG, "DirIndicator=1\n");
       for (layer = img_Layer_min; layer <= img_Layer_max; layer++) {
         for (i = 0; i < num_array; i++) {
           pat_points++; // C÷èòàåì âûâåäåíûå òî÷êè