[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdereview/marble
From:       Torsten Rahn <tackat () kde ! org>
Date:       2007-05-29 14:23:31
Message-ID: 1180448611.867901.7063.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 669486 by rahn:

Some fixes:

- Changed zPointLimit to avoid "Green Pacific" bug
- Changed xmlhandler to change placemark symbols according to legend
- Added resulting cityplacemarks.cache file



 M  +1 -1      data/CMakeLists.txt  
 M             data/placemarks/cityplacemarks.cache  
 M  +1 -1      src/vectorcomposer.cpp  
 M  +1 -0      src/vectormap.cpp  
 M  +3 -1      src/xmlhandler.cpp  


--- trunk/kdereview/marble/data/CMakeLists.txt #669485:669486
@@ -333,7 +333,7 @@
 
 install (FILES
 placemarks/baseplacemarks.cache
-#placemarks/cityplacemarks.cache
+placemarks/cityplacemarks.cache
 placemarks/elevplacemarks.cache
 DESTINATION ${data_dir}/placemarks)
 
--- trunk/kdereview/marble/src/vectorcomposer.cpp #669485:669486
@@ -66,7 +66,7 @@
 
     // Coastlines
     vectormap -> setzBoundingBoxLimit( 0.4 ); 
-    vectormap -> setzPointLimit( 0.6 ); 
+    vectormap -> setzPointLimit( 0 ); // 0.6 results in green pacific
 
     vectormap -> createFromPntMap( pcoast, radius, rotAxis );
     vectormap -> setPen( m_areapen );
--- trunk/kdereview/marble/src/vectormap.cpp #669485:669486
@@ -81,6 +81,7 @@
     m_zPointLimit = ( ( m_zPointLimit >= 0 && zlimit < m_zPointLimit )
                       || m_zPointLimit < 0 )
                      ? zlimit : m_zPointLimit;
+//    m_zPointLimit = 0;
 
     m_rlimit = (int)( (float)(m_radius * m_radius)
                       * (1.0 - m_zPointLimit * m_zPointLimit ) );
--- trunk/kdereview/marble/src/xmlhandler.cpp #669485:669486
@@ -123,7 +123,9 @@
         else if ( m_placemark->role() == 'M' ) m_placemark->setSymbol(17);
         else if ( m_placemark->role() == 'H' ) m_placemark->setSymbol(18);
         else if ( m_placemark->role() == 'V' ) m_placemark->setSymbol(19);
-        else m_placemark->setSymbol( m_placemark->popidx() );
+        else if ( m_placemark->role() == 'N' ) m_placemark->setSymbol( ( \
m_placemark->popidx() -1 ) / 4 * 4 ); +        else if ( m_placemark->role() == 'R' ) \
m_placemark->setSymbol( ( m_placemark->popidx() -1 ) / 4 * 4 + 2); +        else if ( \
m_placemark->role() == 'C' || m_placemark->role() == 'B' ) m_placemark->setSymbol( ( \
m_placemark->popidx() -1 ) / 4 * 4 + 3 );  
         if ( m_coordsset == true ) 
             m_placecontainer->append( m_placemark );


[prev in list] [next in list] [prev in thread] [next in thread]