[Cmap-cvs] cmap PolishFormat.cpp,1.36,1.37 topo.conf,1.8,1.9

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

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

Modified Files:
	PolishFormat.cpp topo.conf 
Log Message:
Use type var to remove code from PF.cpp to topo.conf.

Index: topo.conf
===================================================================
RCS file: /cvsroot/cmap/cmap/topo.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- topo.conf	17 May 2004 08:46:36 -0000	1.8
+++ topo.conf	27 May 2004 11:30:00 -0000	1.9
@@ -545,6 +545,7 @@
   export = true;
   index = false;
   point = 0x6508;
+  type = point;
   layer_min = 0;
   layer_max = 1;
   label = attr9;
@@ -557,7 +558,7 @@
   export = true;
   index = false;
   point = 0x650E;
-  line = 0x1B;
+  type = point;
   layer_min = 0;
   layer_max = 0;
   label = attr9;
@@ -994,7 +995,7 @@
   export = true;
   index = false;
   point = 0x6406;
-  line = 0x1A;
+  type = point;
   layer_min = 0;
   layer_max = 2;
   label = "ïàðîì";
@@ -1022,7 +1023,7 @@
   export = true;
   index = false;
   point = 0x6406;
-  line = 0x16;
+  type = point;
   layer_min = 0;
   layer_max = 1;
   label = "áðîä";
@@ -2795,7 +2796,7 @@
 object "81111000" {
   export = true;
   line = 0x1C;
-  polygon = 0x03;
+  type = line;
   layer_min = 1;
   layer_max = 2;
 }

Index: PolishFormat.cpp
===================================================================
RCS file: /cvsroot/cmap/cmap/PolishFormat.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- PolishFormat.cpp	27 May 2004 11:25:48 -0000	1.36
+++ PolishFormat.cpp	27 May 2004 11:30:00 -0000	1.37
@@ -269,15 +269,7 @@
         strcat(rus_name, getAttr34Str((BYTE*)obj[NumObj].atr_cod[34]));
       }
       break;
-    case 33112000:  // Ïàðîìû àâòîìîáèëüíûå
-      if (obj[NumObj].Cod[0] != 'D')
-        obj[NumObj].Cod[0] = 'P';
-      //img_Layer_max = 2;
-      break;
     case 33130000:  // Áðîäû
-      if (obj[NumObj].Cod[0] != 'D')
-        obj[NumObj].Cod[0] = 'P';
-      //img_Layer_max = 1;
       // 34 Õàððàêòåð ãðóíòà
       if (obj[NumObj].atr_cod[34] != 0) {
         strcat(rus_name, " ");
@@ -285,22 +277,6 @@
       }
       //printf ("%s\n", rus_name);
       break;
-    case 31335100:  // Âîäîïàäû
-      if (obj[NumObj].Cod[0] != 'D')
-        obj[NumObj].Cod[0] = 'P';
-      //img_Layer_max = 2;
-      break;
-    case 31335200:  // Ïîðîãè
-      if (obj[NumObj].Cod[0] != 'D')
-        obj[NumObj].Cod[0] = 'P';
-      //img_Layer_max = 1;
-      break;
-    case 81111000:  // Ðåãèîí
-      //img_Layer_max = 2;
-      //Type_line = 0x1c;
-      if (obj[NumObj].Cod[0] != 'D')
-        obj[NumObj].Cod[0] = 'L';
-      break;
 
     default:
       break;