[Cmap-cvs] cmap PolishFormat.cpp,1.34,1.35 plan.conf,1.3,1.4

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

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

Modified Files:
	PolishFormat.cpp plan.conf 
Log Message:
Fix label assignment
Move all logic for plan to plan.conf

Index: plan.conf
===================================================================
RCS file: /cvsroot/cmap/cmap/plan.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- plan.conf	26 May 2004 21:41:55 -0000	1.3
+++ plan.conf	26 May 2004 21:53:13 -0000	1.4
@@ -349,7 +349,10 @@
   polygon = 0x17;
   layer_min = 0;
   layer_max = 0;
-  label = attr1;
+  label = attr64;
+  case attr6 = "35" {
+    polygon = 0x6;
+  }
 }
 // Ýëåìåíòû çäàíèé, ñîîðóæåíèé
 object "EB" {

Index: PolishFormat.cpp
===================================================================
RCS file: /cvsroot/cmap/cmap/PolishFormat.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- PolishFormat.cpp	17 May 2004 08:46:36 -0000	1.34
+++ PolishFormat.cpp	26 May 2004 21:53:13 -0000	1.35
@@ -166,7 +166,6 @@
     sum_lon = 0;  // Óñðåäíåííûå çíà÷åíèÿ êîîðäèíàò
     sum_lat = 0;
 
-    rus_name[0] = 0;
     if (Len_code != 2)
       COD = atoi (obj[NumObj].Cod + 1);
 
@@ -307,26 +306,6 @@
       break;
     }
 
-    // Ðàçáîð òèïîâ îáúåêòîâ ñ òîïîïëàíîâ - PLAN.DBF
-    if (Len_code == 2) {
-      // BL - Çäàíèå
-      if (strcmp("BL", obj[NumObj].Cod + 1) == 0) {
-        // àòðèáóò 06 "Íàçíà÷åíèå çäàíèÿ, ñîîðóæåíèÿ"
-        if (s_atoi (obj[NumObj].atr_cod[6]) > 0) {
-          switch (s_atoi (obj[NumObj].atr_cod[6])) {
-          case 35:  // Ãàðàæ
-            Type_poly = 0x6;
-            break;
-          }
-        }
-        // àòðèáóò 64 "Ãîðîäñêîé àäðåñ"
-        DosToWin(rus_name, (BYTE *)obj[NumObj].atr_cod[64]);
-        img_Layer_max = 0;
-      } else
-        // àòðèáóò 01 "Èìÿ (íîìåð) îáúåêòà, òåêñò"
-        DosToWin(rus_name, (BYTE *)obj[NumObj].atr_cod[1]);
-    }
-
     // Òîëüêî Äëÿ ÒÎÏÎ
     // Òèï îáúåêòà àòðèáóò 47
     if (obj[NumObj].atr_cod[47] != 0 && Len_code == 8) {