xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'unidata_18.1.1' of github.com:Unidata/awips2 into unidata_18.1.1-osx

Browse source
This commit is contained in:
Michael James 2019-03-21 15:27:14 -06:00
commit a5e762a005
13 changed files with 411 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -5,8 +5,11 @@ test-bin/
testbin/ testbin/
testBin/ testBin/
bin-test/ bin-test/
dist/
build/logs/
*.class *.class
*.pyo *.pyo
*.rpm
*.pyc *.pyc
*.o *.o
*.orig *.orig

10
cave/com.raytheon.uf.viz.aviation.advisory/localization/menus/aviationadvisory/index.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This is an absolute override file, indicating that a higher priority
version of the file will completely replace a lower priority version
of the file.
-->
<menuContributionFile>
<include installTo="menu:obs?after=SURFACE"
fileName="menus/upperair/baseAviationProducts.xml" />
</menuContributionFile>

70
cave/com.raytheon.uf.viz.aviation.advisory/localization/menus/upperair/baseAviationProducts.xml
View file

@ -1,70 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="subMenu" menuText="SIGMET/AIRMET">
<contribute xsi:type="bundleItem" file="bundles/ConvSigmet.xml"
menuText="Convective SIGMET" id="ConvSigmet">
</contribute>
<contribute xsi:type="bundleItem" file="bundles/IntlSigmet.xml"
menuText="International SIGMETs" id="INTLSIGMET">
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Turbulence" id="SIGMETTURB">
<substitute key="hazardType" value="TURBULENCE" />
<substitute key="color" value="#FF4444" />
<substitute key="name" value="Turbulence SIGMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Tropical Cyclone" id="SIGMETTTOPCYCLONE">
<substitute key="hazardType" value="TROPICAL CYCLONE" />
<substitute key="color" value="#00FFFF" />
<substitute key="name" value="Tropical Cyclone SIGMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Icing" id="SIGMETICING">
<substitute key="hazardType" value="ICING" />
<substitute key="color" value="#FFFFFF" />
<substitute key="name" value="Icing SIGMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Icing" id="AIRMETICING">
<substitute key="hazardType" value="ICING" />
<substitute key="color" value="#0000FF" />
<substitute key="name" value="Icing AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Turbulence" id="AIRMETTURB">
<substitute key="hazardType" value="TURBULENCE" />
<substitute key="color" value="#00FF00" />
<substitute key="name" value="Turbulence AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Instrument Flight Rules (IFR)" id="AIRMETIFR">
<substitute key="hazardType" value="INSTRUMENT FLIGHT RULES" />
<substitute key="color" value="#00FFFF" />
<substitute key="name" value="IFR AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Mountain Obstruction" id="AIRMETMTNOBSC">
<substitute key="hazardType" value="MOUNTAIN OBSCURATION" />
<substitute key="color" value="#FF0088" />
<substitute key="name" value="Mtn Obscn AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Volcanic Ash" id="SIGMETVOLCANICASH">
<substitute key="hazardType" value="VOLCANIC ASH CLOUD" />
<substitute key="color" value="#00FF00" />
<substitute key="name" value="Volcanic Ash SIGMET" />
</contribute>
</contribute>
</menuTemplate>

4
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -181,6 +181,10 @@
id="com.raytheon.uf.viz.vtec.feature" id="com.raytheon.uf.viz.vtec.feature"
version="0.0.0"/> version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.aviation.advisory.feature"
version="0.0.0"/>
<requires> <requires>
<import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/> <import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
</requires> </requires>

BIN
cave/com.raytheon.viz.ui.personalities.awips/splash.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 308 KiB

BIN
cave/com.raytheon.viz.ui.personalities.awips/splash.xcf
View file

Binary file not shown.

55
cave/com.raytheon.viz.warnings/localization/bundles/Airmet.xml Normal file
View file

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!--
This is an absolute override file, indicating that a higher priority
version of the file will completely replace a lower priority version
of the file.
-->
<bundle>
<displayList>
<displays xsi:type="d2DMapRenderableDisplay"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="${name}"
colorString="${color}">
<dataAdapter xsi:type="airmetDataAdapter"
hazardType="${hazardType}" />
<binOffset posOffset="20400"
negOffset="1200" virtualOffset="-7200" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="airmet"
constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
</descriptor>
</displays>
</displayList>
</bundle>

