diff --git a/locale/ar/ViewerStrings.properties b/locale/ar/ViewerStrings.properties
index 0ada156..f7d08ce 100644
--- a/locale/ar/ViewerStrings.properties
+++ b/locale/ar/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=حول ArcGIS Viewer for Flex...
-aboutText=يستخدم هذا التطبيق ArcGIS Viewer for Flex version 3.6.
+aboutText=يستخدم هذا التطبيق ArcGIS Viewer for Flex الإصدار 3.7.
aboutLearnMoreBtn=تعلم المزيد
aboutCloseBtn=إغلاق
@@ -117,6 +117,7 @@ uploadUnknownError=حدث خطأ غير معروف أثناء تحميل الم
couldNotProcessUploadResponse=تعذرت معالجة تحميل الاستجابة الكاملة.
fileExceedsAllowedUploadSize=تجاوز الملف الحد الأقصى المسموح به لحجم التحميل. ({0} ميجابايت)
fileUploadError=حدث خطأ أثناء تحميل الملف
+gpTaskFailed=فشلت مهمة المعالجة الجغرافية: {0}
configFileCrossDomain=مشكلة محتملة عبر المجالات: {0}{1}
diff --git a/locale/da_DK/ViewerStrings.properties b/locale/da_DK/ViewerStrings.properties
index 4939c9c..8b63d6e 100644
--- a/locale/da_DK/ViewerStrings.properties
+++ b/locale/da_DK/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Om ArcGIS Viewer for Flex...
-aboutText=Denne applikation bruger ArcGIS Viewer for Flex version 3.6.
+aboutText=Denne applikation bruger ArcGIS Viewer for Flex version 3.7.
aboutLearnMoreBtn=Lær mere
aboutCloseBtn=Luk
@@ -117,6 +117,7 @@ uploadUnknownError=Der opstod en ukendt fejl under overførsel af fil.
couldNotProcessUploadResponse=Kunne ikke behandle komplet respons for overførsel.
fileExceedsAllowedUploadSize=Fil overskrider den maksimalt tilladte størrelse, som kan overføres ({0} MB).
fileUploadError=Fejl ved overførsel af fil
+gpTaskFailed=Geoprocesseringsopgave mislykkedes: {0}
configFileCrossDomain=Muligt tværdomæneproblem: {0}{1}
diff --git a/locale/de_DE/ViewerStrings.properties b/locale/de_DE/ViewerStrings.properties
index 37d7242..4091ca6 100644
--- a/locale/de_DE/ViewerStrings.properties
+++ b/locale/de_DE/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Info zu ArcGIS Viewer for Flex...
-aboutText=Diese Anwendung verwendet ArcGIS Viewer for Flex 3.6.
+aboutText=Diese Anwendung verwendet ArcGIS Viewer for Flex 3.7.
aboutLearnMoreBtn=Weitere Informationen
aboutCloseBtn=Schließen
@@ -117,6 +117,7 @@ uploadUnknownError=Beim Hochladen der Datei ist ein unbekannter Fehler aufgetret
couldNotProcessUploadResponse=Die Antwort beim Hochladen konnte nicht vollständig verarbeitet werden.
fileExceedsAllowedUploadSize=Die Datei überschreitet die maximal zulässige Größe beim Hochladen. ({0} MB)
fileUploadError=Fehler beim Hochladen der Datei.
+gpTaskFailed=Geoverarbeitungs-Task fehlgeschlagen: {0}
configFileCrossDomain=Mögliches domänenübergreifendes Problem: {0} {1}
@@ -266,7 +267,7 @@ showRelatedRecordsText=Zugehörige Datensätze
showAttributesText=Zurück
selectTemplateText=Vorlage zur Feature-Erstellung auswählen
noEditableLayersText=Keine editierbaren Layer.
-noCreateCapabilityLayersText=Kein Layer verfügt über die Funktion "Erstellen"
+noCreateCapabilityLayersText=Kein Layer verfügt über Erstellen-Funktion
layerNotSupportingAttachmentsText=Dieser Layer unterstützt keine Anlagen
noAttachmentsText=Keine Anlagen
chooseFileText=Datei als Anlage wählen
diff --git a/locale/en_US/ViewerStrings.properties b/locale/en_US/ViewerStrings.properties
index 5e41b91..d953f78 100644
--- a/locale/en_US/ViewerStrings.properties
+++ b/locale/en_US/ViewerStrings.properties
@@ -1,7 +1,7 @@
# -- UI related messages for the context menu on the map, in addition to messages from the api --
#
contextMenuText=About ArcGIS Viewer for Flex...
-aboutText=This application is using ArcGIS Viewer for Flex version 3.6.
+aboutText=This application is using ArcGIS Viewer for Flex version 3.7.
aboutLearnMoreBtn=Learn more
aboutCloseBtn=Close
@@ -117,6 +117,7 @@ uploadUnknownError=Unknown error occurred while uploading file.
couldNotProcessUploadResponse=Could not process upload complete response.
fileExceedsAllowedUploadSize=File exceeds max allowed upload size. ({0} MB)
fileUploadError=File upload error
+gpTaskFailed=Geoprocessing task failed: {0}
########## Base Widget and MapManager
configFileCrossDomain=Possible crossdomain issue: {0}{1}
diff --git a/locale/es_ES/ViewerStrings.properties b/locale/es_ES/ViewerStrings.properties
index a1661ed..3069dd7 100644
--- a/locale/es_ES/ViewerStrings.properties
+++ b/locale/es_ES/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Acerca de ArcGIS Viewer for Flex...
-aboutText=Esta aplicación utiliza ArcGIS Viewer 3.5 for Flex.
+aboutText=Esta aplicación utiliza ArcGIS Viewer for Flex versión 3.7.
aboutLearnMoreBtn=Más información
aboutCloseBtn=Cerrar
@@ -117,6 +117,7 @@ uploadUnknownError=Ha ocurrido un error desconocido mientras se cargaba el archi
couldNotProcessUploadResponse=No se pudo procesar la respuesta de carga completa.
fileExceedsAllowedUploadSize=El archivo supera el tamaño de carga máximo permitido. ({0} MB)
fileUploadError=Error de carga de archivo
+gpTaskFailed=La tarea de geoprocesamiento ha generado un error: {0}
configFileCrossDomain=Posible problema de crossdomain: {0}{1}
diff --git a/locale/et_EE/ViewerStrings.properties b/locale/et_EE/ViewerStrings.properties
index 131554a..f4f68e0 100644
--- a/locale/et_EE/ViewerStrings.properties
+++ b/locale/et_EE/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=ArcGIS Viewer for Flex rakendusest...
-aboutText=Antud rakendus kasutab ArcGIS Viewer for Flex 3.6 versiooni.
+aboutText=Antud rakendus kasutab ArcGIS Viewer for Flex 3.7 versiooni.
aboutLearnMoreBtn=Loe lähemalt
aboutCloseBtn=Sulge
@@ -117,6 +117,7 @@ uploadUnknownError=Faili üleslaadimisel tekkis tundmatu viga.
couldNotProcessUploadResponse=Üleslaadimise täieliku vastuse käsitlemine ebaõnnestus.
fileExceedsAllowedUploadSize=Fail ületab maksimaalselt lubatud mahtu. ({0} MB)
fileUploadError=Faili üleslaadimise viga
+gpTaskFailed=Geoprocessing task failed: {0}
configFileCrossDomain=Võimalik crossdomain probleem: {0}{1}
diff --git a/locale/fi_FI/ViewerStrings.properties b/locale/fi_FI/ViewerStrings.properties
index a04a83a..19035d1 100755
--- a/locale/fi_FI/ViewerStrings.properties
+++ b/locale/fi_FI/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Tietoja: ArcGIS Viewer for Flex...
-aboutText=Tämä sovellus käyttää ArcGIS Viewer for Flex -versiota 3.6.
+aboutText=Tämä sovellus käyttää ArcGIS Viewer for Flex -versiota 3.7.
aboutLearnMoreBtn=Lisätietoja
aboutCloseBtn=Sulje
@@ -117,6 +117,7 @@ uploadUnknownError=Tuntematon virhe lähetettäessä tiedostoa.
couldNotProcessUploadResponse=Lähetyksen valmistumisvastauksen käsittely epäonnistui.
fileExceedsAllowedUploadSize=Tiedosto ylittää lähetettävien tiedostojen enimmäiskoon. ({0} Mt)
fileUploadError=Tiedoston lähetysvirhe
+gpTaskFailed=Geoprosessointi epäonnistui: {0}
configFileCrossDomain=Mahdollinen toimialueiden välinen ongelma: {0}{1}
diff --git a/locale/fr_FR/ViewerStrings.properties b/locale/fr_FR/ViewerStrings.properties
index 236fc82..6cb2c74 100644
--- a/locale/fr_FR/ViewerStrings.properties
+++ b/locale/fr_FR/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=A propos d’ArcGIS Viewer for Flex...
-aboutText=Cette application utilise ArcGIS Viewer for Flex version 3.6.
+aboutText=Cette application utilise ArcGIS Viewer for Flex version 3.7.
aboutLearnMoreBtn=En savoir plus
aboutCloseBtn=Fermer
@@ -117,6 +117,7 @@ uploadUnknownError=Une erreur inconnue s’est produite durant le téléchargeme
couldNotProcessUploadResponse=Impossible de traiter la réponse complète du téléchargement.
fileExceedsAllowedUploadSize=Le fichier dépasse la taille de téléchargement maximale autorisée. ({0} Mo)
fileUploadError=Erreur de téléchargement du fichier
+gpTaskFailed=Echec de la tâche de géotraitement : {0}
configFileCrossDomain=Problème possible de domaines croisés : {0}{1}
diff --git a/locale/he_IL/ViewerStrings.properties b/locale/he_IL/ViewerStrings.properties
index 39d2404..255890c 100644
--- a/locale/he_IL/ViewerStrings.properties
+++ b/locale/he_IL/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=אודות ArcGIS Viewer for Flex...
-aboutText=אפליקציה זו משתמשת ב- ArcGIS Viewer 3.6 for Flex.
+aboutText=אפליקציה זו משתמשת ב-ArcGIS Viewer for Flex גרסה 3.7.
aboutLearnMoreBtn=לימוד נוסף
aboutCloseBtn=סגור
@@ -117,6 +117,7 @@ uploadUnknownError=שגיאה לא ידועה ארעה בזמן העלאת הק
couldNotProcessUploadResponse=לא ניתן לעבד את התגובה לסיום תהליך ההעלאה.
fileExceedsAllowedUploadSize=גודל הקובץ עולה על הגודל המקסימלי המותר בטעינה. ({0} MB)
fileUploadError=שגיאה בטעינת קובץ
+gpTaskFailed=משימת עיבוד גיאוגרפי (Geoprocessing) נכשלה: {0}
configFileCrossDomain=כנראה נושא crossdomain : {0}{1}
diff --git a/locale/it_IT/ViewerStrings.properties b/locale/it_IT/ViewerStrings.properties
index bff3db9..39df9f3 100644
--- a/locale/it_IT/ViewerStrings.properties
+++ b/locale/it_IT/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Informazioni su ArcGIS Viewer for Flex...
-aboutText=Questa applicazione utilizza ArcGIS Viewer per Flex versione 3.6.
+aboutText=Questa applicazione utilizza ArcGIS Viewer for Flex versione 3.7.
aboutLearnMoreBtn=Ulteriori informazioni
aboutCloseBtn=Chiudi
@@ -117,6 +117,7 @@ uploadUnknownError=Si è verificato un errore sconosciuto durante il caricamento
couldNotProcessUploadResponse=Impossibile elaborare la risposta per il completamento del caricamento.
fileExceedsAllowedUploadSize=La dimensione del file supera quella massima consentita. ({0} MB)
fileUploadError=Errore di caricamento file
+gpTaskFailed=Attività di geoprocessing non riuscita: {0}
configFileCrossDomain=Possibile problema di crossdomain: {0}{1}
diff --git a/locale/ja_JP/ViewerStrings.properties b/locale/ja_JP/ViewerStrings.properties
index e65ae7e..de8ad04 100644
--- a/locale/ja_JP/ViewerStrings.properties
+++ b/locale/ja_JP/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=ArcGIS Viewer for Flex について...
-aboutText=このアプリケーションは、ArcGIS Viewer 3.6 for Flex を使用しています。
+aboutText=このアプリケーションは、ArcGIS Viewer 3.7 for Flex を使用しています。
aboutLearnMoreBtn=詳細
aboutCloseBtn=閉じる
@@ -117,6 +117,7 @@ uploadUnknownError=ファイルのアップロード中に原因不明のエラ
couldNotProcessUploadResponse=アップロード完了応答を処理できませんでした。
fileExceedsAllowedUploadSize=ファイルが最大アップロード可能サイズ ({0} MB) を超えています。
fileUploadError=ファイル アップロード エラー
+gpTaskFailed=ジオプロセシング タスクが失敗しました: {0}
configFileCrossDomain=考えられるクロスドメインの問題: {0}{1}
diff --git a/locale/ko_KR/ViewerStrings.properties b/locale/ko_KR/ViewerStrings.properties
index c445689..6ee96ce 100644
--- a/locale/ko_KR/ViewerStrings.properties
+++ b/locale/ko_KR/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=ArcGIS Viewer for Flex 정보...
-aboutText=이 응용프로그램은 ArcGIS Viewer 3.6 for Flex를 사용하고 있습니다.
+aboutText=이 응용프로그램은 ArcGIS Viewer for Flex 버전 3.7을 사용합니다.
aboutLearnMoreBtn=자세히 보기
aboutCloseBtn=닫기
@@ -117,6 +117,7 @@ uploadUnknownError=파일을 업로드하는 중에 알 수 없는 오류가 발
couldNotProcessUploadResponse=업로드 완료 응답을 처리할 수 없습니다.
fileExceedsAllowedUploadSize=파일이 허용되는 최대 업로드 크기({0}MB)를 초과했습니다.
fileUploadError=파일 업로드 오류
+gpTaskFailed=지오프로세싱 작업 실패: {0}
configFileCrossDomain=가능한 교차 도메인 문제: {0}{1}
@@ -225,7 +226,7 @@ fillOutlineWidthLabel=너비
showMeasurementsLabel=단위 표시
distanceUnitsLabel=거리 단위
areaUnitsLabel=면적 단위
-areaLabel=영역:
+areaLabel=면적:
perimeterLabel=둘레:
lengthLabel=길이:
@@ -235,7 +236,7 @@ addbookmarksLabel=책갈피 추가
addLabel=현재 범위를 지정된 책갈피로 추가
bookmarkSubmitLabel=책갈피 추가
bookmarkMissingNameLabel=책갈피 이름을 입력하세요.
-deleteBookmarkTooltip=북마크 삭제
+deleteBookmarkTooltip=책갈피 삭제
descLabel=데이터 추출 및 zip 파일 다운로드
@@ -270,7 +271,7 @@ noCreateCapabilityLayersText=레이어에 생성 기능 없음
layerNotSupportingAttachmentsText=이 레이어는 첨부 파일을 지원하지 않습니다
noAttachmentsText=첨부 파일 없음
chooseFileText=첨부할 파일 선택
-attachmentSubmitLabel=보고
+attachmentSubmitLabel=제출
attachmentCancelLabel=취소
singleAttachmentText=피처에 {0} 첨부 파일이 있습니다.
multipleAttachmentsText=피처에 {0} 첨부 파일이 있습니다.
@@ -342,7 +343,7 @@ latitudeLabel=위도
longitudeLabel=경도
-gpSubmitLabel=보고
+gpSubmitLabel=제출
inputLabel=입력
helpLabel=도움말
outputLabel=출력
diff --git a/locale/lt_LT/ViewerStrings.properties b/locale/lt_LT/ViewerStrings.properties
index cfd1288..b0184b3 100644
--- a/locale/lt_LT/ViewerStrings.properties
+++ b/locale/lt_LT/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Apie ArcGIS Viewer for Flex...
-aboutText=Aplikacija naudoja ArcGIS Viewer for Flex 3.6 versiją.
+aboutText=Aplikacija naudoja ArcGIS Viewer for Flex 3.7 versiją.
aboutLearnMoreBtn=Plačiau
aboutCloseBtn=Uždaryti
@@ -117,6 +117,7 @@ uploadUnknownError=Nežinoma klaida įkeliant failą.
couldNotProcessUploadResponse=Negalima apdoroti įkėlimo pabaigos pranešimo.
fileExceedsAllowedUploadSize=Didesnis nei leidžiamas įkeliamo failo dydis. ({0} MB)
fileUploadError=Failo įkėlimo klaida
+gpTaskFailed=Geoprocessing task failed: {0}
configFileCrossDomain=Galima skirtingų domenų problema: {0}{1}
diff --git a/locale/lv_LV/ViewerStrings.properties b/locale/lv_LV/ViewerStrings.properties
index eb14e9b..1610d0c 100644
--- a/locale/lv_LV/ViewerStrings.properties
+++ b/locale/lv_LV/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Par ArcGIS Viewer for Flex...
-aboutText=Šī aplikācija izmanto ArcGIS Viewer 3.6 for Flex.
+aboutText=Šī aplikācija izmanto ArcGIS Viewer 3.7 for Flex.
aboutLearnMoreBtn=Uzziniet vairāk
aboutCloseBtn=Aizvērt
@@ -117,6 +117,7 @@ uploadUnknownError=Nezināma kļūda augšupielādējot failu.
couldNotProcessUploadResponse=Nevarēja augšupielādēt pilnīgu atbildi.
fileExceedsAllowedUploadSize=Fails pārsniedz maksimāli atļauto augšupielādes lielumu. ({0} MB)
fileUploadError=Faila augšupielādes kļūda
+gpTaskFailed=Geoprocessing task failed: {0}
configFileCrossDomain=Iespējams šķērsdomēna jautājums: {0}{1}
diff --git a/locale/nb_NO/ViewerStrings.properties b/locale/nb_NO/ViewerStrings.properties
index 196fefd..d91e470 100644
--- a/locale/nb_NO/ViewerStrings.properties
+++ b/locale/nb_NO/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Om ArcGIS Viewer for Flex...
-aboutText=Dette programmet bruker ArcGIS Viewer for Flex versjon 3.6.
+aboutText=Dette programmet bruker ArcGIS Viewer for Flex versjon 3.7.
aboutLearnMoreBtn=Lær mer
aboutCloseBtn=Lukk
@@ -117,6 +117,7 @@ uploadUnknownError=Det oppstod en ukjent feil under opplasting av filen.
couldNotProcessUploadResponse=Kunne ikke behandle opplasting fullført-responsen.
fileExceedsAllowedUploadSize=Filen overstiger maks. tillatt opplastingsstørrelse. ({0} MB)
fileUploadError=Feil ved filopplasting
+gpTaskFailed=Geoprosesseringsoppgaven mislyktes: {0}
configFileCrossDomain=Mulig kryssdomeneproblem: {0}{1}
diff --git a/locale/nl_NL/ViewerStrings.properties b/locale/nl_NL/ViewerStrings.properties
index 1d4d1ca..79f6a75 100644
--- a/locale/nl_NL/ViewerStrings.properties
+++ b/locale/nl_NL/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Informatie over ArcGIS Viewer for Flex...
-aboutText=Deze applicatie maakt gebruikt van ArcGIS Viewer for Flex 3.6.
+aboutText=Deze applicatie maakt gebruikt van ArcGIS Viewer for Flex 3.7.
aboutLearnMoreBtn=Meer informatie
aboutCloseBtn=Sluiten
@@ -117,6 +117,7 @@ uploadUnknownError=Onbekende fout opgetreden tijdens het uploaden van het bestan
couldNotProcessUploadResponse=Kan antwoord voor voltooien van upload niet verwerken.
fileExceedsAllowedUploadSize=Bestand overschrijdt maximaal toegestane uploadgrootte. ({0} MB)
fileUploadError=Fout tijdens uploaden van bestand
+gpTaskFailed=Geoprocessingtaak mislukt: {0}
configFileCrossDomain=Mogelijk probleem tussen domeinen: {0}{1}
diff --git a/locale/pl_PL/ViewerStrings.properties b/locale/pl_PL/ViewerStrings.properties
index e70d957..1d7266b 100644
--- a/locale/pl_PL/ViewerStrings.properties
+++ b/locale/pl_PL/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=O aplikacji ArcGIS Viewer for Flex...
-aboutText=Ta aplikacja używa ArcGIS Viewer for Flex w wersji 3.6.
+aboutText=Ta aplikacja używa ArcGIS Viewer for Flex w wersji 3.7.
aboutLearnMoreBtn=Dowiedz się więcej
aboutCloseBtn=Zamknij
@@ -117,6 +117,7 @@ uploadUnknownError=Podczas wczytywania pliku wystąpił nieznany błąd.
couldNotProcessUploadResponse=Przetwarzanie komunikatu o zakończeniu wczytywania nie powiodło się.
fileExceedsAllowedUploadSize=Rozmiar pliku przekracza maksymalną dopuszczalną wartość. ({0} MB)
fileUploadError=Błąd podczas wczytywania pliku
+gpTaskFailed=Niepowodzenie zadania geoprzetwarzania: {0}
configFileCrossDomain=Możliwy problem z ruchem międzydomenowym: {0}{1}
diff --git a/locale/pt_BR/ViewerStrings.properties b/locale/pt_BR/ViewerStrings.properties
index 874c803..799dd03 100644
--- a/locale/pt_BR/ViewerStrings.properties
+++ b/locale/pt_BR/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Sobre o ArcGIS Viewer for Flex...
-aboutText=Este aplicativo está utilizando ArcGIS Viewer for Flex versão 3.6.
+aboutText=Este aplicativo está utilizando ArcGIS Viewer for Flex versão 3.7.
aboutLearnMoreBtn=Obter mais informações
aboutCloseBtn=Fechar
@@ -117,9 +117,10 @@ uploadUnknownError=Erro desconhecido ao transferir arquivo.
couldNotProcessUploadResponse=Não foi possível processar a resposta completa da transferência.
fileExceedsAllowedUploadSize=O arquivo excedeu o tamanho máximo de transferência permitido. ({0} MB)
fileUploadError=Erro ao carregar arquivo
+gpTaskFailed=A tarefa de geoprocessamento falhou: {0}
-configFileCrossDomain=Possível problema de inter-domínio: {0}{1}
+configFileCrossDomain=Possível problema de domínio cruzado: {0}{1}
openToolTip=Clique para abrir um mapa de visão geral
diff --git a/locale/pt_PT/ViewerStrings.properties b/locale/pt_PT/ViewerStrings.properties
index b32655e..2348d21 100644
--- a/locale/pt_PT/ViewerStrings.properties
+++ b/locale/pt_PT/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Sobre o ArcGIS Viewer for Flex...
-aboutText=Esta aplicação utiliza o ArcGIS Viewer 3.6 for Flex.
+aboutText=Esta aplicação utiliza o ArcGIS Viewer for Flex versão 3.7.
aboutLearnMoreBtn=Obter mais informações
aboutCloseBtn=Fechar
@@ -117,6 +117,7 @@ uploadUnknownError=Ocorreu um erro desconhecido durante o carregamento do fichei
couldNotProcessUploadResponse=Não foi possível processar a resposta de carregamento concluído.
fileExceedsAllowedUploadSize=O ficheiro excede o tamanho de carregamento máximo permitido. ({0} MB)
fileUploadError=Erro no carregamento do ficheiro
+gpTaskFailed=Falha na tarefa de geoprocessamento: {0}
configFileCrossDomain=Possível problema de crossdomain: {0}{1}
diff --git a/locale/ro_RO/ViewerStrings.properties b/locale/ro_RO/ViewerStrings.properties
index 5ca0cfd..8627ab4 100644
--- a/locale/ro_RO/ViewerStrings.properties
+++ b/locale/ro_RO/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Despre ArcGIS Viewer for Flex...
-aboutText=Această aplicaţie utilizează ArcGIS Viewer 3.6 for Flex.
+aboutText=Această aplicaţie utilizează ArcGIS Viewer 3.7 for Flex.
aboutLearnMoreBtn=Aflaţi mai multe
aboutCloseBtn=Închidere
@@ -117,6 +117,7 @@ uploadUnknownError=A survenit o eroare necunoscută în timpul încărcării fi
couldNotProcessUploadResponse=Nu a putut fi procesat răspunsul de finalizare a încărcării.
fileExceedsAllowedUploadSize=Fişierul depăşeşte dimensiunea maximă permisă pentru încărcare. ({0} MB)
fileUploadError=Eroare la încărcarea fişierului
+gpTaskFailed=Operaţia de geoprocesare a eşuat: {0}
configFileCrossDomain=Posibilă problemă interdomenii: {0}{1}
diff --git a/locale/ru_RU/ViewerStrings.properties b/locale/ru_RU/ViewerStrings.properties
index dd2821c..f45df3c 100644
--- a/locale/ru_RU/ViewerStrings.properties
+++ b/locale/ru_RU/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=О программе ArcGIS Viewer for Flex...
-aboutText=Данное приложение использует ArcGIS Viewer 3.6 for Flex.
+aboutText=Данное приложение использует ArcGIS Viewer for Flex версии 3.7.
aboutLearnMoreBtn=См. Справку
aboutCloseBtn=Закрыть
@@ -117,6 +117,7 @@ uploadUnknownError=Произошла неизвестная ошибка при
couldNotProcessUploadResponse=Не удалось провести загрузку полного ответа.
fileExceedsAllowedUploadSize=Файл превышает максимально допустимый размер загрузки. ({0} МБ)
fileUploadError=Ошибка загрузки файла
+gpTaskFailed=Задача геообработки не выполнена: {0}
configFileCrossDomain=Возможная ошибка междоменного запроса: {0}{1}
diff --git a/locale/sv_SE/ViewerStrings.properties b/locale/sv_SE/ViewerStrings.properties
index d084c9e..944e71c 100644
--- a/locale/sv_SE/ViewerStrings.properties
+++ b/locale/sv_SE/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=Om ArcGIS Viewer for Flex...
-aboutText=Det här programmet använder ArcGIS Viewer 3.6 for Flex.
+aboutText=Det här programmet använder ArcGIS Viewer 3.7 for Flex.
aboutLearnMoreBtn=Läs mer
aboutCloseBtn=Stäng
@@ -117,6 +117,7 @@ uploadUnknownError=Okänt fel uppstod när filen överfördes.
couldNotProcessUploadResponse=Det gick inte att bearbeta svaret för slutförd överföring.
fileExceedsAllowedUploadSize=Filen är större än den maximala tillåtna överföringsstorleken. ({0} MB)
fileUploadError=Fel vid filöverföring
+gpTaskFailed=Geobearbetningsåtgärd misslyckades: {0}
configFileCrossDomain=Möjligt korsdomänproblem: {0}{1}
diff --git a/locale/zh_CN/ViewerStrings.properties b/locale/zh_CN/ViewerStrings.properties
index e75b4e8..6e2bc18 100644
--- a/locale/zh_CN/ViewerStrings.properties
+++ b/locale/zh_CN/ViewerStrings.properties
@@ -1,7 +1,7 @@
contextMenuText=关于 ArcGIS Viewer for Flex...
-aboutText=此应用程序使用 ArcGIS Viewer 3.6 for Flex 构建而成。
+aboutText=此应用程序使用 ArcGIS Viewer for Flex 3.7 版构建而成。
aboutLearnMoreBtn=了解更多信息
aboutCloseBtn=关闭
@@ -104,7 +104,7 @@ rssFeedParsingError=解析 RSS feed 时出现问题。{0}
httpResponseNotXMLError=HTTP 响应不是 XML。
unknownRSSFeedTypeError=无法确定 RSS feed 类型。
initializationError=初始化 {0} 时出现问题
-unableToDetermineGPExecutionType=无法确定 Geoprocessing 执行类型：
+unableToDetermineGPExecutionType=无法确定地理处理执行类型：
projectionError=对几何 {0} 进行投影时出错
cannotRunTaskExecutionTypeUnknownError=无法运行任务：未知的执行类型。
layerDataRetrievalError=无法检索图层数据。
@@ -117,6 +117,7 @@ uploadUnknownError=上传文件时出现未知错误。
couldNotProcessUploadResponse=无法处理上传完成响应。
fileExceedsAllowedUploadSize=文件超出允许的最大上传大小。({0} MB)
fileUploadError=文件上传错误
+gpTaskFailed=地理处理任务失败: {0}
configFileCrossDomain=可能发生跨域问题: {0}{1}
@@ -240,7 +241,7 @@ deleteBookmarkTooltip=删除书签
descLabel=提取数据并保存为 zip 文件
step1Label=选择区域
-dataCurrentExtentLabel=Data will be extracted from your current extent.
+dataCurrentExtentLabel=将从当前范围提取数据。
step2Label=选择要提取的图层
step3Label=选择文件格式
step4Label=选择栅格格式
diff --git a/src/assets/images/i_annotation.png b/src/assets/images/i_annotation.png
new file mode 100755
index 0000000..c92494e
Binary files /dev/null and b/src/assets/images/i_annotation.png differ
diff --git a/src/assets/images/i_dimension.png b/src/assets/images/i_dimension.png
new file mode 100755
index 0000000..93f2350
Binary files /dev/null and b/src/assets/images/i_dimension.png differ
diff --git a/src/assets/images/i_raster.png b/src/assets/images/i_raster.png
new file mode 100755
index 0000000..58aeddb
Binary files /dev/null and b/src/assets/images/i_raster.png differ
diff --git a/src/assets/images/i_rastercatalog.png b/src/assets/images/i_rastercatalog.png
new file mode 100755
index 0000000..2eadc23
Binary files /dev/null and b/src/assets/images/i_rastercatalog.png differ
diff --git a/src/com/esri/viewer/BaseWidget.as b/src/com/esri/viewer/BaseWidget.as
index 36f86ab..557b0ac 100644
--- a/src/com/esri/viewer/BaseWidget.as
+++ b/src/com/esri/viewer/BaseWidget.as
@@ -52,6 +52,8 @@ public class BaseWidget extends Module implements IBaseWidget
private static const WIDGET_CONFIG_LOADED:String = "widgetConfigLoaded";
+ private static const EMPTY_TOOLTIPS:DrawTooltips = new DrawTooltips();
+
//--------------------------------------------------------------------------
//
// Constructor
@@ -466,7 +468,7 @@ public class BaseWidget extends Module implements IBaseWidget
AppEvent.dispatch(AppEvent.SHOW_INFOWINDOW, infoData);
}
- public function setMapAction(action:String, status:String, symbol:Symbol, callback:Function, callback2:Function = null, showDrawTips:Boolean = true, enableGraphicsLayerMouseEvents:Boolean = false):void
+ public function setMapAction(action:String, status:String, symbol:Symbol, callback:Function, callback2:Function = null, showDrawTips:Boolean = true, enableGraphicsLayerMouseEvents:Boolean = false, drawTooltips:DrawTooltips = null):void
{
var data:Object =
{
@@ -476,6 +478,7 @@ public class BaseWidget extends Module implements IBaseWidget
handler: callback,
showDrawTips: showDrawTips,
enableGraphicsLayerMouseEvents: enableGraphicsLayerMouseEvents,
+ drawTooltips: drawTooltips || EMPTY_TOOLTIPS,
handler2: callback2
};
AppEvent.dispatch(AppEvent.SET_MAP_ACTION, data);
diff --git a/src/com/esri/viewer/DrawTooltips.as b/src/com/esri/viewer/DrawTooltips.as
new file mode 100644
index 0000000..2c9e157
--- /dev/null
+++ b/src/com/esri/viewer/DrawTooltips.as
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2008-2013 Esri. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.esri.viewer
+{
+
+public class DrawTooltips
+{
+ public function DrawTooltips(
+ toolTipPoint:String = null,
+ toolTipMultipointStart:String = null,
+ toolTipMultipointEnd:String = null,
+ toolTipPolyStart:String = null,
+ toolTipPolyContinue:String = null,
+ toolTipPolyEnd:String = null,
+ toolTipStartAndLetGo:String = null
+ )
+ {
+ this.toolTipPoint = toolTipPoint;
+ this.toolTipMultipointStart = toolTipMultipointStart;
+ this.toolTipMultipointEnd = toolTipMultipointEnd;
+ this.toolTipPolyStart = toolTipPolyStart;
+ this.toolTipPolyContinue = toolTipPolyContinue;
+ this.toolTipPolyEnd = toolTipPolyEnd;
+ this.toolTipStartAndLetGo = toolTipStartAndLetGo;
+ }
+
+ public var toolTipPoint:String;
+
+ public var toolTipMultipointStart:String;
+
+ public var toolTipMultipointEnd:String;
+
+ public var toolTipPolyStart:String;
+
+ public var toolTipPolyContinue:String;
+
+ public var toolTipPolyEnd:String;
+
+ public var toolTipStartAndLetGo:String;
+}
+}
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
index fcfae81..ca7fb20 100644
--- a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
@@ -28,10 +28,12 @@ import com.esri.ags.layers.Layer;
import com.esri.ags.layers.WMSLayer;
import com.esri.ags.layers.supportClasses.KMLFeatureInfo;
import com.esri.ags.layers.supportClasses.KMLFolder;
+import com.esri.ags.layers.supportClasses.LayerDetails;
import com.esri.ags.layers.supportClasses.LayerInfo;
import com.esri.ags.layers.supportClasses.LayerLegendInfo;
import com.esri.ags.layers.supportClasses.LegendItemInfo;
import com.esri.ags.layers.supportClasses.WMSLayerInfo;
+import com.esri.ags.symbols.PictureMarkerSymbol;
import com.esri.viewer.ViewerContainer;
import com.esri.viewer.components.toc.utils.MapUtil;
import com.esri.viewer.utils.MapServiceUtil;
@@ -278,6 +280,29 @@ public class TocMapLayerItem extends TocItem
private function getLegendResult(layerLegendInfos:Array, token:Object = null):void
{
_layerLegendInfos = [];
+
+ var layerInfos:Array;
+
+ var dynamicLayer:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
+ if (dynamicLayer)
+ {
+ layerInfos = dynamicLayer.layerInfos;
+ }
+ else
+ {
+ var tiledLayer:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
+ if (tiledLayer)
+ {
+ layerInfos = tiledLayer.layerInfos;
+ }
+ }
+
+ if (layerInfos)
+ {
+ var layerInfosWithNoLegend:Array = stripLayerInfosWithNoLegend(layerInfos, layerLegendInfos);
+ setUpExtraIcons(layerInfosWithNoLegend, this, layer);
+ }
+
getLayerLegendInfos(layerLegendInfos); // get all layerLegendInfos as these can be nested
createChildren();
@@ -287,7 +312,7 @@ public class TocMapLayerItem extends TocItem
{
for each (var layerLegendInfo:LayerLegendInfo in arr)
{
- if (layerLegendInfo) // check if layerLegendInfo exists
+ if (layerLegendInfo)
{
_layerLegendInfos.push(layerLegendInfo);
if (layerLegendInfo.layerLegendInfos)
@@ -298,6 +323,137 @@ public class TocMapLayerItem extends TocItem
}
}
+ private function setUpExtraIcons(layerInfos:Array, parentTocItem:TocItem, layer:Layer):void
+ {
+ for each (var layerInfo:LayerInfo in layerInfos)
+ {
+ if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
+ {
+ var responder:AsyncResponder = new AsyncResponder(resultHandler, faultHandler);
+
+ var dynamicLayer:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
+ if (dynamicLayer)
+ {
+ dynamicLayer.getDetails(layerInfo.layerId, responder);
+ continue;
+ }
+
+ var tiledLayer:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
+ if (tiledLayer)
+ {
+ tiledLayer.getDetails(layerInfo.layerId, responder);
+ }
+ }
+ }
+
+ function resultHandler(layerDetails:LayerDetails, token:Object = null):void
+ {
+ var tocItem:TocItem = getTocItemById(parentTocItem, layerDetails.id);
+ if (!tocItem)
+ {
+ return;
+ }
+
+ var resultType:String = layerDetails.type.toLowerCase();
+ var iconUrl:String;
+
+ if (resultType == "annotation sublayer") {
+ iconUrl = "assets/images/i_annotation.png";
+ } else if (resultType == "raster catalog layer") {
+ iconUrl = "assets/images/i_rastercatalog.png";
+ } else if (resultType == "dimension layer") {
+ iconUrl = "assets/images/i_dimension.png";
+ } else if (resultType == "raster layer") {
+ iconUrl = "assets/images/i_raster.png";
+ }
+
+ if (iconUrl)
+ {
+ tocItem.addChild(new TocLegendItem(tocItem, createLegendItemInfo(iconUrl)));
+ }
+ }
+
+ function createLegendItemInfo(iconUrl:String):LegendItemInfo
+ {
+ var legendItemInfo:LegendItemInfo = new LegendItemInfo();
+ legendItemInfo.symbol = new PictureMarkerSymbol(iconUrl, 20, 20);
+ return legendItemInfo;
+ }
+
+ function getTocItemById(parentTocMapItem:TocItem, id:Number):TocItem
+ {
+ var tocItemMatch:TocItem;
+ var infoItem:TocLayerInfoItem;
+
+ for each (var item:TocItem in parentTocMapItem.children) {
+ infoItem = item as TocLayerInfoItem;
+
+ if (infoItem) {
+ if (infoItem.layerInfo.layerId == id) {
+ tocItemMatch = infoItem;
+ break;
+ }
+ }
+ }
+
+ if (tocItemMatch)
+ {
+ return tocItemMatch;
+ }
+
+ for each (item in parentTocMapItem.children) {
+ if (item.children) {
+ tocItemMatch = getTocItemById(item, id);
+ if (tocItemMatch)
+ {
+ return tocItemMatch;
+ }
+ }
+ }
+
+ return tocItemMatch;
+ }
+
+ function faultHandler(fault:Fault, token:Object = null):void
+ {
+ //do nothing
+ }
+ }
+
+ private function stripLayerInfosWithNoLegend(layerInfos:Array, layerLegendInfos:Array):Array
+ {
+ var layerInfosWithNoLegend:Array = layerInfos.concat();
+
+ for each (var layerLegendInfo:LayerLegendInfo in layerLegendInfos)
+ {
+ if (layerLegendInfo)
+ {
+ removeLayerInfoById(layerLegendInfo.layerId);
+ if (layerLegendInfo.layerLegendInfos)
+ {
+ stripLayerInfosWithNoLegend(layerInfosWithNoLegend, layerLegendInfo.layerLegendInfos);
+ }
+ }
+ }
+
+ function removeLayerInfoById(layerId:String):void
+ {
+ var layerInfo:LayerInfo;
+ var totalLayerInfos:int = layerInfosWithNoLegend.length;
+
+ for (var i:int = 0; i < totalLayerInfos; i++) {
+ layerInfo = layerInfosWithNoLegend[i];
+
+ if (layerInfo.layerId.toString() == layerId) {
+ layerInfosWithNoLegend.splice(i, 1);
+ break;
+ }
+ }
+ }
+
+ return layerInfosWithNoLegend;
+ }
+
private function getLegendFault(fault:Fault, token:Object = null):void
{
createChildren();
diff --git a/src/com/esri/viewer/managers/MapManager.mxml b/src/com/esri/viewer/managers/MapManager.mxml
index b326d0e..2786626 100644
--- a/src/com/esri/viewer/managers/MapManager.mxml
+++ b/src/com/esri/viewer/managers/MapManager.mxml
@@ -72,6 +72,7 @@ Class used to configure the viewer map component (including layers) and handle m
import com.esri.ags.utils.WebMercatorUtil;
import com.esri.viewer.AppEvent;
import com.esri.viewer.ConfigData;
+ import com.esri.viewer.DrawTooltips;
import com.esri.viewer.IBaseWidget;
import com.esri.viewer.IInfowindowTemplate;
import com.esri.viewer.ViewerContainer;
@@ -1469,6 +1470,7 @@ Class used to configure the viewer map component (including layers) and handle m
var symbol:Symbol = data.symbol;
var showDrawTips:Boolean = data.showDrawTips;
var enableGraphicsLayerMouseEvents:Boolean = data.enableGraphicsLayerMouseEvents;
+ var drawTooltips:DrawTooltips = data.drawTooltips;
if (tool)
{
@@ -1480,13 +1482,22 @@ Class used to configure the viewer map component (including layers) and handle m
m_drawEndFunction = data.handler;
m_drawUpdateFunction = data.handler2;
m_navTool.deactivate();
- m_drawTool.activate(tool, enableGraphicsLayerMouseEvents);
// showDrawTips
m_drawTool.showDrawTips = showDrawTips;
+
+ m_drawTool.toolTipStartAndLetGo = drawTooltips.toolTipStartAndLetGo;
+ m_drawTool.toolTipPoint = drawTooltips.toolTipPoint;
+ m_drawTool.toolTipMultipointStart = drawTooltips.toolTipMultipointStart;
+ m_drawTool.toolTipMultipointEnd = drawTooltips.toolTipMultipointEnd;
+ m_drawTool.toolTipPolyStart = drawTooltips.toolTipPolyStart;
+ m_drawTool.toolTipPolyContinue = drawTooltips.toolTipPolyContinue;
+ m_drawTool.toolTipPolyEnd = drawTooltips.toolTipPolyEnd;
+
// reset symbology
m_drawTool.markerSymbol = new SimpleMarkerSymbol;
m_drawTool.lineSymbol = new SimpleLineSymbol;
m_drawTool.fillSymbol = new SimpleFillSymbol(SimpleFillSymbol.STYLE_SOLID, 0, 0.5, new SimpleLineSymbol);
+
if (symbol)
{
if (symbol is TextSymbol || symbol is SimpleMarkerSymbol || symbol is PictureMarkerSymbol)
@@ -1503,6 +1514,8 @@ Class used to configure the viewer map component (including layers) and handle m
}
}
+ m_drawTool.activate(tool, enableGraphicsLayerMouseEvents);
+
//map.zoomSliderVisible = true;
AppEvent.setStatus(status);
}
diff --git a/src/com/esri/viewer/utils/LayerObjectUtil.as b/src/com/esri/viewer/utils/LayerObjectUtil.as
index 64dc4dc..ac6f6f9 100644
--- a/src/com/esri/viewer/utils/LayerObjectUtil.as
+++ b/src/com/esri/viewer/utils/LayerObjectUtil.as
@@ -152,7 +152,7 @@ public class LayerObjectUtil
{
key = obj.@key[0] ? obj.@key : "";
}
- var culture:String = obj.@culture[0] ? obj.@culture : "";
+ var culture:String = toCultureCode(obj.@culture[0]);
var showInLegend:Boolean = obj.@showinlegend[0] != "false";
@@ -294,6 +294,11 @@ public class LayerObjectUtil
return resultObject;
}
+ public static function toCultureCode(locale:String):String
+ {
+ return locale ? locale.replace('_', '-') : "";
+ }
+
private static function isSupportedImageType(filePath:String):Boolean
{
var fp:String = filePath;
diff --git a/src/com/esri/viewer/utils/PortalBasemapAppender.as b/src/com/esri/viewer/utils/PortalBasemapAppender.as
index faf2382..84853be 100644
--- a/src/com/esri/viewer/utils/PortalBasemapAppender.as
+++ b/src/com/esri/viewer/utils/PortalBasemapAppender.as
@@ -72,7 +72,7 @@ public class PortalBasemapAppender extends EventDispatcher
portal.addEventListener(PortalEvent.LOAD, portal_loadHandler);
portal.addEventListener(FaultEvent.FAULT, portal_faultHandler);
- cultureCode = toCultureCode(ResourceManager.getInstance().localeChain[0]);
+ cultureCode = LayerObjectUtil.toCultureCode(ResourceManager.getInstance().localeChain[0]);
portal.load(portalURL, cultureCode);
}
@@ -535,11 +535,6 @@ public class PortalBasemapAppender extends EventDispatcher
AppEvent.showError(LocalizationUtil.getDefaultString("couldNotConnectToPortal"), PORTAL_BASEMAP_APPENDER);
dispatchComplete();
}
-
- private function toCultureCode(locale:String):String
- {
- return locale ? locale.replace('_', '-') : locale;
- }
}
}
diff --git a/src/version.xml b/src/version.xml
index e3be70c..63d18af 100644
--- a/src/version.xml
+++ b/src/version.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/src/widgets/AttributeTable/AttributeTableWidget.mxml b/src/widgets/AttributeTable/AttributeTableWidget.mxml
index acf940c..aae1f35 100644
--- a/src/widgets/AttributeTable/AttributeTableWidget.mxml
+++ b/src/widgets/AttributeTable/AttributeTableWidget.mxml
@@ -89,7 +89,7 @@
{
var iconOffset:Number = wTemplate.icon ? (wTemplate.icon.width * 0.5) : 0;
wTemplate.width = map.width - map.width / 100 - Number(this.left) - Number(this.right) - iconOffset;
- wTemplate.height = 300;
+ wTemplate.height = Math.max(height, 300);
}
}
diff --git a/src/widgets/Bookmark/BookmarkWidget.mxml b/src/widgets/Bookmark/BookmarkWidget.mxml
index f406b6c..04780f4 100644
--- a/src/widgets/Bookmark/BookmarkWidget.mxml
+++ b/src/widgets/Bookmark/BookmarkWidget.mxml
@@ -90,7 +90,8 @@
}
else
{
- wTemplate.width = wTemplate.height = 300;
+ wTemplate.width = Math.max(width, 300);
+ wTemplate.height = Math.max(height, 300);
}
}
diff --git a/src/widgets/Chart/ChartWidget.mxml b/src/widgets/Chart/ChartWidget.mxml
index 81e2f32..43a0c95 100644
--- a/src/widgets/Chart/ChartWidget.mxml
+++ b/src/widgets/Chart/ChartWidget.mxml
@@ -140,8 +140,8 @@
}
else
{
- wTemplate.width = 330
- wTemplate.height = 350;
+ wTemplate.width = Math.max(width, 330);
+ wTemplate.height = Math.max(height, 350);
}
}
diff --git a/src/widgets/DataExtract/DataExtractWidget.mxml b/src/widgets/DataExtract/DataExtractWidget.mxml
index 2dbea70..e696039 100644
--- a/src/widgets/DataExtract/DataExtractWidget.mxml
+++ b/src/widgets/DataExtract/DataExtractWidget.mxml
@@ -132,8 +132,8 @@
}
else
{
- wTemplate.width = 320;
- wTemplate.height = 300;
+ wTemplate.width = Math.max(width, 320);
+ wTemplate.height = Math.max(height, 300);
}
}
diff --git a/src/widgets/Directions/DirectionsWidget.mxml b/src/widgets/Directions/DirectionsWidget.mxml
index a524383..ef1750b 100644
--- a/src/widgets/Directions/DirectionsWidget.mxml
+++ b/src/widgets/Directions/DirectionsWidget.mxml
@@ -48,7 +48,7 @@
else
{
wTemplate.height = map.height - map.height / 100 - Number(this.top) - Number(this.bottom);
- wTemplate.width = 300;
+ wTemplate.width = Math.max(width, 300);
}
}
diff --git a/src/widgets/Draw/DrawWidget.mxml b/src/widgets/Draw/DrawWidget.mxml
index 20cf0f0..7c7242f 100644
--- a/src/widgets/Draw/DrawWidget.mxml
+++ b/src/widgets/Draw/DrawWidget.mxml
@@ -207,8 +207,8 @@
}
else
{
- wTemplate.width = 420;
- wTemplate.height = 300;
+ wTemplate.width = Math.max(width, 420);
+ wTemplate.height = Math.max(height, 300);
}
}
@@ -934,7 +934,7 @@
private function map_mouseDownHandler(event:MouseEvent):void
{
map.removeEventListener(MouseEvent.MOUSE_DOWN, map_mouseDownHandler);
- map.addEventListener(MouseEvent.MOUSE_UP, map_mouseUpHandler);
+ map.addEventListener(MouseEvent.MOUSE_UP, map_mouseUpHandler, false, 1000);
map.addEventListener(MouseEvent.MOUSE_MOVE, map_mouseMoveHandler);
}
diff --git a/src/widgets/Edit/EditWidget.mxml b/src/widgets/Edit/EditWidget.mxml
index a4ab76c..85b36ca 100644
--- a/src/widgets/Edit/EditWidget.mxml
+++ b/src/widgets/Edit/EditWidget.mxml
@@ -111,8 +111,8 @@
}
else
{
- wTemplate.width = 310;
- wTemplate.height = 310;
+ wTemplate.width = Math.max(width, 310);
+ wTemplate.height = Math.max(height, 310);
}
}
diff --git a/src/widgets/GeoRSS/GeoRSSWidget.mxml b/src/widgets/GeoRSS/GeoRSSWidget.mxml
index add0308..6e60cdb 100644
--- a/src/widgets/GeoRSS/GeoRSSWidget.mxml
+++ b/src/widgets/GeoRSS/GeoRSSWidget.mxml
@@ -104,8 +104,8 @@
}
else
{
- wTemplate.width = 330;
- wTemplate.height = 300;
+ wTemplate.width = Math.max(width, 330);
+ wTemplate.height = Math.max(height, 300);
}
}
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
index 52da2ee..68892f8 100644
--- a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
+++ b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
@@ -65,6 +65,7 @@
import mx.rpc.AsyncResponder;
import mx.rpc.Fault;
import mx.rpc.events.FaultEvent;
+ import mx.utils.StringUtil;
import widgets.Geoprocessing.parameters.GPParameterTypes;
import widgets.Geoprocessing.parameters.IGPFeatureParameter;
@@ -109,6 +110,8 @@
private var version:Number;
+ private var gpTaskFailureLabel:String;
+
[Bindable]
private var submitLabel:String;
[Bindable]
@@ -125,8 +128,8 @@
}
else
{
- wTemplate.width = 368;
- wTemplate.height = 250;
+ wTemplate.width = Math.max(width, 368);
+ wTemplate.height = Math.max(height, 250);
}
}
@@ -193,6 +196,7 @@
helpLabel = configXML.labels.helplabel || getDefaultString("helpLabel");
inputLabel = configXML.labels.inputlabel || getDefaultString("inputLabel");
outputLabel = configXML.labels.outputlabel || getDefaultString("outputLabel");
+ gpTaskFailureLabel = configXML.labels.taskfailedlabel || getDefaultString("gpTaskFailed");
fetchGPTaskInfo();
}
@@ -614,7 +618,11 @@
private function gp_faultHandler(event:FaultEvent):void
{
busyAnimation.visible = false;
- showError(ErrorMessageUtil.makeHTMLSafe(event.fault.toString()));
+
+ showError(
+ StringUtil.substitute(gpTaskFailureLabel,
+ ErrorMessageUtil.makeHTMLSafe(event.fault.toString()))
+ );
}
private function gp_resultDataCompleteHandler(event:GeoprocessorEvent):void
diff --git a/src/widgets/LayerList/LayerListWidget.mxml b/src/widgets/LayerList/LayerListWidget.mxml
index 61ecb74..a2d9486 100644
--- a/src/widgets/LayerList/LayerListWidget.mxml
+++ b/src/widgets/LayerList/LayerListWidget.mxml
@@ -43,7 +43,8 @@
}
else
{
- wTemplate.width = wTemplate.height = 300;
+ wTemplate.width = Math.max(width, 300);
+ wTemplate.height = Math.max(height, 300);
}
}
diff --git a/src/widgets/Legend/LegendWidget.mxml b/src/widgets/Legend/LegendWidget.mxml
index e721a5b..c9161fd 100644
--- a/src/widgets/Legend/LegendWidget.mxml
+++ b/src/widgets/Legend/LegendWidget.mxml
@@ -55,7 +55,8 @@
}
else
{
- wTemplate.width = wTemplate.height = 300;
+ wTemplate.width = Math.max(width, 300);
+ wTemplate.height = Math.max(height, 300);
}
}
diff --git a/src/widgets/Locate/LocateWidget.mxml b/src/widgets/Locate/LocateWidget.mxml
index 5d7ff24..08675f4 100644
--- a/src/widgets/Locate/LocateWidget.mxml
+++ b/src/widgets/Locate/LocateWidget.mxml
@@ -138,8 +138,8 @@
}
else
{
- wTemplate.width = 290;
- wTemplate.height = 240;
+ wTemplate.width = Math.max(width, 290);
+ wTemplate.height = Math.max(height, 240);
}
}
diff --git a/src/widgets/MapSwitcher/MapSwitcherWidget.mxml b/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
index 284e635..2452982 100644
--- a/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
+++ b/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
@@ -109,6 +109,7 @@
{
currentState = showThumbnails ? "thumbnailOptions" : "buttonOptions";
initBasemapSelectionComponent(showThumbnails);
+ AppEvent.addListener(AppEvent.BASEMAP_SWITCH, checkSelectedBasemap);
}
}
@@ -119,6 +120,20 @@
hideBasemapsTimer.addEventListener(TimerEvent.TIMER, hideBasemapsTimer_timerHandler, false, 0, true);
}
+ private function checkSelectedBasemap(event:AppEvent):void
+ {
+ var selectedBasemapId:String = event.data as String;
+
+ for each (var basemap:Basemap in basemapList.toArray())
+ {
+ if (basemap.id == selectedBasemapId)
+ {
+ basemapSelectionComponent.selectedItem = basemap;
+ break;
+ }
+ }
+ }
+
private function initBasemapList():void
{
basemapList = new ArrayList();
diff --git a/src/widgets/Print/ExportWebMapForm.mxml b/src/widgets/Print/ExportWebMapForm.mxml
index fa9385b..7dd905a 100644
--- a/src/widgets/Print/ExportWebMapForm.mxml
+++ b/src/widgets/Print/ExportWebMapForm.mxml
@@ -134,7 +134,9 @@
for each (var layer:Layer in hostBaseWidget.map.layers)
{
- if (layer.name.indexOf("hiddenLayer_") == -1 && !(layer is GraphicsLayer && !(layer is FeatureLayer)))
+ if (layer.showInLegend &&
+ layer.name.indexOf("hiddenLayer_") == -1 &&
+ !(layer is GraphicsLayer && !(layer is FeatureLayer)))
{
var isBaseMapLayer:Boolean = false;
for each (var baseMapLayer:Object in hostBaseWidget.configData.basemaps)
@@ -171,6 +173,16 @@
}
}
}
+
+ if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
+ {
+ var showInLegendHiddenLayers:Array = layer["showInLegendHiddenLayers"];
+ if (showInLegendHiddenLayers)
+ {
+ excludedSublayers = excludedSublayers.concat(showInLegendHiddenLayers);
+ }
+ }
+
if (!isExcludedLayer)
{
var legendLayer:LegendLayer = new LegendLayer();
diff --git a/src/widgets/Print/PrintWidget.mxml b/src/widgets/Print/PrintWidget.mxml
index 5a2d9de..6d25979 100644
--- a/src/widgets/Print/PrintWidget.mxml
+++ b/src/widgets/Print/PrintWidget.mxml
@@ -34,8 +34,8 @@
}
else
{
- wTemplate.width = 355;
- wTemplate.height = 260;
+ wTemplate.width = Math.max(width, 355);
+ wTemplate.height = Math.max(height, 260);
wTemplate.minHeight = 168;
}
}
diff --git a/src/widgets/Query/QueryWidget.mxml b/src/widgets/Query/QueryWidget.mxml
index 3699eda..c9fb1a4 100644
--- a/src/widgets/Query/QueryWidget.mxml
+++ b/src/widgets/Query/QueryWidget.mxml
@@ -128,7 +128,8 @@
}
else
{
- wTemplate.width = wTemplate.height = 300;
+ wTemplate.width = Math.max(width, 300);
+ wTemplate.height = Math.max(height, 300);
}
}
diff --git a/src/widgets/Search/SearchWidget.mxml b/src/widgets/Search/SearchWidget.mxml
index a0e9e69..4297375 100644
--- a/src/widgets/Search/SearchWidget.mxml
+++ b/src/widgets/Search/SearchWidget.mxml
@@ -157,8 +157,8 @@
}
else
{
- wTemplate.width = 430;
- wTemplate.height = 240;
+ wTemplate.width = Math.max(width, 430);
+ wTemplate.height = Math.max(height, 240);
}
}
diff --git a/src/widgets/Time/TimeWidget.mxml b/src/widgets/Time/TimeWidget.mxml
index 2ae8904..5d289ef 100644
--- a/src/widgets/Time/TimeWidget.mxml
+++ b/src/widgets/Time/TimeWidget.mxml
@@ -58,8 +58,8 @@
}
else
{
- wTemplate.width = 335;
- wTemplate.height = 115;
+ wTemplate.width = Math.max(width, 335);
+ wTemplate.height = Math.max(height, 115);
}
}