[mapguide-commits] r5621 - in sandbox/adsk/2.2gp: Common/Renderers Server/src/Services/Mapping

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2011-03-13 19:48:51 -0700 (Sun, 13 Mar 2011)
New Revision: 5621

Added:
   sandbox/adsk/2.2gp/Common/Renderers/KmlIconStyle.cpp
Modified:
   sandbox/adsk/2.2gp/Server/src/Services/Mapping/ServerMappingService.cpp
Log:
Port to adsk branch, revert the MappingService code which submitted incorrectly.
Fix ticket #1619 Lack of point style in KML service


Added: sandbox/adsk/2.2gp/Common/Renderers/KmlIconStyle.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/Renderers/KmlIconStyle.cpp	                        (rev 0)
+++ sandbox/adsk/2.2gp/Common/Renderers/KmlIconStyle.cpp	2011-03-14 02:48:51 UTC (rev 5621)
@@ -0,0 +1,32 @@
+//
+//  Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of version 2.1 of the GNU Lesser
+//  General Public License as published by the Free Software Foundation.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#include "stdafx.h"
+
+#include "KmlIconStyle.h"
+
+KmlIconStyle::KmlIconStyle(double scale, std::wstring href):
+    m_scale(scale),
+    m_href(href)
+{
+}
+
+
+bool KmlIconStyle::operator<(const KmlIconStyle& other) const
+{
+    return (other.m_scale < m_scale);
+}

Modified: sandbox/adsk/2.2gp/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Services/Mapping/ServerMappingService.cpp	2011-03-14 02:39:49 UTC (rev 5620)
+++ sandbox/adsk/2.2gp/Server/src/Services/Mapping/ServerMappingService.cpp	2011-03-14 02:48:51 UTC (rev 5621)
@@ -45,7 +45,7 @@
 
 
 //for use by observation mesh transformation
-const STRING SRS_LL84 = L"GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137,298.25722293287],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
+const STRING SRS_LL84 = L"GEOGCS[\"LL84\",DATUM[\"WGS 84\",SPHEROID[\"WGS 84\",6378137,298.25722293287],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.01745329252]]";
 
 
 IMPLEMENT_CREATE_SERVICE(MgServerMappingService)