136
cave/com.raytheon.viz.warnings/localization/bundles/ConvSigmet.xml Normal file
View file

@ -0,0 +1,136 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!--
This is an absolute override file, indicating that a higher priority
version of the file will completely replace a lower priority version
of the file.
-->
<bundle>
<displayList>
<displays xsi:type="d2DMapRenderableDisplay"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
<capability xsi:type="imagingCapability"
interpolationState="false" brightness="1.0"
contrast="1.0" alpha="1.0" />
<capability xsi:type="outlineCapability" outlineWidth="3" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="colorableCapability"
colorAsString="#FF8800" />
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="C-SIGMET OUTLOOK"
enableNonstandardInspect="true">
<dataAdapter xsi:type="convSigmetOutlookDataAdapter" />
<binOffset posOffset="3000" negOffset="600"
virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="convsigmet"
constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
<capability xsi:type="imagingCapability"
interpolationState="false" brightness="1.0"
contrast="1.0" alpha="1.0" />
<capability xsi:type="outlineCapability" outlineWidth="3" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="colorableCapability"
colorAsString="#FFFF00" />
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true"
name="1hr C-SIGMET Fcst">
<dataAdapter xsi:type="convSigmetCastDataAdapter"
forecast="true" />
<binOffset posOffset="3000" negOffset="600"
virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="convsigmet"
constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
<capability xsi:type="imagingCapability"
interpolationState="false" brightness="1.0"
contrast="1.0" alpha="1.0" />
<capability xsi:type="colorableCapability"
colorAsString="#FF0000" />
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="C-SIGMET Nowcast">
<dataAdapter xsi:type="convSigmetCastDataAdapter" />
<binOffset posOffset="3000" negOffset="600"
virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="convsigmet"
constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
<capability xsi:type="imagingCapability"
interpolationState="false" brightness="1.0"
contrast="1.0" alpha="1.0" />
<capability xsi:type="outlineCapability" outlineWidth="3" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="colorableCapability"
colorAsString="#FFFFFF" />
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="C-SIGMET Text">
<dataAdapter xsi:type="convSigmetTextDataAdapter" />
<binOffset posOffset="3000" negOffset="600"
virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="convsigmet"
constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
</descriptor>
</displays>
</displayList>
</bundle>

90
cave/com.raytheon.viz.warnings/localization/bundles/IntlSigmet.xml Normal file
View file

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This is an absolute override file, indicating that a higher priority
version of the file will completely replace a lower priority version
of the file.
-->
<!--
TURBULENCE
EMBEDED THUNDERSTORMS
CANCEL
OBSCURE THUNDERSTORMS
CUMULONIMBUS
FREQUENT THUNDERSTORMS
NIL
THUNDERSTORM
UNKNOWN ???
ICING
ISOLATED THUNDERSTORMS
ISOLATED EMBEDED THUNDERSTORMS
EMBEDED THUNDERSTORMS HAIL
-->
<bundle>
<displayList>
<displays xsi:type="d2DMapRenderableDisplay"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
<capability xsi:type="magnificationCapability" magnification="2"/>
<capability xsi:type="outlineCapability" outlineWidth="3" outlineOn="true" lineStyle="DEFAULT"/>
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="Thunderstorm SIGMET"
colorString="#00ffff">
<dataAdapter xsi:type="intlSigmetDataAdapter" hazardType="THUNDERSTORM" />
<binOffset posOffset="2700" negOffset="900" virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="intlsigmet" constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
<capability xsi:type="magnificationCapability" magnification="2"/>
<capability xsi:type="outlineCapability" outlineWidth="3" outlineOn="true" lineStyle="DEFAULT"/>
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="Turbulence SIGMET"
colorString="#ffff00">
<dataAdapter xsi:type="intlSigmetDataAdapter" hazardType="TURBULENCE" />
<binOffset posOffset="2700" negOffset="900" virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="intlsigmet" constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="false">
<capabilities>
<capability xsi:type="magnificationCapability" magnification="2"/>
<capability xsi:type="outlineCapability" outlineWidth="3" outlineOn="true" lineStyle="DEFAULT"/>
</capabilities>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="Icing SIGMET"
colorString="#00ff00">
<dataAdapter xsi:type="intlSigmetDataAdapter" hazardType="ICING" />
<binOffset posOffset="2700" negOffset="900" virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="intlsigmet" constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
</descriptor>
</displays>
</displayList>
</bundle>

