rhodes 3.3.3.beta.4 → 3.3.3

data/platform/shared/common/map/BaseMapEngine.h

@@ -37,6 +37,37 @@
 
 #define TILE_SIZE 256
 
+
+//#define USE_ANDROID_NET_REQUEST
+
+
+
+#ifdef OS_ANDROID
+
+#ifdef USE_ANDROID_NET_REQUEST
+#define ENABLE_ANDROID_NET_REQUEST
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+int  mapengine_request_make();
+
+int  mapengine_request_data(int request_id, const char* url, void** data, int* datasize);
+
+void mapengine_request_cancel(int request_id);
+
+void mapengine_delete_mapview_in_ui_thread(void* p);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+
+
+#endif
+
+
 namespace rho { namespace common { namespace map {
 
 uint64 degreesToPixelsX(double n, int zoom);
@@ -71,6 +102,11 @@ public:
 
         Tile &operator=(Tile const &c);
 
+        void resetObjects() {
+        	m_device = NULL;
+        	m_image = NULL;
+        }
+
         int zoom() const
         {
             return m_zoom;
@@ -101,10 +137,19 @@ public:
 
     class TilesCache
     {
+
     public:
         typedef std::list<Tile> list;
         typedef std::list<Tile>::const_iterator iterator;
 
+    public:
+    	TilesCache() : mIsStoped(false) {}
+    	virtual ~TilesCache() {
+            TilesCache::list mapTiles = get_tiles();
+            for (TilesCache::list::iterator it = mapTiles.begin(), lim = mapTiles.end(); it != lim; ++it)
+                it->resetObjects();
+    	}
+
     public:
         list clone() const;
 
@@ -113,6 +158,15 @@ public:
             return m_tiles.empty();
         }
 
+        void clean() {
+        	mIsStoped = true;
+        	RHO_MAP_TRACE("*******************************    TilesCache::clean: START");
+        	m_by_coordinates.clear();
+        	RHO_MAP_TRACE("*******************************    TilesCache::clean: ___ 1 ___");
+        	m_tiles.clear();
+        	RHO_MAP_TRACE("*******************************    TilesCache::clean: FINISH");
+        }
+
         void put(Tile const &tile);
         Tile const *get(int zoom, uint64 latitude, uint64 longitude) const;
         std::map<String, Tile *>& get_by_coordinates()
@@ -128,6 +182,7 @@ public:
         static String makeKey(int zoom, uint64 latitude, uint64 longitude);
 
     private:
+        bool mIsStoped;
         std::list<Tile> m_tiles;
         std::map<String, Tile *> m_by_coordinates;
     };
@@ -143,19 +198,28 @@ public:
         struct Command : public IQueueCommand
         {
             Command(String const &u, int z, uint64 lat, uint64 lon)
-                :baseUrl(u), zoom(z), latitude(lat), longitude(lon), row(0), column(0)
+                :baseUrl(u), zoom(z), latitude(lat), longitude(lon), row(0), column(0), mIsCancelled(false), mIsStopCommand(false)
             {}
 
             Command(int z, uint64 _row, uint64 _column)
-                :baseUrl(""), zoom(z), latitude(0), longitude(0), row(_row), column(_column)
+                :baseUrl(""), zoom(z), latitude(0), longitude(0), row(_row), column(_column), mIsCancelled(false), mIsStopCommand(false)
             {}
 
+            Command(bool is_stop) 
+            :baseUrl(""), zoom(0), latitude(0), longitude(0), row(0), column(0), mIsCancelled(false), mIsStopCommand(is_stop)
+            {}
+            
             String baseUrl;
             int zoom;
             uint64 latitude;
             uint64 longitude;
             uint64 row;
             uint64 column;
+            bool mIsCancelled;
+            bool mIsStopCommand;
+
+            
+            virtual void cancel(){mIsCancelled = true;}
 
             bool equals(IQueueCommand const &)
             {
@@ -170,25 +234,44 @@ public:
 
         void fetchTile(String const &baseUrl, int zoom, uint64 latitude, uint64 longitude);
         void fetchTile(int zoom, uint64 row, uint64 column);
+        bool fetchData(String const &url, void **data, size_t *datasize);
+        void delayedStop();
+        
+        bool mIsStoped;
+        
+        bool mRequestCanBeCancelled;
 
         virtual void cancel()
         {
-            m_NetRequest.cancel();
+            //cancelCurrentCommand();
+#ifdef ENABLE_ANDROID_NET_REQUEST
+            mapengine_request_cancel(mNetRequestID);
+            mNetRequestID = 0;
+#else
+            if (mRequestCanBeCancelled) {
+                m_NetRequest.cancel();
+            }
+#endif
         }
 
     private:
         int getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void** p_data, size_t* p_size);
         void processCommand(IQueueCommand *cmd);
-        bool fetchData(String const &url, void **data, size_t *datasize);
     public:
+#ifdef ENABLE_ANDROID_NET_REQUEST
+#else
         net::CNetRequestWrapper getNet()
         {
             return getNetRequest(&m_NetRequest);
         }
-
+#endif
     private:
         BaseMapView *m_mapview;
+#ifdef ENABLE_ANDROID_NET_REQUEST
+        int mNetRequestID;
+#else
         NetRequest   m_NetRequest;
+#endif
     };
 
     friend class CacheUpdate;
@@ -201,9 +284,14 @@ public:
 
         struct Command : public IQueueCommand
         {
-            Command() {}
+            Command(bool is_stop): mIsCancelled(false), mIsStopCommand(is_stop) {}
             bool equals(IQueueCommand const &) { return false; }
             String toString() { return "CACHE-UPDATE"; }
+            
+            bool mIsCancelled;
+            bool mIsStopCommand;
+
+            virtual void cancel(){mIsCancelled = true;}
         };
 
     public:
@@ -211,6 +299,9 @@ public:
         ~CacheUpdate();
 
         void updateCache();
+        void delayedStop();
+        
+        bool mIsStoped;
 
     private:
         void processCommand(IQueueCommand *cmd);
@@ -227,6 +318,13 @@ public:
     BaseMapView(IDrawingDevice *device, const char* name);
     virtual ~BaseMapView();
 
+    void cleanTiles();
+    void startClean();
+    bool isReadyToDelete();
+    void finalClean();
+
+    static void processClean(BaseMapView* mapView);
+
     String const &getName() const { return m_name; }
 
     void setSize(int width, int height);
@@ -361,6 +459,34 @@ private:
     };
 */
 
+class MapViewCleaner : public CThreadQueue
+{
+    DEFINE_LOGCLASS;
+private:
+    struct Command : public IQueueCommand
+    {
+        Command(BaseMapView* mapView): mMapView(mapView){}
+        bool equals(IQueueCommand const &) { return false; }
+        String toString() { return "MapView Cleaner Command"; }
+
+        BaseMapView* mMapView;
+
+        virtual void cancel(){}
+    };
+
+public:
+    MapViewCleaner();
+    ~MapViewCleaner();
+
+    void cleanMapView(BaseMapView* mapView);
+private:
+    void processCommand(IQueueCommand *cmd);
+};
+
+
+
+
+
 } // namespace map
 } // namespace common
 } // namespace rho

