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,304 @@
|
|
1
|
+
#include "common/map/MapEngine.h"
|
2
|
+
#include "common/map/GoogleMapEngine.h"
|
3
|
+
#include "common/map/ESRIMapEngine.h"
|
4
|
+
|
5
|
+
#include <algorithm>
|
6
|
+
|
7
|
+
#undef DEFAULT_LOGCATEGORY
|
8
|
+
#define DEFAULT_LOGCATEGORY "MapEngine"
|
9
|
+
|
10
|
+
namespace rho
|
11
|
+
{
|
12
|
+
namespace common
|
13
|
+
{
|
14
|
+
namespace map
|
15
|
+
{
|
16
|
+
|
17
|
+
MapProvider &MapProvider::getInstance()
|
18
|
+
{
|
19
|
+
static MapProvider instance;
|
20
|
+
return instance;
|
21
|
+
}
|
22
|
+
|
23
|
+
MapProvider::MapProvider()
|
24
|
+
{
|
25
|
+
// Initialize predefined engines
|
26
|
+
//registerMapEngine("google", new GoogleMapEngine());
|
27
|
+
registerMapEngine("esri", new ESRIMapEngine());
|
28
|
+
}
|
29
|
+
|
30
|
+
void MapProvider::registerMapEngine(String const &id, IMapEngine *engine)
|
31
|
+
{
|
32
|
+
RAWTRACE2("Register map engine: id=%s, engine=%p", id.c_str(), engine);
|
33
|
+
IMapEngine *old = m_engines.get(id);
|
34
|
+
if (old)
|
35
|
+
delete old;
|
36
|
+
m_engines.put(id, engine);
|
37
|
+
}
|
38
|
+
|
39
|
+
void MapProvider::unregisterMapEngine(String const &id)
|
40
|
+
{
|
41
|
+
RAWTRACE1("Unregister map engine: id=%s", id.c_str());
|
42
|
+
IMapEngine *engine = m_engines.get(id);
|
43
|
+
if (engine)
|
44
|
+
delete engine;
|
45
|
+
m_engines.remove(id);
|
46
|
+
}
|
47
|
+
|
48
|
+
IMapView *MapProvider::createMapView(String const &id, IDrawingDevice *device)
|
49
|
+
{
|
50
|
+
IMapEngine *engine = m_engines.get(id);
|
51
|
+
if (!engine)
|
52
|
+
return 0;
|
53
|
+
IMapView *view = engine->createMapView(device);
|
54
|
+
if (!view)
|
55
|
+
return 0;
|
56
|
+
m_cache.put(view, engine);
|
57
|
+
return view;
|
58
|
+
}
|
59
|
+
|
60
|
+
void MapProvider::destroyMapView(IMapView *view)
|
61
|
+
{
|
62
|
+
if (!view)
|
63
|
+
return;
|
64
|
+
IMapEngine *engine = m_cache.get(view);
|
65
|
+
if (!engine)
|
66
|
+
return;
|
67
|
+
m_cache.remove(view);
|
68
|
+
engine->destroyMapView(view);
|
69
|
+
}
|
70
|
+
|
71
|
+
String Annotation::make_address(double latitude, double longitude)
|
72
|
+
{
|
73
|
+
char buf[128];
|
74
|
+
snprintf(buf, sizeof(buf), "%.5lf,%.5lf", latitude, longitude);
|
75
|
+
return buf;
|
76
|
+
}
|
77
|
+
|
78
|
+
} // namespace map
|
79
|
+
} // namespace common
|
80
|
+
} // namespace rho
|
81
|
+
|
82
|
+
namespace rhomap = rho::common::map;
|
83
|
+
|
84
|
+
rhomap::IMapView *rho_map_create(rho_param *p, rhomap::IDrawingDevice *device, int width, int height)
|
85
|
+
{
|
86
|
+
if (!p || p->type != RHO_PARAM_HASH)
|
87
|
+
rho_ruby_raise_argerror("Wrong input parameter (expect Hash)");
|
88
|
+
|
89
|
+
rho_param *provider = NULL;
|
90
|
+
rho_param *settings = NULL;
|
91
|
+
rho_param *annotations = NULL;
|
92
|
+
for (int i = 0, lim = p->v.hash->size; i < lim; ++i)
|
93
|
+
{
|
94
|
+
char *name = p->v.hash->name[i];
|
95
|
+
rho_param *value = p->v.hash->value[i];
|
96
|
+
if (!name || !value)
|
97
|
+
continue;
|
98
|
+
|
99
|
+
if (strcasecmp(name, "provider") == 0)
|
100
|
+
provider = value;
|
101
|
+
else if (strcasecmp(name, "settings") == 0)
|
102
|
+
settings = value;
|
103
|
+
else if (strcasecmp(name, "annotations") == 0)
|
104
|
+
annotations = value;
|
105
|
+
}
|
106
|
+
|
107
|
+
std::string providerId = "google";
|
108
|
+
if (provider)
|
109
|
+
{
|
110
|
+
if (provider->type != RHO_PARAM_STRING)
|
111
|
+
rho_ruby_raise_argerror("Wrong 'provider' value (expect String)");
|
112
|
+
providerId = provider->v.string;
|
113
|
+
}
|
114
|
+
std::transform(providerId.begin(), providerId.end(), providerId.begin(), &::tolower);
|
115
|
+
|
116
|
+
char *map_type = NULL;
|
117
|
+
bool use_center_radius = false;
|
118
|
+
double latitude = 0;
|
119
|
+
double longitude = 0;
|
120
|
+
double latitudeSpan = 0;
|
121
|
+
double longitudeSpan = 0;
|
122
|
+
char *center = NULL;
|
123
|
+
double radius = 0;
|
124
|
+
bool zoom_enabled = true;
|
125
|
+
bool scroll_enabled = true;
|
126
|
+
|
127
|
+
if (settings)
|
128
|
+
{
|
129
|
+
if (settings->type != RHO_PARAM_HASH)
|
130
|
+
rho_ruby_raise_argerror("Wrong 'settings' value (expect Hash)");
|
131
|
+
|
132
|
+
for (int i = 0, lim = settings->v.hash->size; i < lim; ++i)
|
133
|
+
{
|
134
|
+
char *name = settings->v.hash->name[i];
|
135
|
+
rho_param *value = settings->v.hash->value[i];
|
136
|
+
if (!name || !value)
|
137
|
+
continue;
|
138
|
+
|
139
|
+
if (strcasecmp(name, "map_type") == 0)
|
140
|
+
{
|
141
|
+
if (value->type != RHO_PARAM_STRING)
|
142
|
+
rho_ruby_raise_argerror("Wrong 'map_type' value (expect String)");
|
143
|
+
map_type = value->v.string;
|
144
|
+
}
|
145
|
+
else if (strcasecmp(name, "region") == 0)
|
146
|
+
{
|
147
|
+
if (value->type == RHO_PARAM_ARRAY)
|
148
|
+
{
|
149
|
+
if (value->v.array->size != 4)
|
150
|
+
rho_ruby_raise_argerror("'region' array should contain exactly 4 items");
|
151
|
+
|
152
|
+
rho_param *lat = value->v.array->value[0];
|
153
|
+
if (!lat) continue;
|
154
|
+
rho_param *lon = value->v.array->value[1];
|
155
|
+
if (!lon) continue;
|
156
|
+
rho_param *latSpan = value->v.array->value[2];
|
157
|
+
if (!latSpan) continue;
|
158
|
+
rho_param *lonSpan = value->v.array->value[3];
|
159
|
+
if (!lonSpan) continue;
|
160
|
+
|
161
|
+
latitude = lat->type == RHO_PARAM_STRING ? strtod(lat->v.string, NULL) : 0;
|
162
|
+
longitude = lon->type == RHO_PARAM_STRING ? strtod(lon->v.string, NULL) : 0;
|
163
|
+
latitudeSpan = latSpan->type == RHO_PARAM_STRING ? strtod(latSpan->v.string, NULL) : 0;
|
164
|
+
longitudeSpan = lonSpan->type == RHO_PARAM_STRING ? strtod(lonSpan->v.string, NULL) : 0;
|
165
|
+
|
166
|
+
use_center_radius = false;
|
167
|
+
}
|
168
|
+
else if (value->type == RHO_PARAM_HASH)
|
169
|
+
{
|
170
|
+
for (int j = 0, limm = value->v.hash->size; j < limm; ++j)
|
171
|
+
{
|
172
|
+
char *rname = value->v.hash->name[i];
|
173
|
+
rho_param *rvalue = value->v.hash->value[i];
|
174
|
+
if (!rname || !rvalue)
|
175
|
+
continue;
|
176
|
+
if (strcasecmp(rname, "center") == 0)
|
177
|
+
{
|
178
|
+
if (rvalue->type != RHO_PARAM_STRING)
|
179
|
+
rho_ruby_raise_argerror("Wrong 'center' value (expect String)");
|
180
|
+
center = rvalue->v.string;
|
181
|
+
}
|
182
|
+
else if (strcasecmp(rname, "radius") == 0)
|
183
|
+
{
|
184
|
+
if (rvalue->type != RHO_PARAM_STRING)
|
185
|
+
rho_ruby_raise_argerror("Wrong 'radius' value (expect String or Float)");
|
186
|
+
radius = strtod(rvalue->v.string, NULL);
|
187
|
+
}
|
188
|
+
}
|
189
|
+
|
190
|
+
use_center_radius = true;
|
191
|
+
}
|
192
|
+
else
|
193
|
+
rho_ruby_raise_argerror("Wrong 'region' value (expect Array or Hash");
|
194
|
+
}
|
195
|
+
else if (strcasecmp(name, "zoom_enabled") == 0)
|
196
|
+
{
|
197
|
+
if (value->type != RHO_PARAM_STRING)
|
198
|
+
rho_ruby_raise_argerror("Wrong 'zoom_enabled' value (expect boolean)");
|
199
|
+
zoom_enabled = strcasecmp(value->v.string, "true") == 0;
|
200
|
+
}
|
201
|
+
else if (strcasecmp(name, "scroll_enabled") == 0)
|
202
|
+
{
|
203
|
+
if (value->type != RHO_PARAM_STRING)
|
204
|
+
rho_ruby_raise_argerror("Wrong 'scroll_enabled' value (expect boolean)");
|
205
|
+
scroll_enabled = strcasecmp(value->v.string, "true") == 0;
|
206
|
+
}
|
207
|
+
}
|
208
|
+
}
|
209
|
+
|
210
|
+
typedef rhomap::Annotation ann_t;
|
211
|
+
typedef std::vector<ann_t> ann_list_t;
|
212
|
+
ann_list_t ann_list;
|
213
|
+
if (annotations)
|
214
|
+
{
|
215
|
+
if (annotations->type != RHO_PARAM_ARRAY)
|
216
|
+
rho_ruby_raise_argerror("Wrong 'annotations' value (expect Array)");
|
217
|
+
for (int i = 0, lim = annotations->v.array->size; i < lim; ++i)
|
218
|
+
{
|
219
|
+
rho_param *ann = annotations->v.array->value[i];
|
220
|
+
if (!ann)
|
221
|
+
continue;
|
222
|
+
if (ann->type != RHO_PARAM_HASH)
|
223
|
+
rho_ruby_raise_argerror("Wrong annotation value found (expect Hash)");
|
224
|
+
|
225
|
+
bool latitude_set = false;
|
226
|
+
double latitude = 0;
|
227
|
+
bool longitude_set = false;
|
228
|
+
double longitude = 0;
|
229
|
+
char const *address = "";
|
230
|
+
char const *title = "";
|
231
|
+
char const *subtitle = "";
|
232
|
+
char const *url = "";
|
233
|
+
|
234
|
+
for (int j = 0, limm = ann->v.hash->size; j < limm; ++j)
|
235
|
+
{
|
236
|
+
char *name = ann->v.hash->name[j];
|
237
|
+
rho_param *value = ann->v.hash->value[j];
|
238
|
+
if (!name || !value)
|
239
|
+
continue;
|
240
|
+
|
241
|
+
if (value->type != RHO_PARAM_STRING)
|
242
|
+
rho_ruby_raise_argerror("Wrong annotation value");
|
243
|
+
|
244
|
+
char *v = value->v.string;
|
245
|
+
if (strcasecmp(name, "latitude") == 0)
|
246
|
+
{
|
247
|
+
latitude = strtod(v, NULL);
|
248
|
+
latitude_set = true;
|
249
|
+
}
|
250
|
+
else if (strcasecmp(name, "longitude") == 0)
|
251
|
+
{
|
252
|
+
longitude = strtod(v, NULL);
|
253
|
+
longitude_set = true;
|
254
|
+
}
|
255
|
+
else if (strcasecmp(name, "street_address") == 0)
|
256
|
+
address = v;
|
257
|
+
else if (strcasecmp(name, "title") == 0)
|
258
|
+
title = v;
|
259
|
+
else if (strcasecmp(name, "subtitle") == 0)
|
260
|
+
subtitle = v;
|
261
|
+
else if (strcasecmp(name, "url") == 0)
|
262
|
+
url = v;
|
263
|
+
}
|
264
|
+
|
265
|
+
if (latitude_set && longitude_set)
|
266
|
+
ann_list.push_back(ann_t(title, subtitle, latitude, longitude, url));
|
267
|
+
else
|
268
|
+
ann_list.push_back(ann_t(title, subtitle, address, url));
|
269
|
+
}
|
270
|
+
}
|
271
|
+
|
272
|
+
rhomap::IMapView *mapview = RHOMAPPROVIDER().createMapView(providerId, device);
|
273
|
+
if (!mapview)
|
274
|
+
return NULL;
|
275
|
+
|
276
|
+
mapview->setSize(width, height);
|
277
|
+
|
278
|
+
if (map_type)
|
279
|
+
mapview->setMapType(map_type);
|
280
|
+
|
281
|
+
if (use_center_radius)
|
282
|
+
{
|
283
|
+
mapview->moveTo(center);
|
284
|
+
mapview->setZoom(radius, radius);
|
285
|
+
}
|
286
|
+
else
|
287
|
+
{
|
288
|
+
mapview->moveTo(latitude, longitude);
|
289
|
+
mapview->setZoom(latitudeSpan, longitudeSpan);
|
290
|
+
}
|
291
|
+
|
292
|
+
mapview->setZoomEnabled(zoom_enabled);
|
293
|
+
mapview->setScrollEnabled(scroll_enabled);
|
294
|
+
|
295
|
+
for (ann_list_t::const_iterator it = ann_list.begin(), lim = ann_list.end(); it != lim; ++it)
|
296
|
+
mapview->addAnnotation(*it);
|
297
|
+
|
298
|
+
return mapview;
|
299
|
+
}
|
300
|
+
|
301
|
+
void rho_map_destroy(rho::common::map::IMapView *mapview)
|
302
|
+
{
|
303
|
+
RHOMAPPROVIDER().destroyMapView(mapview);
|
304
|
+
}
|
@@ -0,0 +1,214 @@
|
|
1
|
+
#ifndef _RHOMAPVIEW_H_
|
2
|
+
#define _RHOMAPVIEW_H_
|
3
|
+
|
4
|
+
#include "logging/RhoLog.h"
|
5
|
+
#include "common/rhoparams.h"
|
6
|
+
|
7
|
+
//#define RHO_MAP_DEBUG
|
8
|
+
|
9
|
+
#ifdef RHO_MAP_DEBUG
|
10
|
+
# define RHO_MAP_TRACE(fmt) RAWTRACE(fmt)
|
11
|
+
# define RHO_MAP_TRACE1(fmt, arg1) RAWTRACE1(fmt, arg1)
|
12
|
+
# define RHO_MAP_TRACE2(fmt, arg1, arg2) RAWTRACE2(fmt, arg1, arg2)
|
13
|
+
# define RHO_MAP_TRACE3(fmt, arg1, arg2, arg3) RAWTRACE3(fmt, arg1, arg2, arg3)
|
14
|
+
# define RHO_MAP_TRACE4(fmt, arg1, arg2, arg3, arg4) RAWTRACE4(fmt, arg1, arg2, arg3, arg4)
|
15
|
+
#else
|
16
|
+
# define RHO_MAP_TRACE(fmt)
|
17
|
+
# define RHO_MAP_TRACE1(fmt, arg1)
|
18
|
+
# define RHO_MAP_TRACE2(fmt, arg1, arg2)
|
19
|
+
# define RHO_MAP_TRACE3(fmt, arg1, arg2, arg3)
|
20
|
+
# define RHO_MAP_TRACE4(fmt, arg1, arg2, arg3, arg4)
|
21
|
+
#endif
|
22
|
+
|
23
|
+
namespace rho
|
24
|
+
{
|
25
|
+
namespace common
|
26
|
+
{
|
27
|
+
namespace map
|
28
|
+
{
|
29
|
+
|
30
|
+
class IDrawingImage
|
31
|
+
{
|
32
|
+
public:
|
33
|
+
virtual ~IDrawingImage() {}
|
34
|
+
|
35
|
+
virtual int width() const = 0;
|
36
|
+
virtual int height() const = 0;
|
37
|
+
};
|
38
|
+
|
39
|
+
class IDrawingDevice
|
40
|
+
{
|
41
|
+
public:
|
42
|
+
virtual ~IDrawingDevice(){}
|
43
|
+
|
44
|
+
virtual IDrawingImage* createImage(String const &path, bool useAlpha) = 0;
|
45
|
+
virtual IDrawingImage* createImage(void const *p, size_t s, bool useAlpha) = 0;
|
46
|
+
virtual IDrawingImage* cloneImage(IDrawingImage *image) = 0;
|
47
|
+
virtual void destroyImage(IDrawingImage* image) = 0;
|
48
|
+
|
49
|
+
virtual void requestRedraw() = 0;
|
50
|
+
};
|
51
|
+
|
52
|
+
class IDrawingContext
|
53
|
+
{
|
54
|
+
public:
|
55
|
+
virtual ~IDrawingContext(){}
|
56
|
+
|
57
|
+
virtual void drawImage(int x, int y, IDrawingImage *image) = 0;
|
58
|
+
virtual void drawText(int x, int y, int width, int height, String const &text, int color) = 0;
|
59
|
+
virtual void fillRect(int x, int y, int width, int height, int color) = 0;
|
60
|
+
};
|
61
|
+
|
62
|
+
typedef struct {
|
63
|
+
int x_offset;
|
64
|
+
int y_offset;
|
65
|
+
int click_rect_x;
|
66
|
+
int click_rect_y;
|
67
|
+
int click_rect_width;
|
68
|
+
int click_rect_height;
|
69
|
+
}PIN_INFO;
|
70
|
+
|
71
|
+
|
72
|
+
class Annotation
|
73
|
+
{
|
74
|
+
public:
|
75
|
+
Annotation(String const &title, String const &subtitle,
|
76
|
+
double latitude, double longitude, String const &address,
|
77
|
+
String const &url)
|
78
|
+
:m_title(title), m_subtitle(subtitle), m_resolved(true),
|
79
|
+
m_latitude(latitude), m_longitude(longitude),
|
80
|
+
m_address(address), m_url(url)
|
81
|
+
{}
|
82
|
+
|
83
|
+
Annotation(String const &title, String const &subtitle,
|
84
|
+
double latitude, double longitude, String const &url)
|
85
|
+
:m_title(title), m_subtitle(subtitle), m_resolved(true),
|
86
|
+
m_latitude(latitude), m_longitude(longitude),
|
87
|
+
m_address(make_address(latitude, longitude)), m_url(url)
|
88
|
+
{}
|
89
|
+
|
90
|
+
Annotation(String const &title, String const &subtitle,
|
91
|
+
String const &address, String const &url)
|
92
|
+
:m_title(title), m_subtitle(subtitle), m_resolved(false),
|
93
|
+
m_latitude(0), m_longitude(0),
|
94
|
+
m_address(address), m_url(url)
|
95
|
+
{}
|
96
|
+
|
97
|
+
String const &title() const {return m_title;}
|
98
|
+
String const &subtitle() const {return m_subtitle;}
|
99
|
+
bool resolved() const {return m_resolved;}
|
100
|
+
double latitude() const {return m_latitude;}
|
101
|
+
double longitude() const {return m_longitude;}
|
102
|
+
String const &address() const {return m_address;}
|
103
|
+
String const &url() const {return m_url;}
|
104
|
+
|
105
|
+
private:
|
106
|
+
static String make_address(double latitude, double longitude);
|
107
|
+
|
108
|
+
private:
|
109
|
+
String m_title;
|
110
|
+
String m_subtitle;
|
111
|
+
bool m_resolved;
|
112
|
+
double m_latitude;
|
113
|
+
double m_longitude;
|
114
|
+
String m_address;
|
115
|
+
String m_url;
|
116
|
+
};
|
117
|
+
|
118
|
+
class IMapView
|
119
|
+
{
|
120
|
+
public:
|
121
|
+
virtual ~IMapView() {}
|
122
|
+
|
123
|
+
virtual void setSize(int width, int height) = 0;
|
124
|
+
virtual int width() const = 0;
|
125
|
+
virtual int height() const = 0;
|
126
|
+
|
127
|
+
virtual void setZoomEnabled(bool v) = 0;
|
128
|
+
virtual bool zoomEnabled() const = 0;
|
129
|
+
|
130
|
+
virtual void setScrollEnabled(bool v) = 0;
|
131
|
+
virtual bool scrollEnabled() const = 0;
|
132
|
+
|
133
|
+
virtual void setMapType(String const &type) = 0;
|
134
|
+
virtual String const &mapType() const = 0;
|
135
|
+
|
136
|
+
virtual void setZoom(int zoom) = 0;
|
137
|
+
virtual void setZoom(double latDelta, double lonDelta) = 0;
|
138
|
+
virtual int zoom() const = 0;
|
139
|
+
virtual int minZoom() const = 0;
|
140
|
+
virtual int maxZoom() const = 0;
|
141
|
+
|
142
|
+
virtual void moveTo(double latitude, double longitude) = 0;
|
143
|
+
virtual void moveTo(String const &address) = 0;
|
144
|
+
virtual void move(int dx, int dy) = 0;
|
145
|
+
virtual double latitude() const = 0;
|
146
|
+
virtual double longitude() const = 0;
|
147
|
+
|
148
|
+
virtual void addAnnotation(Annotation const &ann) = 0;
|
149
|
+
|
150
|
+
// Return true if this MapView need to be closed
|
151
|
+
virtual bool handleClick(int x, int y) = 0;
|
152
|
+
|
153
|
+
virtual void paint(IDrawingContext *device) = 0;
|
154
|
+
|
155
|
+
virtual void setPinImage(IDrawingImage *pin, PIN_INFO pin_info) = 0;
|
156
|
+
virtual void setPinCalloutImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info) = 0;
|
157
|
+
virtual void setPinCalloutLinkImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info) = 0;
|
158
|
+
|
159
|
+
};
|
160
|
+
|
161
|
+
class GeoCodingCallback
|
162
|
+
{
|
163
|
+
public:
|
164
|
+
virtual void onError(String const &description) = 0;
|
165
|
+
virtual void onSuccess(double latitude, double longitude) = 0;
|
166
|
+
};
|
167
|
+
|
168
|
+
class IGeoCoding
|
169
|
+
{
|
170
|
+
public:
|
171
|
+
virtual ~IGeoCoding() {}
|
172
|
+
|
173
|
+
//virtual void stop() = 0;
|
174
|
+
|
175
|
+
virtual void resolve(String const &address, GeoCodingCallback *callback) = 0;
|
176
|
+
};
|
177
|
+
|
178
|
+
class IMapEngine
|
179
|
+
{
|
180
|
+
public:
|
181
|
+
virtual IMapView *createMapView(IDrawingDevice *drawingDevice) = 0;
|
182
|
+
virtual void destroyMapView(IMapView *view) = 0;
|
183
|
+
};
|
184
|
+
|
185
|
+
class MapProvider
|
186
|
+
{
|
187
|
+
private:
|
188
|
+
MapProvider();
|
189
|
+
|
190
|
+
public:
|
191
|
+
static MapProvider &getInstance();
|
192
|
+
|
193
|
+
void registerMapEngine(String const &id, IMapEngine *engine);
|
194
|
+
void unregisterMapEngine(String const &id);
|
195
|
+
|
196
|
+
IMapView *createMapView(String const &id, IDrawingDevice *device);
|
197
|
+
void destroyMapView(IMapView *view);
|
198
|
+
|
199
|
+
private:
|
200
|
+
Hashtable<String, IMapEngine *> m_engines;
|
201
|
+
Hashtable<IMapView *, IMapEngine *> m_cache;
|
202
|
+
};
|
203
|
+
|
204
|
+
} // namespace map
|
205
|
+
} // namespace common
|
206
|
+
} // namespace rho
|
207
|
+
|
208
|
+
inline rho::common::map::MapProvider &RHOMAPPROVIDER() {return rho::common::map::MapProvider::getInstance();}
|
209
|
+
|
210
|
+
rho::common::map::IMapView *rho_map_create(rho_param *p, rho::common::map::IDrawingDevice *device, int width, int height);
|
211
|
+
void rho_map_destroy(rho::common::map::IMapView *mapview);
|
212
|
+
|
213
|
+
#endif
|
214
|
+
|