54
cave/com.raytheon.viz.warnings/localization/bundles/NonConvSigmet.xml Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!--
This is an absolute override file, indicating that a higher priority
version of the file will completely replace a lower priority version
of the file.
-->
<bundle>
<displayList>
<displays xsi:type="d2DMapRenderableDisplay"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties loadWithoutData="false">
<capabilities/>
</loadProperties>
<resourceData xsi:type="advisoryResourceData"
isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" name="${name}"
colorString="${color}">
<dataAdapter xsi:type="nonConvSigmetDataAdapter"
hazardType="${hazardType}" />
<binOffset posOffset="2700" negOffset="900"
virtualOffset="0" />
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="nonconvsigmet"
constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
</descriptor>
</displays>
</displayList>
</bundle>

68
cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
View file

@ -31,4 +31,72 @@
menuText="SPC Svr Wx Plot" id="spcWxPlot"> menuText="SPC Svr Wx Plot" id="spcWxPlot">
</contribute> </contribute>
<contribute xsi:type="subMenu" menuText="SIGMET/AIRMET">
<contribute xsi:type="bundleItem" file="bundles/ConvSigmet.xml"
menuText="Convective SIGMET" id="ConvSigmet">
</contribute>
<contribute xsi:type="bundleItem" file="bundles/IntlSigmet.xml"
menuText="International SIGMETs" id="INTLSIGMET">
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Turbulence" id="SIGMETTURB">
<substitute key="hazardType" value="TURBULENCE" />
<substitute key="color" value="#FF4444" />
<substitute key="name" value="Turbulence SIGMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Tropical Cyclone" id="SIGMETTTOPCYCLONE">
<substitute key="hazardType" value="TROPICAL CYCLONE" />
<substitute key="color" value="#00FFFF" />
<substitute key="name" value="Tropical Cyclone SIGMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Icing" id="SIGMETICING">
<substitute key="hazardType" value="ICING" />
<substitute key="color" value="#FFFFFF" />
<substitute key="name" value="Icing SIGMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Icing" id="AIRMETICING">
<substitute key="hazardType" value="ICING" />
<substitute key="color" value="#0000FF" />
<substitute key="name" value="Icing AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Turbulence" id="AIRMETTURB">
<substitute key="hazardType" value="TURBULENCE" />
<substitute key="color" value="#00FF00" />
<substitute key="name" value="Turbulence AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Instrument Flight Rules (IFR)" id="AIRMETIFR">
<substitute key="hazardType" value="INSTRUMENT FLIGHT RULES" />
<substitute key="color" value="#00FFFF" />
<substitute key="name" value="IFR AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Airmet.xml"
menuText="AIRMET Mountain Obstruction" id="AIRMETMTNOBSC">
<substitute key="hazardType" value="MOUNTAIN OBSCURATION" />
<substitute key="color" value="#FF0088" />
<substitute key="name" value="Mtn Obscn AIRMET" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml"
menuText="SIGMET Volcanic Ash" id="SIGMETVOLCANICASH">
<substitute key="hazardType" value="VOLCANIC ASH CLOUD" />
<substitute key="color" value="#00FF00" />
<substitute key="name" value="Volcanic Ash SIGMET" />
</contribute>
</contribute>
</menuTemplate> </menuTemplate>

2
rpms/awips2.upc/Installer.ldm/component.spec
View file

@ -1,4 +1,4 @@
%define _ldm_version 6.13.7 %define _ldm_version 6.13.10
%define _ldm_src_tar ldm-%{_ldm_version}.tar.gz %define _ldm_src_tar ldm-%{_ldm_version}.tar.gz
# ldm-%{_ldm_version}.tar.gz is tarred up ldm-%{_ldm_version}/src dir after # ldm-%{_ldm_version}.tar.gz is tarred up ldm-%{_ldm_version}/src dir after
# ISG makes retrans changes # ISG makes retrans changes

BIN
rpms/awips2.upc/Installer.ldm/src/ldm-6.13.7.tar.gz → rpms/awips2.upc/Installer.ldm/src/ldm-6.13.10.tar.gz
View file

Binary file not shown.