rhodes 2.2.6 → 2.3.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +20 -0
- data/README.md +46 -0
- data/Rakefile +85 -80
- data/bin/rhodes +2 -2
- data/bin/rhogen +1 -1
- data/doc/application.txt +277 -0
- data/doc/bb-css.txt +209 -0
- data/doc/build.txt +785 -0
- data/doc/configuration.txt +236 -0
- data/doc/connect-to-web-services.txt +282 -0
- data/doc/contributing.txt +64 -0
- data/doc/css-framework.txt +144 -0
- data/doc/device-caps.txt +1152 -0
- data/doc/extensions.txt +528 -0
- data/doc/files.txt +4 -0
- data/doc/generator.txt +141 -0
- data/doc/install.txt +35 -0
- data/doc/introduction.txt +88 -0
- data/doc/rhom.txt +826 -0
- data/doc/standard-css.txt +392 -0
- data/doc/synchronization.txt +542 -0
- data/doc/test-log-debug.txt +148 -0
- data/doc/tutorial.txt +136 -0
- data/doc/ui.txt +766 -0
- data/installer/EnvVarUpdate.nsh +328 -0
- data/installer/README.html +81 -0
- data/installer/RHOSYNC-LICENSE.txt +675 -0
- data/installer/icon.ico +0 -0
- data/installer/instant-rhodes.nsi +427 -0
- data/lib/build/jake.rb +15 -1
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
- data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
- data/lib/extensions/digest-sha1/ext/build.bat +1 -0
- data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
- data/lib/extensions/esri/ext/build +17 -0
- data/lib/extensions/esri/ext/build.bat +29 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
- data/lib/extensions/esri/ext.yml +3 -0
- data/lib/extensions/net-http/monitor.rb +265 -0
- data/lib/extensions/net-http/net/ftp.rb +981 -0
- data/lib/extensions/net-http/thread.rb +367 -0
- data/lib/extensions/rhocgi/cgi.rb +16 -0
- data/lib/extensions/rhospec/rhospec.rb +118 -0
- data/lib/framework/base64.rb +91 -0
- data/lib/framework/builtinME.rb +13 -10
- data/lib/framework/ostruct.rb +145 -0
- data/lib/framework/res/back_btn.wm.png +0 -0
- data/lib/framework/res/blue_pushpin.wm.png +0 -0
- data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
- data/lib/framework/res/callout.wm.png +0 -0
- data/lib/framework/res/callout_link.wm.png +0 -0
- data/lib/framework/res/forward_btn.wm.png +0 -0
- data/lib/framework/res/home_btn.wm.png +0 -0
- data/lib/framework/res/options_btn.wm.png +0 -0
- data/lib/framework/res/refresh_btn.wm.png +0 -0
- data/lib/framework/rho/render.rb +5 -2
- data/lib/framework/rho/rho.rb +320 -50
- data/lib/framework/rho/rhoapplication.rb +48 -10
- data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
- data/lib/framework/rho/rhosupport.rb +15 -1
- data/lib/framework/rho/rhotabbar.rb +29 -0
- data/lib/framework/rho/rhotoolbar.rb +17 -0
- data/lib/framework/rho/rhoutils.rb +22 -6
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rholang/rhomsg_de.rb +4 -3
- data/lib/framework/rholang/rhomsg_en.rb +1 -0
- data/lib/framework/rholang/rhomsg_es.rb +1 -0
- data/lib/framework/rholang/rhomsg_it.rb +1 -0
- data/lib/framework/rhom/rhom.rb +31 -10
- data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
- data/lib/framework/rhom/rhom_object_factory.rb +465 -249
- data/lib/framework/rhom/rhom_source.rb +22 -7
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +83 -20
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
- data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
- data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
- data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
- data/platform/android/Rhodes/jni/src/event.cpp +9 -15
- data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
- data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
- data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
- data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
- data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
- data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
- data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
- data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
- data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
- data/platform/android/Rhodes/res/drawable/callout.png +0 -0
- data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
- data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
- data/platform/android/Rhodes/res/layout/signature.xml +24 -17
- data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
- data/platform/android/Rhodes/res/values/strings.xml +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
- data/platform/android/build/RhodesSRC_build.files +32 -23
- data/platform/android/build/android.rake +28 -11
- data/platform/android/build/androidcommon.rb +2 -0
- data/platform/android/build/librhocommon_build.files +9 -5
- data/platform/android/build/librhodes_build.files +1 -0
- data/platform/android/build/libruby_build.files +1 -0
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
- data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
- data/platform/bb/RubyVM/RubyVM.jdp +3 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
- data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
- data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
- data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
- data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
- data/platform/bb/build/RubyVM_build.files +3 -0
- data/platform/bb/build/bb.rake +140 -62
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
- data/platform/bb/rhodes/resources/mappin.png +0 -0
- data/platform/bb/rhodes/rhodes.jdp +3 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
- data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
- data/platform/iphone/Classes/DateTime.h +4 -0
- data/platform/iphone/Classes/DateTime.m +1 -1
- data/platform/iphone/Classes/DateTimePicker.m +8 -1
- data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
- data/platform/iphone/Classes/Event/Event.m +2 -2
- data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
- data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
- data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
- data/platform/iphone/Classes/NativeBar.h +34 -0
- data/platform/iphone/Classes/NativeBar.m +131 -26
- data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
- data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
- data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
- data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
- data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
- data/platform/iphone/Classes/RhoAlert.m +3 -3
- data/platform/iphone/Classes/RhoMainView.h +3 -0
- data/platform/iphone/Classes/Rhodes.h +6 -2
- data/platform/iphone/Classes/Rhodes.m +47 -79
- data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
- data/platform/iphone/Classes/SimpleMainView.h +18 -1
- data/platform/iphone/Classes/SimpleMainView.m +180 -35
- data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
- data/platform/iphone/Classes/TabbedMainView.h +25 -3
- data/platform/iphone/Classes/TabbedMainView.m +340 -14
- data/platform/iphone/ESRI/BluePushpin.png +0 -0
- data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
- data/platform/iphone/ESRI/esri.png +0 -0
- data/platform/iphone/ESRI/esri@2x.png +0 -0
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
- data/platform/iphone/rbuild/iphone.rake +100 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
- data/platform/shared/SyncClient/SyncClient.cpp +29 -3
- data/platform/shared/SyncClient/SyncClient.h +2 -1
- data/platform/shared/common/IRhoClassFactory.h +3 -0
- data/platform/shared/common/IRhoCrypt.h +16 -0
- data/platform/shared/common/IRhoThreadImpl.h +1 -0
- data/platform/shared/common/RhoAppAdapter.h +2 -0
- data/platform/shared/common/RhoConf.cpp +97 -46
- data/platform/shared/common/RhoConf.h +14 -13
- data/platform/shared/common/RhoFile.cpp +10 -0
- data/platform/shared/common/RhoFile.h +1 -0
- data/platform/shared/common/RhoMath.cpp +43 -0
- data/platform/shared/common/RhoMath.h +27 -0
- data/platform/shared/common/RhoNativeViewManager.h +27 -1
- data/platform/shared/common/RhoPort.h +11 -0
- data/platform/shared/common/RhoStd.h +5 -0
- data/platform/shared/common/RhoThread.cpp +1 -1
- data/platform/shared/common/RhoThread.h +1 -1
- data/platform/shared/common/RhodesApp.cpp +381 -139
- data/platform/shared/common/RhodesApp.h +24 -10
- data/platform/shared/common/RhodesAppBase.cpp +72 -1
- data/platform/shared/common/RhodesAppBase.h +5 -1
- data/platform/shared/common/SplashScreen.h +4 -4
- data/platform/shared/common/ThreadQueue.cpp +44 -17
- data/platform/shared/common/ThreadQueue.h +4 -0
- data/platform/shared/common/app_build_configs.c +0 -1
- data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
- data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
- data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
- data/platform/shared/common/map/ESRIMapEngine.h +255 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
- data/platform/shared/common/map/GoogleMapEngine.h +52 -0
- data/platform/shared/common/map/MapEngine.cpp +304 -0
- data/platform/shared/common/map/MapEngine.h +214 -0
- data/platform/shared/db/DBAdapter.cpp +147 -18
- data/platform/shared/db/DBAdapter.h +38 -12
- data/platform/shared/db/DBAttrManager.cpp +4 -3
- data/platform/shared/db/DBAttrManager.h +7 -7
- data/platform/shared/db/res/db/syncdb.triggers +0 -5
- data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
- data/platform/shared/json/JSONIterator.cpp +11 -1
- data/platform/shared/json/JSONIterator.h +1 -0
- data/platform/shared/logging/RhoLogConf.cpp +29 -12
- data/platform/shared/net/CURLNetRequest.cpp +80 -25
- data/platform/shared/net/CURLNetRequest.h +6 -2
- data/platform/shared/net/HttpServer.cpp +12 -6
- data/platform/shared/net/HttpServer.h +2 -1
- data/platform/shared/net/INetRequest.h +1 -0
- data/platform/shared/ruby/ext/alert/alert.i +5 -0
- data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
- data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
- data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
- data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
- data/platform/shared/ruby/ext/system/system.i +4 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
- data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
- data/platform/shared/rubyext/System.cpp +9 -0
- data/platform/shared/rubyext/WebView.h +1 -0
- data/platform/shared/sqlite/crypto.c +907 -0
- data/platform/shared/sqlite/sqlite3.c +6 -0
- data/platform/shared/sync/SyncEngine.cpp +49 -19
- data/platform/shared/sync/SyncEngine.h +0 -1
- data/platform/shared/sync/SyncNotify.cpp +14 -5
- data/platform/shared/sync/SyncNotify.h +2 -2
- data/platform/shared/sync/SyncSource.cpp +79 -33
- data/platform/shared/sync/SyncSource.h +1 -0
- data/platform/shared/sync/SyncThread.cpp +26 -11
- data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
- data/platform/wm/build/wm.rake +6 -0
- data/platform/wm/rhodes/Alert.cpp +4 -3
- data/platform/wm/rhodes/Alert.h +1 -1
- data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
- data/platform/wm/rhodes/DateTimePicker.h +9 -1
- data/platform/wm/rhodes/MainWindow.cpp +121 -61
- data/platform/wm/rhodes/MainWindow.h +29 -4
- data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
- data/platform/wm/rhodes/MapView/Graphics.h +136 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
- data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
- data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
- data/platform/wm/rhodes/Rhodes.cpp +94 -102
- data/platform/wm/rhodes/Rhodes.rc +27 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
- data/platform/wm/rhodes/camera/Camera.cpp +36 -15
- data/platform/wm/rhodes/camera/Camera.h +0 -4
- data/platform/wm/rhodes/resource.h +10 -2
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
- data/platform/wm/rhodes/rhodes.vcproj +38 -2
- data/platform/wm/rhodes/stdafx.h +2 -1
- data/platform/wm/rubylib/rubylib.vcproj +12 -0
- data/rakefile.rb +85 -80
- data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
- data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
- data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/templates/application/app/application.rb +2 -2
- data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
- data/res/generators/templates/application/public/css/android.css +1 -0
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
- data/res/generators/templates/application/rhoconfig.txt +66 -14
- data/rhodes.gemspec +3 -3
- data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
- data/spec/framework_spec/build.yml +1 -1
- data/spec/phone_spec/Rakefile +1 -0
- data/spec/phone_spec/app/Account/account.rb +2 -0
- data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
- data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
- data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
- data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
- data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
- data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
- data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
- data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
- data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
- data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
- data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
- data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
- data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
- data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
- data/spec/phone_spec/app/spec_runner.rb +15 -7
- data/spec/phone_spec/build.yml +2 -2
- metadata +154 -25
- data/README.textile +0 -45
- data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
- data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
- data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
- data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
- data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
@@ -0,0 +1,921 @@
|
|
1
|
+
#include "common/map/ESRIMapEngine.h"
|
2
|
+
#include "common/map/GoogleMapEngine.h"
|
3
|
+
#include "common/RhoMath.h"
|
4
|
+
#include "common/RhoConf.h"
|
5
|
+
#include "common/IRhoClassFactory.h"
|
6
|
+
#include "common/RhodesApp.h"
|
7
|
+
#include "net/INetRequest.h"
|
8
|
+
|
9
|
+
//TODO:
|
10
|
+
//0. create rho::graphics namespace, move all draw interfaces there, create Rect and Point class
|
11
|
+
//1. move classes to files, raname namespace to rho::map
|
12
|
+
//2. image cache: remove only unvisible images
|
13
|
+
//3. see TODO inside
|
14
|
+
//4. when stop thread - cancel current net request. Add cancelCurrentCommand to ThreadQueue and call it from stop
|
15
|
+
//5. move all platform code to appropriate folders
|
16
|
+
|
17
|
+
#ifdef min
|
18
|
+
#undef min
|
19
|
+
#endif
|
20
|
+
|
21
|
+
#ifdef max
|
22
|
+
#undef max
|
23
|
+
#endif
|
24
|
+
|
25
|
+
#ifdef _MSC_VER
|
26
|
+
// Disable warnings about using "this" in member initializater list
|
27
|
+
#pragma warning(disable: 4355)
|
28
|
+
#define PRINTF_UINT64 "%I64u"
|
29
|
+
#define PRINTF_INT64 "%I64d"
|
30
|
+
|
31
|
+
#else
|
32
|
+
|
33
|
+
#define PRINTF_UINT64 "%llu"
|
34
|
+
#define PRINTF_INT64 "%lld"
|
35
|
+
|
36
|
+
#endif
|
37
|
+
|
38
|
+
#undef DEFAULT_LOGCATEGORY
|
39
|
+
#define DEFAULT_LOGCATEGORY "ESRIMapEngine"
|
40
|
+
|
41
|
+
namespace rho
|
42
|
+
{
|
43
|
+
namespace common
|
44
|
+
{
|
45
|
+
namespace map
|
46
|
+
{
|
47
|
+
|
48
|
+
// DON'T CHANGE THIS CONSTANT!!!
|
49
|
+
// This is maximum absolute value of sine ( == sin(85*PI/180) ) allowed by Merkator projection
|
50
|
+
static double MAX_SIN = 0.99627207622;
|
51
|
+
|
52
|
+
static int const MIN_ZOOM = 0;
|
53
|
+
static int const MAX_ZOOM = 19;
|
54
|
+
|
55
|
+
static int const TILE_SIZE = 256;
|
56
|
+
|
57
|
+
#ifdef OS_WINCE
|
58
|
+
static int const MAX_TILES_CACHE_SIZE = 70;
|
59
|
+
#else
|
60
|
+
static int const MAX_TILES_CACHE_SIZE = 100;
|
61
|
+
#endif
|
62
|
+
|
63
|
+
static int const ANNOTATION_SENSITIVITY_AREA_RADIUS = 16;
|
64
|
+
|
65
|
+
static int const BACKGROUND_COLOR = 0x7F7F7F;
|
66
|
+
static int const CALLOUT_TEXT_COLOR = 0xFFFFFFFF;
|
67
|
+
|
68
|
+
static uint64 degreesToPixelsX(double n, int zoom)
|
69
|
+
{
|
70
|
+
while (n < -180) n += 360;
|
71
|
+
while (n > 180) n -= 360;
|
72
|
+
double angleRatio = 360.0/rho_math_pow2(zoom);
|
73
|
+
double val = TILE_SIZE * (n + 180)/angleRatio;
|
74
|
+
return (uint64)val;
|
75
|
+
}
|
76
|
+
|
77
|
+
static uint64 degreesToPixelsY(double n, int zoom)
|
78
|
+
{
|
79
|
+
// Merkator projection
|
80
|
+
double sin_phi = rho_math_sin(n*M_PI/180);
|
81
|
+
// MAX_SIN - maximum value of sine allowed by Merkator projection
|
82
|
+
// (~85.0 degrees of north latitude)
|
83
|
+
if (sin_phi < -MAX_SIN) sin_phi = -MAX_SIN;
|
84
|
+
if (sin_phi > MAX_SIN) sin_phi = MAX_SIN;
|
85
|
+
double ath = rho_math_atanh(sin_phi);
|
86
|
+
double val = TILE_SIZE * rho_math_pow2(zoom) * (1 - ath/M_PI)/2;
|
87
|
+
return (uint64)val;
|
88
|
+
}
|
89
|
+
|
90
|
+
//static uint64 const MIN_LATITUDE = degreesToPixelsY(90, MAX_ZOOM);
|
91
|
+
static uint64 const MAX_LATITUDE = degreesToPixelsY(-90, MAX_ZOOM);
|
92
|
+
//static uint64 const MIN_LONGITUDE = degreesToPixelsX(-180, MAX_ZOOM);
|
93
|
+
static uint64 const MAX_LONGITUDE = degreesToPixelsX(180, MAX_ZOOM);
|
94
|
+
|
95
|
+
static uint64 normalize_latitude(int64 latitude)
|
96
|
+
{
|
97
|
+
while (latitude < 0) latitude += MAX_LATITUDE;
|
98
|
+
while (latitude > (int64)MAX_LATITUDE) latitude -= MAX_LATITUDE;
|
99
|
+
return (uint64)latitude;
|
100
|
+
}
|
101
|
+
|
102
|
+
static uint64 normalize_longitude(int64 longitude)
|
103
|
+
{
|
104
|
+
while (longitude < 0) longitude += MAX_LONGITUDE;
|
105
|
+
while (longitude > (int64)MAX_LONGITUDE) longitude -= MAX_LONGITUDE;
|
106
|
+
return (uint64)longitude;
|
107
|
+
}
|
108
|
+
|
109
|
+
static double pixelsToDegreesX(uint64 n, int zoom)
|
110
|
+
{
|
111
|
+
n = normalize_longitude(n);
|
112
|
+
double angleRatio = 360.0/rho_math_pow2(zoom);
|
113
|
+
double val = n * angleRatio/TILE_SIZE - 180;
|
114
|
+
return val;
|
115
|
+
}
|
116
|
+
|
117
|
+
static double pixelsToDegreesY(uint64 n, int zoom)
|
118
|
+
{
|
119
|
+
// Revert calculation of Merkator projection
|
120
|
+
double ath = M_PI - 2*M_PI*n/(TILE_SIZE * rho_math_pow2(zoom));
|
121
|
+
double th = rho_math_tanh(ath);
|
122
|
+
double val = 180*rho_math_asin(th)/M_PI;
|
123
|
+
return val;
|
124
|
+
}
|
125
|
+
|
126
|
+
static int64 toMaxZoom(int64 n, int zoom)
|
127
|
+
{
|
128
|
+
if (n == 0) return 0;
|
129
|
+
int64 pow = rho_math_pow2(MAX_ZOOM - zoom);
|
130
|
+
return n*pow;
|
131
|
+
}
|
132
|
+
|
133
|
+
static int64 toCurrentZoom(int64 n, int zoom)
|
134
|
+
{
|
135
|
+
if (n == 0) return 0;
|
136
|
+
int64 pow = rho_math_pow2(MAX_ZOOM - zoom);
|
137
|
+
return n/pow;
|
138
|
+
}
|
139
|
+
|
140
|
+
//=============================================================================================
|
141
|
+
// Helper classes
|
142
|
+
|
143
|
+
ESRIMapView::Tile::Tile(IDrawingDevice *device, int z, uint64 lat, uint64 lon)
|
144
|
+
:m_device(device), m_zoom(z), m_latitude(lat), m_longitude(lon), m_image(0)
|
145
|
+
{}
|
146
|
+
|
147
|
+
ESRIMapView::Tile::Tile(IDrawingDevice *device, int z, uint64 lat, uint64 lon, void *data, size_t datasize)
|
148
|
+
:m_device(device), m_zoom(z), m_latitude(lat), m_longitude(lon),
|
149
|
+
m_image(m_device->createImage(data, datasize, false))
|
150
|
+
{}
|
151
|
+
|
152
|
+
ESRIMapView::Tile::Tile(ESRIMapView::Tile const &c)
|
153
|
+
:m_device(c.m_device), m_zoom(c.m_zoom), m_latitude(c.m_latitude), m_longitude(c.m_longitude),
|
154
|
+
m_image(m_device->cloneImage(c.m_image))
|
155
|
+
{}
|
156
|
+
|
157
|
+
ESRIMapView::Tile::~Tile()
|
158
|
+
{
|
159
|
+
m_device->destroyImage(m_image);
|
160
|
+
}
|
161
|
+
|
162
|
+
ESRIMapView::Tile &ESRIMapView::Tile::operator=(ESRIMapView::Tile const &c)
|
163
|
+
{
|
164
|
+
Tile copy(c);
|
165
|
+
swap(copy);
|
166
|
+
return *this;
|
167
|
+
}
|
168
|
+
|
169
|
+
void ESRIMapView::Tile::swap(ESRIMapView::Tile &tile)
|
170
|
+
{
|
171
|
+
std::swap(m_zoom, tile.m_zoom);
|
172
|
+
std::swap(m_latitude, tile.m_latitude);
|
173
|
+
std::swap(m_longitude, tile.m_longitude);
|
174
|
+
std::swap(m_image, tile.m_image);
|
175
|
+
}
|
176
|
+
|
177
|
+
IMPLEMENT_LOGCLASS(ESRIMapView::MapFetch,"MapFetch");
|
178
|
+
ESRIMapView::MapFetch::MapFetch(ESRIMapView *view)
|
179
|
+
:CThreadQueue(rho_impl_createClassFactory()),
|
180
|
+
m_mapview(view), m_net_request(getFactory()->createNetRequest())
|
181
|
+
{
|
182
|
+
CThreadQueue::setLogCategory(getLogCategory());
|
183
|
+
|
184
|
+
start(epNormal);
|
185
|
+
}
|
186
|
+
|
187
|
+
ESRIMapView::MapFetch::~MapFetch()
|
188
|
+
{
|
189
|
+
//stop(1000);
|
190
|
+
}
|
191
|
+
|
192
|
+
void ESRIMapView::MapFetch::fetchTile(String const &baseUrl, int zoom, uint64 latitude, uint64 longitude)
|
193
|
+
{
|
194
|
+
RHO_MAP_TRACE3("fetchTile: zoom=%d, latitude="PRINTF_UINT64", longitude="PRINTF_UINT64"", zoom, latitude, longitude);
|
195
|
+
addQueueCommandToFront(new Command(baseUrl, zoom, latitude, longitude));
|
196
|
+
}
|
197
|
+
|
198
|
+
bool ESRIMapView::MapFetch::fetchData(String const &url, void **data, size_t *datasize)
|
199
|
+
{
|
200
|
+
RHO_MAP_TRACE1("fetchData: url=%s", url.c_str());
|
201
|
+
NetResponse(resp, m_net_request->doRequest("GET", url, "", 0, 0));
|
202
|
+
if (!resp.isOK())
|
203
|
+
return false;
|
204
|
+
*datasize = resp.getDataSize();
|
205
|
+
*data = malloc(*datasize);
|
206
|
+
if (!*data)
|
207
|
+
return false;
|
208
|
+
memcpy(*data, resp.getCharData(), *datasize);
|
209
|
+
return true;
|
210
|
+
}
|
211
|
+
|
212
|
+
void ESRIMapView::MapFetch::processCommand(IQueueCommand *c)
|
213
|
+
{
|
214
|
+
Command *cmd = (Command *)c;
|
215
|
+
RHO_MAP_TRACE1("processCommand: cmd=%s", cmd->toString().c_str());
|
216
|
+
String url = cmd->baseUrl;
|
217
|
+
if (url.empty())
|
218
|
+
{
|
219
|
+
RAWLOG_ERROR("MapFetch::processCommand: passed empty base url");
|
220
|
+
return;
|
221
|
+
}
|
222
|
+
// Append last '/' if not exist
|
223
|
+
if (url[url.size() - 1] != '/')
|
224
|
+
url.push_back('/');
|
225
|
+
int zoom = cmd->zoom;
|
226
|
+
uint64 latitude = cmd->latitude;
|
227
|
+
uint64 longitude = cmd->longitude;
|
228
|
+
|
229
|
+
uint64 ts = toMaxZoom(TILE_SIZE, zoom);
|
230
|
+
unsigned row = (unsigned)((latitude - ts/2)/ts);
|
231
|
+
unsigned column = (unsigned)((longitude - ts/2)/ts);
|
232
|
+
|
233
|
+
char buf[128];
|
234
|
+
snprintf(buf, sizeof(buf), "MapServer/tile/%d/%d/%d", zoom, row, column);
|
235
|
+
url += buf;
|
236
|
+
|
237
|
+
void *data;
|
238
|
+
size_t datasize;
|
239
|
+
if (!fetchData(url, &data, &datasize))
|
240
|
+
return;
|
241
|
+
|
242
|
+
IDrawingDevice *device = m_mapview->drawingDevice();
|
243
|
+
|
244
|
+
{
|
245
|
+
synchronized (m_mapview->tilesCacheLock());
|
246
|
+
m_mapview->tilesCache().put(Tile(device, zoom, latitude, longitude, data, datasize));
|
247
|
+
}
|
248
|
+
|
249
|
+
free(data);
|
250
|
+
m_mapview->redraw();
|
251
|
+
}
|
252
|
+
|
253
|
+
String ESRIMapView::MapFetch::Command::toString()
|
254
|
+
{
|
255
|
+
char buf[64];
|
256
|
+
snprintf(buf, sizeof(buf), "%d/"PRINTF_INT64"/"PRINTF_INT64"", zoom, latitude, longitude);
|
257
|
+
RHO_MAP_TRACE1("ESRIMapView::MapFetch::Command::toString(): %s", buf);
|
258
|
+
return String(&buf[0]);
|
259
|
+
}
|
260
|
+
|
261
|
+
IMPLEMENT_LOGCLASS(ESRIMapView::CacheUpdate,"CacheUpdate");
|
262
|
+
ESRIMapView::CacheUpdate::CacheUpdate(ESRIMapView *view)
|
263
|
+
:CThreadQueue(rho_impl_createClassFactory()), m_mapview(view)
|
264
|
+
{
|
265
|
+
CThreadQueue::setLogCategory(getLogCategory());
|
266
|
+
start(epNormal);
|
267
|
+
}
|
268
|
+
|
269
|
+
ESRIMapView::CacheUpdate::~CacheUpdate()
|
270
|
+
{
|
271
|
+
//stop(200);
|
272
|
+
}
|
273
|
+
|
274
|
+
void ESRIMapView::CacheUpdate::updateCache()
|
275
|
+
{
|
276
|
+
addQueueCommand(new Command());
|
277
|
+
}
|
278
|
+
|
279
|
+
void ESRIMapView::CacheUpdate::processCommand(IQueueCommand *c)
|
280
|
+
{
|
281
|
+
RHO_MAP_TRACE("CacheUpdate: start");
|
282
|
+
|
283
|
+
CMutex &lock = m_mapview->tilesCacheLock();
|
284
|
+
TilesCache &cache = m_mapview->tilesCache();
|
285
|
+
|
286
|
+
IDrawingDevice *drawingDevice = m_mapview->drawingDevice();
|
287
|
+
|
288
|
+
int zoom = m_mapview->zoom();
|
289
|
+
uint64 latitude = m_mapview->latitudeInt();
|
290
|
+
uint64 longitude = m_mapview->longitudeInt();
|
291
|
+
RHO_MAP_TRACE3("CacheUpdate: zoom=%d, latitude="PRINTF_UINT64", longitude="PRINTF_UINT64"", zoom, latitude, longitude);
|
292
|
+
|
293
|
+
uint64 ts = toMaxZoom(TILE_SIZE, zoom);
|
294
|
+
uint64 w = toMaxZoom(m_mapview->width(), zoom);
|
295
|
+
uint64 h = toMaxZoom(m_mapview->height(), zoom);
|
296
|
+
RHO_MAP_TRACE3("CacheUpdate: ts="PRINTF_UINT64", w="PRINTF_UINT64", h="PRINTF_UINT64"", ts, w, h);
|
297
|
+
|
298
|
+
// Coordinates of the most top-left tile visible on the screen
|
299
|
+
uint64 tileIndex = latitude <= h/2 ? 0 : (latitude - h/2)/ts;
|
300
|
+
int64 latBegin = tileIndex*ts + ts/2;
|
301
|
+
tileIndex = longitude <= w/2 ? 0 : (longitude - w/2)/ts;
|
302
|
+
int64 lonBegin = tileIndex*ts + ts/2;
|
303
|
+
RHO_MAP_TRACE2("CacheUpdate: latBegin="PRINTF_INT64", lonBegin="PRINTF_INT64"", latBegin, lonBegin);
|
304
|
+
|
305
|
+
// Coordinates of the most bottom-right tile visible on the screen
|
306
|
+
int64 latEnd = latBegin;
|
307
|
+
while (latEnd < latBegin + (int64)h) latEnd += ts;
|
308
|
+
if (latEnd - ts/2 < latitude + h/2) latEnd += ts;
|
309
|
+
int64 lonEnd = lonBegin;
|
310
|
+
while (lonEnd < lonBegin + (int64)w) lonEnd += ts;
|
311
|
+
if (lonEnd - ts/2 < longitude + w/2) lonEnd += ts;
|
312
|
+
RHO_MAP_TRACE2("CacheUpdate: latEnd="PRINTF_INT64", lonEnd="PRINTF_INT64"", latEnd, lonEnd);
|
313
|
+
|
314
|
+
for (int64 lat = latEnd; lat >= latBegin; lat -= ts)
|
315
|
+
for (int64 lon = lonEnd; lon >= lonBegin; lon -= ts)
|
316
|
+
{
|
317
|
+
uint64 latitude = normalize_latitude(lat);
|
318
|
+
uint64 longitude = normalize_longitude(lon);
|
319
|
+
|
320
|
+
synchronized (lock);
|
321
|
+
Tile const *tile = cache.get(zoom, latitude, longitude);
|
322
|
+
if (tile)
|
323
|
+
continue;
|
324
|
+
|
325
|
+
cache.put(Tile(drawingDevice, zoom, latitude, longitude));
|
326
|
+
|
327
|
+
RHO_MAP_TRACE3("CacheUpdate: fetch tile: zoom=%d, latitude="PRINTF_UINT64", longitude="PRINTF_UINT64"", zoom, latitude, longitude);
|
328
|
+
m_mapview->fetchTile(zoom, latitude, longitude);
|
329
|
+
}
|
330
|
+
|
331
|
+
RHO_MAP_TRACE("CacheUpdate: stop");
|
332
|
+
}
|
333
|
+
|
334
|
+
ESRIMapView::Tile const *ESRIMapView::TilesCache::get(int zoom, uint64 latitude, uint64 longitude) const
|
335
|
+
{
|
336
|
+
//RHO_MAP_TRACE3("TilesCache::get: zoom=%d, latitude=%llu, longitude=%llu", zoom, latitude, longitude);
|
337
|
+
String const &key = makeKey(zoom, latitude, longitude);
|
338
|
+
std::map<String, Tile *>::const_iterator it = m_by_coordinates.find(key);
|
339
|
+
Tile const *ptile = it == m_by_coordinates.end() ? NULL : it->second;
|
340
|
+
RHO_MAP_TRACE3("TilesCache::get: key=%s, ptile=%p, cache size=%lu", key.c_str(), ptile, (unsigned long)m_tiles.size());
|
341
|
+
return ptile;
|
342
|
+
}
|
343
|
+
|
344
|
+
void ESRIMapView::TilesCache::put(Tile const &tile)
|
345
|
+
{
|
346
|
+
int zoom = tile.zoom();
|
347
|
+
uint64 latitude = tile.latitude();
|
348
|
+
uint64 longitude = tile.longitude();
|
349
|
+
//RHO_MAP_TRACE3("TilesCache::put: zoom=%d, latitude=%llu, longitude=%llu", zoom, latitude, longitude);
|
350
|
+
String const &key = makeKey(zoom, latitude, longitude);
|
351
|
+
m_tiles.push_back(tile);
|
352
|
+
Tile *ptile = &m_tiles.back();
|
353
|
+
RHO_MAP_TRACE3("TilesCache::put: key=%s, ptile=%p, cache size=%lu", key.c_str(), ptile, (unsigned long)m_tiles.size());
|
354
|
+
m_by_coordinates.insert(std::make_pair(key, ptile));
|
355
|
+
|
356
|
+
// Throw away oldest tiles if limit reached
|
357
|
+
//TODO: remove only unvisible images
|
358
|
+
for (int i = MAX_TILES_CACHE_SIZE, lim = (int)m_tiles.size(); i < lim; ++i)
|
359
|
+
{
|
360
|
+
Tile const &tile = m_tiles.front();
|
361
|
+
String const &key = makeKey(tile.zoom(), tile.latitude(), tile.longitude());
|
362
|
+
RHO_MAP_TRACE1("TilesCache::put: limit reached, remove oldest tile (%s)", key.c_str());
|
363
|
+
m_by_coordinates.erase(key);
|
364
|
+
m_tiles.pop_front();
|
365
|
+
}
|
366
|
+
}
|
367
|
+
|
368
|
+
ESRIMapView::TilesCache::list ESRIMapView::TilesCache::clone() const
|
369
|
+
{
|
370
|
+
return m_tiles;
|
371
|
+
}
|
372
|
+
|
373
|
+
String ESRIMapView::TilesCache::makeKey(int zoom, uint64 latitude, uint64 longitude)
|
374
|
+
{
|
375
|
+
char key[128];
|
376
|
+
snprintf(key, sizeof(key), "%d/"PRINTF_UINT64"/"PRINTF_UINT64"", zoom, latitude, longitude);
|
377
|
+
return key;
|
378
|
+
}
|
379
|
+
|
380
|
+
class CenterResolved : public GeoCodingCallback
|
381
|
+
{
|
382
|
+
public:
|
383
|
+
CenterResolved(IMapView *view) :m_mapview(view) {}
|
384
|
+
|
385
|
+
void onError(String const &) {}
|
386
|
+
|
387
|
+
void onSuccess(double latitude, double longitude)
|
388
|
+
{
|
389
|
+
RHO_MAP_TRACE2("CenterResolved: latitude=%lf, longitude=%lf", latitude, longitude);
|
390
|
+
m_mapview->moveTo(latitude, longitude);
|
391
|
+
}
|
392
|
+
|
393
|
+
private:
|
394
|
+
IMapView *m_mapview;
|
395
|
+
};
|
396
|
+
|
397
|
+
class AnnotationResolved : public GeoCodingCallback
|
398
|
+
{
|
399
|
+
public:
|
400
|
+
AnnotationResolved(IMapView *view, Annotation const &ann)
|
401
|
+
:m_mapview(view), m_ann(ann)
|
402
|
+
{}
|
403
|
+
|
404
|
+
void onError(String const &) {}
|
405
|
+
|
406
|
+
void onSuccess(double latitude, double longitude)
|
407
|
+
{
|
408
|
+
RHO_MAP_TRACE2("AnnotationResolved: latitude=%lf, longitude=%lf", latitude, longitude);
|
409
|
+
Annotation ann(m_ann.title(), m_ann.subtitle(), latitude, longitude, m_ann.url());
|
410
|
+
m_mapview->addAnnotation(ann);
|
411
|
+
}
|
412
|
+
|
413
|
+
private:
|
414
|
+
IMapView *m_mapview;
|
415
|
+
Annotation m_ann;
|
416
|
+
};
|
417
|
+
|
418
|
+
// ESRIMapView implementation
|
419
|
+
|
420
|
+
ESRIMapView *ESRIMapEngine::createMapView(IDrawingDevice *device)
|
421
|
+
{
|
422
|
+
return new ESRIMapView(device);
|
423
|
+
}
|
424
|
+
|
425
|
+
void ESRIMapEngine::destroyMapView(IMapView *view)
|
426
|
+
{
|
427
|
+
delete view;
|
428
|
+
}
|
429
|
+
|
430
|
+
ESRIMapView::ESRIMapView(IDrawingDevice *device)
|
431
|
+
:m_drawing_device(device), m_geo_coding(new GoogleGeoCoding()),
|
432
|
+
m_map_fetch(new MapFetch(this)), m_cache_update(new CacheUpdate(this)),
|
433
|
+
m_width(0), m_height(0),
|
434
|
+
m_zoom_enabled(true), m_scroll_enabled(true), m_maptype("roadmap"),
|
435
|
+
m_zoom(MIN_ZOOM), m_latitude(degreesToPixelsY(0, MAX_ZOOM)), m_longitude(degreesToPixelsX(0, MAX_ZOOM)),
|
436
|
+
m_selected_annotation_index(-1),
|
437
|
+
m_pinCallout(0), m_pinCalloutLink(0), m_pin(0)
|
438
|
+
{
|
439
|
+
String url = RHOCONF().getString("esri_map_url_roadmap");
|
440
|
+
if (url.empty())
|
441
|
+
url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/";
|
442
|
+
m_map_urls.put("roadmap", url);
|
443
|
+
|
444
|
+
url = RHOCONF().getString("esri_map_url_satellite");
|
445
|
+
if (url.empty())
|
446
|
+
url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/";
|
447
|
+
m_map_urls.put("satellite", url);
|
448
|
+
}
|
449
|
+
|
450
|
+
ESRIMapView::~ESRIMapView()
|
451
|
+
{
|
452
|
+
if ( m_map_fetch.get() != 0)
|
453
|
+
m_map_fetch->stop(2000);
|
454
|
+
|
455
|
+
if ( m_cache_update.get() != 0)
|
456
|
+
m_cache_update->stop(2000);
|
457
|
+
}
|
458
|
+
|
459
|
+
void ESRIMapView::setSize(int width, int height)
|
460
|
+
{
|
461
|
+
RHO_MAP_TRACE2("setSize: width=%d, height=%d", width, height);
|
462
|
+
|
463
|
+
m_width = width;
|
464
|
+
m_height = height;
|
465
|
+
}
|
466
|
+
|
467
|
+
void ESRIMapView::setMapType(String const &type)
|
468
|
+
{
|
469
|
+
m_maptype = type;
|
470
|
+
updateCache();
|
471
|
+
redraw();
|
472
|
+
}
|
473
|
+
|
474
|
+
String const &ESRIMapView::getMapUrl()
|
475
|
+
{
|
476
|
+
String type = m_maptype;
|
477
|
+
if (!m_map_urls.containsKey(type))
|
478
|
+
type = "roadmap";
|
479
|
+
return m_map_urls[type];
|
480
|
+
}
|
481
|
+
|
482
|
+
int ESRIMapView::minZoom() const
|
483
|
+
{
|
484
|
+
return MIN_ZOOM;
|
485
|
+
}
|
486
|
+
|
487
|
+
int ESRIMapView::maxZoom() const
|
488
|
+
{
|
489
|
+
return MAX_ZOOM;
|
490
|
+
}
|
491
|
+
|
492
|
+
#if 0
|
493
|
+
static double calc_delta(int zoom, int pixels, int tile_size)
|
494
|
+
{
|
495
|
+
RHO_MAP_TRACE3("calc_delta: zoom=%d, pixels=%d, tile_size=%d", zoom, pixels, tile_size);
|
496
|
+
if (tile_size == 0)
|
497
|
+
return 0;
|
498
|
+
double twoInZoomExp = (double)rho_math_pow2(zoom);
|
499
|
+
double angleRatio = 360/twoInZoomExp;
|
500
|
+
double degrees = angleRatio*pixels/tile_size;
|
501
|
+
RHO_MAP_TRACE1("calc_delta: degrees=%lf", degrees);
|
502
|
+
return degrees;
|
503
|
+
}
|
504
|
+
#endif // #if 0
|
505
|
+
|
506
|
+
static int calc_zoom(double degrees, int pixels, int tile_size)
|
507
|
+
{
|
508
|
+
RHO_MAP_TRACE3("calc_zoom: degrees=%lf, pixels=%d, tile_size=%d", degrees, pixels, tile_size);
|
509
|
+
if (pixels == 0)
|
510
|
+
return 0;
|
511
|
+
double angleRatio = degrees*tile_size/pixels;
|
512
|
+
double twoInZoomExp = 360/angleRatio;
|
513
|
+
RHO_MAP_TRACE2("calc_zoom: angleRatio=%lf, twoInZoomExp=%lf", angleRatio, twoInZoomExp);
|
514
|
+
int zoom = (int)rho_math_log2(twoInZoomExp);
|
515
|
+
RHO_MAP_TRACE1("calc_zoom: zoom=%d", zoom);
|
516
|
+
return zoom;
|
517
|
+
}
|
518
|
+
|
519
|
+
void ESRIMapView::setZoom(int zoom)
|
520
|
+
{
|
521
|
+
RHO_MAP_TRACE1("setZoom: zoom=%d", zoom);
|
522
|
+
m_zoom = zoom;
|
523
|
+
if (m_zoom < MIN_ZOOM) m_zoom = MIN_ZOOM;
|
524
|
+
if (m_zoom > MAX_ZOOM) m_zoom = MAX_ZOOM;
|
525
|
+
updateCache();
|
526
|
+
redraw();
|
527
|
+
}
|
528
|
+
|
529
|
+
void ESRIMapView::setZoom(double latDelta, double lonDelta)
|
530
|
+
{
|
531
|
+
RHO_MAP_TRACE2("setZoom: latDelta=%lf, lonDelta=%lf", latDelta, lonDelta);
|
532
|
+
int zoom1 = calc_zoom(latDelta, m_height, TILE_SIZE);
|
533
|
+
int zoom2 = calc_zoom(lonDelta, m_width, TILE_SIZE);
|
534
|
+
setZoom(std::min(zoom1, zoom2));
|
535
|
+
}
|
536
|
+
|
537
|
+
double ESRIMapView::latitude() const
|
538
|
+
{
|
539
|
+
return pixelsToDegreesY(m_latitude, MAX_ZOOM);
|
540
|
+
}
|
541
|
+
|
542
|
+
double ESRIMapView::longitude() const
|
543
|
+
{
|
544
|
+
return pixelsToDegreesX(m_longitude, MAX_ZOOM);
|
545
|
+
}
|
546
|
+
|
547
|
+
void ESRIMapView::setCoordinates(int64 latitude, int64 longitude)
|
548
|
+
{
|
549
|
+
RHO_MAP_TRACE2("setCoordinates: latitude="PRINTF_INT64", longitude="PRINTF_INT64"", latitude, longitude);
|
550
|
+
m_latitude = normalize_latitude(latitude);
|
551
|
+
m_longitude = normalize_longitude(longitude);
|
552
|
+
updateCache();
|
553
|
+
redraw();
|
554
|
+
}
|
555
|
+
|
556
|
+
void ESRIMapView::moveTo(double latitude, double longitude)
|
557
|
+
{
|
558
|
+
RHO_MAP_TRACE2("moveTo: latitude=%lf, longitude=%lf", latitude, longitude);
|
559
|
+
uint64 lat = degreesToPixelsY(latitude, MAX_ZOOM);
|
560
|
+
uint64 lon = degreesToPixelsX(longitude, MAX_ZOOM);
|
561
|
+
setCoordinates(lat, lon);
|
562
|
+
}
|
563
|
+
|
564
|
+
void ESRIMapView::moveTo(String const &address)
|
565
|
+
{
|
566
|
+
RHO_MAP_TRACE1("moveTo: address=%s", address.c_str());
|
567
|
+
m_geo_coding->resolve(address, new CenterResolved(this));
|
568
|
+
}
|
569
|
+
|
570
|
+
void ESRIMapView::move(int dx, int dy)
|
571
|
+
{
|
572
|
+
RHO_MAP_TRACE2("move: dx=%d, dy=%d", dx, dy);
|
573
|
+
if (dx == 0 && dy == 0)
|
574
|
+
return;
|
575
|
+
int64 lat = m_latitude;
|
576
|
+
lat += toMaxZoom(dy, m_zoom);
|
577
|
+
int64 lon = m_longitude;
|
578
|
+
lon += toMaxZoom(dx, m_zoom);
|
579
|
+
setCoordinates(lat, lon);
|
580
|
+
}
|
581
|
+
|
582
|
+
void ESRIMapView::addAnnotation(Annotation const &ann)
|
583
|
+
{
|
584
|
+
if (ann.resolved())
|
585
|
+
{
|
586
|
+
RHO_MAP_TRACE("Add resolved annotation");
|
587
|
+
{
|
588
|
+
synchronized(m_annotations_mtx);
|
589
|
+
m_annotations.addElement(ann);
|
590
|
+
}
|
591
|
+
redraw();
|
592
|
+
}
|
593
|
+
else if (!ann.address().empty())
|
594
|
+
{
|
595
|
+
RHO_MAP_TRACE1("Resolve annotation: address=%s", ann.address().c_str());
|
596
|
+
m_geo_coding->resolve(ann.address(), new AnnotationResolved(this, ann));
|
597
|
+
}
|
598
|
+
else
|
599
|
+
RAWLOG_ERROR("Attempt to add annotation with empty address");
|
600
|
+
}
|
601
|
+
|
602
|
+
int ESRIMapView::getAnnotation(int x, int y)
|
603
|
+
{
|
604
|
+
synchronized(m_annotations_mtx);
|
605
|
+
for ( int i = 0; i < (int)m_annotations.size(); i++ )
|
606
|
+
{
|
607
|
+
Annotation const &ann = m_annotations.elementAt(i);
|
608
|
+
|
609
|
+
int64 ann_lon = (int64)degreesToPixelsX(ann.longitude(), m_zoom);
|
610
|
+
int64 topleft_lon = toCurrentZoom(m_longitude, m_zoom) - m_width/2;
|
611
|
+
int64 ann_lat = (int64)degreesToPixelsY(ann.latitude(), m_zoom);
|
612
|
+
int64 topleft_lat = toCurrentZoom(m_latitude, m_zoom) - m_height/2;
|
613
|
+
|
614
|
+
int annX = (int)(ann_lon - topleft_lon);
|
615
|
+
int annY = (int)(ann_lat - topleft_lat);
|
616
|
+
|
617
|
+
int click_rect_left = annX+m_pin_info.click_rect_x;
|
618
|
+
int click_rect_top = annY+m_pin_info.click_rect_y;
|
619
|
+
int click_rect_right = click_rect_left + m_pin_info.click_rect_width;
|
620
|
+
int click_rect_bottom = click_rect_top + m_pin_info.click_rect_height;
|
621
|
+
|
622
|
+
if ((x < click_rect_left) || (click_rect_right < x) || (y < click_rect_top) || (click_rect_bottom < y)) {
|
623
|
+
continue;
|
624
|
+
}
|
625
|
+
/*
|
626
|
+
int deltaX = x - annX;
|
627
|
+
int deltaY = y - annY;
|
628
|
+
|
629
|
+
double distance = rho_math_sqrt(deltaX*deltaX + deltaY*deltaY);
|
630
|
+
if ((int)distance > ANNOTATION_SENSITIVITY_AREA_RADIUS)
|
631
|
+
continue;
|
632
|
+
*/
|
633
|
+
return i;
|
634
|
+
}
|
635
|
+
|
636
|
+
return -1;
|
637
|
+
}
|
638
|
+
|
639
|
+
bool ESRIMapView::handleClick(int x, int y)
|
640
|
+
{
|
641
|
+
synchronized(m_annotations_mtx);
|
642
|
+
|
643
|
+
int old_selected = m_selected_annotation_index;
|
644
|
+
|
645
|
+
//TODO: use m_rcCallout, remove isClickOnCallout
|
646
|
+
if ( m_selected_annotation_index >=0 && isClickOnCallout(x,y,m_annotations.elementAt(m_selected_annotation_index) ))
|
647
|
+
{
|
648
|
+
}else
|
649
|
+
m_selected_annotation_index = getAnnotation(x, y);
|
650
|
+
|
651
|
+
if (m_selected_annotation_index>=0 && m_selected_annotation_index == old_selected )
|
652
|
+
{
|
653
|
+
Annotation& ann = m_annotations.elementAt(m_selected_annotation_index);
|
654
|
+
|
655
|
+
// We have clicked on annotation - go to URL
|
656
|
+
if (ann.url().size() > 0) {
|
657
|
+
RHODESAPP().navigateToUrl(ann.url());
|
658
|
+
m_selected_annotation_index = -1;
|
659
|
+
return true;
|
660
|
+
}
|
661
|
+
}
|
662
|
+
redraw();
|
663
|
+
return false;
|
664
|
+
}
|
665
|
+
|
666
|
+
void ESRIMapView::setPinImage(IDrawingImage *pin, PIN_INFO pin_info)
|
667
|
+
{
|
668
|
+
m_pin = pin;
|
669
|
+
m_pin_info = pin_info;
|
670
|
+
}
|
671
|
+
|
672
|
+
void ESRIMapView::setPinCalloutImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info)
|
673
|
+
{
|
674
|
+
m_pinCallout = pinCallout;
|
675
|
+
m_pin_callout_info = pin_callout_info;
|
676
|
+
}
|
677
|
+
|
678
|
+
void ESRIMapView::setPinCalloutLinkImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info)
|
679
|
+
{
|
680
|
+
m_pinCalloutLink = pinCallout;
|
681
|
+
m_pin_calloutlink_info = pin_callout_info;
|
682
|
+
}
|
683
|
+
|
684
|
+
void ESRIMapView::fetchTile(int zoom, uint64 latitude, uint64 longitude)
|
685
|
+
{
|
686
|
+
m_map_fetch->fetchTile(getMapUrl(), zoom, latitude, longitude);
|
687
|
+
}
|
688
|
+
|
689
|
+
void ESRIMapView::updateCache()
|
690
|
+
{
|
691
|
+
m_cache_update->updateCache();
|
692
|
+
}
|
693
|
+
|
694
|
+
void ESRIMapView::redraw()
|
695
|
+
{
|
696
|
+
m_drawing_device->requestRedraw();
|
697
|
+
}
|
698
|
+
|
699
|
+
int64 ESRIMapView::toScreenCoordinateX(double n)
|
700
|
+
{
|
701
|
+
int64 v = (int64)degreesToPixelsX(n, m_zoom);
|
702
|
+
int64 center = toCurrentZoom(m_longitude, m_zoom);
|
703
|
+
int64 begin = center - m_width/2;
|
704
|
+
return v - begin;
|
705
|
+
}
|
706
|
+
|
707
|
+
int64 ESRIMapView::toScreenCoordinateY(double n)
|
708
|
+
{
|
709
|
+
int64 v = (int64)degreesToPixelsY(n, m_zoom);
|
710
|
+
int64 center = toCurrentZoom(m_latitude, m_zoom);
|
711
|
+
int64 begin = center - m_height/2;
|
712
|
+
return v - begin;
|
713
|
+
}
|
714
|
+
|
715
|
+
void ESRIMapView::paint(IDrawingContext *context)
|
716
|
+
{
|
717
|
+
paintBackground(context);
|
718
|
+
|
719
|
+
{
|
720
|
+
synchronized(m_tiles_cache_mtx);
|
721
|
+
|
722
|
+
TilesCache::list mapTiles = m_tiles_cache.get_tiles();
|
723
|
+
for (TilesCache::list::iterator it = mapTiles.begin(), lim = mapTiles.end(); it != lim; ++it)
|
724
|
+
paintTile(context, *it);
|
725
|
+
}
|
726
|
+
|
727
|
+
{
|
728
|
+
synchronized(m_annotations_mtx);
|
729
|
+
for (annotations_list_t::iterator it = m_annotations.begin(), lim = m_annotations.end(); it != lim; ++it)
|
730
|
+
paintAnnotation(context, *it);
|
731
|
+
|
732
|
+
if (m_selected_annotation_index >= 0)
|
733
|
+
paintCallout(context, m_annotations.elementAt(m_selected_annotation_index));
|
734
|
+
}
|
735
|
+
|
736
|
+
/*
|
737
|
+
TilesCache::list cache;
|
738
|
+
{
|
739
|
+
synchronized(m_tiles_cache_mtx);
|
740
|
+
cache = m_tiles_cache.clone();
|
741
|
+
}
|
742
|
+
|
743
|
+
annotations_list_t annotations;
|
744
|
+
int selected_annotation_index = -1;
|
745
|
+
{
|
746
|
+
synchronized(m_annotations_mtx);
|
747
|
+
annotations = m_annotations;
|
748
|
+
selected_annotation_index = m_selected_annotation_index;
|
749
|
+
}
|
750
|
+
|
751
|
+
for (TilesCache::iterator it = cache.begin(), lim = cache.end(); it != lim; ++it)
|
752
|
+
paintTile(context, *it);
|
753
|
+
|
754
|
+
for (annotations_list_t::iterator it = annotations.begin(), lim = annotations.end(); it != lim; ++it)
|
755
|
+
paintAnnotation(context, *it);
|
756
|
+
|
757
|
+
if (selected_annotation_index >= 0)
|
758
|
+
paintCallout(context, annotations.elementAt(selected_annotation_index)); */
|
759
|
+
}
|
760
|
+
|
761
|
+
void ESRIMapView::paintBackground(IDrawingContext *context)
|
762
|
+
{
|
763
|
+
// TODO:
|
764
|
+
}
|
765
|
+
|
766
|
+
void ESRIMapView::paintTile(IDrawingContext *context, Tile const &tile)
|
767
|
+
{
|
768
|
+
IDrawingImage *image = tile.image();
|
769
|
+
if (tile.zoom() != m_zoom) {
|
770
|
+
return;
|
771
|
+
}
|
772
|
+
|
773
|
+
//RHO_MAP_TRACE3("=== paintTile: tile.zoom=%d, tile.latitude=%llu, tile.longitude=%llu",
|
774
|
+
// tile.zoom(), tile.latitude(), tile.longitude());
|
775
|
+
//RHO_MAP_TRACE3("+++ paintTile: zoom=%d, latitude=%llu, longitude=%llu",
|
776
|
+
// m_zoom, m_latitude, m_longitude);
|
777
|
+
|
778
|
+
// Difference between center of screen and center of tile (in screen pixels)
|
779
|
+
int64 deltaX = toCurrentZoom(m_longitude - tile.longitude(), m_zoom);
|
780
|
+
int64 deltaY = toCurrentZoom(m_latitude - tile.latitude(), m_zoom);
|
781
|
+
//RHO_MAP_TRACE2("paintTile: deltaX=%lld, deltaY=%lld", deltaX, deltaY);
|
782
|
+
|
783
|
+
int imgWidth = TILE_SIZE;
|
784
|
+
if (image != NULL) image->width();
|
785
|
+
int imgHeight = TILE_SIZE;
|
786
|
+
if (image != NULL) image->height();
|
787
|
+
|
788
|
+
//RHO_MAP_TRACE2("paintTile: imgWidth=%d, imgHeight=%d", imgWidth, imgHeight);
|
789
|
+
//RHO_MAP_TRACE2("paintTile: m_width=%d, m_height=%d", m_width, m_height);
|
790
|
+
|
791
|
+
int64 centerX = (int64)m_width/2 - deltaX;
|
792
|
+
int64 centerY = (int64)m_height/2 - deltaY;
|
793
|
+
//RHO_MAP_TRACE2("paintTile: centerX=%lld, centerY=%lld", centerX, centerY);
|
794
|
+
|
795
|
+
int64 left = centerX - imgWidth/2;
|
796
|
+
int64 top = centerY - imgHeight/2;
|
797
|
+
//RHO_MAP_TRACE2("paintTile: left=%lld, top=%lld", left, top);
|
798
|
+
|
799
|
+
// Convert MAX_LATITUDE/MAX_LONGITUDE to screen pixels on current zoom level
|
800
|
+
int64 maxLat = toCurrentZoom(MAX_LATITUDE, m_zoom);
|
801
|
+
int64 maxLon = toCurrentZoom(MAX_LONGITUDE, m_zoom);
|
802
|
+
|
803
|
+
// Adjust image coordinates to be visible on the screen
|
804
|
+
while (left + imgWidth > 0)
|
805
|
+
left -= maxLon;
|
806
|
+
while (top + imgHeight > 0)
|
807
|
+
top -= maxLat;
|
808
|
+
|
809
|
+
for (int64 x = left, limX = (int64)m_width; x < m_width; x += maxLon)
|
810
|
+
{
|
811
|
+
if (x + imgWidth < 0)
|
812
|
+
continue;
|
813
|
+
|
814
|
+
for (int64 y = top, limY = (int64)m_height; y < m_height; y += maxLat)
|
815
|
+
{
|
816
|
+
if (y + imgHeight < 0)
|
817
|
+
continue;
|
818
|
+
|
819
|
+
if (image != NULL) {
|
820
|
+
context->drawImage((int)x, (int)y, image);
|
821
|
+
}
|
822
|
+
else {
|
823
|
+
//TODO: draw grey image
|
824
|
+
//context->fillRect((int)x, (int)y, imgWidth, imgHeight, BACKGROUND_COLOR);
|
825
|
+
}
|
826
|
+
}
|
827
|
+
}
|
828
|
+
}
|
829
|
+
|
830
|
+
void ESRIMapView::paintAnnotation(IDrawingContext *context, Annotation const &ann)
|
831
|
+
{
|
832
|
+
if (!ann.resolved())
|
833
|
+
return;
|
834
|
+
if (!m_pin)
|
835
|
+
return;
|
836
|
+
|
837
|
+
int pinWidth = m_pin->width();
|
838
|
+
int pinHeight = m_pin->height();
|
839
|
+
|
840
|
+
int64 x = toScreenCoordinateX(ann.longitude()) + m_pin_info.x_offset;
|
841
|
+
if (((x + pinWidth) < 0) || (x > m_width))
|
842
|
+
return;
|
843
|
+
int64 y = toScreenCoordinateY(ann.latitude()) + m_pin_info.y_offset;
|
844
|
+
if (((y + pinHeight) < 0) || (y > m_height))
|
845
|
+
return;
|
846
|
+
|
847
|
+
context->drawImage((int)x, (int)y, m_pin);
|
848
|
+
}
|
849
|
+
|
850
|
+
bool ESRIMapView::isClickOnCallout(int x, int y, Annotation const &ann)
|
851
|
+
{
|
852
|
+
//TODO: remove this method. use m_rcCallout
|
853
|
+
if (!m_pinCallout || !m_pin)
|
854
|
+
return false;
|
855
|
+
|
856
|
+
int pinCalloutWidth = m_pinCallout->width();
|
857
|
+
int pinCalloutHeight = m_pinCallout->height();
|
858
|
+
|
859
|
+
int64 xLoc = toScreenCoordinateX(ann.longitude());
|
860
|
+
int64 yLoc = toScreenCoordinateY(ann.latitude());
|
861
|
+
|
862
|
+
int64 xCallout = xLoc - pinCalloutWidth/2;
|
863
|
+
//int64 yCallout = yLoc - pinCalloutHeight + m_pin_info.y_offset;
|
864
|
+
int64 yCallout = yLoc + m_pin_info.y_offset - pinCalloutHeight;//- m_pin_info.y_offset;
|
865
|
+
#ifndef OS_ANDROID
|
866
|
+
//yCallout -= m_pin_info.y_offset;
|
867
|
+
#endif
|
868
|
+
|
869
|
+
return x > xCallout && x < xCallout + pinCalloutWidth && y > yCallout && y < yCallout + pinCalloutHeight;
|
870
|
+
}
|
871
|
+
|
872
|
+
void ESRIMapView::paintCallout(IDrawingContext *context, Annotation const &ann)
|
873
|
+
{
|
874
|
+
if (!m_pinCallout || !m_pin)
|
875
|
+
return;
|
876
|
+
|
877
|
+
//TODO: create m_rcCallout
|
878
|
+
int pinCalloutWidth = m_pinCallout->width();
|
879
|
+
int pinCalloutHeight = m_pinCallout->height();
|
880
|
+
|
881
|
+
int64 xLoc = toScreenCoordinateX(ann.longitude());
|
882
|
+
int64 yLoc = toScreenCoordinateY(ann.latitude());
|
883
|
+
|
884
|
+
int64 xCallout = xLoc - pinCalloutWidth/2;
|
885
|
+
int64 yCallout = yLoc + m_pin_info.y_offset - pinCalloutHeight;//- m_pin->height() - pinCalloutHeight;
|
886
|
+
#ifndef OS_ANDROID
|
887
|
+
//yCallout -= m_pin_info.y_offset;
|
888
|
+
#endif
|
889
|
+
|
890
|
+
int reduceTextWidth = 0;
|
891
|
+
if (ann.url().size() > 0) {
|
892
|
+
context->drawImage((int)xCallout, (int)yCallout, m_pinCalloutLink);
|
893
|
+
reduceTextWidth = 32;
|
894
|
+
}
|
895
|
+
else {
|
896
|
+
context->drawImage((int)xCallout, (int)yCallout, m_pinCallout);
|
897
|
+
}
|
898
|
+
String strText;
|
899
|
+
if ( ann.title().length() > 0 )
|
900
|
+
strText += ann.title();
|
901
|
+
|
902
|
+
if ( ann.subtitle().length() > 0 )
|
903
|
+
{
|
904
|
+
if ( strText.length() > 0 )
|
905
|
+
strText += "\r\n";
|
906
|
+
|
907
|
+
strText += ann.subtitle();
|
908
|
+
}
|
909
|
+
|
910
|
+
int nTextX = (int)xCallout + m_pin_callout_info.x_offset;
|
911
|
+
int nTextY = (int)yCallout + m_pin_callout_info.y_offset;
|
912
|
+
int nTextWidth = pinCalloutWidth - m_pin_callout_info.x_offset*2 - reduceTextWidth;
|
913
|
+
int nTextHeight = pinCalloutHeight - m_pin_callout_info.y_offset*2;
|
914
|
+
|
915
|
+
if ( strText.length() > 0 )
|
916
|
+
context->drawText( nTextX, nTextY, nTextWidth, nTextHeight, strText, CALLOUT_TEXT_COLOR);
|
917
|
+
}
|
918
|
+
|
919
|
+
} // namespace map
|
920
|
+
} // namespace common
|
921
|
+
} // namespace rho
|