Changeset 32

Timestamp:

Oct 20, 2011, 3:24:31 AM (12 years ago)

Author:

roman

Message:

more URL shortcuts for: Bing Maps, Yahoo Maps, OpenStreetMap? and WikiMapia?

Location:

trunk/Utilities/GpsLocationConverter

Files:

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

trunk/Utilities/GpsLocationConverter/GpsLocationConverter_i.c

@@ -7 +7 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Tue Oct 18 12:15:23 2011
+/* at Thu Oct 20 13:23:30 2011
  */
 /* Compiler settings for GpsLocationConverter.idl:

trunk/Utilities/GpsLocationConverter/GpsLocationConverter_i.h

@@ -5 +5 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Tue Oct 18 12:15:23 2011
+/* at Thu Oct 20 13:23:30 2011
  */
 /* Compiler settings for GpsLocationConverter.idl:

trunk/Utilities/GpsLocationConverter/MainDialog.h

@@ -36 +36 @@
         CRoHyperStatic m_GoogleMapsStatic;
         CRoHyperStatic m_YandexMapsStatic;
+        CRoHyperStatic m_BingMapsStatic;
+        CRoHyperStatic m_YahooMapsStatic;
+        CRoHyperStatic m_OpenStreetMapStatic;
+        CRoHyperStatic m_WikiMapiaStatic;
         BOOL m_bSetClipboardTextActive;
         CWindow m_NextClipboardViewerWindow;
@@ -47 +51 @@
         {
                 CString psTexts[12];
-                CString sGoogleMapsLocation, sYandexMapsLocation;
+                CString sGoogleMapsLocation, sYandexMapsLocation, sBingMapsLocation, sYahooMapsLocation, sOpenStreetMapLocation, sWikiMapiaLocation;
                 #pragma region Degrees
                 {
@@ -57 +61 @@
                         psTexts[3] = AtlFormatString(_T("%s, %s"), sLongitude, sLatitude);
                         sGoogleMapsLocation = AtlFormatString(_T("http://maps.google.com/maps/?ll=%s,%s"), sLatitude, sLongitude);
-                        sYandexMapsLocation = AtlFormatString(_T("http://maps.yandex.ru/?ll=%s,%s"), sLongitude, sLatitude);
+                        sYandexMapsLocation = AtlFormatString(_T("http://maps.yandex.ru/?ll=%s,%s&z=%d"), sLongitude, sLatitude, 19);
+                        sBingMapsLocation = AtlFormatString(_T("http://www.bing.com/maps/?v=2&cp=%s~%s&lvl=%d"), sLatitude, sLongitude, 17);
+                        sYahooMapsLocation = AtlFormatString(_T("http://maps.yahoo.com/#lat=%s&lon=%s&zoom=%d"), sLatitude, sLongitude, 17);
+                        sOpenStreetMapLocation = AtlFormatString(_T("http://www.openstreetmap.org/?lat=%s&lon=%s&zoom=%d"), sLatitude, sLongitude, 17);
+                        sWikiMapiaLocation = AtlFormatString(_T("http://wikimapia.org/#lat=%s&lon=%s&z=%d"), sLatitude, sLongitude, 17);
                 }
                 #pragma endregion 
@@ -128 +136 @@
                 m_GoogleMapsStatic.SetWindowText(AtlFormatString(_T("<A TITLE=\"Open in Google Maps\" HREF=\"%s\">%s</A>"), sGoogleMapsLocation, sGoogleMapsLocation));
                 m_YandexMapsStatic.SetWindowText(AtlFormatString(_T("<A TITLE=\"Open in Yandex Maps\" HREF=\"%s\">%s</A>"), sYandexMapsLocation, sYandexMapsLocation));
+                m_BingMapsStatic.SetWindowText(AtlFormatString(_T("<A TITLE=\"Open in Bing Maps\" HREF=\"%s\">%s</A>"), sBingMapsLocation, sBingMapsLocation));
+                m_YahooMapsStatic.SetWindowText(AtlFormatString(_T("<A TITLE=\"Open in Yahoo Maps\" HREF=\"%s\">%s</A>"), sYahooMapsLocation, sYahooMapsLocation));
+                m_OpenStreetMapStatic.SetWindowText(AtlFormatString(_T("<A TITLE=\"Open in Open Street Map\" HREF=\"%s\">%s</A>"), sOpenStreetMapLocation, sOpenStreetMapLocation));
+                m_WikiMapiaStatic.SetWindowText(AtlFormatString(_T("<A TITLE=\"Open in WikiMapia\" HREF=\"%s\">%s</A>"), sWikiMapiaLocation, sWikiMapiaLocation));
         }
         BOOL SetText(const CString& sText)
@@ -156 +168 @@
                 }
                 #pragma endregion 
+                // TODO: Recognize Bing, Yahoo, OpenStreetMap and WikiMapia URLs
                 #pragma region Degrees and Minutes
                 static CAtlStaticRegExp<> g_ExpressionD0(_T("^[\t ]*") 
@@ -305 +318 @@
                 _W(m_GoogleMapsStatic.SubclassWindow(GetDlgItem(IDC_MAIN_GOOGLEMAPS)));
                 _W(m_YandexMapsStatic.SubclassWindow(GetDlgItem(IDC_MAIN_YANDEXMAPS)));
+                _W(m_BingMapsStatic.SubclassWindow(GetDlgItem(IDC_MAIN_BINGMAPS)));
+                _W(m_YahooMapsStatic.SubclassWindow(GetDlgItem(IDC_MAIN_YAHOOMAPS)));
+                _W(m_OpenStreetMapStatic.SubclassWindow(GetDlgItem(IDC_MAIN_OPENSTREETMAP)));
+                _W(m_WikiMapiaStatic.SubclassWindow(GetDlgItem(IDC_MAIN_WIKIMAPIA)));
                 _W(CenterWindow());
                 m_bSetClipboardTextActive = FALSE;