data/platform/shared/common/map/ESRIMapEngine.cpp

@@ -79,7 +79,8 @@ IMapView *ESRIMapEngine::createMapView(IDrawingDevice *device)
 
 void ESRIMapEngine::destroyMapView(IMapView *view)
 {
-    delete view;
+	//delete view;
+	BaseMapView::processClean((BaseMapView*)view);
 }
 
 } // namespace map

data/platform/shared/common/map/GeocodingMapEngine.cpp

@@ -39,6 +39,12 @@
 #include "ruby/ext/rho/rhoruby.h"
 
 
+
+
+
+
+
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "GeocodingMapEngine"
 
@@ -60,6 +66,9 @@ String GoogleGeoCoding::Command::toString()
 IMPLEMENT_LOGCLASS(GoogleGeoCoding,"GGeoCoding");
 GoogleGeoCoding::GoogleGeoCoding()
 {
+#ifdef ENABLE_ANDROID_NET_REQUEST
+	mNetRequestID = 0;
+#endif
     CThreadQueue::setLogCategory(getLogCategory());
     RHO_MAP_TRACE("GoogleGeoCoding: ctor start");
     start(epNormal);
@@ -70,8 +79,8 @@ GoogleGeoCoding::~GoogleGeoCoding()
 {
     RHO_MAP_TRACE("GoogleGeoCoding: dtor");
 
-    m_NetRequest.cancel();
-    CThreadQueue::stop(200);
+    //m_NetRequest.cancel();
+    //CThreadQueue::stop(200);
 }
 /*
 void GoogleGeoCoding::stop()
@@ -83,7 +92,15 @@ void GoogleGeoCoding::stop()
 bool GoogleGeoCoding::fetchData(String const &url, void **data, size_t *datasize)
 {
     RHO_MAP_TRACE1("GoogleGeoCoding: fetchData: url=%s", url.c_str());
-    NetResponse resp = getNet().doRequest("GET", url, "", 0, 0);
+#ifdef ENABLE_ANDROID_NET_REQUEST
+    mNetRequestID = mapengine_request_make();
+    int s = 0;
+    int res = 0;
+    res = mapengine_request_data(mNetRequestID, url.c_str(), data, &s);
+    *datasize = s;
+    return res > 0;
+#else
+ NetResponse resp = getNet().doRequest("GET", url, "", 0, 0);
     if (!resp.isOK())
         return false;
     *datasize = resp.getDataSize();
@@ -92,7 +109,8 @@ bool GoogleGeoCoding::fetchData(String const &url, void **data, size_t *datasize
         return false;
     memcpy(*data, resp.getCharData(), *datasize);
     return true;
-}
+#endif
+ }
 
 void GoogleGeoCoding::resolve(String const &address, GeoCodingCallback *cb)
 {

data/platform/shared/common/map/GeocodingMapEngine.h

@@ -36,6 +36,29 @@
 #include <list>
 
 
+//#define USE_ANDROID_NET_REQUEST
+
+#ifdef OS_ANDROID
+
+#ifdef USE_ANDROID_NET_REQUEST
+#define ENABLE_ANDROID_NET_REQUEST
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+    int  mapengine_request_make();
+
+    int  mapengine_request_data(int request_id, const char* url, void** data, int* datasize);
+
+    void mapengine_request_cancel(int request_id);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+
+#endif
 
 
 namespace rho
@@ -80,13 +103,30 @@ public:
     void resolve(String const &address, GeoCodingCallback *cb);
     void resolve(float latitude, float longitude, GeoCodingCallback *cb);
 
+    void cancel() {
+#ifdef ENABLE_ANDROID_NET_REQUEST
+    	mapengine_request_cancel(mNetRequestID);
+    	mNetRequestID = 0;
+#else
+    	m_NetRequest.cancel();
+#endif
+    }
+
 private:
     bool fetchData(String const &url, void **data, size_t *datasize);
 
     void processCommand(IQueueCommand* cmd);
+#ifdef ENABLE_ANDROID_NET_REQUEST
+#else
     net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
+#endif
+
 private:
+#ifdef ENABLE_ANDROID_NET_REQUEST
+    int mNetRequestID;
+#else
     NetRequest              m_NetRequest;
+#endif
 };
     
 

data/platform/shared/common/map/GoogleMapEngine.cpp

@@ -52,6 +52,7 @@ int GoogleMapView::getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void
 
     void *data = NULL;
     size_t datasize = 0;
+    //int datasize = 0;
 
     String url = "";//cmd->baseUrl;
 
@@ -99,6 +100,14 @@ int GoogleMapView::getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void
     if (!fetchData(url, &data, &datasize))
         return 0;
 
+    //{
+    //	int id = mapengine_request_make();
+    //	if (!mapengine_request_data(id, url.c_str(), &data, &datasize)) {
+    //		return 0;
+    //	}
+    //}
+
+
     *p_data = data;
     *p_size = datasize;
 
@@ -112,7 +121,10 @@ IMapView *GoogleMapEngine::createMapView(IDrawingDevice *device)
 
 void GoogleMapEngine::destroyMapView(IMapView *view)
 {
-    delete view;
+    RHO_MAP_TRACE("GoogleMapEngine::destroyMapView() start");
+    //delete view;
+    BaseMapView::processClean((BaseMapView*)view);
+    RHO_MAP_TRACE("GoogleMapEngine::destroyMapView() finish");
 }
 
 } // namespace map

data/platform/shared/common/map/MapEngine.h

@@ -30,10 +30,17 @@
 #include "logging/RhoLog.h"
 #include "common/rhoparams.h"
 
+
+
 //#define RHO_MAP_DEBUG
 
 #ifdef RHO_MAP_DEBUG
+#ifdef OS_ANDROID
+#include <android/log.h>
+#   define RHO_MAP_TRACE(fmt) __android_log_write(ANDROID_LOG_INFO, "MapEngineNative", fmt)
+#else
 #   define RHO_MAP_TRACE(fmt) RAWTRACE(fmt)
+#endif
 #   define RHO_MAP_TRACE1(fmt, arg1) RAWTRACE1(fmt, arg1)
 #   define RHO_MAP_TRACE2(fmt, arg1, arg2) RAWTRACE2(fmt, arg1, arg2)
 #   define RHO_MAP_TRACE3(fmt, arg1, arg2, arg3) RAWTRACE3(fmt, arg1, arg2, arg3)

data/platform/shared/common/map/OSMMapEngine.cpp

@@ -63,6 +63,7 @@ int OSMMapView::getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void**
 {
     void *data = NULL;
     size_t datasize = 0;
+    //int datasize = 0;
     String url = "";//cmd->baseUrl;
 
     // Make url
@@ -77,6 +78,13 @@ int OSMMapView::getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void**
 
     if (!fetchData(url, &data, &datasize))
         return 0;
+    //{
+    //	int id = mapengine_request_make();
+    //	if (!mapengine_request_data(id, url.c_str(), &data, &datasize)) {
+    //		return 0;
+    //	}
+    //}
+
 
     //RAWLOG_ERROR("###########  getMapTime() AFTER FETCH");
 
@@ -93,7 +101,10 @@ IMapView *OSMMapEngine::createMapView(IDrawingDevice *device)
 
 void OSMMapEngine::destroyMapView(IMapView *view)
 {
-    delete view;
+    RHO_MAP_TRACE("OSMMapEngine::destroyMapView() start");
+    //delete view;
+     BaseMapView::processClean((BaseMapView*)view);
+    RHO_MAP_TRACE("OSMMapEngine::destroyMapView() finish");
 }
 
 } // namespace map