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,686 @@
|
|
1
|
+
package rhomobile.mapview;
|
2
|
+
|
3
|
+
import java.io.IOException;
|
4
|
+
import java.io.InputStream;
|
5
|
+
import java.util.Enumeration;
|
6
|
+
import java.util.Hashtable;
|
7
|
+
import java.util.Vector;
|
8
|
+
|
9
|
+
import com.rho.RhoClassFactory;
|
10
|
+
import com.rho.RhoConf;
|
11
|
+
import com.rho.RhoEmptyLogger;
|
12
|
+
import com.rho.RhoLogger;
|
13
|
+
import com.rho.net.IHttpConnection;
|
14
|
+
|
15
|
+
import net.rim.device.api.math.Fixed32;
|
16
|
+
import net.rim.device.api.system.Bitmap;
|
17
|
+
import net.rim.device.api.system.EncodedImage;
|
18
|
+
import net.rim.device.api.ui.Field;
|
19
|
+
import net.rim.device.api.ui.Graphics;
|
20
|
+
import net.rim.device.api.util.Comparator;
|
21
|
+
import net.rim.device.api.util.SimpleSortingVector;
|
22
|
+
|
23
|
+
public class ESRIMapField extends Field implements RhoMapField {
|
24
|
+
|
25
|
+
private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() :
|
26
|
+
new RhoLogger("ESRIMapField");
|
27
|
+
|
28
|
+
private static final int TILE_SIZE = 256;
|
29
|
+
private static final int MIN_ZOOM = 0;
|
30
|
+
private static final int MAX_ZOOM = 19;
|
31
|
+
|
32
|
+
private static final int CACHE_UPDATE_INTERVAL = 500;
|
33
|
+
|
34
|
+
// Maximum size of image cache (number of images stored locally)
|
35
|
+
private static final int MAX_IMAGE_CACHE_SIZE = 32;
|
36
|
+
|
37
|
+
// Mode of decoding EncodedImage to bitmap
|
38
|
+
private static final int DECODE_MODE = EncodedImage.DECODE_NATIVE |
|
39
|
+
EncodedImage.DECODE_NO_DITHER | EncodedImage.DECODE_READONLY |
|
40
|
+
EncodedImage.DECODE_ALPHA;
|
41
|
+
|
42
|
+
// Constants required to coordinates calculations
|
43
|
+
private static final long MIN_LATITUDE = degreesToPixelsY(90, MAX_ZOOM);
|
44
|
+
private static final long MAX_LATITUDE = degreesToPixelsY(-90, MAX_ZOOM);
|
45
|
+
private static final long MAX_LONGITUDE = degreesToPixelsX(180, MAX_ZOOM);
|
46
|
+
|
47
|
+
// DON'T CHANGE THIS CONSTANT!!!
|
48
|
+
// This is maximum absolute value of sine ( == sin(85*PI/180) ) allowed by Merkator projection
|
49
|
+
private static final double MAX_SIN = 0.99627207622;
|
50
|
+
|
51
|
+
private static final double PI = Math.PI;
|
52
|
+
|
53
|
+
private Hashtable mMapUrls = new Hashtable();
|
54
|
+
|
55
|
+
private String mMapType;
|
56
|
+
|
57
|
+
//===============================================================================
|
58
|
+
// Coordinates of center in pixels of maximum zoom level
|
59
|
+
private long mLatitude = degreesToPixelsY(0, MAX_ZOOM);
|
60
|
+
private long mLongitude = degreesToPixelsX(0, MAX_ZOOM);
|
61
|
+
private int mZoom = 0;
|
62
|
+
|
63
|
+
private int mWidth;
|
64
|
+
private int mHeight;
|
65
|
+
|
66
|
+
private static class ByCoordinatesComparator implements Comparator {
|
67
|
+
|
68
|
+
public int compare (Object o1, Object o2) {
|
69
|
+
CachedImage img1 = (CachedImage)o1;
|
70
|
+
CachedImage img2 = (CachedImage)o2;
|
71
|
+
if (img1.latitude < img2.latitude) return -1;
|
72
|
+
if (img1.latitude > img2.latitude) return 1;
|
73
|
+
if (img1.longitude < img2.longitude) return 1;
|
74
|
+
if (img1.longitude > img2.longitude) return -1;
|
75
|
+
if (img1.zoom < img2.zoom) return -1;
|
76
|
+
if (img1.zoom > img2.zoom) return 1;
|
77
|
+
return 0;
|
78
|
+
}
|
79
|
+
|
80
|
+
}
|
81
|
+
|
82
|
+
private static class ByAccessTimeComparator implements Comparator {
|
83
|
+
|
84
|
+
public int compare (Object o1, Object o2) {
|
85
|
+
long l1 = ((CachedImage)o1).lastUsed;
|
86
|
+
long l2 = ((CachedImage)o2).lastUsed;
|
87
|
+
return l1 < l2 ? -1 : l1 > l2 ? 1 : 0;
|
88
|
+
}
|
89
|
+
|
90
|
+
};
|
91
|
+
|
92
|
+
private class CachedImage {
|
93
|
+
public EncodedImage image;
|
94
|
+
public Bitmap bitmap;
|
95
|
+
public long latitude;
|
96
|
+
public long longitude;
|
97
|
+
public int zoom;
|
98
|
+
public String key;
|
99
|
+
public long lastUsed;
|
100
|
+
|
101
|
+
public CachedImage(EncodedImage img, long lat, long lon, int z) {
|
102
|
+
image = img;
|
103
|
+
bitmap = null;
|
104
|
+
latitude = lat;
|
105
|
+
longitude = lon;
|
106
|
+
zoom = z;
|
107
|
+
key = makeCacheKey(latitude, longitude, zoom);
|
108
|
+
lastUsed = System.currentTimeMillis();
|
109
|
+
}
|
110
|
+
};
|
111
|
+
|
112
|
+
private class ImageCache {
|
113
|
+
private Hashtable hash;
|
114
|
+
private SimpleSortingVector cvec;
|
115
|
+
private SimpleSortingVector tvec;
|
116
|
+
|
117
|
+
public ImageCache() {
|
118
|
+
reinit();
|
119
|
+
}
|
120
|
+
|
121
|
+
private void reinit() {
|
122
|
+
hash = new Hashtable();
|
123
|
+
cvec = new SimpleSortingVector();
|
124
|
+
cvec.setSortComparator(new ByCoordinatesComparator());
|
125
|
+
cvec.setSort(true);
|
126
|
+
tvec = new SimpleSortingVector();
|
127
|
+
tvec.setSortComparator(new ByAccessTimeComparator());
|
128
|
+
tvec.setSort(true);
|
129
|
+
}
|
130
|
+
|
131
|
+
public ImageCache clone() {
|
132
|
+
ImageCache cloned = new ImageCache();
|
133
|
+
for (Enumeration e = hash.elements(); e.hasMoreElements();)
|
134
|
+
cloned.put((CachedImage)e.nextElement());
|
135
|
+
return cloned;
|
136
|
+
}
|
137
|
+
|
138
|
+
public Enumeration sortedByCoordinates() {
|
139
|
+
return cvec.elements();
|
140
|
+
}
|
141
|
+
|
142
|
+
public CachedImage get(String key) {
|
143
|
+
return (CachedImage)hash.get(key);
|
144
|
+
}
|
145
|
+
|
146
|
+
public void put(CachedImage img) {
|
147
|
+
put(img, true);
|
148
|
+
}
|
149
|
+
|
150
|
+
private void put(CachedImage img, boolean doCheck) {
|
151
|
+
hash.put(img.key, img);
|
152
|
+
cvec.addElement(img);
|
153
|
+
tvec.addElement(img);
|
154
|
+
if (doCheck) check();
|
155
|
+
}
|
156
|
+
|
157
|
+
private void check() {
|
158
|
+
if (hash.size() < MAX_IMAGE_CACHE_SIZE)
|
159
|
+
return;
|
160
|
+
|
161
|
+
SimpleSortingVector vec = tvec;
|
162
|
+
reinit();
|
163
|
+
|
164
|
+
Enumeration e = vec.elements();
|
165
|
+
while (e.hasMoreElements()) {
|
166
|
+
CachedImage img = (CachedImage)e.nextElement();
|
167
|
+
put(img, false);
|
168
|
+
}
|
169
|
+
}
|
170
|
+
};
|
171
|
+
|
172
|
+
private ImageCache mImgCache = new ImageCache();
|
173
|
+
|
174
|
+
private static abstract class MapCommand {
|
175
|
+
public abstract String type();
|
176
|
+
public abstract String description();
|
177
|
+
}
|
178
|
+
|
179
|
+
private static class MapFetchCommand extends MapCommand {
|
180
|
+
|
181
|
+
public String baseUrl;
|
182
|
+
public int zoom;
|
183
|
+
public long latitude;
|
184
|
+
public long longitude;
|
185
|
+
|
186
|
+
public MapFetchCommand(String baseUrl, int zoom, long latitude, long longitude) {
|
187
|
+
this.baseUrl = baseUrl;
|
188
|
+
this.zoom = zoom;
|
189
|
+
this.latitude = latitude;
|
190
|
+
this.longitude = longitude;
|
191
|
+
}
|
192
|
+
|
193
|
+
private String makeDescription() {
|
194
|
+
return "" + zoom + "/" + latitude + "/" + longitude;
|
195
|
+
}
|
196
|
+
|
197
|
+
public String type() {
|
198
|
+
return "fetch";
|
199
|
+
}
|
200
|
+
|
201
|
+
public String description() {
|
202
|
+
return "fetch:" + makeDescription();
|
203
|
+
}
|
204
|
+
|
205
|
+
};
|
206
|
+
|
207
|
+
private class MapThread extends Thread {
|
208
|
+
|
209
|
+
private static final int BLOCK_SIZE = 1024;
|
210
|
+
|
211
|
+
private Vector commands = new Vector();
|
212
|
+
private boolean active = true;
|
213
|
+
|
214
|
+
public void process(MapCommand cmd) {
|
215
|
+
synchronized (commands) {
|
216
|
+
commands.addElement(cmd);
|
217
|
+
commands.notify();
|
218
|
+
}
|
219
|
+
}
|
220
|
+
|
221
|
+
public void stop() {
|
222
|
+
active = false;
|
223
|
+
interrupt();
|
224
|
+
}
|
225
|
+
|
226
|
+
public void run() {
|
227
|
+
try {
|
228
|
+
while (active) {
|
229
|
+
MapCommand cmd = null;
|
230
|
+
synchronized (commands) {
|
231
|
+
if (commands.isEmpty()) {
|
232
|
+
try {
|
233
|
+
commands.wait();
|
234
|
+
} catch (InterruptedException e) {
|
235
|
+
// Nothing
|
236
|
+
}
|
237
|
+
continue;
|
238
|
+
}
|
239
|
+
int last = commands.size() - 1;
|
240
|
+
cmd = (MapCommand)commands.elementAt(last);
|
241
|
+
commands.removeElementAt(last);
|
242
|
+
if (cmd == null)
|
243
|
+
continue;
|
244
|
+
}
|
245
|
+
|
246
|
+
try {
|
247
|
+
if (cmd instanceof MapFetchCommand)
|
248
|
+
processCommand((MapFetchCommand)cmd);
|
249
|
+
else
|
250
|
+
LOG.INFO("Received unknown command: " + cmd.type() + ", ignore it");
|
251
|
+
}
|
252
|
+
catch (Exception e) {
|
253
|
+
LOG.ERROR("Processing of map command failed", e);
|
254
|
+
}
|
255
|
+
}
|
256
|
+
}
|
257
|
+
catch (Exception e) {
|
258
|
+
LOG.ERROR("Fatal error in map thread", e);
|
259
|
+
}
|
260
|
+
finally {
|
261
|
+
LOG.INFO("Map thread exit");
|
262
|
+
}
|
263
|
+
}
|
264
|
+
|
265
|
+
private byte[] fetchData(String url) throws IOException
|
266
|
+
{
|
267
|
+
IHttpConnection conn = null;
|
268
|
+
InputStream is = null;
|
269
|
+
|
270
|
+
try
|
271
|
+
{
|
272
|
+
conn = RhoClassFactory.getNetworkAccess().connect(url,false);
|
273
|
+
|
274
|
+
conn.setRequestMethod("GET");
|
275
|
+
|
276
|
+
//conn.setRequestProperty("User-Agent", "Blackberry");
|
277
|
+
//conn.setRequestProperty("Accept", "*/*");
|
278
|
+
|
279
|
+
is = conn.openInputStream();
|
280
|
+
|
281
|
+
int code = conn.getResponseCode();
|
282
|
+
if (code/100 != 2)
|
283
|
+
throw new IOException("ESRI map server respond with " + code + " " + conn.getResponseMessage());
|
284
|
+
|
285
|
+
int size = conn.getHeaderFieldInt("Content-Length", 0);
|
286
|
+
byte[] data = new byte[size];
|
287
|
+
if (size == 0)
|
288
|
+
size = 1073741824; // 1Gb :)
|
289
|
+
|
290
|
+
byte[] buf = new byte[BLOCK_SIZE];
|
291
|
+
for (int offset = 0; offset < size;) {
|
292
|
+
int n = is.read(buf, 0, BLOCK_SIZE);
|
293
|
+
if (n <= 0)
|
294
|
+
break;
|
295
|
+
if (offset + n > data.length) {
|
296
|
+
byte[] newData = new byte[offset + n];
|
297
|
+
System.arraycopy(data, 0, newData, 0, data.length);
|
298
|
+
data = newData;
|
299
|
+
}
|
300
|
+
System.arraycopy(buf, 0, data, offset, n);
|
301
|
+
offset += n;
|
302
|
+
}
|
303
|
+
|
304
|
+
return data;
|
305
|
+
}finally
|
306
|
+
{
|
307
|
+
if ( is != null )
|
308
|
+
try{ is.close(); }catch(IOException e){}
|
309
|
+
|
310
|
+
if ( conn != null )
|
311
|
+
try{ conn.close(); }catch(IOException e){}
|
312
|
+
|
313
|
+
is = null;
|
314
|
+
conn = null;
|
315
|
+
}
|
316
|
+
}
|
317
|
+
|
318
|
+
private void processCommand(MapFetchCommand cmd) throws IOException {
|
319
|
+
LOG.TRACE("Processing map fetch command (thread #" + hashCode() + "): " + cmd.description());
|
320
|
+
|
321
|
+
long ts = toMaxZoom(TILE_SIZE, cmd.zoom);
|
322
|
+
int row = (int)(cmd.latitude/ts);
|
323
|
+
int column = (int)(cmd.longitude/ts);
|
324
|
+
StringBuffer url = new StringBuffer();
|
325
|
+
url.append(cmd.baseUrl);
|
326
|
+
url.append("/MapServer/tile/");
|
327
|
+
url.append(cmd.zoom);
|
328
|
+
url.append('/');
|
329
|
+
url.append(row);
|
330
|
+
url.append('/');
|
331
|
+
url.append(column);
|
332
|
+
|
333
|
+
String finalUrl = url.toString();
|
334
|
+
byte[] data = fetchData(finalUrl);
|
335
|
+
|
336
|
+
EncodedImage img = EncodedImage.createEncodedImage(data, 0, data.length);
|
337
|
+
img.setDecodeMode(DECODE_MODE);
|
338
|
+
|
339
|
+
long lat = row*ts + ts/2;
|
340
|
+
long lon = column*ts + ts/2;
|
341
|
+
LOG.TRACE("Map request done, draw just received image: zoom=" + cmd.zoom + ", lat=" + lat + ", lon=" + lon);
|
342
|
+
CachedImage cachedImage = new CachedImage(img, lat, lon, cmd.zoom);
|
343
|
+
// Put image to the cache and trigger redraw
|
344
|
+
synchronized (ESRIMapField.this) {
|
345
|
+
mImgCache.put(cachedImage);
|
346
|
+
}
|
347
|
+
redraw();
|
348
|
+
}
|
349
|
+
|
350
|
+
};
|
351
|
+
|
352
|
+
private MapThread mMapThread = new MapThread();
|
353
|
+
|
354
|
+
private class CacheUpdate extends Thread {
|
355
|
+
|
356
|
+
private boolean active = true;
|
357
|
+
|
358
|
+
public void stop() throws InterruptedException {
|
359
|
+
active = false;
|
360
|
+
join();
|
361
|
+
}
|
362
|
+
|
363
|
+
public void run() {
|
364
|
+
LOG.TRACE("Cache update thread started");
|
365
|
+
while (active) {
|
366
|
+
try {
|
367
|
+
Thread.sleep(CACHE_UPDATE_INTERVAL);
|
368
|
+
}
|
369
|
+
catch (InterruptedException e) {
|
370
|
+
// Ignore
|
371
|
+
}
|
372
|
+
|
373
|
+
//LOG.TRACE("Cache update: next loop; mLatitude=" + mLatitude +
|
374
|
+
// ", mLongitude=" + mLongitude + ", mZoom=" + mZoom);
|
375
|
+
|
376
|
+
long ts = toMaxZoom(TILE_SIZE, mZoom);
|
377
|
+
//LOG.TRACE("Tile size on the maximum zoom level: " + ts);
|
378
|
+
long h = toMaxZoom(mHeight, mZoom);
|
379
|
+
//LOG.TRACE("Height of the screen on the maximum zoom level: " + h);
|
380
|
+
long w = toMaxZoom(mWidth, mZoom);
|
381
|
+
//LOG.TRACE("Width of the screen on the maximum zoom level: " + w);
|
382
|
+
|
383
|
+
long totalTiles = MapTools.math_pow2(mZoom);
|
384
|
+
//LOG.TRACE("Total tiles count on zoom level " + mZoom + ": " + totalTiles);
|
385
|
+
|
386
|
+
long tlLat = mLatitude - h/2;
|
387
|
+
if (tlLat < 0) tlLat = 0;
|
388
|
+
long tlLon = mLongitude - w/2;
|
389
|
+
if (tlLon < 0) tlLon = 0;
|
390
|
+
//LOG.TRACE("tlLat=" + tlLat + ", tlLon=" + tlLon);
|
391
|
+
for (long lat = (tlLat/ts)*ts, latLim = Math.min(tlLat + h + ts, ts*totalTiles); lat < latLim; lat += ts) {
|
392
|
+
for (long lon = (tlLon/ts)*ts, lonLim = Math.min(tlLon + w + ts, ts*totalTiles); lon < lonLim; lon += ts) {
|
393
|
+
String key = makeCacheKey(lat, lon, mZoom);
|
394
|
+
MapFetchCommand cmd = null;
|
395
|
+
synchronized (ESRIMapField.this) {
|
396
|
+
CachedImage img = mImgCache.get(key);
|
397
|
+
if (img == null) {
|
398
|
+
//LOG.TRACE("lat=" + lat + ", lon=" + lon + "; key=" + key);
|
399
|
+
String baseUrl = getMapUrl();
|
400
|
+
cmd = new MapFetchCommand(baseUrl, mZoom, lat, lon);
|
401
|
+
|
402
|
+
CachedImage dummy = new CachedImage(null, lat, lon, mZoom);
|
403
|
+
mImgCache.put(dummy);
|
404
|
+
}
|
405
|
+
}
|
406
|
+
if (cmd != null)
|
407
|
+
mMapThread.process(cmd);
|
408
|
+
}
|
409
|
+
}
|
410
|
+
}
|
411
|
+
LOG.INFO("Cache update thread stopped");
|
412
|
+
}
|
413
|
+
|
414
|
+
};
|
415
|
+
|
416
|
+
private CacheUpdate mCacheUpdate = new CacheUpdate();
|
417
|
+
|
418
|
+
public ESRIMapField() {
|
419
|
+
String url = RhoConf.getInstance().getString("esri_map_url_roadmap");
|
420
|
+
if (url == null || url.length() == 0)
|
421
|
+
url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/";
|
422
|
+
mMapUrls.put("roadmap", url);
|
423
|
+
|
424
|
+
url = RhoConf.getInstance().getString("esri_map_url_satellite");
|
425
|
+
if (url == null || url.length() == 0)
|
426
|
+
url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/";
|
427
|
+
mMapUrls.put("satellite", url);
|
428
|
+
|
429
|
+
mMapType = "roadmap";
|
430
|
+
|
431
|
+
LOG.TRACE("ESRIMapField ctor: mLatitude=" + mLatitude + ", mLongitude=" + mLongitude);
|
432
|
+
|
433
|
+
mMapThread.start();
|
434
|
+
mCacheUpdate.start();
|
435
|
+
}
|
436
|
+
|
437
|
+
public void close() {
|
438
|
+
mMapThread.stop();
|
439
|
+
try {
|
440
|
+
mCacheUpdate.stop();
|
441
|
+
}
|
442
|
+
catch (InterruptedException e) {
|
443
|
+
LOG.ERROR("Stopping of cache update thread was interrupted", e);
|
444
|
+
}
|
445
|
+
}
|
446
|
+
|
447
|
+
public void redraw() {
|
448
|
+
invalidate();
|
449
|
+
}
|
450
|
+
|
451
|
+
private String getMapUrl() {
|
452
|
+
String url = (String)mMapUrls.get(mMapType);
|
453
|
+
if (url == null)
|
454
|
+
url = (String)mMapUrls.get("roadmap");
|
455
|
+
return url;
|
456
|
+
}
|
457
|
+
|
458
|
+
protected void paint(Graphics graphics) {
|
459
|
+
// Draw background
|
460
|
+
for (int i = 1, lim = 2*Math.max(mWidth, mHeight); i < lim; i += 5) {
|
461
|
+
graphics.drawLine(0, i, i, 0);
|
462
|
+
}
|
463
|
+
|
464
|
+
ImageCache imgCache;
|
465
|
+
synchronized (this) {
|
466
|
+
imgCache = mImgCache.clone();
|
467
|
+
}
|
468
|
+
|
469
|
+
// Draw map tiles
|
470
|
+
Enumeration e = imgCache.sortedByCoordinates();
|
471
|
+
while (e.hasMoreElements()) {
|
472
|
+
// Draw map
|
473
|
+
CachedImage img = (CachedImage)e.nextElement();
|
474
|
+
if (img.image == null)
|
475
|
+
continue;
|
476
|
+
|
477
|
+
paintImage(graphics, img);
|
478
|
+
}
|
479
|
+
}
|
480
|
+
|
481
|
+
private void paintImage(Graphics graphics, CachedImage img) {
|
482
|
+
// Skip images with zoom level which differ from the current zoom level
|
483
|
+
if (img.zoom != mZoom)
|
484
|
+
return;
|
485
|
+
|
486
|
+
long left = -toCurrentZoom(mLongitude - img.longitude, mZoom);
|
487
|
+
long top = -toCurrentZoom(mLatitude - img.latitude, mZoom);
|
488
|
+
|
489
|
+
if (img.zoom != mZoom) {
|
490
|
+
double x = MapTools.math_pow2d(img.zoom - mZoom);
|
491
|
+
int factor = Fixed32.tenThouToFP((int)(x*10000));
|
492
|
+
img.image = img.image.scaleImage32(factor, factor);
|
493
|
+
img.bitmap = null;
|
494
|
+
}
|
495
|
+
|
496
|
+
int imgWidth = img.image.getScaledWidth();
|
497
|
+
int imgHeight = img.image.getScaledHeight();
|
498
|
+
left += (mWidth - imgWidth)/2;
|
499
|
+
top += (mHeight - imgHeight)/2;
|
500
|
+
|
501
|
+
int w = mWidth - (int)left;
|
502
|
+
int h = mHeight - (int)top;
|
503
|
+
|
504
|
+
int maxW = mWidth + TILE_SIZE;
|
505
|
+
int maxH = mHeight + TILE_SIZE;
|
506
|
+
if (w < 0 || h < 0 || w > maxW || h > maxH) {
|
507
|
+
// Image will not be displayed, free its bitmap and skip it
|
508
|
+
img.bitmap = null;
|
509
|
+
return;
|
510
|
+
}
|
511
|
+
|
512
|
+
if (img.bitmap == null)
|
513
|
+
img.bitmap = img.image.getBitmap();
|
514
|
+
graphics.drawBitmap((int)left, (int)top, w, h, img.bitmap, 0, 0);
|
515
|
+
}
|
516
|
+
|
517
|
+
protected void layout(int w, int h) {
|
518
|
+
mWidth = Math.min(mWidth, w);
|
519
|
+
mHeight = Math.min(mHeight, h);
|
520
|
+
setExtent(mWidth, mHeight);
|
521
|
+
}
|
522
|
+
|
523
|
+
public int calculateZoom(double latDelta, double lonDelta) {
|
524
|
+
int zoom1 = calcZoom(latDelta, mWidth);
|
525
|
+
int zoom2 = calcZoom(lonDelta, mHeight);
|
526
|
+
return zoom1 < zoom2 ? zoom1 : zoom2;
|
527
|
+
}
|
528
|
+
|
529
|
+
public Field getBBField() {
|
530
|
+
return this;
|
531
|
+
}
|
532
|
+
|
533
|
+
public double getCenterLatitude() {
|
534
|
+
return pixelsToDegreesY(mLatitude, MAX_ZOOM);
|
535
|
+
}
|
536
|
+
|
537
|
+
public double getCenterLongitude() {
|
538
|
+
return pixelsToDegreesX(mLongitude, MAX_ZOOM);
|
539
|
+
}
|
540
|
+
|
541
|
+
private void validateCoordinates() {
|
542
|
+
if (mLatitude < MIN_LATITUDE) mLatitude = MIN_LATITUDE;
|
543
|
+
if (mLatitude > MAX_LATITUDE) mLatitude = MAX_LATITUDE;
|
544
|
+
}
|
545
|
+
|
546
|
+
public void moveTo(double lat, double lon) {
|
547
|
+
mLatitude = degreesToPixelsY(lat, MAX_ZOOM);
|
548
|
+
mLongitude = degreesToPixelsX(lon, MAX_ZOOM);
|
549
|
+
validateCoordinates();
|
550
|
+
|
551
|
+
//LOG.TRACE("moveTo(" + lat + ", " + lon + "): mLatitude=" + mLatitude + ", mLongitude=" + mLongitude);
|
552
|
+
}
|
553
|
+
|
554
|
+
public void move(int dx, int dy) {
|
555
|
+
mLatitude += toMaxZoom(dy, mZoom);
|
556
|
+
mLongitude += toMaxZoom(dx, mZoom);
|
557
|
+
validateCoordinates();
|
558
|
+
|
559
|
+
//LOG.TRACE("move(" + dx + ", " + dy + "): mLatitude=" + mLatitude + ", mLongitude=" + mLongitude);
|
560
|
+
}
|
561
|
+
|
562
|
+
public void setMapType(String type) {
|
563
|
+
mMapType = type;
|
564
|
+
//LOG.TRACE("setMapType: " + mMapType);
|
565
|
+
}
|
566
|
+
|
567
|
+
public void setPreferredSize(int width, int height) {
|
568
|
+
mWidth = width;
|
569
|
+
mHeight = height;
|
570
|
+
}
|
571
|
+
|
572
|
+
public int getPreferredWidth() {
|
573
|
+
return mWidth;
|
574
|
+
}
|
575
|
+
|
576
|
+
public int getPreferredHeight() {
|
577
|
+
return mHeight;
|
578
|
+
}
|
579
|
+
|
580
|
+
public void setZoom(int zoom) {
|
581
|
+
mZoom = zoom;
|
582
|
+
if (mZoom < MIN_ZOOM) mZoom = MIN_ZOOM;
|
583
|
+
if (mZoom > MAX_ZOOM) mZoom = MAX_ZOOM;
|
584
|
+
LOG.TRACE("setZoom: " + mZoom);
|
585
|
+
}
|
586
|
+
|
587
|
+
public int getMaxZoom() {
|
588
|
+
return MAX_ZOOM;
|
589
|
+
}
|
590
|
+
|
591
|
+
public int getMinZoom() {
|
592
|
+
return MIN_ZOOM;
|
593
|
+
}
|
594
|
+
|
595
|
+
public int getZoom() {
|
596
|
+
return mZoom;
|
597
|
+
}
|
598
|
+
|
599
|
+
private static int calcZoom(double degrees, int pixels) {
|
600
|
+
double angleRatio = degrees*TILE_SIZE/pixels;
|
601
|
+
|
602
|
+
double twoInZoomExp = 360/angleRatio;
|
603
|
+
int zoom = (int)MapTools.math_log2(twoInZoomExp);
|
604
|
+
return zoom;
|
605
|
+
}
|
606
|
+
|
607
|
+
private static long toMaxZoom(long n, int zoom) {
|
608
|
+
if (n == 0) return 0;
|
609
|
+
long pow = MapTools.math_pow2(MAX_ZOOM - zoom);
|
610
|
+
return n*pow;
|
611
|
+
}
|
612
|
+
|
613
|
+
private static long toCurrentZoom(long coord, int zoom) {
|
614
|
+
if (coord == 0) return 0;
|
615
|
+
long pow = MapTools.math_pow2(MAX_ZOOM - zoom);
|
616
|
+
return coord/pow;
|
617
|
+
}
|
618
|
+
|
619
|
+
private static long degreesToPixelsX(double n, int z) {
|
620
|
+
while (n < -180.0) n += 360.0;
|
621
|
+
while (n > 180.0) n -= 360.0;
|
622
|
+
double angleRatio = 360d/MapTools.math_pow2(z);
|
623
|
+
double val = (n + 180)*TILE_SIZE/angleRatio;
|
624
|
+
return (long)val;
|
625
|
+
}
|
626
|
+
|
627
|
+
private static long degreesToPixelsY(double n, int z) {
|
628
|
+
// Merkator projection
|
629
|
+
double sin_phi = MapTools.math_sin(n*PI/180);
|
630
|
+
// MAX_SIN - maximum value of sine allowed by Merkator projection
|
631
|
+
// (~85.0 degrees of north latitude)
|
632
|
+
if (sin_phi < -MAX_SIN) sin_phi = -MAX_SIN;
|
633
|
+
if (sin_phi > MAX_SIN) sin_phi = MAX_SIN;
|
634
|
+
|
635
|
+
double ath = MapTools.math_atanh(sin_phi);
|
636
|
+
double val = TILE_SIZE * MapTools.math_pow2(z) * (1 - ath/PI)/2;
|
637
|
+
return (long)val;
|
638
|
+
}
|
639
|
+
|
640
|
+
private static double pixelsToDegreesX(long n, int z) {
|
641
|
+
while (n < 0) n += MAX_LONGITUDE;
|
642
|
+
while (n > MAX_LONGITUDE) n -= MAX_LONGITUDE;
|
643
|
+
double angleRatio = 360d/MapTools.math_pow2(z);
|
644
|
+
double val = n*angleRatio/TILE_SIZE - 180.0;
|
645
|
+
return val;
|
646
|
+
}
|
647
|
+
|
648
|
+
private static double pixelsToDegreesY(long n, int z) {
|
649
|
+
// Revert calculation of Merkator projection
|
650
|
+
double ath = PI - 2*PI*n/(TILE_SIZE*MapTools.math_pow2(z));
|
651
|
+
double th = MapTools.math_tanh(ath);
|
652
|
+
double val = 180*MapTools.math_asin(th)/PI;
|
653
|
+
return val;
|
654
|
+
}
|
655
|
+
|
656
|
+
private String makeCacheKey(long lat, long lon, int z) {
|
657
|
+
while (lon < 0) lon += MAX_LONGITUDE;
|
658
|
+
while (lon > MAX_LONGITUDE) lon -= MAX_LONGITUDE;
|
659
|
+
long ts = toMaxZoom(TILE_SIZE, z);
|
660
|
+
long x = lon/ts;
|
661
|
+
long y = lat/ts;
|
662
|
+
StringBuffer buf = new StringBuffer();
|
663
|
+
buf.append(z);
|
664
|
+
buf.append(';');
|
665
|
+
buf.append(x);
|
666
|
+
buf.append(';');
|
667
|
+
buf.append(y);
|
668
|
+
String key = buf.toString();
|
669
|
+
return key;
|
670
|
+
}
|
671
|
+
|
672
|
+
public long toScreenCoordinateX(double n) {
|
673
|
+
long v = degreesToPixelsX(n, mZoom);
|
674
|
+
long center = toCurrentZoom(mLongitude, mZoom);
|
675
|
+
long begin = center - mWidth/2;
|
676
|
+
return v - begin;
|
677
|
+
}
|
678
|
+
|
679
|
+
public long toScreenCoordinateY(double n) {
|
680
|
+
long v = degreesToPixelsY(n, mZoom);
|
681
|
+
long center = toCurrentZoom(mLatitude, mZoom);
|
682
|
+
long begin = center - mHeight/2;
|
683
|
+
return v - begin;
|
684
|
+
}
|
685
|
+
|
686
|
+
}
|
@@ -0,0 +1,13 @@
|
|
1
|
+
package rhomobile.mapview;
|
2
|
+
|
3
|
+
public interface GeoCoding {
|
4
|
+
|
5
|
+
public interface OnGeocodingDone {
|
6
|
+
public void onError(String description);
|
7
|
+
public void onSuccess(double latitude, double longitude);
|
8
|
+
};
|
9
|
+
|
10
|
+
public void stop();
|
11
|
+
public void resolve(String address, OnGeocodingDone callback);
|
12
|
+
|
13
|
+
}
|