Changeset 39 for trunk

Timestamp:

Nov 9, 2011, 2:30:02 PM (12 years ago)

Author:

roman

Message:

cosmetic

Location:

trunk/Utilities/GpsLocationConverter

Files:

• GpsLocationConverter.rc (modified) (previous)
• GpsLocationConverter_i.c (modified) (1 diff)
• GpsLocationConverter_i.h (modified) (1 diff)
• MainDialog.h (modified) (4 diffs)
• _Bin/Release/GpsLocationConverter.exe (modified) (previous)

trunk/Utilities/GpsLocationConverter/GpsLocationConverter_i.c

@@ -7 +7 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Thu Oct 20 13:23:30 2011
+/* at Thu Nov 10 00:28:03 2011
  */
 /* Compiler settings for GpsLocationConverter.idl:

trunk/Utilities/GpsLocationConverter/GpsLocationConverter_i.h

@@ -5 +5 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Thu Oct 20 13:23:30 2011
+/* at Thu Nov 10 00:28:03 2011
  */
 /* Compiler settings for GpsLocationConverter.idl:

trunk/Utilities/GpsLocationConverter/MainDialog.h

@@ -79 +79 @@
                         const INT nPartialLatitudeMinute = (INT) fPartialLatitudeMinute;
                         sLatitude.AppendFormat(_T("%02d"), nPartialLatitudeMinute);
-                        sLatitude.AppendFormat(_T(".%03d "), (INT) ((fPartialLatitudeMinute - nPartialLatitudeMinute) * 1000 + 0.5 - 1E-6));
+                        sLatitude.AppendFormat(_T(".%03d"), (INT) ((fPartialLatitudeMinute - nPartialLatitudeMinute) * 1000 + 0.5 - 1E-6));
                         #pragma endregion 
                         #pragma region Latitude
@@ -89 +89 @@
                         const INT nPartialLongitudeMinute = (INT) fPartialLongitudeMinute;
                         sLongitude.AppendFormat(_T("%02d"), nPartialLongitudeMinute);
-                        sLongitude.AppendFormat(_T(".%03d "), (INT) ((fPartialLongitudeMinute - nPartialLongitudeMinute) * 1000 + 0.5 - 1E-6));
+                        sLongitude.AppendFormat(_T(".%03d"), (INT) ((fPartialLongitudeMinute - nPartialLongitudeMinute) * 1000 + 0.5 - 1E-6));
                         #pragma endregion 
                         psTexts[4] = sLatitude;
@@ -169 +169 @@
                 #pragma endregion 
                 // TODO: Recognize Bing, Yahoo, OpenStreetMap and WikiMapia URLs
+                // NOTE: Russian Å is often confused with English E, so we take both
                 #pragma region Degrees and Minutes
-                static CAtlStaticRegExp<> g_ExpressionD0(_T("^[\t ]*") 
-                        _T("{[NSCÞ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}") 
-                        _T("[^0-9\\.]+?") 
-                        _T("{[EWÂÇ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}")
-                        _T(""), FALSE);
-                static CAtlStaticRegExp<> g_ExpressionD1(_T("^[\t ]*") 
-                        _T("{[EWÂÇ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}")
-                        _T("[^0-9\\.]+?") 
-                        _T("{[NSCÞ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}") 
-                        _T(""), FALSE);
-                static CAtlStaticRegExp<> g_ExpressionD2(_T("^[\t ]*") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}") _T("[\t ]*") _T("{[NSCÞ]}")
-                        _T("[^0-9\\.]+?") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}") _T("[\t ]*") _T("{[EWÂÇ]}")
-                        _T(""), FALSE);
-                static CAtlStaticRegExp<> g_ExpressionD3(_T("^[\t ]*") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}") _T("[\t ]*") _T("{[EWÂÇ]}")
-                        _T("[^0-9\\.]+?") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}") _T("[\t ]*") _T("{[NSCÞ]}")
-                        _T(""), FALSE);
+#define LATITUDE_SYMBOL         _T("{[NSCÞ]}")
+#define LONGITUDE_SYMBOL        _T("{[EWÂÇÅ]}")
+#define VALUE                           _T("{[0-9]+}[^0-9]+?{[0-9]+\\.[0-9]+}") 
+#define OPTIONAL_WHITESPACE     _T("[\t ]*")
+#define SEPARATOR                       _T("[^0-9\\.]+?")
+                static CAtlStaticRegExp<> g_ExpressionD0(_T("^") OPTIONAL_WHITESPACE LATITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE SEPARATOR LONGITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE _T(""), FALSE);
+                static CAtlStaticRegExp<> g_ExpressionD1(_T("^") OPTIONAL_WHITESPACE LONGITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE SEPARATOR LATITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE _T(""), FALSE);
+                static CAtlStaticRegExp<> g_ExpressionD2(_T("^") OPTIONAL_WHITESPACE VALUE OPTIONAL_WHITESPACE LATITUDE_SYMBOL SEPARATOR VALUE OPTIONAL_WHITESPACE LONGITUDE_SYMBOL _T(""), FALSE);
+                static CAtlStaticRegExp<> g_ExpressionD3(_T("^") OPTIONAL_WHITESPACE VALUE OPTIONAL_WHITESPACE LATITUDE_SYMBOL SEPARATOR VALUE OPTIONAL_WHITESPACE LONGITUDE_SYMBOL _T(""), FALSE);
+#undef LATITUDE_SYMBOL
+#undef LONGITUDE_SYMBOL
+#undef VALUE
+#undef OPTIONAL_WHITESPACE
+#undef SEPARATOR
                 INT nLayoutD = -1;
                 if(g_ExpressionD0.Match(sText, &MatchContext))
@@ -230 +225 @@
                 #pragma region Degrees, Minutes and Seconds
 #define LATITUDE_SYMBOL         _T("{[NSCÞ]}")
-#define LONGITUDE_SYMBOL        _T("{[EWÂÇ]}")
+#define LONGITUDE_SYMBOL        _T("{[EWÂÇÅ]}")
 #define VALUE                           _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+(\\.([0-9]+)?)?}")
 #define OPTIONAL_WHITESPACE     _T("[\t ]*")