3.1.9

* Correct Yahoo! lookup by US ZIP code * Add option to display Feels Like on menu bar (vs. actual temperature) * Correct rotation of cities * Adjust pressure (QFE) based on altitude (QNH), where altitude is provided (currently only via <here>) git-svn-id: https://svn.code.sf.net/p/heat-meteo/svn/trunk@224 d3ebed13-a016-0410-8795-cbbf129bdbb2
smammy · Jul 12, 2019 · dff0a46 · dff0a46
1 parent 8320f04
commit dff0a46
Show file tree

Hide file tree

Showing 10 changed files with 143 additions and 76 deletions.
diff --git a/AppDelegate.swift b/AppDelegate.swift
diff --git a/CHANGELOG2 b/CHANGELOG2
@@ -1,12 +1,5 @@
-3.1.8
-* Add translation of German special characters (umlauts) to ASCII.
-* Add detection of wake from sleep to avoid some wifi problems.
-* Detect and report (but can't auto-resolve) Yahoo! OAuth errors in the Console log (along with other possible validation errors).
-* Update Yahoo! authentication, again. This time for X-Yahoo-App-Id.
-* Add support for Yahoo! location to be either city,state or lat,long.
-* Allow for unknown weather icons for APIXU (after wake from sleep)
-* Correct a recurring 9999 for OpenWeatherMap
-* Provide a reference URL for Yahoo! locations.
-* Update source code to Swift 5 and Xcode 10.2.
-* Updated support for WunderGround and PWS's (put your PWS ID as the city).
-* Updated OhhAuth to latest version.
+3.1.9
+* Correct Yahoo! lookup by US ZIP code
+* Add option to display Feels Like on menu bar (vs. actual temperature)
+* Correct rotation of cities
+* Adjust pressure (QFE) based on altitude (QNH), where altitude is provided (currently only via <here>)
diff --git a/Info.plist b/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.8</string>
+	<string>3.1.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Meteorologist/Base.lproj/MainMenu.xib b/Meteorologist/Base.lproj/MainMenu.xib
@@ -55,6 +55,7 @@
                 <outlet property="cityTextField7" destination="Reb-eR-Quc" id="Bjo-W6-Gl5"/>
                 <outlet property="cityTextField8" destination="KVC-f8-WaV" id="XG9-hj-NIG"/>
                 <outlet property="controlsInSubmenu" destination="a5p-if-6gI" id="am2-tl-t8c"/>
+                <outlet property="convertQFEtoQNH" destination="Z1k-Rd-UbA" id="hVS-Mv-vfq"/>
                 <outlet property="currentWeatherInSubmenu" destination="Y29-eb-O86" id="A7H-mt-VZP"/>
                 <outlet property="darkSkyLocation" destination="7SB-25-SAM" id="Gxx-8I-717"/>
                 <outlet property="darkSkyURL" destination="NBI-97-MKP" id="Ssq-ek-Wq0"/>
@@ -67,6 +68,7 @@
                 <outlet property="directionUnit" destination="Xnb-H1-W6C" id="enF-pf-yn3"/>
                 <outlet property="displayCityName" destination="a84-ZU-bgl" id="fiH-eB-zGG"/>
                 <outlet property="displayDegreeType" destination="oFq-SC-5Xh" id="biw-WH-hRB"/>
+                <outlet property="displayFeelsLike" destination="ywj-wx-99a" id="eDS-5q-dDO"/>
                 <outlet property="displayHumidity" destination="qEC-Rn-aOw" id="aW4-Yl-oOz"/>
                 <outlet property="displayWeatherIcon" destination="msU-RW-U6K" id="ln6-Pa-0w1"/>
                 <outlet property="distanceLabel" destination="JH6-bw-2q7" id="CB0-K4-QZh"/>
@@ -138,7 +140,7 @@
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Locations_" identifier="Locations_" id="Ct3-sn-Kal" userLabel="Locations Tab">
-                                <view key="view" ambiguous="YES" id="qw4-cW-H1t">
+                                <view key="view" id="qw4-cW-H1t">
                                     <rect key="frame" x="10" y="33" width="1020" height="255"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
@@ -551,7 +553,7 @@
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Options_" identifier="Options_" id="hev-om-kST" userLabel="Options Tab">
-                                <view key="view" id="OSu-6i-qwW">
+                                <view key="view" ambiguous="YES" id="OSu-6i-qwW">
                                     <rect key="frame" x="10" y="33" width="1020" height="255"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
@@ -780,62 +782,70 @@
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
-                                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UDx-ys-QaV">
+                                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ywj-wx-99a" userLabel="Display Feels Like_">
                                             <rect key="frame" x="527" y="176" width="220" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="View extended forecast_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="weo-Gb-vAL">
+                                            <buttonCell key="cell" type="check" title="Display Feels Like_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="V9o-gk-Wn6" userLabel="Display Feels Like_">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RdL-mQ-nf6">
-                                            <rect key="frame" x="750" y="236" width="287" height="18"/>
+                                            <rect key="frame" x="750" y="216" width="287" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Extended forecast in submenu_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="bPO-ho-LLR">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fQB-Yr-XdY">
-                                            <rect key="frame" x="750" y="216" width="287" height="18"/>
+                                            <rect key="frame" x="750" y="196" width="287" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Extended forecast icons_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="4wi-RG-hzU">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tmh-T9-GIK">
-                                            <rect key="frame" x="750" y="196" width="287" height="18"/>
+                                            <rect key="frame" x="750" y="176" width="287" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Extended forecast single line_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="u0w-e0-CBZ">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="L0l-0t-2yC">
-                                            <rect key="frame" x="750" y="176" width="287" height="18"/>
+                                            <rect key="frame" x="750" y="156" width="287" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Extended forecast displays date_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="fyw-x6-4f4">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6ci-Sz-6PT">
-                                            <rect key="frame" x="750" y="156" width="287" height="18"/>
+                                            <rect key="frame" x="750" y="136" width="287" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Rotate weather locations" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="kvB-yI-i09">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ad6-Bg-1bj">
-                                            <rect key="frame" x="750" y="136" width="287" height="18"/>
+                                            <rect key="frame" x="750" y="116" width="287" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Check for new versions on launch_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="9tL-Lo-Tjc">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
+                                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Z1k-Rd-UbA" userLabel="Convert QFE to QNH">
+                                            <rect key="frame" x="750" y="96" width="287" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Convert QFE to QNH_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="rsQ-XY-tO0" userLabel="Convert QFE to QNH">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                        </button>
                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cWg-ob-OCE">
                                             <rect key="frame" x="434" y="63" width="152" height="63"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -872,6 +882,14 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
+                                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UDx-ys-QaV">
+                                            <rect key="frame" x="750" y="236" width="269" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="View extended forecast_" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="weo-Gb-vAL">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                        </button>
                                     </subviews>
                                 </view>
                             </tabViewItem>
@@ -1230,7 +1248,7 @@
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="EET-S5-SCY">
                                                 <rect key="frame" x="0.0" y="0.0" width="984" height="230"/>
-                                                <autoresizingMask key="autoresizingMask"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textView ambiguous="YES" editable="NO" selectable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" baseWritingDirection="leftToRight" spellingCorrection="YES" smartInsertDelete="YES" id="GDo-Sy-c9b">
                                                         <rect key="frame" x="0.0" y="0.0" width="984" height="230"/>

diff --git a/README.txt b/README.txt
@@ -1,5 +1,11 @@
 This file could also be called the change log.
 
+3.1.9
+* Correct Yahoo! lookup by US ZIP code
+* Add option to display Feels Like on menu bar (vs. actual temperature)
+* Correct rotation of cities
+* Adjust pressure (QFE) based on altitude (QNH), where altitude is provided (currently only via <here>)
+
 3.1.8
 * Add translation of German special characters (umlauts) to ASCII.
 * Add detection of wake from sleep to avoid some wifi problems.

diff --git a/VERSION2 b/VERSION2
@@ -1 +1 @@
-3.1.8
+3.1.9
diff --git a/YahooWeatherAPI.swift b/YahooWeatherAPI.swift
@@ -114,10 +114,8 @@ class YahooWeatherAPI: NSObject, XMLParserDelegate {
         //print(String(format:"URL for Yahoo: %@\n", parseURL))
         var ak1 = APIKey1
         var ak2 = APIKey2
-        if (ak1 == "") {
+        if ((ak1 == "") || (ak2 == "")) {
             ak1 = ConsumerKey
-        }
-        if (ak2 == "") {
             ak2 = ConsumerSecret
         }
 

diff --git a/en.lproj/Default.strings b/en.lproj/Default.strings
@@ -11,6 +11,7 @@
 "Close_" = "Close";
 "Controls_" = "Controls";
 "ControlsInSubmenu_" = "Show controls in submenu";
+"convertQFEtoQNH_" = "Convert QFE to QNH";
 "currentConditions_" = "Current Conditions";
 "CurrentWeather_" = "Current weather in submenu";
 "DarkSky_" = "DarkSky.net";
@@ -22,6 +23,7 @@
 "DisplayDegreeType_" = "Display type (C/F)";
 "DisplayFont_" = "Display Font";
 "DisplayHumidity_" = "Display Humidity";
+"DisplayFeelsLike_" = "Display Feels Like";
 "DisplayWeatherIcon_" = "Display weather icon";
 "Distance_" = "Distance";
 "Download?_" = "Would you like to download it now?";

diff --git a/fr.lproj/Localizable.strings b/fr.lproj/Localizable.strings
@@ -11,6 +11,7 @@
 "Close_" = "Fermer";
 "Controls_" = "Contrôles";
 "ControlsInSubmenu_" = "Contrôles dans un sous-menu";
+"convertQFEtoQNH_" = "Convertir QFE en QNH";
 "currentConditions_" = "Météo actuelle";
 "CurrentWeather_" = "Météo actuelle dans sous-menu";
 "DarkSky_" = "DarkSky.net";
@@ -23,6 +24,7 @@
 "DisplayFont_" = "Police d'affichage";
 "DisplayHumidity_" = "Afficher l'humidité";
 "DisplayWeatherIcon_" = "Afficher l'icône-météo";
+"DisplayFeelsLike_" = "Display Ressentie";
 "Distance_" = "Distance";
 "Download?_" = "Télécharger immédiatement ?";
 "ExtendedForecast_" = "Prévisions étendues";

diff --git a/readme.rtf b/readme.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
 {\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fswiss\fcharset0 Helvetica-BoldOblique;
 }
 {\colortbl;\red255\green255\blue255;\red38\green38\blue38;\red38\green71\blue75;\red14\green14\blue255;
@@ -14,7 +14,6 @@
 	* What works and what doesn\'92t on older OS\'92s?\
 \
 * localization started - French only for now\
-* default to current location\
 * localize weather forecast (partially complete)\
 \
 * display location (\strike \strikec0 Menubar\strike0\striked0  vs. Dock vs. Both) - does anybody use Dock view?\
@@ -23,9 +22,6 @@
 \
 * animate refreshing weather icon?\
 \
-* preference pane with 
-\f0\b tabs
-\f1\b0 \
 * dynamic city name list (not limited to 8?)\
 * There is some sort of memory link - possibly with NSTimer?\
 * Give API key only once for a given weather source\
@@ -40,7 +36,7 @@
 \f1\b0\fs28 \
 \
 Version 2 of Meteorologist is initially based on the menuBar app by Brad at {\field{\*\fldinst{HYPERLINK "http://footle.org/WeatherBar/"}}{\fldrslt http://footle.org/WeatherBar/}}.\
-The use is NSXMLParser came as a result of not getting a working copy of curl handle working with the original Meteorologist.\
+The use of NSXMLParser came as a result of not getting a working copy of curl handle working with the original Meteorologist.\
 \
 AppDelegate.swift is the starting point but never really used.\
 It contains a list of websites where I gathered and learn how to do all of this in Swift (2).\
@@ -65,7 +61,7 @@ updateWeather is also called each time the PreferencesWindow is closed\
 In PreferencesWindow\cf2 \expnd0\expndtw0\kerning0
 \CocoaLigature1 .swift\cf3 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
 * the xib is updated with the proper localized (international) text\
-* the Window is updated with the current preferences (default are used if the don\'92t already exist)\
+* the Window is updated with the current preferences (default are used if they don\'92t already exist)\
 * when the Window is closed, the preferences are saved\
 \
 In RadarWindow\cf2 \expnd0\expndtw0\kerning0