Build 21.11.25.45

Author: dkxce

Config.cs

@@ -111,6 +111,8 @@ public class Config
         public bool saveLineNodesShape = false;
         [ProtoMember(34)]
         public string sortAggTagsPriority = null;
+        [ProtoMember(35)]
+        public byte dbfMoreCompatible = 0; // 0,1 - yes, 2 - no
 
         public PointF[] _in_polygon = null;
         public OSMDictionary osmDict = new OSMDictionary();

DBFWrites.cs

@@ -122,6 +122,7 @@ public class DBFWriter: FileStream
         private CodePageSet _cp = CodePageSet.Default;
         private FieldInfos _FieldInfos = new FieldInfos();
         public CodePageList CodePages = new CodePageList();
+        private bool _tenHeaderMode = true;
 
         private OSMPBFReader.MyBitConverter bc = new OSMPBFReader.MyBitConverter(true);
 
@@ -155,6 +156,8 @@ public DBFWriter(string fileName, FileMode mode, byte dbfCodePage): base(fileNam
             WriteHeader();
         }
 
+        public bool ShortenFieldNameMode { get { return _tenHeaderMode; } set { _tenHeaderMode = value; } }
+
         public byte FieldsCount
         {
             get
@@ -250,7 +253,8 @@ public void WriteHeader(FieldInfos fields)
                 //
                 buff = fields[i].BName(_cp.Encoding);
                 if (fields[i].GName.Length > 11)
-                    buff[10] = (byte)(0x41 + (mhl++));                
+                    buff[10] = (byte)(0x41 + (mhl++));
+                if(_tenHeaderMode) buff[10] = 0;
                 this.Write(buff, 0, buff.Length);        // 0 - Field Name
                 {
                     for (int b = 0; b < buff.Length; b++)
@@ -546,6 +550,10 @@ public override void Close()
                     fs.Write(buff, 0, buff.Length);
                     buff = System.Text.Encoding.GetEncoding(1251).GetBytes("R_COUNT < R_SAVED - Âåðîÿòíåå âñåãî ëèíèÿ íå áûëà ýêñïîðòèðîâàíà (íàéäåíà)\r\n");
                     fs.Write(buff, 0, buff.Length);
+                    buff = System.Text.Encoding.GetEncoding(1251).GetBytes("F.../L... - Èç íà÷àëà (F) èëè êîíöà (L) â ëèíèþ WAY_ID\r\n");
+                    fs.Write(buff, 0, buff.Length);
+                    buff = System.Text.Encoding.GetEncoding(1251).GetBytes("T...V... -  (T) ëèíèþ WAY_ID ÷åðåç (V) òî÷êó NODE_ID\r\n");
+                    fs.Write(buff, 0, buff.Length);
                     //R_COUNT <> R_SAVED
                 }
                 else if (filename.IndexOf("[M") > 0)

MForm.Designer.cs

@@ -258,6 +258,7 @@ public void config_onReloadProperties(object sender, EventArgs e)
             props.Items[36].SubItems[1].Text = config.addFisrtAndLastNodesLns2Memory ? "Äà" : "";
             props.Items[37].SubItems[1].Text = config.saveLineNodesShape ? "Äà" : "";
             props.Items[38].SubItems[1].Text = String.IsNullOrEmpty(config.sortAggTagsPriority) ? "" : config.sortAggTagsPriority;
+            props.Items[39].SubItems[1].Text = config.dbfMoreCompatible != 2 ? "Äà" : "Íåò";
 
             if (!String.IsNullOrEmpty(config.scriptFilter))
                 props.Items[19].SubItems[1].Text = config.scriptFilter.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries)[0];
@@ -2269,6 +2270,34 @@ private void SetProperty(int mode)
                 };
                 props.Items[38].SubItems[1].Text = config.sortAggTagsPriority;                
             };
+            ////
+            if (index == 39)
+            {
+                string[] options = new string[] { "Äà", "Íåò" };
+                if (mode == 2)
+                {
+                    config.dbfMoreCompatible = 1;
+                }
+                else if (mode == 0)
+                {
+                    System.Windows.Forms.InputBox.defWidth = 182;
+                    int val = config.dbfMoreCompatible == 2 ? 1 : 0;
+                    if (InputBox.Show("DBF:", "Ðåæèì ïîâûøåííîé ñîâìåñòèìîñòè DBF ôàéëîâ (êîðîòêèå èìåíà ïîëåé):", options, ref val) == DialogResult.OK)
+                    {
+                        config.dbfMoreCompatible = (byte) (1 + val);
+                        props.Items[39].SubItems[1].Text = config.dbfMoreCompatible != 2 ? "Äà" : "Íåò";
+                    };
+                    System.Windows.Forms.InputBox.defWidth = 310;
+                }
+                else
+                {
+                    if (config.dbfMoreCompatible == 2)
+                        config.dbfMoreCompatible = 1;
+                    else
+                        config.dbfMoreCompatible = 2;
+                };
+                props.Items[39].SubItems[1].Text = config.dbfMoreCompatible != 2 ? "Äà" : "Íåò";                
+            };
             //////////////////////////////
             //////////////////////////////
             //////////////////////////////